From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Nov 2019 16:06:58 +0000 Subject: gentoo resync : 03.11.2019 --- app-office/calligra/Manifest | 3 +- app-office/calligra/calligra-3.1.0-r4.ebuild | 4 +++ .../files/calligra-3.1.0-poppler-0.82.patch | 35 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch (limited to 'app-office/calligra') diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest index ed87a8094d00..2a5d51f6dd57 100644 --- a/app-office/calligra/Manifest +++ b/app-office/calligra/Manifest @@ -6,8 +6,9 @@ AUX calligra-3.1.0-poppler-0.69.patch 2963 BLAKE2B 8fac1f298d414ac52073dfdb645d0 AUX calligra-3.1.0-poppler-0.71.patch 6868 BLAKE2B 3787bcc3564598450ec14b9bd4e63559af6ebd3a92f9c80560812f7b9a8f94681987ca6dfa49faee7ed3985d09a7f49d2a2499f9c6acfb5a96a0f8c86d7b8484 SHA512 1376ac7940e6ca0e9615445dc9c16f5ff75db547944dc8a5006520ff30b9d34eced1e5fa679a82535ceb581ae96352d1b6c039b54038290973f456de4d792917 AUX calligra-3.1.0-poppler-0.72.patch 1777 BLAKE2B 28db9f2f6a69c4460fe5be2907f3ff38b7e1b1ff8e6b5480c1ac532f7884706f47da45709f0791a43146dc58e99e3a789700ac53afba9e99a28e8c0c96913a46 SHA512 4e50c321875a0a685d5401c0b8f8f85a76f873cbc0cd6faeb6798d5a3119e4a8123742d58348752ec7d87c1a3055161aaabbda15759cf8e22f2752ef25375376 AUX calligra-3.1.0-poppler-0.73.patch 1342 BLAKE2B e36495c1f1f6c546666f30473fea46dfbdf47906ee61c2fed325a27117c14d3899703c6ca4667b3185ab9cacf3a5aa79a0c829777100d3088711f8fa359f5752 SHA512 ef5710d4f7fcc8015ce725b6f2f26ae1a8cd9bfe2e857633662696453104661f154309f0d0cc5e30b15b868bb43549d5ab8f81ee4cde31f0465cf795d453d233 +AUX calligra-3.1.0-poppler-0.82.patch 1601 BLAKE2B abfa73ee6c675f644ac62f6601fa1d5991259197902d0e8c88ce5a69ffc3862277c1ee7f528d7bed3167c5e11e369c8c691d556c18e7d2bfd704c04f34d8644f SHA512 7525d2df828f0853bd731357381e691dc04c3b4697b16e84128cd4206281c3ae74bc95227c39b15e899b0c6e5401fcea66e2dae3440a7230d47a65ea93c2d72e AUX calligra-3.1.0-qt-5.11.patch 3537 BLAKE2B 25aa9f832eb49876e0ee28d3af945658f9e93610fa894cb73dc274083febf5d62c97de427c10277f07aa7ef8054f4e0c811c70d4b0c4068cd018a3475c9a7e80 SHA512 f895ee2b9999ab4ff6dae523e4f4ea6f72bd05a8f8163a33f05401b63c08cc3c987a1207d1008ae808db0564c0036194e3d6ab5806c681b793c5191f9e585a7e AUX calligra-3.1.0-stage-qt-5.11.patch 656 BLAKE2B 1a4d8f005fd03395617ba0b225302e40b4aaf75c2a838a3009a3b3b6df7e75afdc798f27f08e76b7ad0ea60766612912d06eebe87c209ad9cab45db4bb3ccf54 SHA512 685bfca658404dc9920c805b97832b0a481a0ec0614bf142978c4ae03329e5e93b28d5af09d021b53c6d7a1316404f87612ab316f6a47c3f174572b50c65989b DIST calligra-3.1.0.tar.xz 58037392 BLAKE2B b933012fe0031f4d6eac626054e7fb248f85635e5873224328d30f9aed31dce0a0a49f99cf6eea9c232477400af1d16ffc4dae483cdfd5081720434e95684e50 SHA512 ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b -EBUILD calligra-3.1.0-r4.ebuild 5688 BLAKE2B c830d02ecb9e40bb39b2badceb0f0cae7b2c1c4337e7d3d7369b7bddd5c14ddc3ed9372b518c82f2d9977a2df432799a2dbce8b9309389bb9db75b09326a17b2 SHA512 1f30b8b1baeb3c3d63d116e8d7a9813f2b8a0fd7654421f9ee79915499e72c952ac78c0703b126df75a581cef482df843ca04678a8f66fc779a9866817158b65 +EBUILD calligra-3.1.0-r4.ebuild 5820 BLAKE2B 5fb4febdf4ae0e024d313e06b12faae8442c52f41c8aa3cfd38b577b619d2ab7ab78224f63201adcda0d8ad0eb777c1d626d616bb735b80b0a48761211969ca2 SHA512 e4e8f51ba566a36f022268816bc23cd5546bfe4e2d052d24f7110007673afee75f8ca5c137d72e1cefa29291d41476b4f388e7548e41f9885272d1428057949b MISC metadata.xml 1149 BLAKE2B e5461ec7fe1747ce0f4f1b68e3573bcad14183e9a6522f4e2a47fc14cb2a2c968f1bee6d6bf91304d23b981df8c2bdf086222f823ccc6abbe44ff3fcd630ceb0 SHA512 2c6b8ac3f48fa278faf079cfc42b6bdc8ecba994222adfe735489088e1fbb26c60f5f6ef4ff773a64e9a6e5026ef4dff368ec3c2c3c96cd6b0a38b6711b2d7a9 diff --git a/app-office/calligra/calligra-3.1.0-r4.ebuild b/app-office/calligra/calligra-3.1.0-r4.ebuild index 37e03558459c..411c8177f1c4 100644 --- a/app-office/calligra/calligra-3.1.0-r4.ebuild +++ b/app-office/calligra/calligra-3.1.0-r4.ebuild @@ -135,6 +135,10 @@ pkg_setup() { src_prepare() { kde5_src_prepare + if has_version ">=app-text/poppler-0.82"; then + eapply "${FILESDIR}/${P}-poppler-0.82.patch" # TODO: make upstreamable patch + fi + if ! use test; then sed -e "/add_subdirectory( *benchmarks *)/s/^/#DONT/" \ -i libs/pigment/CMakeLists.txt || die diff --git a/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch new file mode 100644 index 000000000000..4cb9d1872ebb --- /dev/null +++ b/app-office/calligra/files/calligra-3.1.0-poppler-0.82.patch @@ -0,0 +1,35 @@ +Patch stolen from Mageia Cauldron but had to be modified quite a bit. + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index ffdbf01..70bc9f8 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -405,7 +405,7 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + const char * p = s->c_str(); + int len = s->getLength(); + CharCode code; +- Unicode *u = nullptr; ++ const Unicode *u = nullptr; + int uLen; + double dx, dy, originX, originY; + while (len > 0) { +@@ -545,7 +545,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + + void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- bool /*interpolate*/, int *maskColors, bool inlineImg) ++ bool /*interpolate*/, const int *maskColors, bool inlineImg) + { + drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); + } +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -63,7 +63,7 @@ public: + // images + void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- bool interpolate, int *maskColors, bool inlineImg) override; ++ bool interpolate, const int *maskColors, bool inlineImg) override; + + // styles + virtual void updateAll(GfxState *state); -- cgit v1.2.3