* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/files/, media-gfx/xloadimage/
@ 2023-12-25 8:11 Viorel Munteanu
0 siblings, 0 replies; 2+ messages in thread
From: Viorel Munteanu @ 2023-12-25 8:11 UTC (permalink / raw
To: gentoo-commits
commit: 91a66474b005dae230f22c3c223ad550b338083c
Author: Pascal Jäger <pascal.jaeger <AT> leimstift <DOT> de>
AuthorDate: Fri Sep 22 10:42:15 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Dec 25 08:07:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a66474
media-gfx/xloadimage: fix incomp. func. pointer
Closes: https://bugs.gentoo.org/896232
Signed-off-by: Pascal Jäger <pascal.jaeger <AT> leimstift.de>
Closes: https://github.com/gentoo/gentoo/pull/32988
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
...age-4.1-fix-incomp-function-pointer-types.patch | 17 ++++
media-gfx/xloadimage/xloadimage-4.1-r16.ebuild | 93 ++++++++++++++++++++++
2 files changed, 110 insertions(+)
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 <pascal.jaeger@leimstift.de> (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
+ # <azarah@gentoo.org> (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 <varargs.h>:#include <stdarg.h>:" 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/files/, media-gfx/xloadimage/
@ 2024-11-23 17:43 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-11-23 17:43 UTC (permalink / raw
To: gentoo-commits
commit: a5d24a109bf52c23c565f26d795efdeaf010978c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 17:42:43 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 17:43:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d24a10
media-gfx/xloadimage: fix modern C issue
* Fix sed delimiter for CFLAGS
* Fix modern C issue (thanks Stephane Bakhos)
Closes: https://bugs.gentoo.org/710428
Closes: https://bugs.gentoo.org/920772
Thanks-to: Stephane Bakhos <nuitari <AT> nuitari.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../xloadimage/files/xloadimage-4.1-c99.patch | 15 ++++
media-gfx/xloadimage/xloadimage-4.1-r17.ebuild | 96 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch
new file mode 100644
index 000000000000..6da8b008aa86
--- /dev/null
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/920772#c11
+Signed-off-by: Stephane Bakhos <nuitari@nuitari.net>
+--- a/pdsuncomp.c
++++ b/pdsuncomp.c
+@@ -421,8 +421,8 @@
+ static char obuf[2048];
+ char ibuf[2048];
+ int left;
+- int in_length;
+- static int out_length= 2048, out_ptr= 0;
++ long int in_length;
++ static long int out_length= 2048, out_ptr= 0;
+
+ if (Decompressing) {
+ left= size;
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
new file mode 100644
index 000000000000..17ba67ea90d1
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2024 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 ~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
+ # <azarah@gentoo.org> (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
+ "${FILESDIR}"/${P}-c99.patch
+)
+
+src_prepare() {
+ default
+
+ sed -i -e "s|OPT_FLAGS=|OPT_FLAGS=$CFLAGS|" Make.conf || die
+ sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" 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() {
+ append-cflags -std=gnu17
+
+ # 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-11-23 17:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-23 17:43 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/files/, media-gfx/xloadimage/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2023-12-25 8:11 Viorel Munteanu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox