From a45eaba8b74340f1b166bb2ba96d61d41fc11fad Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Mar 2024 23:43:21 +0000 Subject: gentoo auto-resync : 04:03:2024 - 23:43:21 --- media-gfx/inkscape/Manifest | 3 +- .../files/inkscape-1.3.2-poppler-24.03.patch | 61 ++++++++++++++++++++++ media-gfx/inkscape/inkscape-1.3.2.ebuild | 3 +- 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 media-gfx/inkscape/files/inkscape-1.3.2-poppler-24.03.patch (limited to 'media-gfx/inkscape') 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 +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 +--- + 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() { -- cgit v1.2.3