Update poppler to 0.72

This update brings many changes
- the build system has switched to cmake
- some ports needed to be switched to use their bundled
  version of poppler:
  - print/tex-luatex (r487226)
  - print/tex-xetex (r487226)
  - editors/opeonffice-devel
- Qt4 support has been dropped
  - print/frescobaldi has been removed for this reason.
- most of the added patches can be removed with the next
  upgrade of the concerning port.

PR:		233452
Exp-run by:	antoine
Approved by:	gnome (kwm)
Differential Revision:	https://reviews.freebsd.org/D17456

13 files changed, 427 insertions, 217 deletions

diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 37dbd00b2667..8df72ab7c9f0 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	calligra
 DISTVERSION=	3.1.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	editors kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
diff --git a/editors/calligra/files/patch-debian_poppler-0.69.patch b/editors/calligra/files/patch-debian_poppler-0.69.patch
new file mode 100644
index 000000000000..327435149bc1
--- /dev/null
+++ b/editors/calligra/files/patch-debian_poppler-0.69.patch
@@ -0,0 +1,17 @@
+Description: Fix build with poppler 0.69
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Bug-Debian: https://bugs.debian.org/910873
+Last-Update: 2018-10-22
+
+--- filters/karbon/pdf/PdfImport.cpp
++++ filters/karbon/pdf/PdfImport.cpp
+@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::co
+     delete globalParams;
+     globalParams = 0;
+ 
+-    // check for memory leaks
+-    Object::memCheck(stderr);
+-
+     return KoFilter::OK;
+ }
+
diff --git a/editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp b/editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp
new file mode 100644
index 000000000000..24c28f41e9c1
--- /dev/null
+++ b/editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp
@@ -0,0 +1,15 @@
+--- filters/karbon/pdf/PdfImport.cpp.orig	2018-12-08 16:48:32 UTC
++++ filters/karbon/pdf/PdfImport.cpp
+@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QB
+     SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
+     if (dev->isOk()) {
+         int rotate = 0;
+-        GBool useMediaBox = gTrue;
+-        GBool crop = gFalse;
+-        GBool printing = gFalse;
++        bool useMediaBox = true;
++        bool crop = false;
++        bool printing = false;
+         pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
+         dev->dumpContent();
+     }
diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp
new file mode 100644
index 000000000000..911bedf7e936
--- /dev/null
+++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp
@@ -0,0 +1,175 @@
+--- filters/karbon/pdf/SvgOutputDev.cpp.orig	2018-01-26 09:24:44 UTC
++++ filters/karbon/pdf/SvgOutputDev.cpp
+@@ -39,7 +39,7 @@ class SvgOutputDev::Private
+ {
+ public:
+     Private(const QString &fname)
+-            : svgFile(fname), defs(0), body(0), state(gTrue)
++            : svgFile(fname), defs(0), body(0), state(true)
+             , brush(Qt::SolidPattern) {}
+ 
+     ~Private() {
+@@ -52,7 +52,7 @@ class SvgOutputDev::Private
+     QString defsData;
+     QTextStream * defs;
+     QTextStream * body;
+-    GBool state;
++    bool state;
+     QSizeF pageSize;
+     QPen pen;
+     QBrush brush;
+@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName)
+         : d(new Private(fileName))
+ {
+     if (! d->svgFile.open(QIODevice::WriteOnly)) {
+-        d->state = gFalse;
++        d->state = false;
+         return;
+     }
+ 
+@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev()
+     delete d;
+ }
+ 
+-GBool SvgOutputDev::isOk()
++bool SvgOutputDev::isOk()
+ {
+     return d->state;
+ }
+ 
+-GBool SvgOutputDev::upsideDown()
++bool SvgOutputDev::upsideDown()
+ {
+-    return gTrue;
++    return true;
+ }
+ 
+-GBool SvgOutputDev::useDrawChar()
++bool SvgOutputDev::useDrawChar()
+ {
+-    return gFalse;
++    return false;
+ }
+ 
+-GBool SvgOutputDev::interpretType3Chars()
++bool SvgOutputDev::interpretType3Chars()
+ {
+-    return gFalse;
++    return false;
+ }
+ 
+ void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
+@@ -143,7 +143,9 @@ void SvgOutputDev::stroke(GfxState * state)
+ {
+     QString path = convertPath(state->getPath());
+     *d->body << "<path";
+-    *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\"";
++    const double * ctm = state->getCTM();
++    QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
++    *d->body << " transform=\"" << convertMatrix(transform) << "\"";
+     *d->body << printStroke();
+     *d->body << " fill=\"none\"";
+     *d->body << " d=\"" << path << "\"";
+@@ -154,7 +156,9 @@ void SvgOutputDev::fill(GfxState * state)
+ {
+     QString path = convertPath(state->getPath());
+     *d->body << "<path";
+-    *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\"";
++    const double * ctm = state->getCTM();
++    QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
++    *d->body << " transform=\"" << convertMatrix(transform) << "\"";
+     *d->body << printFill();
+     *d->body << " fill-rule=\"nonzero\"";
+     *d->body << " d=\"" << path << "\"";
+@@ -165,7 +169,9 @@ void SvgOutputDev::eoFill(GfxState *state)
+ {
+     QString path = convertPath(state->getPath());
+     *d->body << "<path";
+-    *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\"";
++    const double * ctm = state->getCTM();
++    QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
++    *d->body << " transform=\"" << convertMatrix(transform) << "\"";
+     *d->body << printFill();
+     *d->body << " fill-rule=\"evenodd\"";
+     *d->body << " d=\"" << path << "\"";
+@@ -387,7 +393,7 @@ QString SvgOutputDev::printStroke()
+     return stroke;
+ }
+ 
+-void SvgOutputDev::drawString(GfxState * state, GooString * s)
++void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ {
+     int render = state->getRender();
+     // check for invisible text -- this is used by Acrobat Capture
+@@ -402,7 +408,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
+ 
+     QString str;
+ 
+-    char * p = s->getCString();
++    const char * p = s->c_str();
+     int len = s->getLength();
+     CharCode code;
+     Unicode *u = nullptr;
+@@ -429,7 +435,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
+     double x = state->getCurX();
+     double y = state->getCurY();
+ 
+-    double * ctm = state->getCTM();
++    const double * ctm = state->getCTM();
+     QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
+ 
+     QMatrix mirror;
+@@ -451,11 +457,11 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
+     *d->body << " y=\"" << y << "px\"";
+ 
+     if (font && font->getFamily()) {
+-        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
+-        //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
++        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
++        //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
+     } else if (font && font->getName()) {
+-        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
+-        //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
++        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
++        //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
+     }
+     *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
+ 
+@@ -476,7 +482,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
+                              int width, int height, GfxImageColorMap *colorMap,
+-                             int *maskColors, GBool /*inlineImg*/)
++                             int *maskColors, bool /*inlineImg*/)
+ {
+     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+     imgStr->reset();
+@@ -522,7 +528,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
+         return;
+     }
+ 
+-    double * ctm = state->getCTM();
++    const double * ctm = state->getCTM();
+     QMatrix m;
+     m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
+ 
+@@ -531,7 +537,9 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
+     device.open(QIODevice::WriteOnly);
+     if (image->save(&device, "PNG")) {
+         *d->body << "<image";
+-        *d->body << " transform=\"" << convertMatrix(m) << "\"";
++        const double * ctm = state->getCTM();
++        QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
++        *d->body << " transform=\"" << convertMatrix(transform) << "\"";
+         *d->body << " width=\"" << width << "px\"";
+         *d->body << " height=\"" << height << "px\"";
+         *d->body << " xlink:href=\"data:image/png;base64," << ba.toBase64() <<  "\"";
+@@ -545,7 +553,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
+ 
+ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+                              int width, int height, GfxImageColorMap *colorMap,
+-                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
++                             bool /*interpolate*/, int *maskColors, bool inlineImg)
+ {
+     drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
+ }
diff --git a/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h
new file mode 100644
index 000000000000..731c1a9a086f
--- /dev/null
+++ b/editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h
@@ -0,0 +1,37 @@
+--- filters/karbon/pdf/SvgOutputDev.h.orig	2018-01-26 09:24:44 UTC
++++ filters/karbon/pdf/SvgOutputDev.h
+@@ -44,11 +44,11 @@ class SvgOutputDev : public OutputDev (public)
+     explicit SvgOutputDev(const QString &fileName);
+     virtual ~SvgOutputDev();
+ 
+-    GBool isOk();
++    bool isOk();
+ 
+-    virtual GBool upsideDown();
+-    virtual GBool useDrawChar();
+-    virtual GBool interpretType3Chars();
++    virtual bool upsideDown();
++    virtual bool useDrawChar();
++    virtual bool interpretType3Chars();
+     virtual void startPage(int pageNum, GfxState *state, XRef *xref);
+     virtual void endPage();
+ 
+@@ -58,15 +58,15 @@ class SvgOutputDev : public OutputDev (public)
+     virtual void eoFill(GfxState *state);
+ 
+     // text
+-    virtual void drawString(GfxState * state, GooString * s);
++    virtual void drawString(GfxState * state, const GooString * s);
+ 
+     // images
+     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           int *maskColors, GBool inlineImg);
++                           int *maskColors, bool inlineImg);
+     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
+                            int width, int height, GfxImageColorMap *colorMap,
+-                           GBool interpolate, int *maskColors, GBool inlineImg);
++                           bool interpolate, int *maskColors, bool inlineImg);
+ 
+     // styles
+     virtual void updateAll(GfxState *state);
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 55e3509e0877..fa501d4b28de 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	3
+PORTREVISION=	4
 MASTER_SITES=	https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		https://dev-www.libreoffice.org/src/:src \
 		https://dev-www.libreoffice.org/extern/:ext
diff --git a/editors/libreoffice/files/patch-archgit_poppler-0.70.patch b/editors/libreoffice/files/patch-archgit_poppler-0.70.patch
index 037fcd0e51f4..8ad0c409c5e9 100644
--- a/editors/libreoffice/files/patch-archgit_poppler-0.70.patch
+++ b/editors/libreoffice/files/patch-archgit_poppler-0.70.patch
@@ -1,45 +1,179 @@
-From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@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.orig	2018-10-30 16:55:21 UTC
 +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
+@@ -528,7 +528,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
+ 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)
+ {
+ }
+@@ -569,7 +569,7 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+     LinkAction* pAction = link->getAction();
+     if (pAction && pAction->getKind() == actionURI)
+     {
+-        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
++        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
+ 
+         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
+ 
+@@ -592,7 +592,7 @@ void PDFOutDev::restoreState(GfxState*)
      printf( "restoreState\n" );
  }
  
-+#if POPPLER_CHECK_VERSION(0, 70, 0)
+-void PDFOutDev::setDefaultCTM(double *pMat)
 +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
+@@ -767,7 +767,7 @@ void PDFOutDev::updateFont(GfxState *state)
+ 
+             aFont = it->second;
+ 
+-            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
++            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
+             printf( " %d %d %d %d %f %d %s",
+                     aFont.isEmbedded,
+                     aFont.isBold,
+@@ -953,11 +953,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;
+@@ -986,9 +986,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
+ 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;
+@@ -1037,13 +1037,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, St
+                                 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
+                                )
+ {
+@@ -1059,13 +1059,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*
+                                     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
+                                    )
+ {
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2018-10-30 16:55:21 UTC
 +++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -166,7 +166,11 @@ namespace pdfi
+@@ -150,22 +150,22 @@ 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
  
          // Set default transform matrix.
-+#if POPPLER_CHECK_VERSION(0, 70, 0)
+-        virtual void setDefaultCTM(double *ctm) override;
 +        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
-
+@@ -232,40 +232,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;
+ 
diff --git a/editors/libreoffice/files/patch-archgit_poppler-0.71.patch b/editors/libreoffice/files/patch-archgit_poppler-0.71.patch
index 9589dcc36297..8a95132d38ba 100644
--- a/editors/libreoffice/files/patch-archgit_poppler-0.71.patch
+++ b/editors/libreoffice/files/patch-archgit_poppler-0.71.patch
@@ -1,155 +1,6 @@
-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 @@
+--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig	2018-10-30 16:55:21 UTC
++++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+@@ -69,7 +69,7 @@ int main(int argc, char **argv)
  
      // read config file
      globalParams = new GlobalParams();
@@ -158,7 +9,7 @@ diff -ru sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pd
  #if defined(_MSC_VER)
      globalParams->setupBaseFonts(nullptr);
  #endif
-@@ -143,7 +143,7 @@
+@@ -143,7 +143,7 @@ int main(int argc, char **argv)
                  i,
                  PDFI_OUTDEV_RESOLUTION,
                  PDFI_OUTDEV_RESOLUTION,
@@ -167,4 +18,3 @@ diff -ru sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pd
          rDoc.processLinks(&aOutDev, i);
      }
  
-
diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile
index 9bf4b438b096..df27cb976857 100644
--- a/editors/openoffice-devel/Makefile
+++ b/editors/openoffice-devel/Makefile
@@ -196,9 +196,10 @@ MYSQL_USES=			mysql
 SDK_CONFIGURE_ENABLE=		odk
 SDK_DISTFILES=			unowinreg.dll:unoreg
 
+# The current version of openoffice is not compatible with the changed API and
+# requirements of popller-0.7x. Switch to using bundled version for now.
+CONFIGURE_ARGS+=		--without-system-poppler
 PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
-PDFIMPORT_CONFIGURE_WITH=	system-poppler
-PDFIMPORT_LIB_DEPENDS=		libpoppler.so:graphics/poppler
 
 REPORT_BUILDER_BROKEN=		REPORT_BUILDER option requires additional .jar files
 REPORT_BUILDER_CONFIGURE_ENABLE=	report-builder
diff --git a/editors/texmaker/Makefile b/editors/texmaker/Makefile
index d2865e959cc2..7e0324146f87 100644
--- a/editors/texmaker/Makefile
+++ b/editors/texmaker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	texmaker
 PORTVERSION=	4.5
-PORTREVISION=	10
+PORTREVISION=	11
 PORTEPOCH=	3
 CATEGORIES=	editors
 MASTER_SITES=	http://www.xm1math.net/texmaker/
@@ -33,7 +33,6 @@ OPTIONS_DEFAULT=	QT5
 TOOLKIT_DESC=	Qt toolkit
 QT4_USES=	qt:4
 QT4_USE=	${_USE_QT4:S/^/QT=/}
-QT4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
 QT5_USES=	qt:5
 QT5_USE=	${_USE_QT5:S/^/QT=/}
 QT5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
diff --git a/editors/texstudio/Makefile b/editors/texstudio/Makefile
index 7b0bda3828ed..45f751d72ddf 100644
--- a/editors/texstudio/Makefile
+++ b/editors/texstudio/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	texstudio
-DISTVERSION=	2.12.8
+DISTVERSION=	2.12.10
 CATEGORIES=	editors
-PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	abiliojr@gmail.com
 COMMENT=	Integrated writing environment for LaTeX documents
@@ -14,36 +13,17 @@ BROKEN_aarch64=		fails to compile: error: no member named mc_eip in __mcontext
 BROKEN_armv6=		fails to compile: error: no member named mc_eip in __mcontext
 
 LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
-		libpoppler.so:graphics/poppler
-
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-
-qt4_DEPRECATED=		Qt4 has been EOL since december 2015
-qt4_EXPIRATION_DATE=	2019-03-15
-
-qt4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
-			libquazip.so:archivers/quazip@qt4
-qt5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5 \
-			libquazip5.so:archivers/quazip@qt5
+		libpoppler.so:graphics/poppler \
+		libpoppler-qt5.so:graphics/poppler-qt5 \
+		libquazip5.so:archivers/quazip@qt5
 
 USES=		desktop-file-utils dos2unix ghostscript:run \
-		pkgconfig qmake
-
-.if ${FLAVOR} == qt4
-USES+=		qt:4
-USE_QT=		corelib gui network script svg xml \
-		iconengines_run designer_build moc_build rcc_build uic_build
-QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
-		QUAZIP_LIB="-lquazip"
-.else
-USES+=		qt:5
+		pkgconfig qmake qt:5
 USE_QT	=	core gui network script svg widgets xml \
 		printsupport concurrent uitools buildtools_build
 QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
 		QUAZIP_LIB="-lquazip5"
 QTVER_SUFFIX=	5
-.endif
 
 USE_XORG=	x11
 USE_GL=		gl
diff --git a/editors/texstudio/distinfo b/editors/texstudio/distinfo
index 48285746e3cb..427acdd862df 100644
--- a/editors/texstudio/distinfo
+++ b/editors/texstudio/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523190835
-SHA256 (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 3dec30ded3f36bb0591f8ed1b78b86fa23f276f5744925bc91075715c3f58062
-SIZE (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 26555418
+TIMESTAMP = 1538913866
+SHA256 (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 92cf9cbb536e58a5929611fa40438cd9d7ea6880022cd3c5de0483fd15d3df0b
+SIZE (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 26770850
diff --git a/editors/texstudio/pkg-plist b/editors/texstudio/pkg-plist
index 805aaeef1b47..bc0718b2dff1 100644
--- a/editors/texstudio/pkg-plist
+++ b/editors/texstudio/pkg-plist
@@ -128,6 +128,8 @@ share/icons/hicolor/scalable/apps/texstudio.svg
 %%DATADIR%%/texstudio_hu.qm
 %%DATADIR%%/texstudio_it.qm
 %%DATADIR%%/texstudio_ja.qm
+%%DATADIR%%/texstudio_ko.qm
+%%DATADIR%%/texstudio_ko_KR.qm
 %%DATADIR%%/texstudio_nl.qm
 %%DATADIR%%/texstudio_pl.qm
 %%DATADIR%%/texstudio_pt_BR.qm