gentoo auto-resync : 02:01:2023 - 20:24:39

3 files changed, 30 insertions, 4 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index de6033106894..a4a4f70e48e7 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,10 +4,11 @@ AUX netpbm-10.86.21-misc-deps.patch 1565 BLAKE2B a4d629ea9fe01efc45c799dac4bd376
 AUX netpbm-10.86.21-test.patch 331 BLAKE2B 59451b2f1632afdd8e84bcec0ef91e0589604706b373281bf4963385fe971991711cc6ed4f169cc45aa460ac1db20de69039b137da1a2ec3d6cb82b60ae5f745 SHA512 e5c1a88cc03e227c7a7a01e9586ceacaf24a6752f4285f228b0176a8a12a6a9ac83d8ce1c5965e8f56ab652b5e42aa2cd535f1e121449fe668312b7e49720e4f
 AUX netpbm-10.86.22-fix-ps-test.patch 15448 BLAKE2B cfe77600197fc39ef0be0ed793f5181db57fd718a6fed268a8afb2fd2b5afab404c3be3c89dc25d178f8fe2edc4d386e33f22f7b3bc826e9c90307ef3895830f SHA512 a521c771d2384cb86d87b4efdf05e0835adcbefb84d4e66e744b2f8bc40df5358f20c4824dce5a942ccc24b18168276278d65e8e9a529b7c09b157b3e02438bb
 AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5e5bf8fb1ae9aff1ff1d7859cf1bb0d5f74fa1143681b451d36323f93d5e7fa3876e485d6538958e30779cac081df5b8 SHA512 7135533660b15a113df5a38298725f895e8cbd6ac4695eb5f2d40bd214c43cb9d1c261063e0cea162a6ca6071cda5f4e0380d29eefa6af57e7d67ce319fe2216
+AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 DIST netpbm-10.86.35.tar.xz 3699944 BLAKE2B 754b695ab25ba2c3ff0cdc8d3810a3df7af9a30476dfd6afa70591df0931334806ad41da41797e3f6121b77b7e3fb77a3c01ebc533812e9a8cb3ccb3eb6c19ea SHA512 a4a0107f04ccdef066d340f97a7d3487a2b349dd5994b294fd815813bb04db10063ba933442ef77e27a96fb3b31a5769f3a19532a651b802f14667dbf43c06f5
 DIST netpbm-10.86.36.tar.xz 3700660 BLAKE2B c5f0acd0147f2ad66f69ae2ade56fcbb5286faddc7f8f3387e2269fd20ea2586a29d7e7dc96bd715fe12896eef47803b826031087e6be8166183ba7cf82aebf4 SHA512 b05df76760629881047c44799a905a491fb4c139a9af909d77cc4238fc82dfac37ba174df4f81cb1177716ad38a37b26eadcc3889d2c2057ff9d850697fad3c6
 DIST netpbm-11.1.0.tar.xz 3771676 BLAKE2B 0f377dc36b03b99a174c2d5a09d62aea8a813f9eb501a59630c4f083247cc3c82e3fee88085ec686f4d787d67104b834a511b4ef1f7d75eda7b10fed3281d9e5 SHA512 77528e2508d7a2d348de339d57b677fd1a061bb2902273d536ea09c34033af03a75bb723bcc7e87551406f47f115085a60691b3fda4ae672372b8473528370de
 EBUILD netpbm-10.86.35-r1.ebuild 6868 BLAKE2B 6671fe735c84396edf72a5946e9de2514080d143508dcf274838c2480cd8d5218788ae5d01ab024d9a21f05deaca8f718a8129b696801cf793fc7021fd3d90f8 SHA512 a6aebe77131a72863e88dc3917d1b1301c4f8ddf2322acf77c7fe823231ff0c7e9bcb8cf19107cb1a1a629e9ccb41e1048d6c771cfa688bbd90e1656d8ee303e
 EBUILD netpbm-10.86.36.ebuild 6779 BLAKE2B 3957a83f53892c2f43e2a0a087b01f2e8674cc9de130bc5f51767ed7bf46c0dd45463495487084610f09c75028b30b2d054dc42204075535a2816aa2fa8fa1e0 SHA512 55a47205afce3be64893e271562bc40fca19f70fcf95bbb8fc5558bffc1366b228fd1e12d71f2a757517515ae0708be8c974ae7e414fa91776068392641fe7b1
-EBUILD netpbm-11.1.0.ebuild 6922 BLAKE2B 082bad6cfd13a72b9cc6d7a3c63fd2893cf06c9e8940f270f7826e0721269358ee7a074e5a9777019b3b435767174bfca04afed09cc315364d16d91bd09621c3 SHA512 ffea6f726a0525e329b62b41ebb221bcf58f6fd1303aa91b573708355db069773cbab9ad55883f51a3fcf0c248b9d34827026acdb78e6324bc8e0f60b9bfc2c0
+EBUILD netpbm-11.1.0-r1.ebuild 6958 BLAKE2B 01044532de8bdf262f6bae96ce99b24e151f194057d512fb83d6aaebad03acf21b0f75c62109084d9e281b9f4a3a192d429d129519ca1fe6c04206321201add1 SHA512 127e4376b9f515016a58c6d392f452585950fccf3e56aabf0675ba8a92bbdb4a4c156792c502d09b483b7c0724b5ee681fc5ac9e199dd6e458cb4a406edc0952
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/files/netpbm-11.1.0-fix-clang-O2.patch b/media-libs/netpbm/files/netpbm-11.1.0-fix-clang-O2.patch
new file mode 100644
index 000000000000..4427676b9b35
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.1.0-fix-clang-O2.patch
@@ -0,0 +1,26 @@
+When compiling with clang and -O2, local variable origJmpbufP with value
+changed after setjmp contains garbage after longjmp.
+
+According to glibc documentation, making it volatile should have fixed the
+issue, but it didn't.  Static outside the function works.
+
+Bug: https://bugs.gentoo.org/885561
+
+--- a/lib/libpamread.c
++++ b/lib/libpamread.c
+@@ -25,6 +25,7 @@
+ #include "fileio.h"
+ #include "pam.h"
+ 
++static jmp_buf * origJmpbufP = NULL;
+ 
+ static void
+ readPbmRow(const struct pam * const pamP,
+@@ -35,7 +36,6 @@
+                  "It says PBM format, but 'depth' member is not 1.");
+     else {
+         jmp_buf jmpbuf;
+-        jmp_buf * origJmpbufP;
+         unsigned char * bitrow;
+ 
+         bitrow = (unsigned char *) pbm_allocrow(pbm_packed_bytes(pamP->width));
diff --git a/media-libs/netpbm/netpbm-11.1.0.ebuild b/media-libs/netpbm/netpbm-11.1.0-r1.ebuild
index 7d44b7a5bd79..321a76b14293 100644
--- a/media-libs/netpbm/netpbm-11.1.0.ebuild
+++ b/media-libs/netpbm/netpbm-11.1.0-r1.ebuild
@@ -42,16 +42,14 @@ RDEPEND="
 	)
 	rle? ( media-libs/urt:= )
 	svga? ( media-libs/svgalib )
-	tiff? ( >=media-libs/tiff-3.5.5:= )
+	tiff? ( media-libs/tiff )
 	xml? ( dev-libs/libxml2 )
 	X? ( x11-libs/libX11 )
 "
-
 DEPEND="
 	${RDEPEND}
 	x11-base/xorg-proto
 "
-
 BDEPEND="
 	app-arch/xz-utils
 	sys-devel/flex
@@ -61,6 +59,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/netpbm-10.86.21-build.patch
 	"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
+	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
 )
 
 netpbm_libtype() {