summaryrefslogtreecommitdiff
path: root/app-office/scribus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-09-02 10:16:02 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-09-02 10:16:02 +0100
commit02fbebe9426ee05ab39e9b5a56e3529e64160ef6 (patch)
tree4c2a5db6966711f46fbc73aece931b17625e27b7 /app-office/scribus
parentb052fbf151106a4f47cac7fdf0ffff983decb773 (diff)
gentoo auto-resync : 02:09:2022 - 10:16:01
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/Manifest3
-rw-r--r--app-office/scribus/files/scribus-1.5.8-poppler-22.09.0.patch20
-rw-r--r--app-office/scribus/scribus-1.5.8-r1.ebuild1
3 files changed, 23 insertions, 1 deletions
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"