From 479921825a5c44a5fbcd5441f00ee98e54db9bac Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Dec 2023 13:34:50 +0000 Subject: gentoo auto-resync : 25:12:2023 - 13:34:50 --- media-gfx/xloadimage/Manifest | 2 + ...age-4.1-fix-incomp-function-pointer-types.patch | 17 ++++ media-gfx/xloadimage/xloadimage-4.1-r16.ebuild | 93 ++++++++++++++++++++++ 3 files changed, 112 insertions(+) create mode 100644 media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch create mode 100644 media-gfx/xloadimage/xloadimage-4.1-r16.ebuild (limited to 'media-gfx/xloadimage') diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index bbd21925a4c3..f7b7003e9e9e 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -1,5 +1,6 @@ AUX xloadimage-4.1-bracket.patch 518 BLAKE2B fca92d66bc559f17e091d544f2b726d1db11d54e72a71e901917d19da1e0bef3538f538cee329ad84a867ba3482085367bb0fa3017b5d99d69e1ea581a8bc7bf SHA512 f73b8077c7fe03ca688646f63df24c6dcecf21b1ebccf9983c7c6fb0332b371b17f835985ffccbe39fcb7bfd553a78df70c94d734930e35310a1b8ba0e30bf34 AUX xloadimage-4.1-endif.patch 321 BLAKE2B dc140933e4b61e9a243f9cc2c4c78b5406a7d4defe0d7ae796c46ea8e21607d27c79481fe528f4c3e40dbfa5b27db09b47600a61454aaa3882c2ff267f18931a SHA512 503fd3672ae22a468ae6ec71a62b3113dc3df2e5bed4b90b641320d954c563118eb53b8681ad38edaff5a87a385fb063592ac422c24c2150084e0171f4f17d25 +AUX xloadimage-4.1-fix-incomp-function-pointer-types.patch 582 BLAKE2B 5ac8bf2e35e58bc476bde54228620089fa90bdeb7dc25bffa344775e0d149cbad238e3526a6669f9ee0fe539d68dbad52a62be752e71ef9412d220a4a2d05a19 SHA512 16d3c30d1baa16dbaf8fb3314b2721996d2fbfca9fc73471108ada969b69b4aaf1607cbe6bda284daaeaf6168d5b485dabf68495a51f6a31a925b2fd975627fa AUX xloadimage-4.1-include-errno_h.patch 303 BLAKE2B f82f4beadf42e2b5ba0f20ed6c16ea88e829c0b224c219a257c9986d30a8568d8d59e92f686469c26238eb33c6a51f3ba90e854a3f8c9c9c386a4848f745c8f2 SHA512 208261855d1677a755e34b421bbb4f95cbbe1d9d494cb3c895e9f799a376f2162a3f8e08134b06029da5acd318c873c798bd2c64eaf0aaf1d0e2970a56f4ef2f AUX xloadimage-4.1-ldflags_and_exit.patch 775 BLAKE2B e2107eca87d99d28d19f2213877bb6e3f6cfa5294c69a2ba9eeb01407b4f2b54f9f96de4b15e1ddd67acde45e8c2df0d4ed135001fdd3dc78afff9a367975fa1 SHA512 724484e06868c818c6c66cfdca9b07972da6c6b7977da9dad4e05109506751641e211dd34a9afbf925fed712ed046764362856079dda11b628b32fe3f6813f59 AUX xloadimage-4.1-libpng15.patch 751 BLAKE2B 411c7a2fcf62a86e9402e7656b4cf484c16028802cebe97a843669bb12e96897ff47d66544387bc6754180ade67516f6c41b532efe3b1a3b5733b68ad41b0eb0 SHA512 12fae67db18540ca4ccd39e077c7557b878581a79082ae6abd156a4633db59f157bafbcb45d1b0fb40b9f8356a6fb44117da7b1d3e7803361e800435d7877a12 @@ -11,4 +12,5 @@ DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bc DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 EBUILD xloadimage-4.1-r14.ebuild 2504 BLAKE2B 12c9a486786e1640d4697c39f4e2fb9fdb61adf775026c2023e9643c5e4191b6a4bf10bcfb8a0345a3650e178c91de58faee153bb0dceeac2c200423b80df7f9 SHA512 c57e7d7b571fc2ad4f56fdd1e7d5de1b56107782edb2703a0887c826d8ac230ce924e0c85772df15a419b1e2550e664f6d5c3716c7430a6fc95aed615e9ccb09 EBUILD xloadimage-4.1-r15.ebuild 2488 BLAKE2B bd34e5765b9701eeec684f5da9ee6ae88d5147796c0bd44eed60dd2d409d89a3b794d95c95e5403bee9d64edebadf9fcc805e48b02986f88b5cf16c4287fded7 SHA512 a16a74df34fe271b0d3900b7bba2a3ef75e1d55781b4d02ff60e1e6d5b9fe11569e04fea86093fa5d10409ae7008ceea3db6ecff0c96ba2af526ec496061d27f +EBUILD xloadimage-4.1-r16.ebuild 2554 BLAKE2B 5480f70de2690e720a10fd614423da2346e12d29394cb990368d753ef2b07f142db0fd9f6c39d405454f05c9ca16e2a26466dcd2da204b0e7932ed147d2c1192 SHA512 a42f4aec6fbf6e19944e8db128d2e16bb8993d976bd374b637e44d7dcc55f1a13c281dfd6280682b7e54ddd0b5a4cd462bd72a91e5efa1611f8e49ff9f7fb62e MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch new file mode 100644 index 000000000000..0ddd2da0f65f --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-types.patch @@ -0,0 +1,17 @@ +Inpompatible function pointers are an error instead of a warning by default since clang16 + +Bug: https://bugs.gentoo.org/896232 + +Pascal Jäger (2023-09-22) + +--- a/window.c ++++ b/window.c +@@ -833,7 +833,7 @@ char imageInWindow (Display *disp, int scrn, Image *image, OptionSet *global_opt + /* reset alarm to -delay seconds after every event */ + #ifdef ENABLE_TIMEOUT + AlarmWentOff = 0; +- signal(SIGALRM, delayAlarmHandler); ++ signal(SIGALRM, (__sighandler_t)delayAlarmHandler); + alarm(delay); + #endif /* ENABLE_TIMEOUT */ + } diff --git a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild new file mode 100644 index 000000000000..461bdfe35a16 --- /dev/null +++ b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Utility to view many different types of images under X11" +HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage" +SRC_URI=" + ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz + mirror://gentoo/${P}-gentoo-r1.diff.bz2 + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz +" +S="${WORKDIR}"/${P/-/.} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="tiff jpeg png" + +RDEPEND="x11-libs/libX11 + tiff? ( media-libs/tiff:= ) + png? ( media-libs/libpng:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + !media-gfx/xli" +DEPEND="${RDEPEND}" + +PATCHES=( + "${WORKDIR}"/${P}-gentoo-r1.diff + "${FILESDIR}"/${P}-zio-shell-meta-char.diff + "${FILESDIR}"/${P}-endif.patch + # Do not define errno extern, but rather include errno.h + # (1 Jan 2003) + "${FILESDIR}"/${P}-include-errno_h.patch + "${FILESDIR}"/xloadimage-gentoo.patch + "${FILESDIR}"/${P}-unaligned-access.patch + "${FILESDIR}"/${P}-ldflags_and_exit.patch + "${FILESDIR}"/${P}-libpng15.patch + "${WORKDIR}"/${P}-fix-build-for-clang16.patch + # One of the previous patches screws up a bracket... + "${FILESDIR}"/${P}-bracket.patch + "${FILESDIR}"/${P}-fix-incomp-function-pointer-types.patch +) + +src_prepare() { + default + + sed -i -e "s:OPT_FLAGS=:OPT_FLAGS=$CFLAGS:" Make.conf || die + sed -i -e "s:^#include :#include :" rlelib.c || die + # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, + # but that is alright + sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die + sed -i \ + -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ + png.c || die + + eautoreconf +} + +src_configure() { + # Set TIFFHeader to TIFFHeaderCommon wrt #319383 + has_version '>=media-libs/tiff-4.0.0_pre' && \ + append-flags -DTIFFHeader=TIFFHeaderCommon + + tc-export CC + econf $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) +} + +src_compile() { + emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage +} + +src_install() { + dobin xloadimage uufilter + + dosym xloadimage /usr/bin/xsetbg + dosym xloadimage /usr/bin/xview + + insinto /etc/X11 + doins xloadimagerc + + newman xloadimage.man xloadimage.1 + newman uufilter.man uufilter.1 + + echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die + doman "${T}"/xsetbg.1 + newman "${T}"/xsetbg.1 xview.1 + + dodoc README +} -- cgit v1.2.3