svn commit: r486305 - head/editors/libreoffice/files
Tobias C. Berner
tcberner at FreeBSD.org
Fri Nov 30 22:19:54 UTC 2018
Author: tcberner
Date: Fri Nov 30 22:19:52 2018
New Revision: 486305
URL: https://svnweb.freebsd.org/changeset/ports/486305
Log:
editors/libreoffice: prepare for poppler 0.71
PR: 233452
Obtained from: Arch Linux
Added:
head/editors/libreoffice/files/patch-archgit_poppler-0.70.patch (contents, props changed)
head/editors/libreoffice/files/patch-archgit_poppler-0.71.patch (contents, props changed)
Added: head/editors/libreoffice/files/patch-archgit_poppler-0.70.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-archgit_poppler-0.70.patch Fri Nov 30 22:19:52 2018 (r486305)
@@ -0,0 +1,45 @@
+From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <evangelos at foutrelis.com>
+Date: Wed, 24 Oct 2018 17:48:53 +0300
+Subject: [PATCH] fix build with poppler 0.70
+
+---
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
+ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
+ 2 files changed, 8 insertions(+)
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+index 575a90acb..99219f7e6 100644
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
+ printf( "restoreState\n" );
+ }
+
++#if POPPLER_CHECK_VERSION(0, 70, 0)
++void PDFOutDev::setDefaultCTM(const double *pMat)
++#else
+ void PDFOutDev::setDefaultCTM(double *pMat)
++#endif
+ {
+ assert(pMat);
+
+diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+index da021a2a0..27440f2bb 100644
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
++++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+@@ -166,7 +166,11 @@ namespace pdfi
+ //----- initialization and control
+
+ // Set default transform matrix.
++#if POPPLER_CHECK_VERSION(0, 70, 0)
++ virtual void setDefaultCTM(const double *ctm) override;
++#else
+ virtual void setDefaultCTM(double *ctm) override;
++#endif
+
+ // Start a page.
+ virtual void startPage(int pageNum, GfxState *state
+--
+2.19.1
+
Added: head/editors/libreoffice/files/patch-archgit_poppler-0.71.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/editors/libreoffice/files/patch-archgit_poppler-0.71.patch Fri Nov 30 22:19:52 2018 (r486305)
@@ -0,0 +1,170 @@
+diff -ru sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx 2018-11-01 20:43:55.802520387 +0000
++++ 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 sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
+--- sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx 2018-11-01 20:43:55.802520387 +0000
++++ 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 sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx 2018-11-01 20:43:55.802520387 +0000
++++ 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);
+ }
+
+
More information about the svn-ports-all
mailing list