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

7 files changed, 72 insertions, 2 deletions

diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index f5accae56b95..4f49757a1e9c 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index fd75ec6d486c..45030cf34c34 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,6 +5,7 @@ AUX libreoffice-7.2.6.2-poppler-22.03.0.patch 1361 BLAKE2B da788c4de7203ab20337a
 AUX libreoffice-7.3.3.2-Add-missing-nSize-set-for-Poppler-22.04.0.patch 1122 BLAKE2B 7f6c0d006fda26d868f2b4a193c8280ac3048233a2e796d1a10ec7210e68ecc391d6c4aa88a28c42bfb053fe418abe5fbbb1c3eeb8521990f692fb94387c334e SHA512 3abdc14a55cea3829cac8c652fcbe6cbbbae45b1ba8e02bf8654f8b8c45780d73eb094968985fe98e10b014c2e2b8b3fd82a830af297902644e2ceffe3a02ad1
 AUX libreoffice-7.3.3.2-Import-FreeBSD-patch-for-Poppler-22.04.0-build.patch 2462 BLAKE2B bb49834014847b2cba163cbb946d865f3dee13a3a9fc04fa74ff9526ae089f8213ae2f094170d41e909ae77d93e468cbf06eefdd05262a305d52a3300a2b4b88 SHA512 d47885a5476bb81243a93729f176902144134c66914ad7e8ec9032c85bb9b5f19040236da883d7cc0dec14d05af32771be06c3a686d0b9587721b8aed65aa5ad
 AUX libreoffice-7.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c9963300580378213e7768748012f5ece1f761eb95ee9cda1dd5582c47abd7a2ca10c0266ab26ce4cc1aa4a683d8791c6940ca9d8758cac446 SHA512 b631300030d0fa9434ca97bf79ebfb8d497568f02aff58b9438840f1166b7d6d9c0d3ce7a4ad67dedfe5ee7588adb4027ef17dd6054a6c29f28278615ae0c019
+AUX libreoffice-7.3.5.2-poppler-22.09.0.patch 1792 BLAKE2B 76b328207cbbc1ad607ed9568c296152deb3aca8a425386fadaf9eebc575e1841f917f6eb2846ced361e1e559fe0ded105c92cb8c6674237e5655e80d0014c0d SHA512 437312894fdee03eb37d1330c22685b3de57791f20ab104ec8dbb4281ccfea3f31586eea1dd31a37fea24e2065f16f631fd721f749df4c31fc5e5e71d2f43626
 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
@@ -39,7 +40,7 @@ DIST skia-m103-b301ff025004c9cd82816c86c547588e6c24b466.tar.xz 11079112 BLAKE2B
 DIST skia-m97-a7230803d64ae9d44f4e1282444801119a3ae967.tar.xz 11826600 BLAKE2B 2985ba0318fd72ac216fda33c6961eaa8ee649d2a850eb736accbd91fbc9cee7dc4e5752b2696a35204770a188412e2ecd0cc128cec324c682f9bc35e68358b3 SHA512 fbf5cfef66991565dbad928091a4e795a5b5b79a1e062a98ab9135b9972827de703c449507957294e7471c422c2e2ed239d6df61ffb9b9581a9ca3d848687a76
 EBUILD libreoffice-7.3.3.2-r3.ebuild 20228 BLAKE2B cb29a34f5c74e4edd871f36b469242de2bfe4b29c31eb61248855cf29925c5d2303e9fa0bc6e64d09833f9a44e70ebc9c140fe60b0bf33e25a815365d4fdb9be SHA512 b0ea4d4225cf32915a6c57a9644439b841b3c171680dbe187592cd9c12522e98c085f23e3594a37b5d18afe118b0137c68e66790408a1fadaedeb30a0ae552b8
 EBUILD libreoffice-7.3.4.2-r1.ebuild 19845 BLAKE2B 3bfd2994d25e0be0e751ac273b311cc6172cd117526acbb149dde34c114767c8860d79f1f4616d60256e4052d69f80779dc9607ef77fe08ab9ed3b75f047216a SHA512 2902c88f6dad6b37e8de0770d556cd6c55e04431f85daf6a889c3b4a9d6d282882da48670a951cd2500f7cd5ddf6de1da0aee77e8cb389d497c4353cea7d4006
-EBUILD libreoffice-7.3.5.2.ebuild 19485 BLAKE2B 923b123949c4beed98b7f8fb42713b95bbea5ae53dcc3a6cc9b68224cdd4982553d0ed0b7ab4200924e9ce2dd3614072ee7a2be622f262f6b442ba6ec80509da SHA512 98c90984e22b1ec45396cc8cc4f48bdc21cfd74c0f946084a113ce6bbbb6b7910682c8649172834f89b3384a482050e1ed8fe5a0e8b0705db4d0f8dbab931dea
+EBUILD libreoffice-7.3.5.2.ebuild 19536 BLAKE2B da70eb18e9d5958db91db7788c1af0b352e0c3ac12db134f15817cd4b200ec2415d7d7c29e6a9f3d4d721043c360f64fd905f0297d298695ec635be20fc275a0 SHA512 5fde33cd504872550bf6160c942c698ddb4c8ebcabae0cb357dd86a1d6349049978ac30a37f47ed581f98cea8d83537f55b47d3174d03f575f481a23cedf1096
 EBUILD libreoffice-7.3.9999.ebuild 19460 BLAKE2B 7248df0a3c14b9f8d906a604d28da23f792752204eeb7023fbbfee6234b744cfd553e59a1c0a5bd13fe765488ee276bfba7cc209a405e195e6e3fa86c95b1185 SHA512 9a830c095364c73ef632efc2ff191e6f2d5cec855bcdd3da926b6da462279be46c2d671c21ff0122aa0129b8b0abd70d094851feda0efe43d710f0416c8a8c97
 EBUILD libreoffice-9999.ebuild 19402 BLAKE2B 5df5971e4858fdf107ef6d67fb994c1edcf6a6e2754beb6dd9ea53637508aaf92a1f8556e82d96f558af333f64d5cf70167e97f2a0ca1cb2c46f60ba4141b740 SHA512 3b4ef56789ce84254e29b50a32d21fadd20c1d437df6e25eaca3a6c4f8afb08cecff1e93fb8ad6b0805fe20d3c7003fe21018f4131d2293828577018ca6cef5e
 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686
diff --git a/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch
new file mode 100644
index 000000000000..f269d53196da
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-7.3.5.2-poppler-22.09.0.patch
@@ -0,0 +1,46 @@
+https://gerrit.libreoffice.org/c/core/+/139249
+
+From 8bad83bf044661357b02b695e6f53e2e19dea396 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 2 Sep 2022 04:31:18 +0100
+Subject: [PATCH] Fix build with Poppler 22.09.0
+
+With Poppler 22.09.0, LO fails to build with:
+```
+/var/tmp/portage/app-office/libreoffice-7.3.5.2/work/libreoffice-7.3.5.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx:682:36: error: too many arguments to function call, expected single argument 'start', have 3 arguments
+    state->getLineDash(&dashArray, &arrayLen, &startOffset);
+    ~~~~~~~~~~~~~~~~~~             ^~~~~~~~~~~~~~~~~~~~~~~
+/usr/include/poppler/GfxState.h:1506:32: note: 'getLineDash' declared here
+    const std::vector<double> &getLineDash(double *start)
+                               ^
+1 error generated.
+```
+
+Poppler changed the getLineDash interface:
+```
+-    void getLineDash(double **dash, int *length, double *start)
++    const std::vector<double> &getLineDash(double *start)
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+Change-Id: I29e18f20d7650a7fcac1bc8ab4aaa04aaa2ab8fb
+--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -678,8 +678,16 @@ void PDFOutDev::updateLineDash(GfxState *state)
+         return;
+     assert(state);
+ 
+-    double* dashArray; int arrayLen; double startOffset;
++    int arrayLen; double startOffset;
++#if POPPLER_CHECK_VERSION(22, 9, 0)
++    const double* dashArray;
++    const std::vector<double> &dash = state->getLineDash(&startOffset);
++    dashArray = dash.data();
++    arrayLen = dash.size();
++#else
++    double* dashArray;
+     state->getLineDash(&dashArray, &arrayLen, &startOffset);
++#endif
+ 
+     printf( "updateLineDash" );
+     if( arrayLen && dashArray )
diff --git a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
index 07c41dd1473e..92051c1009c6 100644
--- a/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
+++ b/app-office/libreoffice/libreoffice-7.3.5.2.ebuild
@@ -296,6 +296,7 @@ PATCHES=(
 
 	# Upstream
 	"${FILESDIR}/${PN}-7.3.5.2-gpgme-1.18.0.patch"
+	"${FILESDIR}/${PN}-7.3.5.2-poppler-22.09.0.patch"
 )
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 8b1ee92bfe4d..577e1f2a45eb 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,8 +4,9 @@ AUX scribus-1.5.6-findhyphen.patch 597 BLAKE2B 166e71a1efd00262b9eead90e6b47457e
 AUX scribus-1.5.8-findhyphen-1.patch 1264 BLAKE2B e35c561c275ef945aca9a7cc34e9ac9732450d7a2d15f5766c2a637f296d026fbc1d777266634b98cc5e8ad09364019f8eeeffd63f634e0836144cb6dacd3f5d SHA512 c0db1a12698b2e9770049b20c73b33e3cd5f56d8a69486a42955949f37216c0347df32e6acbdd7567075f98450dd59e9ef2f6a42f82ce38699fa704d77fbc60d
 AUX scribus-1.5.8-poppler-22.03.0.patch 2176 BLAKE2B 72f636999677cb166b96ba35896887daa71e1302081698c8b6a70ecc0d4a6e5c6a5dba41ff911d2bbad76ae17b20483050ba71595948e3d3097026506390e67c SHA512 86ea87f3a31ba5729e7c3f18ddcfcbe706d824c80d3fad85d6ea296ca6468e8f19964d6b6a771b5a8bc9deb1ed0b0baf4a0d2253aa562acad0c65e71c3f2e448
 AUX scribus-1.5.8-poppler-22.04.0.patch 11352 BLAKE2B 392bf170c922c3e47167da287d86d63bbb3110c09bf68c40f3c55ae5886d72b05032c4ef746fbcf0f1934991482ed7891177956229834731e73bdadb292cbc98 SHA512 f05a3607702df1b398e8fdcd913bab761606aeff12e359df0df98d2f8fb2f41f266776d4ba10be9f8a745de6ec70678f8340dc1f8fee85b9bbc2a527d318b5e2
+AUX scribus-1.5.8-poppler-22.09.0.patch 677 BLAKE2B c6f351551e725f3e9d455cc807ceef52dcd81a8eb586485c94c0b4ac16c88be63da377d0558f6d9b881fe28302f8a9cf7a508be11ce08a60e69833dd33060166 SHA512 600a9454dbe70a85f1a675db7a1c88f5ab88765b3bfd1b37ca6298e2d72b299c90e7117903c419bbe71f654172deac9eb5d0def55b19282c3b4a2d8f06832d8c
 AUX scribus-1.5.8-poppler-22.2.0-1.patch 3899 BLAKE2B 616ded940828b14309b1dca597b5b209da3374e41aad01ed3a204888c3ad3ff25fce61bdfa69c947ead67b0a9cbe11f2e4fbdb6054f02bd251477830ddafd375 SHA512 7a5e21cc98bb7d87c326a8576e6ccf368d5fc64538896f5aedcb13598f2aa11cc6f999011e6920f0bf6116e46f5469a713bb7f04fa8c2ca308b0dd07f2c088af
 AUX scribus-1.5.8-poppler-22.2.0-2.patch 1190 BLAKE2B 5eb29f6246d157f14af0a12bf2234f5981bbd012253ac867a499d2fa3c96221724c060af5549731d00ab96ee67dfd18a26662d601d59a5458fd39c69f022c73e SHA512 826f671ae67e157a6a71befaac77b6fa1888fbbd3c708a3d412d01bfe28a9d3b268ecf33b05fa94390904a140b0eba1e46e712024a02e0ec33933df2a711a611
 DIST scribus-1.5.8.tar.xz 74543476 BLAKE2B 6eacf3089db88b673bd146a9727af4faa4e64901b332dbe08e6c62c912212bfd0e9e2003796df51621ee7d66262388ecfc3bed057a22d1d7fb1740e77fe50686 SHA512 eb46be0165eeb0d8974aa744fc8ffac321b206ca0015da39bb2f50d9fd4a5e28300a49ada0f963b4e0cf9a3301dc746ffba74f359f5e76d308d80b71ee669c2d
-EBUILD scribus-1.5.8-r1.ebuild 4219 BLAKE2B ab236866da16800819ebf054a6f6895f0060a1ad8cf48aca4826358d455260e19daa50d2ab656363752ccd2363958520a138d05f303df14e0e348a32d423aaf4 SHA512 aad68dd23e6a6df229aacfbb9881613c31e45a8a9d8053acba7165479dd6a9a0bdaf3f7e2910954f24a0f3625b503e586126229f866216f61cacb3236e531532
+EBUILD scribus-1.5.8-r1.ebuild 4268 BLAKE2B 308cf01a2a0f4f24db14afabc79b1ae1f6ce7a344fad9e05b00777df907cdfe15e0474b694aebe769ae64fd9b431b68b07f69382e1587eb9f31f5c0ee1e24379 SHA512 c3eafa186ed7489220bd3c4dea9baa1da811cad8f762606bebf9f466f80fe774f69329e955c2eeb982a0ae1c74e80a0c0848490cca41e0b1f91722640f0e99c1
 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91
diff --git a/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
new file mode 100644
index 000000000000..106a6f5162b6
--- /dev/null
+++ b/app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch
@@ -0,0 +1,20 @@
+--- a/scribus/plugins/import/pdf/slaoutput.cpp
++++ b/scribus/plugins/import/pdf/slaoutput.cpp
+@@ -3741,9 +3741,16 @@ void SlaOutputDev::getPenState(GfxState *state)
+ 			break;

+ 	}

+ 	double lw = state->getLineWidth();

+-	double *dashPattern;

+ 	int dashLength;

++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(22, 9, 0)

++	const double *dashPattern;

++	const std::vector<double> &dash = state->getLineDash(&DashOffset);

++	dashPattern = dash.data();

++	dashLength = dash.size();

++#else

++	double *dashPattern;

+ 	state->getLineDash(&dashPattern, &dashLength, &DashOffset);

++#endif

+ 	QVector<double> pattern(dashLength);

+ 	for (int i = 0; i < dashLength; ++i)

+ 	{

diff --git a/app-office/scribus/scribus-1.5.8-r1.ebuild b/app-office/scribus/scribus-1.5.8-r1.ebuild
index 5457bc6ee17f..175ae6cd558b 100644
--- a/app-office/scribus/scribus-1.5.8-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.8-r1.ebuild
@@ -80,6 +80,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.5.8-poppler-22.2.0-2.patch
 	"${FILESDIR}"/${PN}-1.5.8-poppler-22.03.0.patch # bug 834537
 	"${FILESDIR}"/${PN}-1.5.8-poppler-22.04.0.patch # bug 843287
+	"${FILESDIR}"/${PN}-1.5.8-poppler-22.09.0.patch
 )
 
 CMAKE_BUILD_TYPE="Release"