From 31459e63971ac3b08706bba949851d93c45043c3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 30 Sep 2022 15:24:40 +0100 Subject: gentoo auto-resync : 30:09:2022 - 15:24:40 --- media-gfx/Manifest.gz | Bin 38330 -> 38336 bytes media-gfx/transfig/Manifest | 2 +- media-gfx/transfig/transfig-3.2.5e-r1.ebuild | 5 +- media-gfx/xli/Manifest | 3 +- media-gfx/xli/files/xli-1.17.0-clang16.patch | 20 ++++++ media-gfx/xli/xli-1.17.0-r5.ebuild | 86 ------------------------- media-gfx/xli/xli-1.17.0-r6.ebuild | 91 +++++++++++++++++++++++++++ 7 files changed, 117 insertions(+), 90 deletions(-) create mode 100644 media-gfx/xli/files/xli-1.17.0-clang16.patch delete mode 100644 media-gfx/xli/xli-1.17.0-r5.ebuild create mode 100644 media-gfx/xli/xli-1.17.0-r6.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index aa22d1f2b8d1..d2c1a7ecdae6 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/transfig/Manifest b/media-gfx/transfig/Manifest index fec32e6bbeee..5155f40b20e7 100644 --- a/media-gfx/transfig/Manifest +++ b/media-gfx/transfig/Manifest @@ -3,5 +3,5 @@ AUX transfig-3.2.5e-gcc10-fno-common.patch 939 BLAKE2B 70af7830470b5ed524d6b5df5 DIST fig2mpdf-1.1.2.tar.bz2 191438 BLAKE2B 411791fecf6e10aac92c004c7da69a10c97a6e12f811452f12d0b51b3a1eeff8fff97d831a5e64c9047855d27e6825a4e65f62be2536651e5876edd00cc822a9 SHA512 36dea40008371386b47a4451e2f311cc2540ab063e3b61e628a535775d62a8840c5cc20c37b80465184bf041c6e583aaf3e5156079e72211d0a87ff3346d2980 DIST transfig-3.2.5e-gentoo-patchset-r1.tar.bz2 21160 BLAKE2B 093020827fc0636f7549c3b325e4f148aa52407d8e288038dd02012875737523e83e0717662d04e463a01e8cfacfabffaaa4362b5bb1276c4f2052f6653fa26f SHA512 dbef1ca464929de45f3c706e76eb9f324ea9e692cc8c924893926e07ef7d4e0dbe597bcf465a9c7fc9fca22abe0acc6784ab09658a18aeff4ba44921b52b02ff DIST transfig.3.2.5e.tar.gz 531256 BLAKE2B 830a97cb801b9cb284f7746a7f4a9645263cc34fd35d904288143d730331901302b12223ba135d8fa936f5ca0eeccacd194bbe2e74dfcfbf0cf4aede273ab507 SHA512 ed1379f1112514d90a4b3eecd3222baad311d804b5090e8e66867ec299e4f9a5f8d83ef8939aa6ecaa85a18143b8fb9b97f78e078ac5eeb934a158c55de6bb1e -EBUILD transfig-3.2.5e-r1.ebuild 3443 BLAKE2B 40eb4b45f45ed98f13e5e99d90657d430f126712b6de1872861fc167f7979e3fefdd8443bb6b0de07ef74c9dffb46e682bfd3895885373aee02894159cb14a69 SHA512 3c49a8fd93dd6b6c2c3cd1ae02d5806804916bbe06ff7a07c80456badf03f51b03649aa7679d9344061d0723e636f457b1e985f98e21ef2db05addf56811f6ce +EBUILD transfig-3.2.5e-r1.ebuild 3461 BLAKE2B a34d84cfe0afafd62515c9d9d42328c0604c02ad4fece0c3853bc02810646d667605f915e67d2ac837903ce3ff82303e3a40e9bf0270f65895adb2ce8eff2226 SHA512 03f204fe28c830c62846f7a249515bdfcf44555a321342e1219a434f89f05935f17f77b023baf8f55dcd0832588a2f6c5e35d041ab685c20d9e5cb4659bee415 MISC metadata.xml 239 BLAKE2B 7318d5b7bc5c4e143cab638973eb637b4d3b5e7d8ff039231251371b0574f12e318412fd306c2bcf7b6b3d5b04a7b103ca5e74c4f8088f944fa79b15f271a51f SHA512 f6816d8f304e955fa8f8e188f0ea7f0e20c2a13f19e5f5832d1e7ec7dda03c644196b762e5b76de6c19efc02fbafc4fc7add41627d36bcce537f7ec877a0ce3b diff --git a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild index eba86b40a63e..51f33e7fd865 100644 --- a/media-gfx/transfig/transfig-3.2.5e-r1.ebuild +++ b/media-gfx/transfig/transfig-3.2.5e-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,6 +26,7 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND=" app-text/rman + sys-devel/gcc >=x11-misc/imake-1.0.8-r1" PATCHES=( @@ -73,7 +74,7 @@ src_prepare() { } src_configure() { - export IMAKECPP=${IMAKECPP:-$(tc-getCPP)} + export IMAKECPP=${IMAKECPP:-${CHOST}-gcc -E} CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" xmkmf || die } diff --git a/media-gfx/xli/Manifest b/media-gfx/xli/Manifest index 657c5ddcecfe..4184aaee548b 100644 --- a/media-gfx/xli/Manifest +++ b/media-gfx/xli/Manifest @@ -1,7 +1,8 @@ AUX Xli.ad 123 BLAKE2B 4ea6d6b8b4e0ddf53ac1e5fb1fc67c000b48843e114b3349a9021096ee27af135c998f2013377c2b31cc2885f2eaf627ce343d25fd5cad407a4def92a87bb192 SHA512 a37a8054e1533bc46f0e24b88137bf2ea8a7294f16e37edd6c323f42d28bfa0dc93b74d41fb1cb3df3488754db42fb5a269c42ae08dade61f22b8c42c8cd9c8b +AUX xli-1.17.0-clang16.patch 402 BLAKE2B 573dd4c4cd06b4d1cc12a3ca646666a3a122c554f4579b9639a6f81b1157ea2edf8c460144e92f9bf5e1450f759dbfed02dc1fa5701bcfa9efe0f097a97b2406 SHA512 58741aa0d0bbc09b8f25477f1752d7c8cb1f3295de91787d855d31d271cc46b353b2714ed1f35a6a9181fe250c9c5cec96b04fe0bcc421a6411f02d20aa7f466 AUX xli-1.17.0-fix-scale-zoom.patch 1942 BLAKE2B fefbcbec8d9dba30fc1435fc998e37116ffa22ccb752840e999d95aa227d74b16f76dd704840be404910c5d1bc340de57e8108b8a7e4edc58cd5fc6dce4299a2 SHA512 b77348b83e26b0684cf7292100bbdbbd2c3f7b025f14588f7b52935d997b7ca51c3aad70479ce74cd9193a045436b39233b7ebb1fea6abcdf3d3a9dc21c8b84f AUX xli-1.17.0-libpng14.patch 245 BLAKE2B 681fd31f8d7f812272e54dc67de31ece9a936f4608d339e9d63fe7bdc2ba257d20d7ce01fb00b120662557bdfa44b908bbeb4e136665abdadeb062c1425e7af7 SHA512 079162bfd639994ea6553b49f9370faf5becee8ec1e99a1e71f43e32968f244c5a393433fba8920a399a9eb8bc4a3ec6097903bd2eaff46bdeef55f1f90d1fcf AUX xli-security-gentoo.diff 6940 BLAKE2B 907fd85a2b248083380ae2210665dd9c251a7d528a93b1e2dffd149827f4900cab54b84b8a0be67c198a73d180cf31f4c8cdd7c4a37a3a8c5b30718babd5b1bf SHA512 b992219eb4b89bfee57429afbf67be6d6a04051b50de6e814c84c1adb209494d2faff15a228b43a992530fbeac83f15a94e9c1988982f98eabf287c26716671e DIST xli-2005-02-27.tar.gz 201011 BLAKE2B c16f40368a7c55cb7d31777662e4e9c1515232904df4f6f0e7fdc4daf44fdafaa0a3d9d8298493dac9352fa10eaf5d2984f9e66832ca0bfd07d9e6d551f4dca5 SHA512 132b28396ebf3832dc35ff5fa7c102539ef30a194512fe6577ce1432bb84ecd7b4368e75eaf59f26a806900f63e1bfb9a93487ce1ebe3cfef2199256a783ccf7 -EBUILD xli-1.17.0-r5.ebuild 2077 BLAKE2B c6ef0bf5fcaf4d33a04f783c54f55e0f6eae2c0eaa40f633cbc9340e7af6ff6cd6ba0b11534fc558b850c6f2294852805f495648e7f86a12ea106b1a2b90e6ee SHA512 b510552f84f5c4110bd93be54b83a10a5a79e12770ed620f5e061777b176d978131c32021d78621c709e7a25cd25b96a506dd25a15779ee7c67c7d79f7cefd91 +EBUILD xli-1.17.0-r6.ebuild 2145 BLAKE2B ca8a689edcade26e9e9d362a78fd46c14eecb2b84fcfd7bbc580e43d326aa77a6b2e2262d40b586e944e842d919022bbad2afb6696b0a53a62b5a58e6c5fef38 SHA512 8d58c6f32a94984381fdd533b69246a59870f242df0f87a7e39c75596b70e6b05b172666790cbeda3a471d46867be1afe202d8f38bf78c880430e2b53a7e42a1 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xli/files/xli-1.17.0-clang16.patch b/media-gfx/xli/files/xli-1.17.0-clang16.patch new file mode 100644 index 000000000000..99a5ee44c4eb --- /dev/null +++ b/media-gfx/xli/files/xli-1.17.0-clang16.patch @@ -0,0 +1,20 @@ +https://bugs.gentoo.org/870790 +--- a/window.c ++++ b/window.c +@@ -211,3 +211,3 @@ + XSetWindowAttributes swa; +- static cmap_atom = None; ++ static int cmap_atom = None; + Window cmap_windows[2]; +--- a/xli.h ++++ b/xli.h +@@ -14,2 +14,3 @@ + #include ++#include + #include +--- a/xlito.c ++++ b/xlito.c +@@ -3,2 +3,3 @@ + #include ++#include + #include diff --git a/media-gfx/xli/xli-1.17.0-r5.ebuild b/media-gfx/xli/xli-1.17.0-r5.ebuild deleted file mode 100644 index a62e12b505df..000000000000 --- a/media-gfx/xli/xli-1.17.0-r5.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -SNAPSHOT="2005-02-27" -DESCRIPTION="X Load Image: view images or load them to root window" -HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README" -SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz" -S="${WORKDIR}/${PN}-${SNAPSHOT}" - -LICENSE="HPND" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=" - app-arch/bzip2:= - >=media-libs/libpng-1.0.5:= - >=sys-libs/zlib-1.1.4:= - virtual/jpeg:0 - x11-libs/libXext - !media-gfx/xloadimage" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/rman - x11-base/xorg-proto - >=x11-misc/imake-1.0.8-r1" - -PATCHES=( - "${FILESDIR}"/xli-security-gentoo.diff - "${FILESDIR}"/${P}-fix-scale-zoom.patch #282979 - "${FILESDIR}"/${P}-libpng14.patch -) -DOCS=( README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg ) - -src_prepare() { - default - - # avoid conflicts on systems that have zopen in system headers - sed -i -e "s:zopen:xli_zopen:g" * - - sed -i Imakefile \ - -e '/^DEFINES =/s/$/ -DHAVE_GUNZIP -DHAVE_BUNZIP2 /' \ - -e '/CCOPTIONS =/s/=.*/=/' - - # This is a hack to avoid a parse error on /usr/include/string.h - # when _BSD_SOURCE is defined. This may be a bug in that header. - sed -i png.c \ - -e '/^#include "xli.h"/i#undef _BSD_SOURCE' - - # This hack will allow xli to compile using gcc-3.3 - sed -i rlelib.c \ - -e 's/#include //' -} - -src_configure() { - CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die -} - -src_compile() { - local myemakeargs=( - CC="$(tc-getCC)" - CDEBUGFLAGS="${CFLAGS}" - EXTRA_LDOPTIONS="${LDFLAGS}" - ) - emake "${myemakeargs[@]}" -} - -src_install() { - dobin xli xlito - - dosym xli /usr/bin/xsetbg - dosym xli /usr/bin/xview - - newman xli.man xli.1 - newman xliguide.man xliguide.1 - newman xlito.man xlito.1 - einstalldocs - - insinto /etc/X11/app-defaults - newins "${FILESDIR}"/Xli.ad Xli - fperms a+r /etc/X11/app-defaults/Xli -} diff --git a/media-gfx/xli/xli-1.17.0-r6.ebuild b/media-gfx/xli/xli-1.17.0-r6.ebuild new file mode 100644 index 000000000000..a33109d2bef3 --- /dev/null +++ b/media-gfx/xli/xli-1.17.0-r6.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +SNAPSHOT="2005-02-27" +DESCRIPTION="X Load Image: view images or load them to root window" +HOMEPAGE="ftp://ftp.ibiblio.org/pub/Linux/apps/graphics/viewers/X/xli-1.16.README" +SRC_URI="http://pantransit.reptiles.org/prog/xli/xli-${SNAPSHOT}.tar.gz" +S="${WORKDIR}/${PN}-${SNAPSHOT}" + +LICENSE="HPND" +SLOT="0" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" + +RDEPEND=" + app-arch/bzip2:= + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= + x11-libs/libX11 + x11-libs/libXext + !media-gfx/xloadimage" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto" +BDEPEND=" + app-text/rman + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" + +PATCHES=( + "${FILESDIR}"/xli-security-gentoo.diff + "${FILESDIR}"/${P}-fix-scale-zoom.patch #282979 + "${FILESDIR}"/${P}-libpng14.patch + "${FILESDIR}"/${P}-clang16.patch +) + +DOCS=( README README.xloadimage ABOUTGAMMA TODO chkgamma.jpg ) + +src_prepare() { + default + + # avoid conflicts on systems that have zopen in system headers + sed -i -e "s:zopen:xli_zopen:g" * + + sed -i Imakefile \ + -e '/^DEFINES =/s/$/ -DHAVE_GUNZIP -DHAVE_BUNZIP2 /' \ + -e '/CCOPTIONS =/s/=.*/=/' + + # This is a hack to avoid a parse error on /usr/include/string.h + # when _BSD_SOURCE is defined. This may be a bug in that header. + sed -i png.c \ + -e '/^#include "xli.h"/i#undef _BSD_SOURCE' + + # This hack will allow xli to compile using gcc-3.3 + sed -i rlelib.c \ + -e 's/#include //' +} + +src_configure() { + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die +} + +src_compile() { + local myemakeargs=( + CC="$(tc-getCC)" + CDEBUGFLAGS="${CFLAGS}" + EXTRA_LDOPTIONS="${LDFLAGS}" + ) + emake "${myemakeargs[@]}" +} + +src_install() { + dobin xli xlito + + dosym xli /usr/bin/xsetbg + dosym xli /usr/bin/xview + + newman xli.man xli.1 + newman xliguide.man xliguide.1 + newman xlito.man xlito.1 + einstalldocs + + insinto /etc/X11/app-defaults + newins "${FILESDIR}"/Xli.ad Xli + fperms a+r /etc/X11/app-defaults/Xli +} -- cgit v1.2.3