From 81d0795c69b29a666e67a14ccaed0f0f846a268b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 25 Apr 2018 17:07:23 +0200 Subject: app-office/libreoffice: Fix build with poppler-0.64 Bug: https://bugs.gentoo.org/653478 Package-Manager: Portage-2.3.31, Repoman-2.3.9 --- app-office/libreoffice/Manifest | 2 +- .../files/libreoffice-6.0.3.2-poppler-0.64.patch | 71 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 + 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index b9c41dd67e4c..3b6fd2b27966 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -9,4 +9,4 @@ DIST libreoffice-6.0.3.2-patchset-01.tar.xz 39268 BLAKE2B 0bf5ad04323cbd2cf157da DIST libreoffice-6.0.3.2.tar.xz 203747760 BLAKE2B 8a666aa2e3e880b050ac8eed93a1c55ddbfa7ce74364b0dff4f5be446cf64c4fe347b164716a7d226c6cfbac01dbd3f11b89ecff75460ccd902ac44fe93d5daa SHA512 d1ec8982f185926d3f3040bcdef737e7c74fcf5b360a12a91983eac92843510553759ffa84c7d244df13036fc32149ffe13dd6a56fb1bda6f64fd5a318fd7879 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce47185e070e275d873741e96a98fd6d2dbf546b579fc304c1931775de86734710d2b91542ee9c9749b6036fe8e443cfecb60ed SHA512 b3860dd592207f83b8c6613fdb42962a9e175f6e850282cef6380869add7fe81c7292fdd145f2e2616f8113e2c18f6ed60210d4a182c1be021d7a1db61c9d89d -DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40 +DIST libreoffice-help-6.0.3.2.tar.xz 593680 BLAKE2B 940657b776913772267c8c37d80238206b7c921993091085e5042348a50a9cf8aaa4ed225a2f1a364693dd68aa4690381c1dd206155e56fb4e1200b6d4afd30b SHA512 e19a896fa50a9a26280a9c1b0ce0cbac9dc5e9dfc58481b6b4c17cf6094c3d717570184497117f8486b2ad5f2706c11eeb9d70bb261d7cc6587b4c44ee95bb66 diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch new file mode 100644 index 000000000000..37a554d807da --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-poppler-0.64.patch @@ -0,0 +1,71 @@ +From 106b2c96e9807af14d6eb6e8f83dcf25095a093e Mon Sep 17 00:00:00 2001 +From: Rene Engelhard +Date: Tue, 24 Apr 2018 15:56:23 +0200 +Subject: fix build with poppler 0.64 + +GooString became const... + +Change-Id: Icc95be2e8603a4e22c6a9ac2008986bacd0bfba5 +Reviewed-on: https://gerrit.libreoffice.org/53422 +Tested-by: Jenkins +Reviewed-by: Michael Stahl +--- + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 10 ++++++++++ + sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++ + 2 files changed, 14 insertions(+) + +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +index 00fd56a..9618e5b 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -446,6 +446,9 @@ int PDFOutDev::parseFont( long long nNewId, GfxFont* gfxFont, GfxState* state ) + FontAttributes aNewFont; + int nSize = 0; + ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++ const ++#endif + GooString* pFamily = gfxFont->getName(); + if( pFamily ) + { +@@ -742,6 +745,9 @@ void PDFOutDev::updateFont(GfxState *state) + FontAttributes aFont; + int nEmbedSize=0; + ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++ const ++#endif + Ref* pID = gfxFont->getID(); + // TODO(Q3): Portability problem + long long fontID = (long long)pID->gen << 32 | (long long)pID->num; +@@ -932,7 +938,11 @@ void PDFOutDev::drawChar(GfxState *state, double x, double y, + printf( "\n" ); + } + ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++void PDFOutDev::drawString(GfxState*, const GooString* /*s*/) ++#else + void PDFOutDev::drawString(GfxState*, GooString* /*s*/) ++#endif + { + // TODO(F3): NYI + } +diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +index 922c513..2a6268c 100644 +--- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -223,7 +223,11 @@ namespace pdfi + double dx, double dy, + double originX, double originY, + CharCode code, int nBytes, Unicode *u, int uLen) override; ++#if POPPLER_CHECK_VERSION(0, 64, 0) ++ virtual void drawString(GfxState *state, const GooString *s) override; ++#else + virtual void drawString(GfxState *state, GooString *s) override; ++#endif + virtual void endTextObject(GfxState *state) override; + + //----- image drawing +-- +cgit v1.1 + diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild index 9ac42f54a68d..8ee18655d754 100644 --- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild @@ -247,6 +247,8 @@ PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + # 6.0 branch + "${FILESDIR}/${P}-poppler-0.64.patch" # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" -- cgit v1.2.3-65-gdbad