gentoo auto-resync : 04:03:2024 - 23:43:21

9 files changed, 74 insertions, 13 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index b9e93d381dba..298156e3ed77 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index d8d81c66a262..a1c2a610f921 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -1,8 +1,9 @@
 AUX inkscape-1.2.2-fix-compile.patch 1948 BLAKE2B 4482e3f021f9cdee4a26e0d179e5e18e21d2a0649d1801979ee08b2428a1b9ae8850a09cacaa2121a25069d763758123f0c550e1e7dac2a91c04198eb6bc960f SHA512 ccc4a593c903ce467e0076a8b036aac421a3f5a943815d6d7cf91c48acb07d49c76fb73b58ad01fc3a3f45af2c6e4bc78d6a13848ed3f91de42c3a074b1aeb17
 AUX inkscape-1.3.2-libxml2-2.12.patch 916 BLAKE2B 06ff8b562f6eb703ae2b88a8f0c4ce68257066a8482c1e9b05144bf2fa188512fd6521bfaed700f5fae90dd7b9d927e3382220ebc2a67fdf01614fc9db08b30c SHA512 afdd6c92b16ecc7078cc15b13c40cb19ca2b326367729341003894004ba1fd36c6df8d04f954c65fbbe213201cee14bd5dc38766d87801a4b78934a9927957a4
+AUX inkscape-1.3.2-poppler-24.03.patch 2982 BLAKE2B b8ed08ef09afbab15196ae6d0f198acc01a4000bc2688d0209d53108dac0c801f9d3d1d3be78893e6268f0e82ca7f61b6975252d29aa657487fe792d42c79532 SHA512 9bd8062599fe183de837804106aa2501cb77710f76214663dfd504d9a7cb4a4bc838311c87ed2bbacca4bbcab29a2f81e0831cbd4f8c2017816a0e6fbbfe306b
 DIST inkscape-1.2.2.tar.xz 39392040 BLAKE2B 7a4f0e42d1d8b67f42b924c760be484156e210e5661dc48408c992cbef5e0ac997a468cf1263e5c14cd5c0c0a83345e77055ff59fd7fb2d01b2d196f42a9e858 SHA512 b3e95f7d45612140b38c95fd758b051c27b0ed55bac7e7980c0491d3ba94c62edd7f0b27034314388bf74faf2046d829f36d2f6745cb4a54fb43b8b684df235f
 DIST inkscape-1.3.2.tar.xz 44720944 BLAKE2B 24120f8c671e1fb54bb6626cab95e7086e3c60fbc117bbe8017d081c799bc26812b1286e670771e7ffe88720ba25f237146c452afaf65c1ee2ee554fb07f79a2 SHA512 a6da4b676ba3e7f954f95e3916ce78ce358b49c8052795a52d478064ef02eeae0337b0a94e89b9752ea6824a5758d28072c2bbf83f1e9ee28daebd3b0ef87343
 EBUILD inkscape-1.2.2-r4.ebuild 5450 BLAKE2B 1c2938f4b6be6e65dd80ceae1371e3b64b18a1aba5b0ff0e34fb00e0b460f7da2b0938b464b061a19414c811b16dbbcd006d4a0fd7d3b44106387a96f437d6ce SHA512 4e6bafcc3c647f78294ec10f5c8698cd2f61945e31a09e8ed7e9910c7a1764da86401b4e78c8a9aa73e25379c2e06a1a065849b3ebfe7699f573d941575d5265
-EBUILD inkscape-1.3.2.ebuild 5558 BLAKE2B 96af8a596d274a28dd4f8c36cf909d1d906445cc473e790276cacc1f71bdd802e7aeb0530e1c1d01f7ee5af61cc315396b8b153765b67e8e49745c764c82ab29 SHA512 9f78e3d070a49d2af9454c9d02d70e4375f111e4c5f414cb8d3fde096bf554025722c3541e98c6682590eb1bc5f068b4a8cc608c6fa507226482b9527ae4e0d1
+EBUILD inkscape-1.3.2.ebuild 5591 BLAKE2B 40a220a0bcb48020ba03a022994c548ff08e18e69dde2f7ba89ed838a44467e71fbaed29affbcf4c7370b76acbf9c1103ed4f499650302446c36711582970941 SHA512 2467361c532953141997c36ac11f27400f2362de96a3ea0c6f1b9d216946c4e96561f381327805e81c0b5fa4066675c850b08366e6d6651e5d91b736169dde08
 EBUILD inkscape-9999.ebuild 5471 BLAKE2B bbc2fcd95623653b6b5b2bccca420a4172b0453c8e4e295897f977681678f0152faa04a2851dd9f74f14df15ddce492595a0d915c6566505e8b4db4fb35892e7 SHA512 403c1db94726ed25e5ee93a4afac23d3efd9ce1f476bd9dcea9cd5f675e4f46bf1af76206af1e2675262fefe9bb8cf4024963b6ef94ef1f364aceaea619820a8
 MISC metadata.xml 982 BLAKE2B f44f534865614c8dd7bf71e92ce69cff708fc08e3eb701765bf93144b433ec52df52a506b69cc98969909c695015881b60592cccdf27613c6fe82812fc50727b SHA512 2963a9b473f139d06cefd1c3231ef148045c005adb4688850522c183f39ba15a36331b7eae7752e9bf15a26e6370f2af14ec02e59735f1753246c45821c0cdbc
diff --git a/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch
new file mode 100644
index 000000000000..53cf3fd2b6cd
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch
@@ -0,0 +1,61 @@
+From 3dd9846ab99260134e11938f0e575be822507037 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 4 Mar 2024 22:59:40 +0100
+Subject: [PATCH] Fix build with >=poppler-24.03.0
+
+Fixes build errors caused by:
+
+"Use an enum for Function getType"
+Upstream commit 6e3824d45d42cb806a28a2df84e4ab6bb3587083
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/extension/internal/pdfinput/svg-builder.cpp | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 525fbfec0..bcd7b1f61 100644
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1175,9 +1175,13 @@ static bool svgGetShadingColor(GfxShading *shading, double offset, GfxColor *res
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+                                    _POPPLER_CONST Function *func) {
+-    int type = func->getType();
++    auto type = func->getType();
+     auto space = shading->getColorSpace();
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++    if ( type == Function::Type::Sampled || type == Function::Type::Exponential ) {  // Sampled or exponential function
++#else
+     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
++#endif
+         GfxColor stop1, stop2;
+         if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) {
+             return false;
+@@ -1185,7 +1189,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+             _addStopToGradient(gradient, 0.0, &stop1, space, 1.0);
+             _addStopToGradient(gradient, 1.0, &stop2, space, 1.0);
+         }
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++    } else if ( type == Function::Type::Stitching ) { // Stitching
++#else
+     } else if ( type == 3 ) { // Stitching
++#endif
+         auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
+         const double *bounds = stitchingFunc->getBounds();
+         const double *encode = stitchingFunc->getEncode();
+@@ -1200,7 +1208,11 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+         for ( int i = 0 ; i < num_funcs ; i++ ) {
+             svgGetShadingColor(shading, bounds[i + 1], &color);
+             // Add stops
++#if POPPLER_CHECK_VERSION(24, 3, 0)
++            if (stitchingFunc->getFunc(i)->getType() == Function::Type::Exponential) {    // process exponential fxn
++#else
+             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
++#endif
+                 double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+                 if (expE > 1.0) {
+                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
+-- 
+2.44.0
+
diff --git a/media-gfx/inkscape/inkscape-1.3.2.ebuild b/media-gfx/inkscape/inkscape-1.3.2.ebuild
index 5aeb0df4ea69..bcd4aa1ca77c 100644
--- a/media-gfx/inkscape/inkscape-1.3.2.ebuild
+++ b/media-gfx/inkscape/inkscape-1.3.2.ebuild
@@ -107,7 +107,8 @@ DEPEND="${COMMON_DEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.2-libxml2-2.12.patch
+	"${FILESDIR}"/${P}-libxml2-2.12.patch
+	"${FILESDIR}"/${P}-poppler-24.03.patch
 )
 
 pkg_pretend() {
diff --git a/media-gfx/libbgcode/Manifest b/media-gfx/libbgcode/Manifest
index 485842eb498a..9c443a2d7416 100644
--- a/media-gfx/libbgcode/Manifest
+++ b/media-gfx/libbgcode/Manifest
@@ -1,5 +1,5 @@
 DIST libbgcode-0.0.20231116.tar.gz 455134 BLAKE2B 63c37b7a8189ef5f14539d6e32cc442b91e65a8e0047c1d7cc2b6970a31b2aa02c212c7ed7dec4497392755d64550a28652b04746eaef279d4fb4a8ec58aac12 SHA512 605110a0e4ca16fd497dbe8b15f9794a75c19d5d5367320ddacaa621eb1a4370fcc5b8a799440d8b449774595c5bcbcd2d96fcb574707da475ef85764f9760d3
 DIST libbgcode-0.0.20240220.tar.gz 456416 BLAKE2B 966eadd2888dc733f3bffb919992774e138fe464702b072fd56b0c636cceca9636f1fe1606220ccccc2be44a66e2e999e3b81634c707a19a38b7416da7aa1407 SHA512 258466ebfe4c16fd8074be12434348866378220b64f2687667defa21b919b1e2d8c1dc4d11f829777eacdc785834acaebcb3cb46a903c53f3a2604e70c5bb75c
-EBUILD libbgcode-0.0.20231116.ebuild 652 BLAKE2B 5d597c72da9105924aec3df188d63f1ac6ad9a94602dde37f4f8d6e581c22b548f441efced673d7d5cadd6b920b3a689d3bfb9e305131566ed0f1a84b0aa1fa9 SHA512 70378066c32fdc82501125777a0c2e735eeab4ca35dcd961e423fad5f00f347b88ebd03092566474e73de32f98e366bd10493945c67e733fb1e2fc259a03c236
-EBUILD libbgcode-0.0.20240220.ebuild 723 BLAKE2B 4341a86b9e099da3aa0409293935f1fb0c14abf9a1a13384eb2b666eb68e962247c964b830a71895597faba8996e21a36d080edb5f7296adf4519d70978acb8d SHA512 88a2de15c9bd9c754a3b26fdd1f44f371c82c3ec021c6321c49a543ee625a27e9433ee57a534f2a8198b451b519a28f60904c2954cfc6d7af3d7a91a6ee84975
+EBUILD libbgcode-0.0.20231116.ebuild 651 BLAKE2B dab4c9349f741ffdb7cbae2ae3c7f88e433a65e461e7272426db3b4a2bce45a366a4e4952aed3e8d0ef7adc551b6cc8678cf74f1d5df10421cb35a48321bc776 SHA512 c309d6796a3d4e210d79dd4dcb880f4b5335cf5740db42d85438f980114485bd6e69354d8f8eca03fe15b8f114651d244bcbf043320d0f2fcbc2ffadc49c8455
+EBUILD libbgcode-0.0.20240220.ebuild 735 BLAKE2B 408dc5b13294573e86d49b8fcd1a5176ad2d826853835794ec253707c1fc4b323fbeac59089526f43b027623f59dd2230f77fa9f1fd021f9fb4ddb12f34e859b SHA512 586acaa9424d193593e2b13b55798b170f2999afb910479b209c768eff7516571cffa416c85b74a4a3d459cfc4d983e2199e34f518e0775eaab50251ef3afde8
 MISC metadata.xml 517 BLAKE2B f13be19479e8ade30b867081f8014821be2c5650b407890268e6cab65330bd4b8e3ab37e6cba531f029ebb0499d0cb7269ccb17b309b15105f6bb6aa94b5c42e SHA512 0d09893294fc40e9b52bbdf7f8f31e075c1e8839fd90c2b9656b70d30ab52f088527ab2d1ffec797ecb1e309ea7d40bb48d571eafd19eb3a2592aef4e7c918c0
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20231116.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20231116.ebuild
index c0cf7e5f4299..e2c87aad46fe 100644
--- a/media-gfx/libbgcode/libbgcode-0.0.20231116.ebuild
+++ b/media-gfx/libbgcode/libbgcode-0.0.20231116.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/prusa3d/libbgcode/archive/${LIBBGCODE_COMMIT}.tar.gz
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 
 DEPEND="
 	>=dev-libs/boost-1.82
diff --git a/media-gfx/libbgcode/libbgcode-0.0.20240220.ebuild b/media-gfx/libbgcode/libbgcode-0.0.20240220.ebuild
index f84dbf92d3b0..fdb67e02c362 100644
--- a/media-gfx/libbgcode/libbgcode-0.0.20240220.ebuild
+++ b/media-gfx/libbgcode/libbgcode-0.0.20240220.ebuild
@@ -18,14 +18,12 @@ KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="
+# catch is not needed only for tests: đ926168
+DEPEND="
+	=dev-cpp/catch-2*:0
 	>=dev-libs/boost-1.82
 	>=dev-libs/heatshrink-0.4.1
 	>=dev-python/pybind11-2.11
 	>=sys-libs/zlib-1.0
 "
-DEPEND="
-	${CDEPEND}
-	test? ( =dev-cpp/catch-2*:0 )
-"
-RDEPEND="${CDEPEND}"
+RDEPEND="${DEPEND}"
diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 68b718ae9ed7..b9c0306105c1 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -5,6 +5,6 @@ DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B d5bfe09a76c5e1e5d3f5fae350db27db6
 DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f SHA512 20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
 DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8 SHA512 74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db
 EBUILD prusaslicer-2.6.1.ebuild 1993 BLAKE2B 9aed21a5e7e62ff8cbfd4e13d3716e0067828f924226b00ab1355dbeb5e501fde123b81df3b8b458abdc339236bf62483d470dd55982a97bb4f792f24a8c9f6d SHA512 4c05f5af7f46e72c01b651e0c2ce075d3a842e9386d93c38076640ac1ad1997641b7996b41dae086de25f7aa83cf20310abfbed8c699103dc9855538392f08ed
-EBUILD prusaslicer-2.7.1.ebuild 1960 BLAKE2B aed93e9eb315299f6d63903380a095ede25d66868cbd26fec5abe9a5604f333f84a0f8e920338160b8c330f6421195df26cf3296ea3f7dde92b7ca195cfd6b90 SHA512 62c17d874095cc1a5276cd15216911b7fb78cc5780066631c17e21d5984462efd41515b17a9bb7d2b91b9757ef7e60af0535a16c045eb0626217be0376b050d6
+EBUILD prusaslicer-2.7.1.ebuild 1959 BLAKE2B 03428fd19c6d57f00eefe42b731b54aadf77c0fc634ec085a39ec768b67b7516371e2a1b907c04ba6d09426d249b160db27be96a6232db8ab20a819717e24e26 SHA512 8f43cca3145bc02468d0846242d38b2eea3bb7f4872602864147f659bda4d51b6e1ac7a3e1c01b1138c21e7dfbad6693235f0afbbacfc88a5521af7aedb54625
 EBUILD prusaslicer-2.7.2.ebuild 1960 BLAKE2B aed93e9eb315299f6d63903380a095ede25d66868cbd26fec5abe9a5604f333f84a0f8e920338160b8c330f6421195df26cf3296ea3f7dde92b7ca195cfd6b90 SHA512 62c17d874095cc1a5276cd15216911b7fb78cc5780066631c17e21d5984462efd41515b17a9bb7d2b91b9757ef7e60af0535a16c045eb0626217be0376b050d6
 MISC metadata.xml 1028 BLAKE2B a267e6b0ee72a85b895046cc7d5f659cca379fd799a9ebb802dc1fafd7edfa1b989784b10eb93ac24f1ea6153153b892e28e20055b0a7d2021f6db7742e065b4 SHA512 5760ea954f5ccf09e5d69e101b6d68839a4517a9375adc3009b1bf846b98091ee0555e9c92bb0cf316670efec699cd24d04b4ebe7db5b65e363f83051d868512
diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
index 2a926a3e0102..52f7bd2d1548 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="test"