diff options
Diffstat (limited to 'app-office/scribus')
| -rw-r--r-- | app-office/scribus/Manifest | 3 | ||||
| -rw-r--r-- | app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch | 70 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.6.1-r1.ebuild | 1 |
3 files changed, 73 insertions, 1 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 188b7ed82793..f9553ef56968 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -1,11 +1,12 @@ AUX scribus-1.5.3-fpic.patch 376 BLAKE2B 102f6ca21c96d0b05354bf65c551efde01291c1b878db27e24ee8680eca6bebc9e402b19d62fe2001ed5dfc46ca11c3b3450816a017c942ba848bd43476628fc SHA512 531c3697983adbdeef4959c44a89ccf5e3802f2b1e64a65a63747a659cb808a08095d7592e6f8974e3e0e16ad913ba05bd3f3fe9c9fbd0a50463fd8df6f47d34 AUX scribus-1.5.8-cmake.patch 951 BLAKE2B 7f64fbb7d92974b44946eeee359a87ea3c1564a804765169f0271d5cbdef488b142eec3d057d0367415b665c09ef82ef4da2934b3343e6bf0f0a91abe949bb23 SHA512 340185ac6ae1a0dbb6138ff2d714ba330ce4957864788a5f7786d7f5149abddcda222e5b902bc67c6ed61bf01dd4225eb66ce6abc5e3a672ef2c0586701384e7 AUX scribus-1.6.1-findhyphen.patch 1787 BLAKE2B 28faaa033a876516333ce10f89cc741c56090c53e98b0b9dee44cd05153533b0fd088e178f087f1125365b199385463ae1e07add1a92976e32a8b500d6e2979c SHA512 772ded373a356a679416dcd4f87abaf4b2a47bcf48738a8d40103cadff6eb332381e07bd277c5013c5e112f5b2997b2e9667052b83324960990ce96fa7ec4542 +AUX scribus-1.6.1-poppler-24.03.patch 2950 BLAKE2B f2f6b32bf918b4aa935468eb60908afd5f982853e4c5aede0948c6abc22b8f7211c9c8806ddf35c7e9ff13d7ea4eaa7ca9a48105efaee8ed253a38cdb3fba8e1 SHA512 30b062fa811b8e5aaaafa47ecc8b8582d87889cea62cf1e5debd3ec8a2a5337ede3d30edd93320e3b6703c924284a793b137fa8252dfe091cca2cad00a594be3 AUX scribus-1.7.0-dont-install-thirdparty-license.patch 517 BLAKE2B cba2d9ad7e3b4a028f75dddb8296d8d5fd8f38c6eb91f673db4fda779375ed7f29e266874a66c9ea7d40c6e54908a2c98397072805cfb6c640c6a0a58b1cfd2a SHA512 8a38b5a1254f089f94f0fc8ca8f646e1c1d76a1193b232bb4420639a725f10cc2204d83c42a6a7535347dc7e2486048311e8221cfb445542b32511cedb07142e AUX scribus-1.7.0-findhyphen.patch 1900 BLAKE2B 6d5ef69a889afefa8449e35cdb4348d9cdf3ebe1b110b4de86a35e72e5faae97ae2fbadfe9ae2672a144d7ccea33ea95e0e25f2894f444c3a58a6e1b713aa357 SHA512 cde9231dd4783832340d9dd3df1522d3f5f7a3ab4f26d18ca5825d634d8102e3ca1bae483f0bd111e7e4fff31e5c9154923a9d79eae735a0445b6829e74b5c5f AUX scribus-1.7.0-fix-icon-version.patch 410 BLAKE2B 65d077457d8c85a8830345d7299b054806c16285e75ed4055f14ba4d844a9b0fd4972f0f1eba6ec889af4f460f50522d88722bfa34b123b80f280f2f0e029462 SHA512 230085c17081a33fb900e686e7469b878965c659e10845c39d2c7dc68a11e1f6a01bd614a21a555539c437a567ac8231490da739bfe5c17ef13fed9bd61352e2 AUX scribus-1.7.0-remove-hello-world-test.patch 239 BLAKE2B c74e2fc5f29d3c1a50b1f9a5c0d4205f7f348191dd3b7cde07d21566e85fcea273369b4d47078d2c19db230693fbe2267497b4b106ad0112e5b37a9f22a259a0 SHA512 88f8195144722b991138115bf398b63f3558c12a3a6d02a65a6520a80a710e67d38338d71dc80006f72e946aebf2eac4c692e23e8a759709aa31100791684f49 DIST scribus-1.6.1.tar.xz 73266900 BLAKE2B b8120823cf98201ed197748cffe3f12019acfbd4831b497585ad7d04fa6d6e470bf4bc85dac15700483dfc977c56136cb49bcee20106f482cd9b0022d75d28d5 SHA512 ffde5628ea314dab8f212f78e7dd96cd258ceaebccc5b8de2c21e338a433f82d7fbbb047d05882abb07b4dceac031141b77fef933c9a3ed0e26f29bb94377e7e -EBUILD scribus-1.6.1-r1.ebuild 3932 BLAKE2B 0700c8f70859e7640ad94d53b971675b15f2eeb41cc91f233574d1e2177a9786171ef6e872689265736823aaa9cf8f9a9a320244ed84c03910492da0a4711737 SHA512 8bd486cd03ca39a440380a9a194da439e875bc17a6ca8f29e20e49bf5b31e3e50fcb5327db015de2f586b90dc41c12631e6b960c302b08424ab7957b8e632efe +EBUILD scribus-1.6.1-r1.ebuild 3979 BLAKE2B 8d549e4b50c1405da8c385ea5670f7509ecb3ebcd9407ab40bffddd5f11ac2d8c244804747f810ad7d58d2ed19cb27ca3faa6c9d0079cfdfdce04c9e5627631d SHA512 f0847654c74563e0d6449e749daaa451725287a641226f7c1b1057adac76f749383a8104679831c8fffa3b1d1674ca032e686cb9d10693780110ba2cbfe592a7 EBUILD scribus-9999.ebuild 4030 BLAKE2B 52b4aa2873a6deefc274dcc2303b288ba64daad3bbe37c2190e0d07da612f7bc5860a9ffc85a9df2210cf2c316ab8b8ddddd37689748817714cc59c879a8b15e SHA512 e831559052b968976a5e6889883038640fc87c3687e7316690f478b7106720c605c377c059c4d8cc2c97b903de44bb55e1b200b5ea84b39e50dea4cc29c1e3b4 MISC metadata.xml 883 BLAKE2B 7dc92ce97a3337f9397b52c647c00313790a8a674c88ba3491ef55b056941d6dcdfe1eac9009c4a5f2c4ebe70d81f9fa27439efad544bf8415ffb2235440402e SHA512 3348ea8be21835e88182c23e21dfaef4f52928aee1f4af1c88707cc3bd3f016d56986f197eec9b26279f4df72f20559fe7f4cad7439e67a66ab2c1b4f585ad91 diff --git a/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch new file mode 100644 index 000000000000..076e48e14fd9 --- /dev/null +++ b/app-office/scribus/files/scribus-1.6.1-poppler-24.03.patch @@ -0,0 +1,70 @@ +From dc2470990ab73c87fdd60068c99518ced01a3edd Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 4 Mar 2024 17:35:11 +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> +--- + scribus/plugins/import/pdf/slaoutput.cpp | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 4e31e4b6c..3e4a768ec 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -1731,7 +1731,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1753,7 +1757,11 @@ bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, do + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+@@ -1865,7 +1873,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + VGradient FillGradient = VGradient(VGradient::linear);
+ FillGradient.clearStops();
+ GfxColorSpace *color_space = shading->getColorSpace();
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ if (func->getType() == Function::Type::Stitching)
++#else
+ if (func->getType() == 3)
++#endif
+ {
+ StitchingFunction *stitchingFunc = (StitchingFunction*)func;
+ const double *bounds = stitchingFunc->getBounds();
+@@ -1887,7 +1899,11 @@ bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, + FillGradient.addStop( ScColorEngine::getShadeColor(m_doc->PageColors[stopColor], m_doc, shade), stopPoint, 0.5, 1.0, stopColor, shade );
+ }
+ }
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(24, 3, 0)
++ else if ((func->getType() == Function::Type::Exponential) || (func->getType() == Function::Type::Sampled))
++#else
+ else if ((func->getType() == 2) || (func->getType() == 0))
++#endif
+ {
+ GfxColor stop1;
+ shading->getColor(0.0, &stop1);
+-- +2.44.0 + diff --git a/app-office/scribus/scribus-1.6.1-r1.ebuild b/app-office/scribus/scribus-1.6.1-r1.ebuild index 3b9230eb12a6..21e17e6ae260 100644 --- a/app-office/scribus/scribus-1.6.1-r1.ebuild +++ b/app-office/scribus/scribus-1.6.1-r1.ebuild @@ -77,6 +77,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.6.1-findhyphen.patch "${FILESDIR}"/${PN}-1.7.0-remove-hello-world-test.patch "${FILESDIR}"/${PN}-1.7.0-fix-icon-version.patch + "${FILESDIR}"/${PN}-1.6.1-poppler-24.03.patch ) src_prepare() { |