gentoo auto-resync : 02:09:2022 - 10:16:01

3 files changed, 79 insertions, 1 deletions

diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 2b86bb08cb0b..5c2b22898b89 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -3,6 +3,7 @@ AUX inkscape-1.1.2-automagic-libX11.patch 6042 BLAKE2B 6a59ac91e4e867fddc4cb4cba
 AUX inkscape-1.1.2-poppler-22.03.0.patch 1782 BLAKE2B 0cad51f92dd5427a07d8602237cec4937764e28be627a70e97a24535de2732dad7a15e7f0d0dd8b91f574e0a01aeced57d7dc54db7b340733f5395d14d6ab70d SHA512 5e04dfdffdca6acf18f869c6c385d808680261f3cbceb67a7dc3473bcef58c8e893ee7646f8b4027cb1287687dc6bff14fe6f9f3cdb32e5de91cc722b339be95
 AUX inkscape-1.1.2-r1-poppler-22.03.0.patch 1866 BLAKE2B f3f6ce5b6c5677999583af698b3984973b144125cad1801e33c4cce0b5f66739d7e3c178e27b2837da3a8dc8c5c1077c7f5d4afa1d62f76a99bbb1288e5b7933 SHA512 f2bec4d41ec707ac9617a59b02697c84c8a70ba96ee6efff39172ec54e16403a5416eb3f05590d3e23426168ad7307121739ae5ec5f99065e23b447e4de8fa2c
 AUX inkscape-1.1.2-r1-poppler-22.04.0.patch 4538 BLAKE2B bf60575e86dbfb3f483dc17c17f7cc42f9b947e64849b126a5fc4063036cfc14e93dcb2b2a6b16cf219033e59f890b0e4e58fe0014a382b77f056d87121355ff SHA512 043e2e85fecd8c657828871067801096e289a2b40c367c113047c0ec3a90b85436b6ca15df1a6cf8fef1a11e683033afda42098dc97b686d2d3ec7cd3a52e7af
+AUX inkscape-1.2.1-poppler-22.09.0.patch 3123 BLAKE2B 9186cf3993059551c94d25aa613cc5a0a8790c04369aae76ae87f3acc6303e56443c77358f0de792d42cea689d65ef7d89b252dee87f20e47f60954c34c44e3f SHA512 0fb1bf88795669cb106b670363c66d728ec0cfe97ec549050bc3156e737b6d1358f4255459bd99165db9d98364b8924906af8d20a40beca76eb4be997dde040c
 DIST inkscape-1.1-musl.txz 10820 BLAKE2B 3e7d346161d8c58436cae01227ce0eafc122276ba4b0483271cbb2e74447c7a89b2033bf709adb521abe2aebca79fffece183786071478b29aedbf3c742c4616 SHA512 8900863fb2d12cb6aea39b2e2ac8d32b512086aa3a26f3598d3117abd0b44f95b6001ea21ac02ce2368dd66dee0faefdef049c433f62380904770b7680680668
 DIST inkscape-1.1.1.tar.xz 34221284 BLAKE2B e628ead14f76fa3de929cfe14a6f085c5e9cd4304d2ee0a4b2046380284aacb8a32ff311c2e104f39f6abd0d080594ec4f9783fcaff183588107eedb49863c82 SHA512 22b1b584a344c4f4ebd0b6e84a4af44e472ef47b3971cb97cbb026a4bf7cb5bea49a7de0c2af2a9e439c7c794f775081c8d1904f33eadb49a5389ea01bc0896c
 DIST inkscape-1.1.2.tar.xz 34222832 BLAKE2B cb9bd271ff209055a6f5c2d99fd93dde29c7cb8c1b7caa7061dd1380ea914d5ccc6f5a91c5356c68bf0fd1462a3a5178e9774d0aeadcfceee9f0ea5f4beee73b SHA512 55884f34e6fcc604027e7ea60f67702a658d3838332c1f3b56ec2cb05ab44992df0651ed741d6e7e807848366b24ee7415d0908ed1143b0bfb33ddbf26ae5c16
@@ -15,6 +16,6 @@ EBUILD inkscape-1.1.2-r1.ebuild 4770 BLAKE2B f70037c5c2596f16e47058ca58964616b2f
 EBUILD inkscape-1.1.2-r2.ebuild 4972 BLAKE2B 26ef9465a2b40fd9bfcd0c9af8bf11bad6b2e1af11826c68c9d0f61679df79520401fbf45199e3a5ab1b29330abe33558d00574aa264722388acaf79eb7ffb23 SHA512 dd05eba12d4aa8c97eda4d828db6d00930aa6b56bd908e11f15ee129c5cf8a4863902d2692c06cc8cefdb37b9173a4793033821bd9647ddac8808237d28fcfff
 EBUILD inkscape-1.1.2.ebuild 4645 BLAKE2B 0777360387987f1b86b82c25b2d8e72ebb589b57554aa0b610c1f567fb7a46508008b1de7b41a9fe7061a8a77490b3c98f4ab9800bbab61b4d29dba08e223d7a SHA512 d1f2601504f58e82f92ae7ce19c0d745ec3ffeb631d9b0f21f67b621eb0b403f7f22d427e5911c220fc7bb7f8ac937dc44e6b3acbdd594a855534002fb4c89f7
 EBUILD inkscape-1.2-r1.ebuild 5106 BLAKE2B 11ff95ce9b484bc2dcaf181e9ee036dfba42f4721c5098149e549814b9542d1cc9de9415f726f5bb7b0f415b4067147d8ee4e37ebc0734eefe253a41bd8f4ba9 SHA512 e6d86169f7349b2fb55fff18f91e12509bee229d27db2c0173a77ff5b1a7cecab2858bbaf6fb03d4c63b73b2aaf3fa12d555f59fa22d87efb01c56312735cc3c
-EBUILD inkscape-1.2.1.ebuild 5138 BLAKE2B 011bb3cd383c4199483a129ab41e689873e7c0a05fe90ae96f09984fe7c81dbe2b6a86f183de648b66e9a43b012354ca8c805eb5365cfac54e2176903efac966 SHA512 da85491e40f939a1817af9a2b8a1bf0dd0c1699ec6b02254db8b5776d6a66e9ff2dd5191560ce83c1d9b693c6c0144f586b66d64045598b1d427f54937ff21cf
+EBUILD inkscape-1.2.1.ebuild 5200 BLAKE2B b36546e469f4ae1cd3204b2619095b4fc36bfcc06a17ae932c8abc004f1b482a99c8c8b50419e9168889eb807daea45ec01a8058abb8708f7b615ab1d129f1eb SHA512 d6debcb97e3faf9bda70a67a332986ef0b337162d83686305799a22360a13e0ad12c9ed2c59c807e3bfa1b5fed34103a5b0e89ee77dd17b5a5001b84eb3b5a55
 EBUILD inkscape-9999.ebuild 5159 BLAKE2B 8d84de64f1f6103599d9618dbacc585650a0eb2c159ed614fcd185bdb7ba9eeaa797d85b257762bde898d452ae2263d736eb141b0270c040c72712760673c102 SHA512 fcaf708c9696d7e26827ece7f75de9288007670924f0f4921d777e830f959442514d5b8655eff0e70ce6bc19745e6b2fc74262ecd70cedffb2d9d25cd148bd53
 MISC metadata.xml 984 BLAKE2B 8aee1f973005f9587571770eb14ccf725bf3ba9034d9935b029f776e64e17a9e156ec864e1150b259d2a983aec6e53b10791be4f1a3b67d5aa465ee115d966f0 SHA512 7ee7c7d473ae2120b9f592777b08d77899c6bf7f750f09cc334dc76a997a472e2593442fb281a9984d77e1aa4eca39e389484405e0aa8b5614da0f718c713fc0
diff --git a/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
new file mode 100644
index 000000000000..87583019d6e3
--- /dev/null
+++ b/media-gfx/inkscape/files/inkscape-1.2.1-poppler-22.09.0.patch
@@ -0,0 +1,73 @@
+https://gitlab.com/inkscape/inkscape/-/merge_requests/4719
+
+From dce083204c62f1185ad079fc124f7fb40a1d0bb6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Sep 2022 06:21:28 +0100
+Subject: [PATCH] Fix build with Poppler 22.09.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With Poppler 22.09.0, inkscape fails to build with:
+```
+/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:394:23: error: no matching function for call to ‘GfxState::getLineDash(double**, int*, double*)’
+  394 |     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
+      |     ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In file included from /var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/svg-builder.cpp:44:
+/usr/include/poppler/GfxState.h:1506:32: note: candidate: ‘const std::vector<double>& GfxState::getLineDash(double*)’
+ 1506 |     const std::vector<double> &getLineDash(double *start)
+      |                                ^~~~~~~~~~~
+[...]
+/var/tmp/portage/media-gfx/inkscape-1.2.1/work/inkscape-1.2.1/src/extension/internal/pdfinput/pdf-parser.cpp:700:21: error: no matching function for call to ‘GfxState::setLineDash(double*&, int&, double)’
+  700 |   state->setLineDash(dash, length, args[1].getNum());
+      |   ~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+```
+
+Poppler changed the getLineDash interface:
+```
+-    void getLineDash(double **dash, int *length, double *start)
++    const std::vector<double> &getLineDash(double *start)
+```
+
+... and the setLineDash interface:
+````
+-    void setLineDash(double *dash, int length, double start);
++    void setLineDash(std::vector<double> &&dash, double start);
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/extension/internal/pdfinput/pdf-parser.cpp
++++ b/src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -697,7 +697,11 @@ void PdfParser::opSetDash(Object args[], int /*numArgs*/)
+       _POPPLER_FREE(obj);
+     }
+   }
++#if POPPLER_CHECK_VERSION(22, 9, 0)
++  state->setLineDash(std::vector<double> (*dash, length), args[1].getNum());
++#else
+   state->setLineDash(dash, length, args[1].getNum());
++#endif
+   builder->updateStyle(state);
+ }
+ 
+--- a/src/extension/internal/pdfinput/svg-builder.cpp
++++ b/src/extension/internal/pdfinput/svg-builder.cpp
+@@ -388,10 +388,17 @@ void SvgBuilder::_setStrokeStyle(SPCSSAttr *css, GfxState *state) {
+     sp_repr_css_set_property(css, "stroke-miterlimit", os_ml.str().c_str());
+ 
+     // Line dash
+-    double *dash_pattern;
+     int dash_length;
+     double dash_start;
++#if POPPLER_CHECK_VERSION(22, 9, 0)
++    const double *dash_pattern;
++    const std::vector<double> &dash = state->getLineDash(&dash_start);
++    dash_pattern = dash.data();
++    dash_length = dash.size();
++#else
++    double *dash_pattern;
+     state->getLineDash(&dash_pattern, &dash_length, &dash_start);
++#endif
+     if ( dash_length > 0 ) {
+         Inkscape::CSSOStringStream os_array;
+         for ( int i = 0 ; i < dash_length ; i++ ) {
diff --git a/media-gfx/inkscape/inkscape-1.2.1.ebuild b/media-gfx/inkscape/inkscape-1.2.1.ebuild
index e2183428d93b..a0df591ee0d9 100644
--- a/media-gfx/inkscape/inkscape-1.2.1.ebuild
+++ b/media-gfx/inkscape/inkscape-1.2.1.ebuild
@@ -108,6 +108,10 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.1-poppler-22.09.0.patch
+)
+
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 }