* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/, media-gfx/xloadimage/files/
@ 2019-01-17 22:04 Andreas K. Hüttel
0 siblings, 0 replies; 2+ messages in thread
From: Andreas K. Hüttel @ 2019-01-17 22:04 UTC (permalink / raw
To: gentoo-commits
commit: 49f7781f888de99eddd4ef1a2b1f6af5dd4b0ace
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 17 22:02:18 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 17 22:04:04 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49f7781f
media-gfx/xloadimage: EAPI bump
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../xloadimage/files/xloadimage-4.1-libpng15.patch | 4 +-
media-gfx/xloadimage/xloadimage-4.1-r12.ebuild | 96 ++++++++++++++++++++++
2 files changed, 98 insertions(+), 2 deletions(-)
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
index ffd05f62b33..da222d68c25 100644
--- a/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-libpng15.patch
@@ -1,5 +1,5 @@
---- png.c
-+++ png.c
+--- a/png.c
++++ b/png.c
@@ -75,7 +75,7 @@
{
debug(" #error ");
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
new file mode 100644
index 00000000000..7e9f5a36e1e
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="utility to view many different types of images under X11"
+HOMEPAGE="https://tracker.debian.org/pkg/xloadimage"
+SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz
+ mirror://gentoo/${P}-gentoo-r1.diff.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="tiff jpeg png"
+
+RDEPEND="x11-libs/libX11
+ tiff? ( media-libs/tiff:0= )
+ png? ( media-libs/libpng:0= )
+ jpeg? ( virtual/jpeg:0 )"
+DEPEND="${RDEPEND}
+ !media-gfx/xli"
+
+S=${WORKDIR}/${P/-/.}
+
+src_prepare() {
+ eapply "${WORKDIR}"/${P}-gentoo-r1.diff
+ eapply "${FILESDIR}"/${P}-zio-shell-meta-char.diff
+ eapply "${FILESDIR}"/${P}-endif.patch
+
+ # Do not define errno extern, but rather include errno.h
+ # <azarah@gentoo.org> (1 Jan 2003)
+ eapply "${FILESDIR}"/${P}-include-errno_h.patch
+
+ eapply "${FILESDIR}"/xloadimage-gentoo.patch
+
+ 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
+
+ # On FreeBSD systems malloc.h is a false header asking for fixes.
+ # On MacOSX it would require malloc/malloc.h
+ # On other systems it's simply unneeded
+ sed -i -e 's,<malloc.h>,<stdlib.h>,' vicar.c || die
+
+ eapply "${FILESDIR}"/${P}-unaligned-access.patch
+ eapply "${FILESDIR}"/${P}-ldflags_and_exit.patch
+
+ sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die
+
+ eapply "${FILESDIR}"/${P}-libpng15.patch
+ sed -i \
+ -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
+ png.c || die
+
+ # One of the previous patches screws up a bracket...
+ eapply "${FILESDIR}"/${P}-bracket.patch
+
+ default
+
+ chmod +x configure || 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/, media-gfx/xloadimage/files/
@ 2025-02-10 9:14 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2025-02-10 9:14 UTC (permalink / raw
To: gentoo-commits
commit: 2eb2b82b8c4cb09ac49b8fbb493a3ac43c1a139a
Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com>
AuthorDate: Wed Jan 15 11:21:39 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 09:05:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb2b82b
media-gfx/xloadimage: fix incompatible function pointer types on musl
Replaces previous patch that fixed it on glibc only
Bug: https://bugs.gentoo.org/924114
Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com>
Closes: https://github.com/gentoo/gentoo/pull/40143
Signed-off-by: Sam James <sam <AT> gentoo.org>
...mage-4.1-fix-incomp-function-pointer-musl.patch | 14 ++++
media-gfx/xloadimage/xloadimage-4.1-r18.ebuild | 97 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch
new file mode 100644
index 000000000000..ab76b835c899
--- /dev/null
+++ b/media-gfx/xloadimage/files/xloadimage-4.1-fix-incomp-function-pointer-musl.patch
@@ -0,0 +1,14 @@
+__signalhandler_t isn't defined on musl, one needs to drill down to bare type definition
+so code builds both on glibc and musl systems
+https://bugs.gentoo.org/924114
+--- 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, (void (*)(int))delayAlarmHandler);
+ alarm(delay);
+ #endif /* ENABLE_TIMEOUT */
+ }
diff --git a/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild
new file mode 100644
index 000000000000..848cd70d77c4
--- /dev/null
+++ b/media-gfx/xloadimage/xloadimage-4.1-r18.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2025 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}
+ x11-base/xorg-proto"
+
+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-musl.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:[~2025-02-10 9:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-17 22:04 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xloadimage/, media-gfx/xloadimage/files/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2025-02-10 9:14 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox