gentoo auto-resync : 19:03:2023 - 06:33:49

3 files changed, 31 insertions, 12 deletions

diff --git a/media-gfx/xsane/Manifest b/media-gfx/xsane/Manifest
index 38294d6a3df0..92b2af399db0 100644
--- a/media-gfx/xsane/Manifest
+++ b/media-gfx/xsane/Manifest
@@ -1,6 +1,7 @@
+AUX xsane-0.999-configure-clang16.patch 220 BLAKE2B b345b740e9fce550a162799e62f4a4bdcdf888082af0016896bb798525766d250a79905d3efafdf0fac8a9cbef2684255fb569cec92108e6a6726dfd87c5c264 SHA512 bcb42c31fa7d22733c5efbd8d4a598a5e22c199d2a06ead5175b4124882f08a6d7c1d20cdb25e5a098a9623e9216dae5729c4be2c02d752e83ad5e143f9d5db0
 AUX xsane-0.999-lcms2.patch 11788 BLAKE2B 2a7f40e1d430b74f29c201e850ee5520395a6a6d906323125c084effb9a52720d1a1d38d2a3680986a05787170818011342a7fcde225f4d1f70cdf36c6a9d8a1 SHA512 bdb5f078d7a36702b327b01f8c6d4259d52252968e5d287ce17aed18adb0bb89420049609242ee89048cb8e4012a0dd04ba29fa994570014d3c62b098e33508b
 DIST xsane-0.998-patches-3.tar.xz 54480 BLAKE2B 8c77bf0304e60114fa964e337640b61e7c353a6b6f9ad5bc3c87fd5324440b27e58a45aef7df2f16d5faa63692b9f8b22cca7d5dbf21dd6a1cac8572e668cf65 SHA512 e0a85e536502fef66526f12d7607381d07a2a53953f200b298afd1225f85657dfa3550f37b1ee7827739cb2b00333ab926a146c6424ec2543b691f0945300b68
 DIST xsane-0.999.tar.gz 2950621 BLAKE2B a8490981b7da497934f0334874fb65d2d3f2a7d9153825544672a39780bd8c4bfabee6bda134bd7b37b07947d1f01f283fb7242552b0e6342cab5a70484a5488 SHA512 73ec961fce1a86b5d6f5bac0995d222785eb4b077dc8e72492b092d2bf4500455426e80e4d27233721cd38ec84f77fb9f92190a6afe45bdaf7ffd1ee50b431ed
 DIST xsane-256x256.png 18478 BLAKE2B 5661d68fab2c5f7219f0de9e2c2c811ef5fba6f5472e85d98f6f3a10bb058c1d26597d15c2aa8ab59c52060a62b571aafc2daafcef4bb8edd0445cf875ec0ca3 SHA512 7bd63a701a4776b395689799ad98b7619917a9b40367c980bebaa116e6c5c2bfeffb8b996a8295b07f3483aa689c9040d8a68bb21376af65b1c0e8f69294f2e5
-EBUILD xsane-0.999-r4.ebuild 1998 BLAKE2B fee45d3148313c68e97ee82ded7055d4408c195d87655e4d8c10db6d9e25f1726d07bfe128743cf85c8266a38ae126bdb9efbe14411fc60da759c77adea03cbb SHA512 105b2d74e59aef57e35a053d3de8d4cba7ee19c44d077a3e751a93a73024fd5f6ae03a56e2e59ab5abccd6291bbe7468047570e1239c8fa9968bb1864ec8ba4e
+EBUILD xsane-0.999-r5.ebuild 2120 BLAKE2B 87b5ac88788256a19612c28670ed2d073daaf13c154255580c42204466625c31734244266a30bddfc028deb2cd4a83c0b17af0f5b080c60b4949a92aaffcef59 SHA512 8377c831b80593d9c9b6948c6afaff0ae93a3c9943ab5d70c01428c76ce2288225e3127e85327f934a06193294204f2c095d6f43740be3a937bf1ae33164a719
 MISC metadata.xml 371 BLAKE2B 2816d22902bed33d3af4bc8df476953a4bfd8e4f08411d2da60af273c966ffe692f155eaaf5cfb8dc79b78d0f82ef117cabdf1e315b051cbe216fe451da98400 SHA512 2def02aa540182ef68f99c7c327b1f6607ff6cb151bb44e232338549da82ef5b60d7096ad6212f4fd6d7aeb93063dca9ca994bec95fcfe0133e674e4ec5b6922
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
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
 }