From 3e97c0b95eb0424ac94317f67ee909c8044dab61 Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sat, 3 Nov 2018 13:35:22 +0000 Subject: [PATCH] extra/libreoffice-fresh to 6.1.2-4 --- extra/libreoffice-fresh/PKGBUILD | 6 +- .../libreoffice-poppler-0.71.patch | 169 ++++++++++++++++++ 2 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 extra/libreoffice-fresh/libreoffice-poppler-0.71.patch diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD index c9787a483..316ec0483 100644 --- a/extra/libreoffice-fresh/PKGBUILD +++ b/extra/libreoffice-fresh/PKGBUILD @@ -20,7 +20,7 @@ pkgbase=libreoffice-fresh pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh') _LOver=6.1.2.1 pkgver=6.1.2 -pkgrel=3 +pkgrel=4 arch=('x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -64,6 +64,7 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc} ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll make-pyuno-work-with-system-wide-module-install.diff poppler-0.70.patch + libreoffice-poppler-0.71.patch 0001-Update-mdds-to-1.4.1.patch 0001-Update-orcus-to-0.14.0.patch libreoffice-fresh.sh libreoffice-fresh.csh) @@ -106,6 +107,7 @@ sha256sums=('650c57b60f880db28e49e584f42018da9e714865dfa94fbb8391de15b58a3f91' 'eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6' 'c463654a73ecfbc242ff109726fb4faecdbfb3d91affafe919b24bea65afb563' '4cac21ffdb711803c0d5372c6b0ba04f1310afa7907081fdd01c11e68c1785bf' + 'ffe1698d3db3320a9213a459e7619f4962c9792a8b256ea0fe2b7e0af1df430a' '8e8460302a7febc9a29b32b98fb77c85910ccadc65c73e0e9997dc5aabaaeb2a' '60560283a5e22acad7f341b16dff4a654559b36db5d49b1e59f3bb9ae9b2336c' '28c97effbe55e43a1370ab141c676cec9daba9e3dc408bec78136dfefc892a8b' @@ -137,6 +139,8 @@ prepare() { # fix build with poppler 0.70 patch -Np1 -i ../poppler-0.70.patch + # fix build with poppler 0.71 + patch -p1 -i ../libreoffice-poppler-0.71.patch # fix build with new mdds 1.4.x, liborcus 0.14.x # sed -i "s:mdds-1.2 >= 1.2.3:mdds-1.4 >= 1.4.2:" configure.ac diff --git a/extra/libreoffice-fresh/libreoffice-poppler-0.71.patch b/extra/libreoffice-fresh/libreoffice-poppler-0.71.patch new file mode 100644 index 000000000..27249258d --- /dev/null +++ b/extra/libreoffice-fresh/libreoffice-poppler-0.71.patch @@ -0,0 +1,169 @@ +diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +--- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx 2018-11-01 20:43:55.802520387 +0000 ++++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx 2018-11-01 20:44:33.399286879 +0000 +@@ -514,7 +514,7 @@ + PDFOutDev::PDFOutDev( PDFDoc* pDoc ) : + m_pDoc( pDoc ), + m_aFontMap(), +- m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ), ++ m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ), + m_bSkipImages(false) + { + } +@@ -943,11 +943,11 @@ + } + + void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str, +- int width, int height, GBool invert, ++ int width, int height, bool invert, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif +- GBool /*inlineImg*/ ) ++ bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -976,9 +976,9 @@ + void PDFOutDev::drawImage(GfxState*, Object*, Stream* str, + int width, int height, GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif +- int* maskColors, GBool /*inlineImg*/ ) ++ int* maskColors, bool /*inlineImg*/ ) + { + if (m_bSkipImages) + return; +@@ -1027,13 +1027,13 @@ + int width, int height, + GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif + Stream* maskStr, + int maskWidth, int maskHeight, +- GBool maskInvert ++ bool maskInvert + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool /*maskInterpolate*/ ++ , bool /*maskInterpolate*/ + #endif + ) + { +@@ -1049,13 +1049,13 @@ + int width, int height, + GfxImageColorMap* colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool /*interpolate*/, ++ bool /*interpolate*/, + #endif + Stream* maskStr, + int maskWidth, int maskHeight, + GfxImageColorMap* maskColorMap + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool /*maskInterpolate*/ ++ , bool /*maskInterpolate*/ + #endif + ) + { +diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +--- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx 2018-11-01 20:43:55.802520387 +0000 ++++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx 2018-11-01 20:44:33.402620221 +0000 +@@ -151,17 +151,17 @@ + + // Does this device use upside-down coordinates? + // (Upside-down means (0,0) is the top left corner of the page.) +- virtual GBool upsideDown() override { return gTrue; } ++ virtual bool upsideDown() override { return true; } + + // Does this device use drawChar() or drawString()? +- virtual GBool useDrawChar() override { return gTrue; } ++ virtual bool useDrawChar() override { return true; } + + // Does this device use beginType3Char/endType3Char? Otherwise, + // text in Type 3 fonts will be drawn with drawChar/drawString. +- virtual GBool interpretType3Chars() override { return gFalse; } ++ virtual bool interpretType3Chars() override { return false; } + + // Does this device need non-text content? +- virtual GBool needNonText() override { return gTrue; } ++ virtual bool needNonText() override { return true; } + + //----- initialization and control + +@@ -237,40 +237,40 @@ + + //----- image drawing + virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, +- int width, int height, GBool invert, ++ int width, int height, bool invert, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif +- GBool inlineImg) override; ++ bool inlineImg) override; + virtual void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif +- int *maskColors, GBool inlineImg) override; ++ int *maskColors, bool inlineImg) override; + virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif + Stream *maskStr, int maskWidth, int maskHeight, +- GBool maskInvert ++ bool maskInvert + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool maskInterpolate ++ , bool maskInterpolate + #endif + ) override; + virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, + int width, int height, + GfxImageColorMap *colorMap, + #if POPPLER_CHECK_VERSION(0, 12, 0) +- GBool interpolate, ++ bool interpolate, + #endif + Stream *maskStr, + int maskWidth, int maskHeight, + GfxImageColorMap *maskColorMap + #if POPPLER_CHECK_VERSION(0, 12, 0) +- , GBool maskInterpolate ++ , bool maskInterpolate + #endif + ) override; + +diff -ru libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +--- libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx 2018-11-01 20:43:55.802520387 +0000 ++++ libreoffice-6.1.2.1/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx 2018-11-01 20:44:33.402620221 +0000 +@@ -69,7 +69,7 @@ + + // read config file + globalParams = new GlobalParams(); +- globalParams->setErrQuiet(gTrue); ++ globalParams->setErrQuiet(true); + #if defined(_MSC_VER) + globalParams->setupBaseFonts(nullptr); + #endif +@@ -143,7 +143,7 @@ + i, + PDFI_OUTDEV_RESOLUTION, + PDFI_OUTDEV_RESOLUTION, +- 0, gTrue, gTrue, gTrue); ++ 0, true, true, true); + rDoc.processLinks(&aOutDev, i); + } +