diff options
Diffstat (limited to 'x11-libs/motif')
| -rw-r--r-- | x11-libs/motif/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/motif/metadata.xml | 3 | ||||
| -rw-r--r-- | x11-libs/motif/motif-2.3.8-r5.ebuild (renamed from x11-libs/motif/motif-2.3.8-r1.ebuild) | 32 |
3 files changed, 24 insertions, 13 deletions
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest index 9cfd32417067..95f7f2d0744b 100644 --- a/x11-libs/motif/Manifest +++ b/x11-libs/motif/Manifest @@ -1,2 +1,2 @@ -DIST motif-2.3.8-patches-1.tar.xz 1896 BLAKE2B 7234860dadac55362c7f1804133a660da1ab468fb6c0f0c71cad76b956a5f0b1e58874496a6721f49bd6413e916014807e946112b48b9a22272db5e4d97d43d9 SHA512 22e5d8c590d2c1c57fc639cb46d16984dc5fbafb3b68fd647d180d6299a06f884a8ed69e2180da8153bb0f68821eb0031f93e9b9a3128ba93535fd7fb92b402b +DIST motif-2.3.8-patches-5.tar.xz 6156 BLAKE2B b8d1ac1f2bea3521c97b506ecb480ea92c64708376c1bd9c00b853109568527f82eb8f87bd50d78afe9e15a4c84aab51f32598a12b040f7d67ae0dee422c0366 SHA512 594b39ded4e932789baf906e5e7e3cc402f1940cba147b35ae43aba52f65522ba48a05f3193ed9f8ff5c03fed1b517bfde35b38c189e1e7169745c8b97a5d924 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55 diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml index 40ef2c33fec6..8b80f7d45e98 100644 --- a/x11-libs/motif/metadata.xml +++ b/x11-libs/motif/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> <email>ulm@gentoo.org</email> @@ -8,6 +8,7 @@ <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag> </use> <upstream> + <bugs-to>http://bugs.motifzone.net/</bugs-to> <remote-id type="sourceforge">motif</remote-id> </upstream> </pkgmetadata> diff --git a/x11-libs/motif/motif-2.3.8-r1.ebuild b/x11-libs/motif/motif-2.3.8-r5.ebuild index 6a64584bd370..208377262a2a 100644 --- a/x11-libs/motif/motif-2.3.8-r1.ebuild +++ b/x11-libs/motif/motif-2.3.8-r5.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=8 -inherit autotools flag-o-matic multilib toolchain-funcs multilib-minimal +inherit autotools flag-o-matic toolchain-funcs multilib-minimal DESCRIPTION="The Motif user interface component toolkit" HOMEPAGE="https://sourceforge.net/projects/motif/ https://motif.ics.com/" SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz - https://dev.gentoo.org/~ulm/distfiles/${P}-patches-1.tar.xz" + https://dev.gentoo.org/~ulm/distfiles/${P}-patches-5.tar.xz" LICENSE="LGPL-2.1+ MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft" RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] - jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] ) + jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] ) unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) xft? ( @@ -29,15 +29,19 @@ RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} - sys-devel/flex - || ( dev-util/byacc sys-freebsd/freebsd-ubin ) x11-base/xorg-proto x11-misc/xbitmaps" +BDEPEND="sys-devel/flex + dev-util/byacc" + src_prepare() { eapply ../patch eapply_user + # remove files generated by flex #864533 + rm tools/wml/{wmllex,wmluiltok}.c || die + AT_M4DIR=. eautoreconf # get around some LANG problems in make (#15119) @@ -53,8 +57,7 @@ src_prepare() { [[ ${CHOST} == *-solaris2.11 ]] \ && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3 - if use !elibc_glibc && use !elibc_uclibc && use !elibc_musl \ - && use unicode; then + if use !elibc_glibc && use !elibc_musl && use unicode; then # libiconv detection in configure script doesn't always work # http://bugs.motifzone.net/show_bug.cgi?id=1423 export LIBS="${LIBS} -liconv" @@ -65,6 +68,13 @@ src_prepare() { # remember the name of the C compiler for the native ABI MY_NATIVE_CC=$(tc-getCC) + + # -Werror=lto-type-mismatch + # + # Helpfully, the motif bugtracker is entirely down. They are also + # on sourceforge but only for merge requests? The project is a + # fascinating kind of ghostly haunting. Punting on reporting... for now. + filter-lto } multilib_src_configure() { @@ -102,7 +112,7 @@ multilib_src_install_all() { newins "${FILESDIR}"/Mwm.defaults Mwm # cleanup - rm -rf "${ED}"/usr/share/Xm + rm -rf "${ED}"/usr/share/Xm || die find "${D}" -type f -name "*.la" -delete || die dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO |