From f23431ea2c4ec37865fdc6de49206b7ec1750ee9 Mon Sep 17 00:00:00 2001 From: Marek Kasik Date: Fri, 25 Jan 2019 19:48:59 +0100 Subject: [PATCH] Rebuild for poppler-0.73.0 --- libreoffice-poppler-0.73.0.patch | 240 +++++++++++++++++++++++++++++++ libreoffice.spec | 6 +- 2 files changed, 245 insertions(+), 1 deletion(-) create mode 100644 libreoffice-poppler-0.73.0.patch diff --git a/libreoffice-poppler-0.73.0.patch b/libreoffice-poppler-0.73.0.patch new file mode 100644 index 0000000..4db1394 --- /dev/null +++ b/libreoffice-poppler-0.73.0.patch @@ -0,0 +1,240 @@ +--- libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx ++++ libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx +@@ -298,7 +298,7 @@ void writePpm_( OutputBuffer& o_rOut + o_rOutputBuf.resize(header_size); + + // initialize stream +- Guchar *p; ++ unsigned char *p; + GfxRGB rgb; + std::unique_ptr imgStr( + new ImageStream(str, +@@ -401,7 +401,7 @@ void writeImage_( OutputBuffer& o_rO + oneColor = { byteToCol( 0xff ), byteToCol( 0xff ), byteToCol( 0xff ) }; + if( colorMap->getColorSpace()->getMode() == csIndexed || colorMap->getColorSpace()->getMode() == csDeviceGray ) + { +- Guchar nIndex = 0; ++ unsigned char nIndex = 0; + colorMap->getRGB( &nIndex, &zeroColor ); + nIndex = 1; + colorMap->getRGB( &nIndex, &oneColor ); +@@ -514,7 +514,7 @@ void PDFOutDev::printPath( GfxPath* pPat + 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) + { + } +@@ -555,7 +555,7 @@ void PDFOutDev::processLink(Link* link, + LinkAction* pAction = link->getAction(); + if (pAction && pAction->getKind() == actionURI) + { +- const char* pURI = static_cast(pAction)->getURI()->getCString(); ++ const char* pURI = static_cast(pAction)->getURI()->c_str(); + + std::vector aEsc( lcl_escapeLineFeeds(pURI) ); + +@@ -753,7 +753,7 @@ void PDFOutDev::updateFont(GfxState *sta + + aFont = it->second; + +- std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) ); ++ std::vector aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) ); + printf( " %d %d %d %d %f %d %s", + aFont.isEmbedded, + aFont.isBold, +@@ -939,11 +939,11 @@ void PDFOutDev::endTextObject(GfxState*) + } + + 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; +@@ -972,9 +972,9 @@ void PDFOutDev::drawImageMask(GfxState* + 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; +@@ -1023,13 +1023,13 @@ void PDFOutDev::drawMaskedImage(GfxState + 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 + ) + { +@@ -1045,13 +1045,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxS + 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 + ) + { +--- libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx ++++ libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx +@@ -151,17 +151,17 @@ namespace pdfi + + // 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 + +@@ -233,40 +233,40 @@ namespace pdfi + + //----- 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; + +@@ -279,7 +279,7 @@ extern FILE* g_binary_out; + + // note: if you ever change Output_t, please keep in mind that the current code + // relies on it being of 8 bit size +-typedef Guchar Output_t; ++typedef unsigned char Output_t; + typedef std::vector< Output_t > OutputBuffer; + + #endif // INCLUDED_SDEXT_SOURCE_PDFIMPORT_XPDFWRAPPER_PDFIOUTDEV_GPL_HXX +--- libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx ++++ libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx +@@ -69,7 +69,7 @@ int main(int argc, char **argv) + + // read config file + globalParams = new GlobalParams(); +- globalParams->setErrQuiet(gTrue); ++ globalParams->setErrQuiet(true); + #if defined(_MSC_VER) + globalParams->setupBaseFonts(nullptr); + #endif +@@ -143,7 +143,7 @@ int main(int argc, char **argv) + i, + PDFI_OUTDEV_RESOLUTION, + PDFI_OUTDEV_RESOLUTION, +- 0, gTrue, gTrue, gTrue); ++ 0, true, true, true); + rDoc.processLinks(&aOutDev, i); + } + +--- libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx ++++ libreoffice-6.1.4.2/sdext/source/pdfimport/xpdfwrapper/pnghelper.cxx +@@ -242,7 +242,7 @@ void PngHelper::createPng( OutputBuffer& + appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image + + // initialize stream +- Guchar *p, *pm; ++ unsigned char *p, *pm; + GfxRGB rgb; + GfxGray alpha; + ImageStream* imgStr = +@@ -328,7 +328,7 @@ void PngHelper::createPng( OutputBuffer& + appendIHDR( o_rOutputBuf, width, height, 8, 6 ); // RGBA image + + // initialize stream +- Guchar *p; ++ unsigned char *p; + GfxRGB rgb; + ImageStream* imgStr = + new ImageStream(str, +@@ -374,7 +374,7 @@ void PngHelper::createPng( OutputBuffer& + { + for( int x = 0; x < maskWidth; ++x ) + { +- Guchar aPixel = 0; ++ unsigned char aPixel = 0; + imgStrMask->getPixel( &aPixel ); + int nIndex = (y*height/maskHeight) * (width*4+1) + // mapped line + (x*width/maskWidth)*4 + 1 + 3 // mapped column diff --git a/libreoffice.spec b/libreoffice.spec index 425eb26..fc47b03 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -54,7 +54,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: %{libo_version}.2 -Release: 1%{?libo_prerelease}%{?dist} +Release: 2%{?libo_prerelease}%{?dist} License: (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0 URL: http://www.libreoffice.org/ @@ -239,6 +239,7 @@ Patch1: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch Patch2: 0001-Update-mdds-to-1.4.1.patch Patch3: 0001-Update-orcus-to-0.14.0.patch Patch4: 0001-tdf-121855-like-osx-case-don-t-search-near-infinite-.patch +Patch5: libreoffice-poppler-0.73.0.patch %if 0%{?rhel} # not upstreamed @@ -2171,6 +2172,9 @@ done %{_includedir}/LibreOfficeKit %changelog +* Fri Jan 25 2019 Marek Kasik - 1:6.1.4.2-2 +- Rebuild for poppler-0.73.0 + * Mon Jan 07 2019 Caolán McNamara - 1:6.1.4.2-1 - latest version - Resolves: rhbz#1662616 crash in macro dialog editor