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.5.5-poppler-0.82.patch | 89 | ||||
| -rw-r--r-- | app-office/scribus/scribus-1.5.5.ebuild | 5 |
3 files changed, 95 insertions, 2 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest index 63e9290ec240..fcb0dbe55d1c 100644 --- a/app-office/scribus/Manifest +++ b/app-office/scribus/Manifest @@ -2,11 +2,12 @@ AUX scribus-1.5.3-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace0 AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015 AUX scribus-1.5.5-docdir.patch 1053 BLAKE2B 3efadd63156463cd0d955b8de072082a3d958849e1c2107eb9bf16260048ad5e9f162162a4f148025fcad091dd44a1f291a6ae708f17014205791e5fcc24b613 SHA512 cae03652fcf541bdce1c89f60e7ba7e2cd14ad3846bbaa7c832e97ee7617188310f51e72c5e88947b51892b61c174f18db35785cf5631b436fc63d35056e2bf1 AUX scribus-1.5.5-findhyphen.patch 1685 BLAKE2B bcd286d7285ff2a28477ae538bd8917a336c2e0e1db908350893cf56558f7a49e592b8acb980768ce6b3ad228e05bc5f99ce6acf9416ac3ee0db967522a1edbc SHA512 daa75d0c040d3827cde4fd617246c826ade30f85a72c63ac5011251b1c9dce0fff8f5c314c32481b05ba9377e1f9b532487cffcf6194a024a8d75b245acd725c +AUX scribus-1.5.5-poppler-0.82.patch 5228 BLAKE2B 4d3dac11d77a41bca4ace028a249acacd07d4595dbd1611b15ad697fd6da5848cea880cb5edbc4411ed512bc3414261129b95984510750bdd5c1066185833d78 SHA512 8621876aa7ba5d91f48e2d4b1c9d865b2179e4029fdf1b122defa619454690328cc30d03963aad0865fe6dff480285fb21ba44c82d57d81f5b7ce1d687c34cc4 AUX scribus-1.5.5_pre20190429-poppler-0.76.patch 2102 BLAKE2B 80cc47f73cd3c2d8fe5a5ff379b37c279d65fccc68864e28f0cfcbeaf4953eb548e8ccc87d2754a3d2b7014e5702bfb8a191a57e634e77abba55d59b9c6c3bd9 SHA512 210243d3a2f104cf0e03ba0a8df7db15818fcae5808f3974a1260079d31e83b363b29c85aced985cc29b889ea07359a0ac5e62fb03c3ecc0f2b4bc98d633a5e3 AUX scribus-1.5.6-docdir.patch 1107 BLAKE2B 2bd9aa5bfc6b3b125cfdee0ff513749c9cc5fe1e5b5d12da1c92b14397e50d3a9ae40b20c2638e9e0eada080f3b9df30ddba3190f25bbde4102a887101d1b609 SHA512 fb6d23f6e5a53246a8f1dd168195c8f101d8ff3e2f05b7af09e1a58a4c3ed3ab05b07803cf5e7877da1b9e9c17dd0677580dbdeeeacd83063ab0bf4bbf60ae06 DIST scribus-1.5.5.tar.xz 73861836 BLAKE2B 1a10878eaba67116d72c20d8ecd8952764c709ad14d575e4eb921b4f8a7c4525b73e6722f610b1cce57c08540f619d6ebd3d32e04b653b310e475026c185561b SHA512 2d62424ad609296df33ced550940fceb4e15133a595a740cc4f4b4ffbc92aa31737336ac7716c2eed20d2866e37f5a9b780a44d86128daa6bbad3ccb58168b50 DIST scribus-1.5.5_pre20190429.tar.gz 85838093 BLAKE2B 4ffdc6356b5a2c7372bf6395847f348e7c56276d39114fa5691b6c7f8345aa89a0efe221adbbf1d431d89208fae53ae211c5298d9406487d46ddf98dd69d8c1a SHA512 1aa76491560848dccbeb17f03ba4ac24d6045881f6f92f31b921cf1a91c051176b835d86e0c46046e73573bf60b330e07945c279c077a7619bf2ee9331ca9324 -EBUILD scribus-1.5.5.ebuild 4171 BLAKE2B 15f30ae395ffcc77c9c9c96d6e125d106708bb126e0557132e9b47c13fcf9cd41c8e8dcb16d17169bf4b56d6804ef5f43f3dee4eb611a043a9e31b65b9e02064 SHA512 4a27359f21c23b61a93005967794737fb329e244fb8870a32a2a14c1a1072e94dd8dd7b785bcc5392fc8aa8af95bfcf97e86f49c473fc4e0944e3c6acf1d8128 +EBUILD scribus-1.5.5.ebuild 4253 BLAKE2B 32f7725f8d49b1c26551e9bee9c872aed5151eb4c2c89223a094cefa6bc3cda272ecf015a06d8afd2534a9f6fc72b7f8a9f2fc76d745b8176317cfc0ed2413e2 SHA512 971bc854c74e93f98895dd3b20f5094dded35518cc5262b9ca8fb2c42f578cc5444c692ca01fbca94e5c6f3c44055cca5a7395eecbecd3495876a1655ff1590e EBUILD scribus-1.5.5_pre20190429.ebuild 6836 BLAKE2B ecabcfc6b6d7291bfd7820030464106185ba921fdd02ea3b2d483a1d4754817ab2f479dd319e23b85f0355f7e4e1a246e7740344896157f9b3bf558420bc0755 SHA512 ee4ac07e72a4de97f45f2b90af8568f79e3669aed79332ba42aead90db6c38209756f38cf251ed4dbbe90020bc4a6eb9dafaa9277514829713dc74d702ef41ad EBUILD scribus-9999.ebuild 6643 BLAKE2B f4c56004896b625cfcaddd1cd0a2dba01ece7f5b16a4cf745c4f61ab4747c1feb2d057d134a1bbad1039ac33255e82601efc2f9d5dc882028a8c60e5d9c113ae SHA512 d6a9251b10dd61e702ffff373763d939b9f3229846bd0416106cade51eb5546da0bdcaa5f26c39e7c723f3d6475016dcb6cc13567d16099e0363659e1ec89651 MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1 diff --git a/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch b/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch new file mode 100644 index 000000000000..f1eb1e887da0 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.5-poppler-0.82.patch @@ -0,0 +1,89 @@ +From 615b6185c70c70928cab1aab6e1340ba5f80c174 Mon Sep 17 00:00:00 2001 +From: Craig Bradney <mrb@scribus.info> +Date: Mon, 28 Oct 2019 22:11:56 +0000 +Subject: [PATCH] Work around poppler 0.82 signature changes + +git-svn-id: svn://scribus.net/trunk/Scribus@23287 11d20701-8431-0410-a711-e3c959e3b870 + +Use same mechanism as with previous poppler versions to support change of constness in function signatures + +git-svn-id: svn://scribus.net/trunk/Scribus@23289 11d20701-8431-0410-a711-e3c959e3b870 +--- + scribus/plugins/import/pdf/importpdfconfig.h | 6 ++++++ + scribus/plugins/import/pdf/slaoutput.cpp | 6 +++--- + scribus/plugins/import/pdf/slaoutput.h | 6 +++--- + 3 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/scribus/plugins/import/pdf/importpdfconfig.h b/scribus/plugins/import/pdf/importpdfconfig.h +index 2a13b0d10..9913ee382 100644 +--- a/scribus/plugins/import/pdf/importpdfconfig.h ++++ b/scribus/plugins/import/pdf/importpdfconfig.h +@@ -52,4 +52,10 @@ for which a new license (GPL+exception) is in place. + #define POPPLER_REF
+ #endif
+
++#if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 82, 0)
++#define POPPLER_CONST_082 const
++#else
++#define POPPLER_CONST_082
++#endif
++
+ #endif
+diff --git a/scribus/plugins/import/pdf/slaoutput.cpp b/scribus/plugins/import/pdf/slaoutput.cpp +index 6094f3d9e..520474f65 100644 +--- a/scribus/plugins/import/pdf/slaoutput.cpp ++++ b/scribus/plugins/import/pdf/slaoutput.cpp +@@ -2784,7 +2784,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str, i + delete[] mbuffer;
+ }
+
+-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg)
++void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int* maskColors, GBool inlineImg)
+ {
+ ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+ // qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors;
+@@ -3365,7 +3365,7 @@ err1: + fontsrc->unref();
+ }
+
+-void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, Unicode *u, int uLen)
++void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, double dy, double originX, double originY, CharCode code, int nBytes, POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ double x1, y1, x2, y2;
+ int render;
+@@ -3452,7 +3452,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x, double y, double dx, doub + }
+ }
+
+-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
++GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, POPPLER_CONST_082 Unicode *u, int uLen)
+ {
+ // qDebug() << "beginType3Char";
+ GfxFont *gfxFont;
+diff --git a/scribus/plugins/import/pdf/slaoutput.h b/scribus/plugins/import/pdf/slaoutput.h +index bc4350a03..14a590d55 100644 +--- a/scribus/plugins/import/pdf/slaoutput.h ++++ b/scribus/plugins/import/pdf/slaoutput.h +@@ -229,7 +229,7 @@ public: +
+ //----- image drawing
+ void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg) override;
+- void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg) override;
++ void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, POPPLER_CONST_082 int *maskColors, GBool inlineImg) override;
+ void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height,
+ GfxImageColorMap *colorMap,
+@@ -261,8 +261,8 @@ public: + //----- text drawing
+ void beginTextObject(GfxState *state) override;
+ void endTextObject(GfxState *state) override;
+- void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/) override;
+- GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/) override;
++ void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override;
++ GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, POPPLER_CONST_082 Unicode * /*u*/, int /*uLen*/) override;
+ void endType3Char(GfxState * /*state*/) override;
+ void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/) override;
+ void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/) override;
+-- +2.23.0 + diff --git a/app-office/scribus/scribus-1.5.5.ebuild b/app-office/scribus/scribus-1.5.5.ebuild index 576abf23fb5b..3cfe057c2add 100644 --- a/app-office/scribus/scribus-1.5.5.ebuild +++ b/app-office/scribus/scribus-1.5.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" +KEYWORDS="amd64 ~hppa ~ppc ~ppc64 x86" IUSE="+boost debug examples graphicsmagick hunspell +minimal osg +pdf scripts +templates tk" REQUIRED_USE="${PYTHON_REQUIRED_USE} @@ -67,6 +67,9 @@ RDEPEND="${DEPEND} " PATCHES=( + # upstream svn trunk + "${FILESDIR}"/${P}-poppler-0.82.patch + # non(?)-upstreamable "${FILESDIR}"/${PN}-1.5.3-fpic.patch "${FILESDIR}"/${P}-docdir.patch "${FILESDIR}"/${P}-findhyphen.patch |