* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/, media-gfx/xsane/files/
@ 2023-03-19 3:22 99% Sam James
0 siblings, 0 replies; 1+ results
From: Sam James @ 2023-03-19 3:22 UTC (permalink / raw
To: gentoo-commits
commit: f3b5822bf70361e15208f95f832357fe7317e45b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 02:50:35 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 02:50:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3b5822b
media-gfx/xsane: fix configure w/ clang 16
Closes: https://bugs.gentoo.org/885311
Closes: https://bugs.gentoo.org/899806
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/xsane-0.999-configure-clang16.patch | 12 ++++++++++
...xsane-0.999-r4.ebuild => xsane-0.999-r5.ebuild} | 28 +++++++++++++---------
2 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch b/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch
new file mode 100644
index 000000000000..0e0ee342a3de
--- /dev/null
+++ b/media-gfx/xsane/files/xsane-0.999-configure-clang16.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/885311
+https://bugs.gentoo.org/899806
+--- a/m4/sane.m4
++++ b/m4/sane.m4
+@@ -44,6 +44,7 @@ dnl
+ AC_TRY_RUN([
+ #include <sane/sane.h>
+ #include <stdio.h>
++#include <stdlib.h>
+
+ int
+ main ()
diff --git a/media-gfx/xsane/xsane-0.999-r4.ebuild b/media-gfx/xsane/xsane-0.999-r5.ebuild
similarity index 83%
rename from media-gfx/xsane/xsane-0.999-r4.ebuild
rename to media-gfx/xsane/xsane-0.999-r5.ebuild
index 78d35099cfd2..351830dee66a 100644
--- a/media-gfx/xsane/xsane-0.999-r4.ebuild
+++ b/media-gfx/xsane/xsane-0.999-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,8 +18,10 @@ SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
IUSE="nls jpeg png tiff gimp lcms ocr"
-RDEPEND="
+DEPEND="
+ dev-libs/glib:2
media-gfx/sane-backends
+ sys-libs/zlib
x11-libs/gtk+:2
x11-misc/xdg-utils
jpeg? ( media-libs/libjpeg-turbo:= )
@@ -28,27 +30,31 @@ RDEPEND="
gimp? ( media-gfx/gimp:0/2 )
lcms? ( media-libs/lcms:2 )
"
+RDEPEND="${DEPEND}"
PDEPEND="ocr? ( app-text/gocr )"
-DEPEND="${RDEPEND}"
BDEPEND="virtual/pkgconfig"
+PATCHES=(
+ # Apply multiple fixes from different distributions
+ "${WORKDIR}"/${PN}-0.998-patches-3
+ # Add support for lcms-2 (from Fedora)
+ "${FILESDIR}"/${PN}-0.999-lcms2.patch
+ # See bug #885311 and bug #899806
+ "${FILESDIR}"/${PN}-0.999-configure-clang16.patch
+)
+
src_prepare() {
default
- strip-linguas -i po/ #609672
+ # bug #609672
+ strip-linguas -i po/
- # Apply multiple fixes from different distributions
- eapply "${WORKDIR}/${PN}-0.998-patches-3"/
-
- # Fix compability with libpng15 wrt #377363
+ # Fix compability with libpng15 (bug #377363)
sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
# Fix AR calling directly (bug #442606)
sed -i -e 's:ar r:$(AR) r:' lib/Makefile.in || die
- # Add support for lcms-2 (from Fedora)
- eapply "${FILESDIR}/${PN}-0.999-lcms2.patch"
-
AT_M4DIR="m4" eautoreconf
}
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2023-03-19 3:22 99% [gentoo-commits] repo/gentoo:master commit in: media-gfx/xsane/, media-gfx/xsane/files/ Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox