gentoo auto-resync : 12:04:2024 - 12:04:36

4 files changed, 18 insertions, 2 deletions

diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index eeda41d9b680..dbc474bd50ff 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -4,10 +4,11 @@ AUX netpbm-11.0.0-misc-deps.patch 1446 BLAKE2B 721e926a83d50d04d4a407051ee077db5
 AUX netpbm-11.1.0-fix-clang-O2.patch 773 BLAKE2B a8d2bef659d384b0f94560fec847d37731315f5cdb67e5474efb596672d146446c6d545caa816d74f9d4c32fe486ce49f8cb55f38e9706bae6b0ba79c0dbbb5e SHA512 0a0049415d5c252603c47325d69ae582bec76ac15f442682ef0a2ff8c5a8cd19e28543644883bde891f2a376a401f43ed923b184112f49c67d295b9215d519de
 AUX netpbm-11.2.7-fix-pnmcolormap2-test.patch 7051 BLAKE2B 741d4943b2e9eab1fb0061d6265271df8e25e458c1eb39f50aed8a392edf8369c9f0f3c43fc6ca0b940dd376166c9419c5039ddeaf10487859a7ea9bec4e6075 SHA512 4c7be95b582db27e3ce542b8f53bfdad2e6882b22ccc383aa7ca480cb5ba2a6aa000724dae3c5107efd1071bb87fac0648061dd46b0b75f1072ef05b7e128a68
 AUX netpbm-11.5.2-fix-tests-musl.patch 4779 BLAKE2B 049b20cecdaf40e77c37ad01cfe4e17b8006c3788f47971319e553bfbab760e7e0bb3a970060e74860a7c3326945f5505680519efe7c2feee5fa6ee08ba45202 SHA512 260f4282dcfd6dd0922b62e4c3f217e33d159ab2df779ec0c1df27f16c8075fb77927ce2aadd34c20475d38b7482506758e38b7571df7c3d5a92de9c5cc496d6
+AUX netpbm-11.6.1-incompatible-pointer-types.patch 514 BLAKE2B 0ea8a3c50838776ee645e61accc13645a690dc7e75cde2c33afd1ac7f07abbcb85a97b7e113217af12617ec5ad314eca0324c7bfbe7beb445aee85de47649ffb SHA512 a3a46607904c8ff9757f0a136aa2336382033760bc69bcca5a5d7662ca824f9a7d4281fe3996efc57456c3b30ddf7319fb70a1cb950ef974507f82340a226abb
 DIST netpbm-11.2.7.tar.xz 3780372 BLAKE2B 8a6a75bd0358acf21faa3defd2b3ca886aacd38a28a1f8b65280a9d6c1667102a47efb734fe2ff2dfae38a5d0995b5efaa4b3ec70138bac7ad07e3e6e79c6063 SHA512 3fb00524b958d97304066749d4117b11ce5e23b7c8e08e68bfb5109575cc40a52dbe0f44559e6c0832a4397298efbea50a8ed0b9d2b57e41a09275729574bace
 DIST netpbm-11.2.9.tar.xz 3782172 BLAKE2B b5acec8306c820e7b0ac2dec21ab5df8f2cdbec01d3d59f82b307d90111954e81e1b01ad7d8e25e8fbd0ea7cf61e8b023e3dfaed6d1cab71b51f7e367d792e56 SHA512 02961bb2ac4a4292e028ed5dbd05daf89ac795f50d36d97be67c49a61be0cbd977e954aa9266c4649d9a46de3fbe7c4b2b51c8363cc7bee322926dd4a9af2ab1
 DIST netpbm-11.6.1.tar.xz 3792940 BLAKE2B e48ec658708baac53708c96feb7aac94c32debae675d8f9114393aaccabc1f59309bf577bff98d252fecab37fb0faa1cc29955269636f736563a859edbdd947d SHA512 844256dc61d29c4f1ba164d5c1ec0b7c6cb8e97c4c6c04cf7b92cd7c118b99994cf7dda4a256f35ef575cb718a7a7f253468b60ba567733a613da8102d23bebf
 EBUILD netpbm-11.2.7.ebuild 6976 BLAKE2B 18225d4d04fe229802a170d569d297f9231b1c0d46c05239ec4221a10da0e4934b01c6ac294e8d972333e0ab90b8b71c5334ea5a4c85fac006c3fe87060f99f7 SHA512 4da684cb71c45de8b76bae5c7f79269bb25fb4b3fac9cc71cde5707923bdddb7e52e527c1e47755df7185e7fd18c1a19ebbbbc94f9e6a171583415735602de2c
-EBUILD netpbm-11.2.9.ebuild 7056 BLAKE2B 98516177afd25c82919639f5d31dcd5c98201b10c4084c606c0d2c2b2b2dee5de7c6dbc4edb5585f2fce74cb0464a01a889937a63c4e2d49122253becce4877b SHA512 a17e4559de67e1d479748eaa3f783deaec6af76e1f8b8929d4d21a5075655fcbdfe4cc82dbab47ae16841bb1ba709147f1a083cf50534c363f8fe8d44521fba4
-EBUILD netpbm-11.6.1.ebuild 6922 BLAKE2B bcceeb28fbb881a7c71ee1794b0f190cc14881b78f7345f315d099c496172d72f5a0ff5ffbe061118bbb0e9ccffcb25421b0c0ddd46edf3b74915d416528d805 SHA512 4dd64564ded09bdd30e106ac194de5a62bfb8a3356ce5be08dbd7685cf4cc3ce8dc85d706782579477c98986d5337f98c4593cb98cd78e336102d22cc3956747
+EBUILD netpbm-11.2.9-r1.ebuild 7118 BLAKE2B aae0530d8a34216c44bf574553225ba1961b2ef02b7494d0c508881b24415dca098bf19b046bdeb1c1bd91bbc81a4497026e0f3e3b2f444b4fa10aff33ead613 SHA512 4997bae85799ffd0ea77c9a13aaa2979bf763b331ff5f5dfe1e1b492d33e0e33bbf75a76c62d816dd7778002b12797330e2f448a4ea43e6ad91694cc9769cb03
+EBUILD netpbm-11.6.1-r1.ebuild 6984 BLAKE2B ee29cdaf8e397781efdca52bf3b55f9912158381328b8b05fdab124fee06fa2e988a5a7d32d3d0245662716f85cdb924b151fb966e5b75450f368502e1da7a9a SHA512 4e40c3d736311711de6c1bd21b041086215499b9bdc9e3a7ca0e248f196d6a50431128faba4fa572909b5dba75d4b5156e87592e75e552716710a3def25cb03f
 MISC metadata.xml 424 BLAKE2B 9ccc907d6c15cb1a7d6cfe4679d6fa9f488642948897ca34958a06b439ebcfb912cfb18fa9d93f15f19573aed4bd7083d277151c477410a59cd64b4c9c0446d4 SHA512 a987be2134a44cc916d5a026068219b8ccaa149e577eaf2a53a7802321793129777cc79b069df95ec9320f15279249a5f9d8a61509452ef02effcb6c66cf9e80
diff --git a/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..785ca247719c
--- /dev/null
+++ b/media-libs/netpbm/files/netpbm-11.6.1-incompatible-pointer-types.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/929019
+
+--- a/converter/other/pnmtorle.c
++++ b/converter/other/pnmtorle.c
+@@ -374,7 +374,7 @@
+         if (cmdline.header) {
+             skipData(ifP, width, height, maxval, format);
+         } else {
+-            rle_addhist(argv, NULL, &hdr);
++            rle_addhist((char**)argv, NULL, &hdr);
+             writeRleHeader(cmdline.alpha, format, width, height, &hdr);
+             writeRleData(verbose, cmdline.alpha, ifP, &hdr,
+                          width, height, maxval, format);
diff --git a/media-libs/netpbm/netpbm-11.2.9.ebuild b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
index ed27be399d6c..042c3ac90c65 100644
--- a/media-libs/netpbm/netpbm-11.2.9.ebuild
+++ b/media-libs/netpbm/netpbm-11.2.9-r1.ebuild
@@ -58,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}"/netpbm-11.0.0-misc-deps.patch
 	"${FILESDIR}"/netpbm-11.1.0-fix-clang-O2.patch
 	"${FILESDIR}"/netpbm-11.2.7-fix-pnmcolormap2-test.patch
+	"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
 )
 
 netpbm_libtype() {
diff --git a/media-libs/netpbm/netpbm-11.6.1.ebuild b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild
index 56896f092bd3..b63b5a302d37 100644
--- a/media-libs/netpbm/netpbm-11.6.1.ebuild
+++ b/media-libs/netpbm/netpbm-11.6.1-r1.ebuild
@@ -57,6 +57,7 @@ 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
+	"${FILESDIR}"/netpbm-11.6.1-incompatible-pointer-types.patch
 )
 
 netpbm_libtype() {