From 4441f84fb8958b0824879c9a7015491f07645cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 25 Dec 2019 16:08:43 +0100 Subject: [PATCH] libreoffice: upgrade 6.3.3.2 -> 6.3.4.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- .../libreoffice/libreoffice-version.inc | 8 +- .../libreoffice/libreoffice.bb | 5 +- .../0011-Fix-build-with-poppler-0.82.patch | 128 ------------------ 3 files changed, 6 insertions(+), 135 deletions(-) delete mode 100644 recipes-libreoffice/libreoffice/libreoffice/0011-Fix-build-with-poppler-0.82.patch diff --git a/recipes-libreoffice/libreoffice/libreoffice-version.inc b/recipes-libreoffice/libreoffice/libreoffice-version.inc index 2bc26c4..b10a97f 100644 --- a/recipes-libreoffice/libreoffice/libreoffice-version.inc +++ b/recipes-libreoffice/libreoffice/libreoffice-version.inc @@ -1,9 +1,9 @@ -PV = "6.3.3.2" -DIRV = "6.3.3" +PV = "6.3.4.2" +DIRV = "6.3.4" SRC_URI += " \ http://download.documentfoundation.org/libreoffice/src/${DIRV}/libreoffice-${PV}.tar.xz \ " -SRC_URI[md5sum] = "2cecdd24f36fbc2e2276e453658381e8" -SRC_URI[sha256sum] = "d40ee5b29c9a0c2f0df2681f993b04a9f64e13d785fa7b7a1e8349b84149e5cf" +SRC_URI[md5sum] = "813a4c02a899ad0b69b9c6b894e0ccf0" +SRC_URI[sha256sum] = "cb72559aa9774f2c13e8fa78391d8f30f3c6f02e3fd83b2311bd643a5cdde49c" diff --git a/recipes-libreoffice/libreoffice/libreoffice.bb b/recipes-libreoffice/libreoffice/libreoffice.bb index 2e389a1..a6e18b6 100644 --- a/recipes-libreoffice/libreoffice/libreoffice.bb +++ b/recipes-libreoffice/libreoffice/libreoffice.bb @@ -13,11 +13,10 @@ SRC_URI += " \ file://0008-configure.ac-avoid-finding-calling-pg_config.patch \ file://0009-avoid-downloading-by-git-submodules.patch \ file://0010-Use-wrappers-for-gobject-introspection.patch \ - file://0011-Fix-build-with-poppler-0.82.patch \ " -SRC_URI[translations.md5sum] = "fcaa3bf5996b0c3cb3e92884b601da54" -SRC_URI[translations.sha256sum] = "721b760b7a9dc88e7d278dab89a2148a4e9239047f7b8f9ee6741c0f8f84b2fb" +SRC_URI[translations.md5sum] = "586c89a3b60bbc90b3a32f870a05cca6" +SRC_URI[translations.sha256sum] = "74a11926ba96ad2fa373a3231ad2e283d95e2ba4a1458c4c625686569f6f5fe9" DEPENDS += " \ ${BPN}-native \ diff --git a/recipes-libreoffice/libreoffice/libreoffice/0011-Fix-build-with-poppler-0.82.patch b/recipes-libreoffice/libreoffice/libreoffice/0011-Fix-build-with-poppler-0.82.patch deleted file mode 100644 index 787111e..0000000 --- a/recipes-libreoffice/libreoffice/libreoffice/0011-Fix-build-with-poppler-0.82.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 2eadd46ab81058087af95bdfc1fea28fcdb65998 Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Sat, 26 Oct 2019 14:11:35 +0200 -Subject: [PATCH] Fix build with poppler-0.82 - -Change-Id: I3b6b3faea7986f3e5a6ae4790580d03bc9c955fc -Reviewed-on: https://gerrit.libreoffice.org/81545 -Tested-by: Jenkins -Reviewed-by: Michael Stahl - -Upstream-Status: Applied [1] - -[1] https://github.com/LibreOffice/core/commit/2eadd46ab81058087af95bdfc1fea28fcdb65998 ---- - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 25 +++++++++++++++++++ - .../pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 16 +++++++++++- - 2 files changed, 40 insertions(+), 1 deletion(-) - -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -index ce32a4139c45..3ae3bdc503e0 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx -@@ -863,11 +863,20 @@ void PDFOutDev::eoClip(GfxState *state) - local offset of character (zero for horizontal writing mode). not - taken into account for output pos updates. Used for vertical writing. - */ -+ -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode, int /*nBytes*/, const Unicode *u, int uLen) -+{ -+#else - void PDFOutDev::drawChar(GfxState *state, double x, double y, - double dx, double dy, - double originX, double originY, - CharCode, int /*nBytes*/, Unicode *u, int uLen) - { -+#endif - assert(state); - - if( u == nullptr ) -@@ -979,11 +988,19 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, - writeBinaryBuffer(aBuf); - } - -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, -+ int width, int height, GfxImageColorMap* colorMap, -+ poppler_bool /*interpolate*/, -+ const int* maskColors, poppler_bool /*inlineImg*/ ) -+{ -+#else - void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - int width, int height, GfxImageColorMap* colorMap, - poppler_bool /*interpolate*/, - int* maskColors, poppler_bool /*inlineImg*/ ) - { -+#endif - if (m_bSkipImages) - return; - OutputBuffer aBuf; initBuf(aBuf); -@@ -1004,12 +1021,20 @@ void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, - { - GfxRGB aMinRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast(maskColors), -+#else - reinterpret_cast(maskColors), -+#endif - &aMinRGB ); - - GfxRGB aMaxRGB; - colorMap->getColorSpace()->getRGB( -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ reinterpret_cast(maskColors)+gfxColorMaxComps, -+#else - reinterpret_cast(maskColors)+gfxColorMaxComps, -+#endif - &aMaxRGB ); - - aMaskBuf.push_back( colToByte(aMinRGB.r) ); -diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -index 1a0c3f0caad1..02f6b59f6f15 100644 ---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx -@@ -232,10 +232,17 @@ namespace pdfi - virtual void eoClip(GfxState *state) override; - - //----- text drawing -+#if POPPLER_CHECK_VERSION(0, 82, 0) -+ virtual void drawChar(GfxState *state, double x, double y, -+ double dx, double dy, -+ double originX, double originY, -+ CharCode code, int nBytes, const Unicode *u, int uLen) override; -+#else - virtual 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; -+#endif - #if POPPLER_CHECK_VERSION(0, 64, 0) - virtual void drawString(GfxState *state, const GooString *s) override; - #else -@@ -248,10 +255,17 @@ namespace pdfi - int width, int height, poppler_bool invert, - poppler_bool interpolate, - poppler_bool inlineImg) override; -+#if POPPLER_CHECK_VERSION(0, 82, 0) - virtual void drawImage(GfxState *state, Object *ref, Stream *str, - int width, int height, GfxImageColorMap *colorMap, - poppler_bool interpolate, -- int* maskColors, poppler_bool inlineImg) override; -+ const int* maskColors, poppler_bool inlineImg) override; -+#else -+ virtual void drawImage(GfxState *state, Object *ref, Stream *str, -+ int width, int height, GfxImageColorMap *colorMap, -+ poppler_bool interpolate, -+ int* maskColors, poppler_bool inlineImg) override; -+#endif - virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, - int width, int height, - GfxImageColorMap *colorMap, --- -2.21.0 -