Page MenuHomeFreeBSD
Files F144738242

D17456.id50519.diff
No OneTemporary
Actions

D17456.id50519.diff
View Options

Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -10628,3 +10628,4 @@
graphics/ImageMagick-nox11|graphics/ImageMagick6-nox11|2018-11-10|Port renamed
lang/gcc6-devel|lang/gcc6|2018-11-11|The GCC 6 branch has been closed, use the final release instead (or a later major version)
mail/py-email-reply-parser|mail/py-email_reply_parser|2018-11-15|Rename to match upstream naming
+graphics/diffpdf||2018-11-31|Depends on non-existent poppler-qt4
Index: editors/texmaker/Makefile
===================================================================
--- editors/texmaker/Makefile
+++ 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 @@
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
Index: editors/texstudio/Makefile
===================================================================
--- editors/texstudio/Makefile
+++ 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,33 +13,17 @@
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
+ libpoppler.so:graphics/poppler \
+ libpoppler-qt5.so:graphics/poppler-qt5 \
+ libquazip5.so:archivers/quazip@qt5
-FLAVORS= qt5 qt4
-FLAVOR?= ${FLAVORS:[1]}
-
-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
-
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
Index: editors/texstudio/distinfo
===================================================================
--- editors/texstudio/distinfo
+++ 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
Index: editors/texstudio/pkg-plist
===================================================================
--- editors/texstudio/pkg-plist
+++ editors/texstudio/pkg-plist
@@ -128,6 +128,8 @@
%%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
Index: graphics/Makefile
===================================================================
--- graphics/Makefile
+++ graphics/Makefile
@@ -138,7 +138,6 @@
SUBDIR += devil
SUBDIR += dia
SUBDIR += diff-pdf
- SUBDIR += diffpdf
SUBDIR += digikam
SUBDIR += digikam-kde4
SUBDIR += digikam-kde4-doc
@@ -867,7 +866,6 @@
SUBDIR += poppler
SUBDIR += poppler-data
SUBDIR += poppler-glib
- SUBDIR += poppler-qt4
SUBDIR += poppler-qt5
SUBDIR += poppler-utils
SUBDIR += potrace
@@ -938,7 +936,6 @@
SUBDIR += py-plotly
SUBDIR += py-png
SUBDIR += py-poppler
- SUBDIR += py-poppler-qt4
SUBDIR += py-pycha
SUBDIR += py-pycollada
SUBDIR += py-pydot
Index: graphics/diffpdf/Makefile
===================================================================
--- graphics/diffpdf/Makefile
+++ graphics/diffpdf/Makefile
@@ -1,27 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= diffpdf
-PORTVERSION= 2.1.3
-PORTREVISION= 2
-CATEGORIES= graphics
-MASTER_SITES= http://www.qtrac.eu/
-
-MAINTAINER= dinoex@FreeBSD.org
-COMMENT= Compare two PDF files-textually or visually
-
-LICENSE= GPLv2+
-
-LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-
-USES= compiler:c++11-lang qmake qt:4
-USE_QT= qmake_build moc_build rcc_build uic_build linguist_build
-
-PLIST_FILES= bin/diffpdf
-
-pre-configure:
- ${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/diffpdf ${STAGEDIR}${PREFIX}/bin/
-
-.include <bsd.port.mk>
Index: graphics/diffpdf/distinfo
===================================================================
--- graphics/diffpdf/distinfo
+++ graphics/diffpdf/distinfo
@@ -1,3 +0,0 @@
-TIMESTAMP = 1485019097
-SHA256 (diffpdf-2.1.3.tar.gz) = c6142ee038a78108397f45b0c456dca7a4fe1d75250f21a514a134101d322433
-SIZE (diffpdf-2.1.3.tar.gz) = 91856
Index: graphics/diffpdf/pkg-descr
===================================================================
--- graphics/diffpdf/pkg-descr
+++ graphics/diffpdf/pkg-descr
@@ -1,8 +0,0 @@
-DiffPDF is used to compare two PDF files-textually or visually.
-
-DiffPDF can compare two PDF files.
-It offers three comparison modes: Words, Characters, and Appearance.
-
-LICENSE: GPL2 or later
-
-WWW: http://www.qtrac.eu/diffpdf-foss.html
Index: graphics/inkscape/Makefile
===================================================================
--- graphics/inkscape/Makefile
+++ graphics/inkscape/Makefile
@@ -82,5 +82,8 @@
post-patch:
@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \
${WRKSRC}/share/*/CMakeLists.txt
+ # Obtained from Arch Linux
+ @${REINPLACE_CMD} -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
+ ${WRKSRC}/src/extension/internal/pdfinput/pdf-parser.*
.include <bsd.port.mk>
Index: graphics/inkscape/files/patch-archgit_bee18ea
===================================================================
--- graphics/inkscape/files/patch-archgit_bee18ea
+++ graphics/inkscape/files/patch-archgit_bee18ea
@@ -0,0 +1,713 @@
+Obtained from: Arch Linux
+ https://git.archlinux.org/svntogit/packages.git/plain/trunk/poppler-fixes-from-master.patch?h=packages/inkscape
+
+From bee18ea9799e34aaf9141141f14384fd6b9cf7bd Mon Sep 17 00:00:00 2001
+From: Eduard Braun <eduard.braun2@gmx.de>
+Date: Tue, 24 Apr 2018 19:18:26 +0200
+Subject: [PATCH 1/4] Fix compilation with poppler 0.64
+
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 10 +++++-----
+ src/extension/internal/pdfinput/pdf-parser.h | 2 +-
+ src/extension/internal/pdfinput/svg-builder.cpp | 4 ++--
+ src/extension/internal/pdfinput/svg-builder.h | 3 +--
+ 4 files changed, 9 insertions(+), 10 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 604b7f8079..721524e10a 100644
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
+ }
+ }
+
+-void PdfParser::doShowText(GooString *s) {
++void PdfParser::doShowText(const GooString *s) {
+ GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
+ font = state->getFont();
+ wMode = font->getWMode();
+
+- builder->beginString(state, s);
++ builder->beginString(state);
+
+ // handle a Type 3 char
+ if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
+@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
+ double lineX = state->getLineX();
+ double lineY = state->getLineY();
+ oldParser = parser;
+- p = s->getCString();
++ p = g_strdup(s->getCString());
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
+
+ } else {
+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
+- p = s->getCString();
++ p = g_strdup(s->getCString());
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
+ {
+ Object obj1, obj2, obj3, refObj;
+
+- char *name = args[0].getName();
++ char *name = g_strdup(args[0].getName());
+ #if defined(POPPLER_NEW_OBJECT_API)
+ if ((obj1 = res->lookupXObject(name)).isNull()) {
+ #else
+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
+index e28fecc2e1..f985b15cad 100644
+--- src/extension/internal/pdfinput/pdf-parser.h
++++ src/extension/internal/pdfinput/pdf-parser.h
+@@ -287,7 +287,7 @@ private:
+ void opMoveShowText(Object args[], int numArgs);
+ void opMoveSetShowText(Object args[], int numArgs);
+ void opShowSpaceText(Object args[], int numArgs);
+- void doShowText(GooString *s);
++ void doShowText(const GooString *s);
+
+ // XObject operators
+ void opXObject(Object args[], int numArgs);
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index a448be6397..617861928d 100644
+--- src/extension/internal/pdfinput/svg-builder.cpp
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ GfxFont *font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+- _font_specification = font->getName()->getCString();
++ _font_specification = g_strdup(font->getName()->getCString());
+ } else {
+ _font_specification = (char*) "Arial";
+ }
+@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
+ _glyphs.clear();
+ }
+
+-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
++void SvgBuilder::beginString(GfxState *state) {
+ if (_need_font_update) {
+ updateFont(state);
+ }
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index ad15c9c06f..ed2a4d48e0 100644
+--- src/extension/internal/pdfinput/svg-builder.h
++++ src/extension/internal/pdfinput/svg-builder.h
+@@ -29,7 +29,6 @@ namespace Inkscape {
+ #include <glibmm/ustring.h>
+
+ #include "CharTypes.h"
+-class GooString;
+ class Function;
+ class GfxState;
+ struct GfxColor;
+@@ -136,7 +135,7 @@ public:
+ void clearSoftMask(GfxState *state);
+
+ // Text handling
+- void beginString(GfxState *state, GooString *s);
++ void beginString(GfxState *state);
+ void endString(GfxState *state);
+ void addChar(GfxState *state, double x, double y,
+ double dx, double dy,
+--
+2.19.1
+
+
+From 60d37b26a344a749c0b2eda003c92bad7470ebba Mon Sep 17 00:00:00 2001
+From: Jan Palus <atler@pld-linux.org>
+Date: Fri, 25 May 2018 00:30:17 +0200
+Subject: [PATCH 2/4] Fix compilation with poppler 0.65.0
+
+replace unused includes with one that is actually used
+
+Signed-off-by: Jan Palus <atler@pld-linux.org>
+---
+ src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index 721524e10a..a3aa3213a1 100644
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -37,8 +37,7 @@ extern "C" {
+ #include "util/units.h"
+
+ #include "goo/gmem.h"
+-#include "goo/GooTimer.h"
+-#include "goo/GooHash.h"
++#include "goo/GooString.h"
+ #include "GlobalParams.h"
+ #include "CharTypes.h"
+ #include "Object.h"
+--
+2.19.1
+
+
+From 20795fdf1314a2f0047d6834f290a92e493764c7 Mon Sep 17 00:00:00 2001
+From: Eduard Braun <eduard.braun2@gmx.de>
+Date: Wed, 5 Sep 2018 00:31:06 +0200
+Subject: [PATCH 3/4] Modified fix for compatibility with poppler 0.64
+
+This is slightly uglier than a600c6438fef2f4c06f9a4a7d933d99fb054a973
+but avoids duplicating strings (which is unnecessary and leaked memory).
+
+It's also closer to what upstream intended with the changes in 0.64.
+---
+ .../internal/pdfinput/pdf-parser.cpp | 19 ++++++++++++++++---
+ src/extension/internal/pdfinput/pdf-parser.h | 6 ++++++
+ .../internal/pdfinput/svg-builder.cpp | 6 +++---
+ src/extension/internal/pdfinput/svg-builder.h | 4 ++--
+ 4 files changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index a3aa3213a1..ea9f902e09 100644
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -36,6 +36,7 @@ extern "C" {
+ #include "pdf-parser.h"
+ #include "util/units.h"
+
++#include "glib/poppler-features.h"
+ #include "goo/gmem.h"
+ #include "goo/GooString.h"
+ #include "GlobalParams.h"
+@@ -2581,7 +2582,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
+ }
+ }
+
++#if POPPLER_CHECK_VERSION(0,64,0)
+ void PdfParser::doShowText(const GooString *s) {
++#else
++void PdfParser::doShowText(GooString *s) {
++#endif
+ GfxFont *font;
+ int wMode;
+ double riseX, riseY;
+@@ -2594,7 +2599,11 @@ void PdfParser::doShowText(const GooString *s) {
+ Object charProc;
+ Dict *resDict;
+ Parser *oldParser;
++#if POPPLER_CHECK_VERSION(0,64,0)
++ const char *p;
++#else
+ char *p;
++#endif
+ int len, n, uLen;
+
+ font = state->getFont();
+@@ -2630,7 +2639,7 @@ void PdfParser::doShowText(const GooString *s) {
+ double lineX = state->getLineX();
+ double lineY = state->getLineY();
+ oldParser = parser;
+- p = g_strdup(s->getCString());
++ p = s->getCString();
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+@@ -2685,7 +2694,7 @@ void PdfParser::doShowText(const GooString *s) {
+
+ } else {
+ state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
+- p = g_strdup(s->getCString());
++ p = s->getCString();
+ len = s->getLength();
+ while (len > 0) {
+ n = font->getNextChar(p, len, &code,
+@@ -2731,7 +2740,11 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
+ {
+ Object obj1, obj2, obj3, refObj;
+
+- char *name = g_strdup(args[0].getName());
++#if POPPLER_CHECK_VERSION(0,64,0)
++ const char *name = args[0].getName();
++#else
++ char *name = args[0].getName();
++#endif
+ #if defined(POPPLER_NEW_OBJECT_API)
+ if ((obj1 = res->lookupXObject(name)).isNull()) {
+ #else
+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
+index f985b15cad..ed28274f42 100644
+--- src/extension/internal/pdfinput/pdf-parser.h
++++ src/extension/internal/pdfinput/pdf-parser.h
+@@ -25,6 +25,7 @@ namespace Inkscape {
+ // TODO clean up and remove using:
+ using Inkscape::Extension::Internal::SvgBuilder;
+
++#include "glib/poppler-features.h"
+ #include "goo/gtypes.h"
+ #include "Object.h"
+
+@@ -287,7 +288,12 @@ private:
+ void opMoveShowText(Object args[], int numArgs);
+ void opMoveSetShowText(Object args[], int numArgs);
+ void opShowSpaceText(Object args[], int numArgs);
++#if POPPLER_CHECK_VERSION(0,64,0)
+ void doShowText(const GooString *s);
++#else
++ void doShowText(GooString *s);
++#endif
++
+
+ // XObject operators
+ void opXObject(Object args[], int numArgs);
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 617861928d..767c8af4d4 100644
+--- src/extension/internal/pdfinput/svg-builder.cpp
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -1020,9 +1020,9 @@ void SvgBuilder::updateFont(GfxState *state) {
+ GfxFont *font = state->getFont();
+ // Store original name
+ if (font->getName()) {
+- _font_specification = g_strdup(font->getName()->getCString());
++ _font_specification = font->getName()->getCString();
+ } else {
+- _font_specification = (char*) "Arial";
++ _font_specification = "Arial";
+ }
+
+ // Prune the font name to get the correct font family name
+@@ -1030,7 +1030,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ char *font_family = NULL;
+ char *font_style = NULL;
+ char *font_style_lowercase = NULL;
+- char *plus_sign = strstr(_font_specification, "+");
++ const char *plus_sign = strstr(_font_specification, "+");
+ if (plus_sign) {
+ font_family = g_strdup(plus_sign + 1);
+ _font_specification = plus_sign + 1;
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index ed2a4d48e0..55daacee74 100644
+--- src/extension/internal/pdfinput/svg-builder.h
++++ src/extension/internal/pdfinput/svg-builder.h
+@@ -80,7 +80,7 @@ struct SvgGlyph {
+ bool style_changed; // Set to true if style has to be reset
+ SPCSSAttr *style;
+ int render_mode; // Text render mode
+- char *font_specification; // Pointer to current font specification
++ const char *font_specification; // Pointer to current font specification
+ };
+
+ /**
+@@ -202,7 +202,7 @@ private:
+
+ SPCSSAttr *_font_style; // Current font style
+ GfxFont *_current_font;
+- char *_font_specification;
++ const char *_font_specification;
+ double _font_scaling;
+ bool _need_font_update;
+ Geom::Affine _text_matrix;
+--
+2.19.1
+
+
+From bc2b40c17dc4fdbb90675b6dc80e30e7e08c4488 Mon Sep 17 00:00:00 2001
+From: Thomas Holder <thomas@thomas-holder.de>
+Date: Fri, 28 Sep 2018 18:05:30 +0000
+Subject: [PATCH 4/4] fix 1789208 poppler 0.69
+
+---
+ CMakeScripts/DefineDependsandFlags.cmake | 12 -----
+ src/extension/internal/pdfinput/pdf-input.cpp | 2 +-
+ src/extension/internal/pdfinput/pdf-input.h | 1 +
+ .../internal/pdfinput/pdf-parser.cpp | 46 ++++++++-----------
+ src/extension/internal/pdfinput/pdf-parser.h | 12 +++--
+ .../pdfinput/poppler-transition-api.h | 39 ++++++++++++++++
+ .../internal/pdfinput/svg-builder.cpp | 22 ++++-----
+ src/extension/internal/pdfinput/svg-builder.h | 3 +-
+ 8 files changed, 80 insertions(+), 57 deletions(-)
+ create mode 100644 src/extension/internal/pdfinput/poppler-transition-api.h
+
+diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
+index c33a3bfb5e..fa67f67714 100644
+--- CMakeScripts/DefineDependsandFlags.cmake
++++ CMakeScripts/DefineDependsandFlags.cmake
+@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
+ set(HAVE_POPPLER_GLIB ON)
+ endif()
+ endif()
+- if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
+- POPPLER_VERSION VERSION_EQUAL "0.26.0")
+- set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
+- endif()
+- if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
+- POPPLER_VERSION VERSION_EQUAL "0.29.0")
+- set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
+- endif()
+- if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
+- POPPLER_VERSION VERSION_EQUAL "0.58.0")
+- set(POPPLER_NEW_OBJECT_API ON)
+- endif()
+ else()
+ set(ENABLE_POPPLER_CAIRO OFF)
+ endif()
+diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
+index e3115620e3..9621e306a0 100644
+--- src/extension/internal/pdfinput/pdf-input.cpp
++++ src/extension/internal/pdfinput/pdf-input.cpp
+@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
+ dlg->getImportSettings(prefs);
+
+ // Apply crop settings
+- PDFRectangle *clipToBox = NULL;
++ _POPPLER_CONST PDFRectangle *clipToBox = NULL;
+ double crop_setting;
+ sp_repr_get_double(prefs, "cropTo", &crop_setting);
+
+diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
+index 6e36603c31..73bbfe2a71 100644
+--- src/extension/internal/pdfinput/pdf-input.h
++++ src/extension/internal/pdfinput/pdf-input.h
+@@ -15,6 +15,7 @@
+ #endif
+
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+
+ #include <gtkmm/dialog.h>
+
+diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
+index ea9f902e09..4a7fd8a5e5 100644
+--- src/extension/internal/pdfinput/pdf-parser.cpp
++++ src/extension/internal/pdfinput/pdf-parser.cpp
+@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
+ int /*pageNum*/,
+ int rotate,
+ Dict *resDict,
+- PDFRectangle *box,
+- PDFRectangle *cropBox) :
++ _POPPLER_CONST PDFRectangle *box,
++ _POPPLER_CONST PDFRectangle *cropBox) :
+ xref(xrefA),
+ builder(builderA),
+ subPage(gFalse),
+@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
+ builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
+ Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
+
+- double *ctm = state->getCTM();
++ const double *ctm = state->getCTM();
+ double scaledCTM[6];
+ for (int i = 0; i < 6; ++i) {
+ baseMatrix[i] = ctm[i];
+@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
+ PdfParser::PdfParser(XRef *xrefA,
+ Inkscape::Extension::Internal::SvgBuilder *builderA,
+ Dict *resDict,
+- PDFRectangle *box) :
++ _POPPLER_CONST PDFRectangle *box) :
+ xref(xrefA),
+ builder(builderA),
+ subPage(gTrue),
+@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
+
+ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
+ PdfOperator *op;
+- char *name;
++ const char *name;
+ Object *argPtr;
+ int i;
+
+@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
+ (this->*op->func)(argPtr, numArgs);
+ }
+
+-PdfOperator* PdfParser::findOp(char *name) {
++PdfOperator* PdfParser::findOp(const char *name) {
+ int a = -1;
+ int b = numOps;
+ int cmp = -1;
+@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
+ GBool stroke, GBool eoFill) {
+ GfxShading *shading;
+ GfxPath *savedPath;
+- double *ctm, *btm, *ptm;
++ const double *ctm, *btm, *ptm;
+ double m[6], ictm[6], m1[6];
+ double xMin, yMin, xMax, yMax;
+ double det;
+@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
+ GfxColor color0M, color1M, colorM0, colorM1, colorMM;
+ GfxColor colors2[4];
+ double functionColorDelta = colorDeltas[pdfFunctionShading-1];
+- double *matrix;
++ const double *matrix;
+ double xM, yM;
+ int nComps, i, j;
+
+@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
+ }
+ }
+
+-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
++void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
+ GfxPatch patch00 = blankPatch();
+ GfxPatch patch01 = blankPatch();
+ GfxPatch patch10 = blankPatch();
+@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
+ double x, y, dx, dy, tdx, tdy;
+ double originX, originY, tOriginX, tOriginY;
+ double oldCTM[6], newCTM[6];
+- double *mat;
++ const double *mat;
+ Object charProc;
+ Dict *resDict;
+ Parser *oldParser;
+@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
+ Stream *PdfParser::buildImageStream() {
+ Object dict;
+ Object obj;
+- char *key;
+ Stream *str;
+
+ // build dictionary
+@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
+ obj.free();
+ #endif
+ } else {
+- key = copyString(obj.getName());
+-#if defined(POPPLER_NEW_OBJECT_API)
+- obj = parser->getObj();
+-#else
+- obj.free();
+- parser->getObj(&obj);
+-#endif
+- if (obj.isEOF() || obj.isError()) {
+- gfree(key);
++ Object obj2;
++ _POPPLER_CALL(obj2, parser->getObj);
++ if (obj2.isEOF() || obj2.isError()) {
++ _POPPLER_FREE(obj);
+ break;
+ }
+-#if defined(POPPLER_NEW_OBJECT_API)
+- dict.dictAdd(key, std::move(obj));
++ _POPPLER_DICTADD(dict, obj.getName(), obj2);
++ _POPPLER_FREE(obj);
++ _POPPLER_FREE(obj2);
+ }
+- obj = parser->getObj();
+-#else
+- dict.dictAdd(key, &obj);
+- }
+- parser->getObj(&obj);
+-#endif
++ _POPPLER_CALL(obj, parser->getObj);
+ }
+ if (obj.isEOF()) {
+ error(errSyntaxError, getPos(), "End of file in inline image");
+diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
+index ed28274f42..0a04c81d46 100644
+--- src/extension/internal/pdfinput/pdf-parser.h
++++ src/extension/internal/pdfinput/pdf-parser.h
+@@ -9,6 +9,7 @@
+ #define PDF_PARSER_H
+
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+
+ #ifdef USE_GCC_PRAGMAS
+ #pragma interface
+@@ -128,11 +129,14 @@ public:
+
+ // Constructor for regular output.
+ PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
+- Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
++ Dict *resDict,
++ _POPPLER_CONST PDFRectangle *box,
++ _POPPLER_CONST PDFRectangle *cropBox);
+
+ // Constructor for a sub-page object.
+ PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
+- Dict *resDict, PDFRectangle *box);
++ Dict *resDict,
++ _POPPLER_CONST PDFRectangle *box);
+
+ virtual ~PdfParser();
+
+@@ -186,7 +190,7 @@ private:
+
+ void go(GBool topLevel);
+ void execOp(Object *cmd, Object args[], int numArgs);
+- PdfOperator *findOp(char *name);
++ PdfOperator *findOp(const char *name);
+ GBool checkArg(Object *arg, TchkType type);
+ int getPos();
+
+@@ -257,7 +261,7 @@ private:
+ double x2, double y2, GfxColor *color2,
+ int nComps, int depth);
+ void doPatchMeshShFill(GfxPatchMeshShading *shading);
+- void fillPatch(GfxPatch *patch, int nComps, int depth);
++ void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
+ void doEndPath();
+
+ // path clipping operators
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+new file mode 100644
+index 0000000000..898e64bf2b
+--- /dev/null
++++ src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -0,0 +1,39 @@
++#ifndef SEEN_POPPLER_TRANSITION_API_H
++#define SEEN_POPPLER_TRANSITION_API_H
++
++#include <glib/poppler-features.h>
++
++#if POPPLER_CHECK_VERSION(0,70,0)
++#define _POPPLER_CONST const
++#else
++#define _POPPLER_CONST
++#endif
++
++#if POPPLER_CHECK_VERSION(0,69,0)
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
++#elif POPPLER_CHECK_VERSION(0,58,0)
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
++#else
++#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
++#endif
++
++#if POPPLER_CHECK_VERSION(0,58,0)
++#define POPPLER_NEW_OBJECT_API
++#define _POPPLER_FREE(obj)
++#define _POPPLER_CALL(ret, func) (ret = func())
++#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
++#else
++#define _POPPLER_FREE(obj) (obj).free()
++#define _POPPLER_CALL(ret, func) (*func(&ret))
++#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
++#endif
++
++#if POPPLER_CHECK_VERSION(0, 29, 0)
++#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
++#endif
++
++#if POPPLER_CHECK_VERSION(0, 25, 0)
++#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
++#endif
++
++#endif
+diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
+index 767c8af4d4..d449d1af52 100644
+--- src/extension/internal/pdfinput/svg-builder.cpp
++++ src/extension/internal/pdfinput/svg-builder.cpp
+@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
+ if ( pattern != NULL ) {
+ if ( pattern->getType() == 2 ) { // Shading pattern
+ GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
+- double *ptm;
++ const double *ptm;
+ double m[6] = {1, 0, 0, 1, 0, 0};
+ double det;
+
+@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+
+ Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
+ // Set pattern transform matrix
+- double *p2u = tiling_pattern->getMatrix();
++ const double *p2u = tiling_pattern->getMatrix();
+ double m[6] = {1, 0, 0, 1, 0, 0};
+ double det;
+ det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2]; // see LP Bug 1168908
+@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+ pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
+ // Set pattern tiling
+ // FIXME: don't ignore XStep and YStep
+- double *bbox = tiling_pattern->getBBox();
++ const double *bbox = tiling_pattern->getBBox();
+ sp_repr_set_svg_double(pattern_node, "x", 0.0);
+ sp_repr_set_svg_double(pattern_node, "y", 0.0);
+ sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
+@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
+ */
+ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
+ Inkscape::XML::Node *gradient;
+- Function *func;
++ _POPPLER_CONST Function *func;
+ int num_funcs;
+ bool extend0, extend1;
+
+@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
+
+ #define INT_EPSILON 8
+ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+- Function *func) {
++ _POPPLER_CONST Function *func) {
+ int type = func->getType();
+ if ( type == 0 || type == 2 ) { // Sampled or exponential function
+ GfxRGB stop1, stop2;
+@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+ _addStopToGradient(gradient, 1.0, &stop2, 1.0);
+ }
+ } else if ( type == 3 ) { // Stitching
+- StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
+- double *bounds = stitchingFunc->getBounds();
+- double *encode = stitchingFunc->getEncode();
++ auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
++ const double *bounds = stitchingFunc->getBounds();
++ const double *encode = stitchingFunc->getEncode();
+ int num_funcs = stitchingFunc->getNumFuncs();
+
+ // Add stops from all the stitched functions
+@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
+ svgGetShadingColorRGB(shading, bounds[i + 1], &color);
+ // Add stops
+ if (stitchingFunc->getFunc(i)->getType() == 2) { // process exponential fxn
+- double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
++ double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
+ if (expE > 1.0) {
+ expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1
+ if (encode[2*i] == 0) { // normal sequence
+@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
+ Inkscape::CSSOStringStream os_font_size;
+ double css_font_size = _font_scaling * state->getFontSize();
+ if ( font->getType() == fontType3 ) {
+- double *font_matrix = font->getFontMatrix();
++ const double *font_matrix = font->getFontMatrix();
+ if ( font_matrix[0] != 0.0 ) {
+ css_font_size *= font_matrix[3] / font_matrix[0];
+ }
+@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
+ void SvgBuilder::updateTextMatrix(GfxState *state) {
+ _flushText();
+ // Update text matrix
+- double *text_matrix = state->getTextMat();
++ const double *text_matrix = state->getTextMat();
+ double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
+ double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
+ double max_scale;
+diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
+index 55daacee74..34b42e17b8 100644
+--- src/extension/internal/pdfinput/svg-builder.h
++++ src/extension/internal/pdfinput/svg-builder.h
+@@ -15,6 +15,7 @@
+ #endif
+
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+
+ class SPDocument;
+ namespace Inkscape {
+@@ -174,7 +175,7 @@ private:
+ void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
+ GfxRGB *color, double opacity);
+ bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
+- Function *func);
++ _POPPLER_CONST Function *func);
+ gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
+ bool is_stroke=false);
+ // Image/mask creation
+--
+2.19.1
+
Index: graphics/okular-kde4/Makefile
===================================================================
--- graphics/okular-kde4/Makefile
+++ graphics/okular-kde4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= okular
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= graphics kde kde-kde4
MAINTAINER= kde@FreeBSD.org
@@ -15,7 +15,6 @@
libkscreen.so:graphics/libkscreen \
libqca.so:devel/qca@qt4 \
libtiff.so:graphics/tiff \
- libpoppler-qt4.so:graphics/poppler-qt4 \
libspectre.so:print/libspectre \
libchm.so:misc/chmlib \
libfreetype.so:print/freetype2 \
Index: graphics/okular-kde4/pkg-plist
===================================================================
--- graphics/okular-kde4/pkg-plist
+++ graphics/okular-kde4/pkg-plist
@@ -44,7 +44,6 @@
lib/kde4/okularGenerator_mobi.so
lib/kde4/okularGenerator_ooo.so
lib/kde4/okularGenerator_plucker.so
-lib/kde4/okularGenerator_poppler.so
lib/kde4/okularGenerator_tiff.so
lib/kde4/okularGenerator_txt.so
lib/kde4/okularGenerator_xps.so
@@ -63,7 +62,6 @@
share/applications/kde4/active-documentviewer_ghostview.desktop
share/applications/kde4/active-documentviewer_kimgio.desktop
share/applications/kde4/active-documentviewer_ooo.desktop
-share/applications/kde4/active-documentviewer_pdf.desktop
share/applications/kde4/active-documentviewer_plucker.desktop
share/applications/kde4/active-documentviewer_tiff.desktop
share/applications/kde4/active-documentviewer_txt.desktop
@@ -80,7 +78,6 @@
share/applications/kde4/okularApplication_kimgio.desktop
share/applications/kde4/okularApplication_mobi.desktop
share/applications/kde4/okularApplication_ooo.desktop
-share/applications/kde4/okularApplication_pdf.desktop
share/applications/kde4/okularApplication_plucker.desktop
share/applications/kde4/okularApplication_tiff.desktop
share/applications/kde4/okularApplication_txt.desktop
@@ -125,7 +122,6 @@
share/config.kcfg/gssettings.kcfg
share/config.kcfg/okular.kcfg
share/config.kcfg/okular_core.kcfg
-share/config.kcfg/pdfsettings.kcfg
share/doc/HTML/en/okular/annotation-properties.png
share/doc/HTML/en/okular/annotations.png
share/doc/HTML/en/okular/bookmark-management.png
@@ -174,7 +170,6 @@
share/kde4/services/libokularGenerator_mobi.desktop
share/kde4/services/libokularGenerator_ooo.desktop
share/kde4/services/libokularGenerator_plucker.desktop
-share/kde4/services/libokularGenerator_poppler.desktop
share/kde4/services/libokularGenerator_tiff.desktop
share/kde4/services/libokularGenerator_txt.desktop
share/kde4/services/libokularGenerator_xps.desktop
@@ -191,7 +186,6 @@
share/kde4/services/okularMobi.desktop
share/kde4/services/okularOoo.desktop
share/kde4/services/okularPlucker.desktop
-share/kde4/services/okularPoppler.desktop
share/kde4/services/okularTiff.desktop
share/kde4/services/okularTxt.desktop
share/kde4/services/okularXps.desktop
Index: graphics/poppler-glib/Makefile
===================================================================
--- graphics/poppler-glib/Makefile
+++ graphics/poppler-glib/Makefile
@@ -2,17 +2,11 @@
# $FreeBSD$
PORTREVISION= 0
-PKGNAMESUFFIX= -glib
-MAINTAINER= gnome@FreeBSD.org
COMMENT= GLib bindings to poppler
MASTERDIR= ${.CURDIR}/../../graphics/poppler
-SLAVEPORT= glib
+_SLAVE_PORT= glib
PLIST= ${.CURDIR}/pkg-plist
-
-pre-build:
- @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
- Makefile ${MAKE_ARGS} libpoppler-cairo.la
.include "${MASTERDIR}/Makefile"
Index: graphics/poppler-glib/pkg-plist
===================================================================
--- graphics/poppler-glib/pkg-plist
+++ graphics/poppler-glib/pkg-plist
@@ -7,6 +7,7 @@
include/poppler/glib/poppler-features.h
include/poppler/glib/poppler-form-field.h
include/poppler/glib/poppler-layer.h
+include/poppler/glib/poppler-macros.h
include/poppler/glib/poppler-media.h
include/poppler/glib/poppler-movie.h
include/poppler/glib/poppler-page.h
@@ -15,6 +16,6 @@
lib/girepository-1.0/Poppler-0.18.typelib
lib/libpoppler-glib.so
lib/libpoppler-glib.so.8
-lib/libpoppler-glib.so.8.9.0
+lib/libpoppler-glib.so.8.10.0
libdata/pkgconfig/poppler-glib.pc
share/gir-1.0/Poppler-0.18.gir
Index: graphics/poppler-qt4/Makefile
===================================================================
--- graphics/poppler-qt4/Makefile
+++ graphics/poppler-qt4/Makefile
@@ -1,14 +0,0 @@
-# Created by: Michael Johnson <ahze@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 1
-PKGNAMESUFFIX= -qt4
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Qt 4 bindings to poppler
-
-MASTERDIR= ${.CURDIR}/../../graphics/poppler
-SLAVEPORT= qt4
-PLIST= ${.CURDIR}/pkg-plist
-
-.include "${MASTERDIR}/Makefile"
Index: graphics/poppler-qt4/pkg-plist
===================================================================
--- graphics/poppler-qt4/pkg-plist
+++ graphics/poppler-qt4/pkg-plist
@@ -1,13 +0,0 @@
-include/poppler/qt4/poppler-annotation.h
-include/poppler/qt4/poppler-export.h
-include/poppler/qt4/poppler-form.h
-include/poppler/qt4/poppler-link.h
-include/poppler/qt4/poppler-link-private.h
-include/poppler/qt4/poppler-media.h
-include/poppler/qt4/poppler-optcontent.h
-include/poppler/qt4/poppler-page-transition.h
-include/poppler/qt4/poppler-qt4.h
-lib/libpoppler-qt4.so
-lib/libpoppler-qt4.so.4
-lib/libpoppler-qt4.so.4.11.0
-libdata/pkgconfig/poppler-qt4.pc
Index: graphics/poppler-qt5/Makefile
===================================================================
--- graphics/poppler-qt5/Makefile
+++ graphics/poppler-qt5/Makefile
@@ -1,13 +1,12 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 0
PKGNAMESUFFIX= -qt5
-MAINTAINER= gnome@FreeBSD.org
COMMENT= Qt 5 bindings to poppler
MASTERDIR= ${.CURDIR}/../../graphics/poppler
-SLAVEPORT= qt5
+_SLAVE_PORT= qt5
PLIST= ${.CURDIR}/pkg-plist
.include "${MASTERDIR}/Makefile"
Index: graphics/poppler-qt5/pkg-plist
===================================================================
--- graphics/poppler-qt5/pkg-plist
+++ graphics/poppler-qt5/pkg-plist
@@ -2,12 +2,11 @@
include/poppler/qt5/poppler-export.h
include/poppler/qt5/poppler-form.h
include/poppler/qt5/poppler-link.h
-include/poppler/qt5/poppler-link-private.h
include/poppler/qt5/poppler-media.h
include/poppler/qt5/poppler-optcontent.h
include/poppler/qt5/poppler-page-transition.h
include/poppler/qt5/poppler-qt5.h
lib/libpoppler-qt5.so
lib/libpoppler-qt5.so.1
-lib/libpoppler-qt5.so.1.10.0
+lib/libpoppler-qt5.so.1.17.0
libdata/pkgconfig/poppler-qt5.pc
Index: graphics/poppler-utils/Makefile
===================================================================
--- graphics/poppler-utils/Makefile
+++ graphics/poppler-utils/Makefile
@@ -1,14 +1,12 @@
# Created by: Michael Nottebrock <lofi@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
-PKGNAMESUFFIX= -utils
+PORTREVISION= 0
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= Poppler's xpdf-workalike command line utilities
+COMMENT= Poppler's xpdf-workalike command line utilities # '
MASTERDIR= ${.CURDIR}/../../graphics/poppler
-SLAVEPORT= utils
+_SLAVE_PORT= utils
PLIST= ${.CURDIR}/pkg-plist
.include "${MASTERDIR}/Makefile"
Index: graphics/poppler/Makefile
===================================================================
--- graphics/poppler/Makefile
+++ graphics/poppler/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= poppler
-PORTVERSION= 0.57.0
-PORTREVISION= 1
+DISTVERSION= 0.71.0
CATEGORIES= graphics print
MASTER_SITES= http://poppler.freedesktop.org/
@@ -13,133 +12,84 @@
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-LIB_DEPENDS= libpng.so:graphics/png \
- libtiff.so:graphics/tiff \
- libfontconfig.so:x11-fonts/fontconfig \
+LIB_DEPENDS= libnspr4.so:devel/nspr \
liblcms2.so:graphics/lcms2 \
+ libpng.so:graphics/png \
+ libtiff.so:graphics/tiff \
libfreetype.so:print/freetype2 \
libnss3.so:security/nss \
- libnspr4.so:devel/nspr
+ libfontconfig.so:x11-fonts/fontconfig
RUN_DEPENDS= poppler-data>0:graphics/poppler-data
-USES= compiler:c++11-lang cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz
+USES= compiler:c++11-lang cpe cmake jpeg libtool localbase pathfix pkgconfig tar:xz
CPE_VENDOR= freedesktop
-USE_GNOME= libxml2
-GNU_CONFIGURE= yes
+USE_GNOME= cairo libxml2
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-zlib \
- --enable-xpdf-headers \
- --disable-libnss \
- --disable-gtk-test \
- --without-html-dir \
- --disable-static \
- --enable-libnss
+CMAKE_ON= ENABLE_LIBJPEG \
+ ENABLE_LIBPNG \
+ ENABLE_LIBTIFF \
+ ENABLE_XPDF_HEADERS \
+ ENABLE_ZLIB \
+ ENABLE_NSS \
+ ENABLE_SPLASH
-INSTALL_TARGET= install-strip
-.if !defined(SLAVEPORT)
-PORTSCOUT= limitw:1,even
+# Slave ports.
+_POPPLER_SLAVES= library glib qt5 utils
+_SLAVE_PORT?= library
-OPTIONS_DEFINE= CAIRO CURL OPENJPEG
-OPTIONS_DEFAULT=CAIRO OPENJPEG
+# Activate the wanted module, and deactivate the others.
+CMAKE_ON+= ENABLE_${_SLAVE_PORT:tu}
+CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/}
+.if ${_SLAVE_PORT} == library
+PORTSCOUT= limitw:1,even
USES+= iconv
-.endif
+CMAKE_ON+= ENABLE_CPP
-.include <bsd.port.options.mk>
-
-.if defined(SLAVEPORT)
-PORTSCOUT= ignore:1
-LIB_DEPENDS+= libpoppler.so:graphics/poppler
-
-.if ${SLAVEPORT}==glib
-CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
-USE_GNOME+= cairo glib20 introspection:build
-BUILD_WRKSRC= ${WRKSRC}/glib
-INSTALL_WRKSRC= ${WRKSRC}/glib
+OPTIONS_DEFINE= CURL OPENJPEG
+OPTIONS_DEFAULT= OPENJPEG
+OPTIONS_SUB= yes
.else
-CONFIGURE_ARGS+=--disable-poppler-glib
-.endif
+PORTSCOUT= ignore:1
-.if ${SLAVEPORT}==qt4
-CONFIGURE_ARGS+=--enable-poppler-qt4
-CONFIGURE_ENV+= MOCQT4=${MOC}
-USES+= qt:4
-USE_QT= gui corelib xml qtestlib moc_build
-BUILD_WRKSRC= ${WRKSRC}/qt4
-INSTALL_WRKSRC= ${WRKSRC}/qt4
-.else
-CONFIGURE_ARGS+=--disable-poppler-qt4
-.endif
+LIB_DEPENDS+= libpoppler.so:graphics/poppler
+PKGNAMESUFFIX= -${_SLAVE_PORT}
-.if ${SLAVEPORT}==qt5
-CONFIGURE_ARGS+=--enable-poppler-qt5
-CONFIGURE_ENV+= MOCQT5=${MOC}
-USES+= qt:5
-USE_QT= core gui widgets xml buildtools_build testlib_build
-# Qt from 5.7.0 on requires c++11.
-USE_CXXSTD= c++11
-BUILD_WRKSRC= ${WRKSRC}/qt5
-INSTALL_WRKSRC= ${WRKSRC}/qt5
-.else
-CONFIGURE_ARGS+=--disable-poppler-qt5
-.endif
+BUILD_WRKSRC= ${WRKSRC}/${_SLAVE_PORT}
+INSTALL_WRKSRC= ${WRKSRC}/${_SLAVE_PORT}
-.if ${SLAVEPORT}==utils
-LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib
-CONFIGURE_ARGS+=--enable-utils
-BUILD_WRKSRC= ${WRKSRC}/utils
-INSTALL_WRKSRC= ${WRKSRC}/utils
-.else
-CONFIGURE_ARGS+=--disable-utils
-.endif
+CMAKE_ARGS+= -DENABLE_LIBOPENJPEG:STRING="none" \
+ -DENABLE_LIBCURL:BOOL=FALSE
-.else # ! SLAVE options below
-CONFIGURE_ARGS+=--disable-poppler-glib \
- --disable-poppler-qt4 \
- --disable-poppler-qt5 \
- --disable-utils
+. if ${_SLAVE_PORT} == glib
+USES+= gnome
+USE_GNOME+= glib20 introspection:Build
+. elif ${_SLAVE_PORT} == qt5
+USES+= qt:5
+USE_QT= core gui widgets xml \
+ buildtools_build qmake_build testlib_build
+. elif ${_SLAVE_PORT} == utils
+LIB_DEPENDS+= libpoppler-glib.so:graphics/poppler-glib
+USES+= gnome
+. endif
-.if ${PORT_OPTIONS:MCAIRO}
-LIB_DEPENDS+= libcairo.so:graphics/cairo
-PLIST_SUB+= CAIRO=""
-.else
-CONFIGURE_ARGS+=--disable-cairo-output
-PLIST_SUB+= CAIRO="@comment "
.endif
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+= libcurl.so:ftp/curl
-CONFIGURE_ARGS+=--enable-libcurl
-PLIST_SUB+= CURL=""
-.else
-CONFIGURE_ARGS+=--disable-libcurl
-PLIST_SUB+= CURL="@comment "
-.endif
+CURL_CMAKE_BOOL= ENABLE_LIBCURL
+CURL_LIB_DEPENDS= libcurl.so:ftp/curl
-.if ${PORT_OPTIONS:MOPENJPEG}
-CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2
-LIB_DEPENDS+= libopenjp2.so:graphics/openjpeg
-.else
-CONFIGURE_ARGS+=--enable-libopenjpeg=none
-.endif
-.endif # end of options
+OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg
+OPENJPEG_CMAKE_ON= -DENABLE_LIBOPENJPEG:STRING="openjpeg2"
+OPENJPEG_CMAKE_OFF= -DENABLE_LIBOPENJPEG:STRING="none"
-post-patch:
- @${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure
-
post-install:
-.if defined(SLAVEPORT)
-. if ${SLAVEPORT}==glib
+.if ${_SLAVE_PORT} == glib
${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig
-. elif ${SLAVEPORT}==qt4
- ${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig
-. elif ${SLAVEPORT}==qt5
+.elif ${_SLAVE_PORT} == qt5
${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
${STAGEDIR}${PREFIX}/libdata/pkgconfig
-. endif
.endif
.include <bsd.port.mk>
Index: graphics/poppler/distinfo
===================================================================
--- graphics/poppler/distinfo
+++ graphics/poppler/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1503426409
-SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
-SIZE (poppler-0.57.0.tar.xz) = 1703300
+TIMESTAMP = 1542396664
+SHA256 (poppler-0.71.0.tar.xz) = badbecd2dddf63352fd85ec08a9c2ed122fdadacf2a34fcb4cc227c4d01f2cf9
+SIZE (poppler-0.71.0.tar.xz) = 1480852
Index: graphics/poppler/files/patch-CMakeLists.txt
===================================================================
--- graphics/poppler/files/patch-CMakeLists.txt
+++ graphics/poppler/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig 2018-10-07 08:06:59 UTC
++++ CMakeLists.txt
+@@ -263,6 +263,7 @@ endif()
+
+ if (NSS3_FOUND)
+ add_definitions(${NSS3_CFLAGS})
++ link_directories(${NSS3_LIBRARY_DIRS})
+ set(ENABLE_NSS3 ON)
+ endif()
+ if(JPEG_FOUND)
Index: graphics/poppler/files/patch-configure
===================================================================
--- graphics/poppler/files/patch-configure
+++ graphics/poppler/files/patch-configure
@@ -1,29 +0,0 @@
---- configure.orig 2016-07-24 22:14:28 UTC
-+++ configure
-@@ -20556,7 +20556,7 @@ fi
-
- ac_save_CPPFLAGS="$CPPFLAGS"
- ac_save_CXXFLAGS="$CXXFLAGS"
--ac_save_LIBS="$LDFLAGS"
-+ac_save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS"
- CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
- LIBS="$LIBS $LIBTIFF_LIBS"
-@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then :
- else
-
- ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
-+LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the
- else
-
- ac_save_LIBS="$LIBS"
--LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
-+LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm"
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
Index: graphics/poppler/files/patch-glib_Makefile.in
===================================================================
--- graphics/poppler/files/patch-glib_Makefile.in
+++ graphics/poppler/files/patch-glib_Makefile.in
@@ -1,28 +0,0 @@
---- glib/Makefile.in.orig 2015-01-19 11:51:06.175898921 +0100
-+++ glib/Makefile.in 2015-01-19 11:51:27.026898915 +0100
-@@ -134,7 +134,6 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libpoppler_glib_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la \
- $(top_builddir)/poppler/libpoppler-cairo.la \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__objects_1 = libpoppler_glib_la-poppler-enums.lo
-@@ -553,7 +552,7 @@
- $(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
-
- libpoppler_glib_la_LIBADD = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
- $(top_builddir)/poppler/libpoppler-cairo.la \
- $(POPPLER_GLIB_LIBS) \
- $(FREETYPE_LIBS)
-@@ -576,7 +575,7 @@
- @HAVE_INTROSPECTION_TRUE@introspection_files = $(filter-out poppler-private.h poppler-input-stream.h, $(libpoppler_glib_la_SOURCES)) $(poppler_glib_include_HEADERS) $(nodist_poppler_glib_include_HEADERS)
- @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
- @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
--@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
-+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
- @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
- @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
- @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib
Index: graphics/poppler/files/patch-glib_demo_Makefile.in
===================================================================
--- graphics/poppler/files/patch-glib_demo_Makefile.in
+++ graphics/poppler/files/patch-glib_demo_Makefile.in
@@ -1,20 +0,0 @@
---- glib/demo/Makefile.in.orig 2012-06-13 13:31:37.000000000 +0200
-+++ glib/demo/Makefile.in 2012-06-13 13:32:45.000000000 +0200
-@@ -66,7 +66,7 @@
- am__DEPENDENCIES_1 =
- poppler_glib_demo_DEPENDENCIES = \
- $(top_builddir)/glib/libpoppler-glib.la \
-- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1)
- AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
-@@ -365,7 +365,7 @@
-
- LDADD = \
- $(top_builddir)/glib/libpoppler-glib.la \
-- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
- $(GTK_TEST_LIBS)
-
- all: all-am
Index: graphics/poppler/files/patch-qt4_Makefile.in
===================================================================
--- graphics/poppler/files/patch-qt4_Makefile.in
+++ graphics/poppler/files/patch-qt4_Makefile.in
@@ -1,11 +0,0 @@
---- qt4/Makefile.in.orig 2008-03-24 08:30:49.000000000 -0400
-+++ qt4/Makefile.in 2008-03-24 08:30:34.000000000 -0400
-@@ -223,7 +223,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- win32_libs = @win32_libs@
--SUBDIRS = src tests demos
-+SUBDIRS = src
- all: all-recursive
-
- .SUFFIXES:
Index: graphics/poppler/files/patch-qt4_src_Makefile.in
===================================================================
--- graphics/poppler/files/patch-qt4_src_Makefile.in
+++ graphics/poppler/files/patch-qt4_src_Makefile.in
@@ -1,20 +0,0 @@
---- qt4/src/Makefile.in.orig 2013-12-02 18:58:51.000000000 +0100
-+++ qt4/src/Makefile.in 2013-12-02 18:59:39.000000000 +0100
-@@ -129,7 +129,7 @@
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libpoppler_qt4_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1)
- am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
- libpoppler_qt4_la-poppler-page.lo \
- libpoppler_qt4_la-poppler-fontinfo.lo \
-@@ -505,7 +505,7 @@
- -Dpoppler_qt4_EXPORTS
-
- libpoppler_qt4_la_LIBADD = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
- $(POPPLER_QT4_LIBS)
-
- libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
Index: graphics/poppler/files/patch-qt5_Makefile.in
===================================================================
--- graphics/poppler/files/patch-qt5_Makefile.in
+++ graphics/poppler/files/patch-qt5_Makefile.in
@@ -1,11 +0,0 @@
---- qt5/Makefile.in.orig 2014-11-25 11:49:19 UTC
-+++ qt5/Makefile.in
-@@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- win32_libs = @win32_libs@
--SUBDIRS = src tests demos
-+SUBDIRS = src
- all: all-recursive
-
- .SUFFIXES:
Index: graphics/poppler/files/patch-qt5_src_Makefile.in
===================================================================
--- graphics/poppler/files/patch-qt5_src_Makefile.in
+++ graphics/poppler/files/patch-qt5_src_Makefile.in
@@ -1,20 +0,0 @@
---- qt5/src/Makefile.in.orig 2014-11-25 11:49:19 UTC
-+++ qt5/src/Makefile.in
-@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
- LTLIBRARIES = $(lib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- libpoppler_qt5_la_DEPENDENCIES = \
-- $(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
-+ $(am__DEPENDENCIES_1)
- am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
- libpoppler_qt5_la-poppler-page.lo \
- libpoppler_qt5_la-poppler-fontinfo.lo \
-@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \
- -Dpoppler_qt5_EXPORTS -fPIC
-
- libpoppler_qt5_la_LIBADD = \
-- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
- $(POPPLER_QT5_LIBS)
-
- libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@
Index: graphics/poppler/files/patch-qt5_src_poppler-form.h
===================================================================
--- graphics/poppler/files/patch-qt5_src_poppler-form.h
+++ graphics/poppler/files/patch-qt5_src_poppler-form.h
@@ -1,10 +0,0 @@
---- qt5/src/poppler-form.h.orig 2017-07-02 21:00:50 UTC
-+++ qt5/src/poppler-form.h
-@@ -26,6 +26,7 @@
- #include <QtCore/QStringList>
- #include <QtCore/QSharedPointer>
- #include "poppler-export.h"
-+#include <ctime> // time_t
-
- class Page;
- class FormWidget;
Index: graphics/poppler/files/patch-utils_Makefile.in
===================================================================
--- graphics/poppler/files/patch-utils_Makefile.in
+++ graphics/poppler/files/patch-utils_Makefile.in
@@ -1,111 +0,0 @@
---- utils/Makefile.in.orig 2016-03-16 22:22:14 UTC
-+++ utils/Makefile.in
-@@ -136,45 +136,38 @@ PROGRAMS = $(bin_PROGRAMS)
- am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
- pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
- pdfdetach_LDADD = $(LDADD)
--pdfdetach_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdfdetach_DEPENDENCIES = libparseargs.la
- am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
- pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
- pdffonts_LDADD = $(LDADD)
--pdffonts_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdffonts_DEPENDENCIES = libparseargs.la
- am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
- JSInfo.$(OBJEXT)
- pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
- pdfimages_LDADD = $(LDADD)
--pdfimages_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdfimages_DEPENDENCIES = libparseargs.la
- am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
- JSInfo.$(OBJEXT)
- pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
- pdfinfo_LDADD = $(LDADD)
--pdfinfo_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdfinfo_DEPENDENCIES = libparseargs.la
- am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
- pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
- pdfseparate_LDADD = $(LDADD)
--pdfseparate_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdfseparate_DEPENDENCIES = libparseargs.la
- am_pdfsig_OBJECTS = pdfsig.$(OBJEXT)
- pdfsig_OBJECTS = $(am_pdfsig_OBJECTS)
- pdfsig_LDADD = $(LDADD)
--pdfsig_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdfsig_DEPENDENCIES = libparseargs.la
- am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
- pdftocairo-pdftocairo-win32.$(OBJEXT)
- pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
--am__DEPENDENCIES_1 = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+am__DEPENDENCIES_1 = libparseargs.la
- am__DEPENDENCIES_2 =
- @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 = \
- @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@ $(am__DEPENDENCIES_2)
- am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
--pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
-+pdftocairo_DEPENDENCIES = \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
- $(am__DEPENDENCIES_2)
- am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
-@@ -182,31 +175,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
- pdftohtml-HtmlOutputDev.$(OBJEXT)
- pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
- pdftohtml_LDADD = $(LDADD)
--pdftohtml_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdftohtml_DEPENDENCIES = libparseargs.la
- pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
- am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
- pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
- pdftoppm_LDADD = $(LDADD)
--pdftoppm_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdftoppm_DEPENDENCIES = libparseargs.la
- am_pdftops_OBJECTS = pdftops.$(OBJEXT)
- pdftops_OBJECTS = $(am_pdftops_OBJECTS)
- pdftops_LDADD = $(LDADD)
--pdftops_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdftops_DEPENDENCIES = libparseargs.la
- am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
- pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
- pdftotext_LDADD = $(LDADD)
--pdftotext_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdftotext_DEPENDENCIES = libparseargs.la
- am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
- pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
- pdfunite_LDADD = $(LDADD)
--pdfunite_DEPENDENCIES = libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la
-+pdfunite_DEPENDENCIES = libparseargs.la
- AM_V_P = $(am__v_P_@AM_V@)
- am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
- am__v_P_0 = false
-@@ -549,7 +537,7 @@ AM_CPPFLAGS = \
-
- LDADD = \
- libparseargs.la \
-- $(top_builddir)/poppler/libpoppler.la \
-+ -lpoppler \
- $(UTILS_LIBS)
-
- @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
-@@ -615,7 +603,7 @@ pdftocairo_SOURCES = \
- pdftocairo-win32.h
-
- pdftocairo_LDADD = \
-- $(top_builddir)/poppler/libpoppler-cairo.la \
-+ -lpoppler-glib \
- $(LDADD) \
- $(PDFTOCAIRO_LIBS) \
- $(PTHREAD_LIBS)
Index: graphics/poppler/pkg-plist
===================================================================
--- graphics/poppler/pkg-plist
+++ graphics/poppler/pkg-plist
@@ -28,6 +28,8 @@
include/poppler/Hints.h
include/poppler/JArithmeticDecoder.h
include/poppler/JBIG2Stream.h
+%%OPENJPEG%%include/poppler/JPEG2000Stream.h
+%%NO_OPENJPEG%%include/poppler/JPXStream.h
include/poppler/Lexer.h
include/poppler/Linearization.h
include/poppler/Link.h
@@ -54,8 +56,6 @@
include/poppler/ProfileData.h
include/poppler/Rendition.h
include/poppler/SecurityHandler.h
-include/poppler/SignatureHandler.h
-include/poppler/SignatureInfo.h
include/poppler/Sound.h
include/poppler/SplashOutputDev.h
include/poppler/StdinCachedFile.h
@@ -66,16 +66,15 @@
include/poppler/StructTreeRoot.h
include/poppler/TextOutputDev.h
include/poppler/UTF.h
-include/poppler/UTF8.h
include/poppler/UnicodeCClassTables.h
include/poppler/UnicodeCompTables.h
include/poppler/UnicodeDecompTables.h
include/poppler/UnicodeMap.h
+include/poppler/UnicodeMapFuncs.h
include/poppler/UnicodeMapTables.h
include/poppler/UnicodeTypeTable.h
include/poppler/ViewerPreferences.h
include/poppler/XRef.h
-include/poppler/XpdfPluginAPI.h
include/poppler/cpp/poppler-document.h
include/poppler/cpp/poppler-embedded-file.h
include/poppler/cpp/poppler-font.h
@@ -94,17 +93,16 @@
include/poppler/fofi/FoFiType1.h
include/poppler/fofi/FoFiType1C.h
include/poppler/goo/FixedPoint.h
-include/poppler/goo/GooHash.h
+include/poppler/goo/GooCheckedOps.h
include/poppler/goo/GooLikely.h
include/poppler/goo/GooList.h
-include/poppler/goo/GooMutex.h
include/poppler/goo/GooString.h
include/poppler/goo/GooTimer.h
include/poppler/goo/ImgWriter.h
include/poppler/goo/JpegWriter.h
-include/poppler/goo/NetPBMWriter.h
include/poppler/goo/PNGWriter.h
include/poppler/goo/TiffWriter.h
+include/poppler/goo/gdir.h
include/poppler/goo/gfile.h
include/poppler/goo/gmem.h
include/poppler/goo/grandom.h
@@ -128,19 +126,16 @@
include/poppler/splash/SplashPattern.h
include/poppler/splash/SplashScreen.h
include/poppler/splash/SplashState.h
-include/poppler/splash/SplashT1Font.h
-include/poppler/splash/SplashT1FontEngine.h
-include/poppler/splash/SplashT1FontFile.h
include/poppler/splash/SplashTypes.h
include/poppler/splash/SplashXPath.h
include/poppler/splash/SplashXPathScanner.h
lib/libpoppler-cpp.so
lib/libpoppler-cpp.so.0
-lib/libpoppler-cpp.so.0.3.0
+lib/libpoppler-cpp.so.0.5.0
lib/libpoppler.so
-lib/libpoppler.so.68
-lib/libpoppler.so.68.0.0
-%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
+lib/libpoppler.so.82
+lib/libpoppler.so.82.0.0
+libdata/pkgconfig/poppler-cairo.pc
libdata/pkgconfig/poppler-cpp.pc
libdata/pkgconfig/poppler-splash.pc
libdata/pkgconfig/poppler.pc
Index: graphics/py-poppler-qt4/Makefile
===================================================================
--- graphics/py-poppler-qt4/Makefile
+++ graphics/py-poppler-qt4/Makefile
@@ -1,23 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= poppler-qt4
-PORTVERSION= 0.18.1
-PORTREVISION= 10
-CATEGORIES= graphics python
-MASTER_SITES= CHEESESHOP
-PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= python-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER= martin.dieringer@gmx.de
-COMMENT= Python bindings for the Poppler-Qt4 PDF rendering library
-
-LICENSE= LGPL21 LGPL3
-LICENSE_COMB= dual
-
-LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-
-USES= compiler:c++11-lang pkgconfig pyqt:4 python
-USE_PYQT= gui xml sip_build
-USE_PYTHON= distutils autoplist
-
-.include <bsd.port.mk>
Index: graphics/py-poppler-qt4/distinfo
===================================================================
--- graphics/py-poppler-qt4/distinfo
+++ graphics/py-poppler-qt4/distinfo
@@ -1,2 +0,0 @@
-SHA256 (python-poppler-qt4-0.18.1.tar.gz) = 00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c
-SIZE (python-poppler-qt4-0.18.1.tar.gz) = 15523
Index: graphics/py-poppler-qt4/files/patch-types.sip
===================================================================
--- graphics/py-poppler-qt4/files/patch-types.sip
+++ graphics/py-poppler-qt4/files/patch-types.sip
@@ -1,16 +0,0 @@
-PyList_SET_ITEM() is supposed to be void, but as a macro it's an
-expression and has a pointer value. Clang 4.0 trips on the bogus
-pointer comparison; given the comparison, it should be PyList_SetItem()
-which returns -1 on failure.
-
---- types.sip.orig 2017-01-21 07:19:29 UTC
-+++ types.sip
-@@ -27,7 +27,7 @@
- foreach (Poppler::Document::RenderBackend value, set)
- {
- PyObject *obj = PyLong_FromLong ((long) value);
-- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
-+ if (obj == NULL || PyList_SetItem (l, i, obj) < 0)
- {
- Py_DECREF(l);
-
Index: graphics/py-poppler-qt4/pkg-descr
===================================================================
--- graphics/py-poppler-qt4/pkg-descr
+++ graphics/py-poppler-qt4/pkg-descr
@@ -1,3 +0,0 @@
-Python bindings for graphics/poppler-qt4.
-
-WWW: https://pypi.org/project/python-poppler-qt4/
Index: misc/tellico-kde4/Makefile
===================================================================
--- misc/tellico-kde4/Makefile
+++ misc/tellico-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tellico
PORTVERSION= 2.3.12
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= misc kde
MASTER_SITES= http://tellico-project.org/files/
@@ -18,7 +18,6 @@
LIB_DEPENDS= libexempi.so:textproc/exempi \
libgcrypt.so:security/libgcrypt \
libgpg-error.so:security/libgpg-error \
- libpoppler-qt4.so:graphics/poppler-qt4 \
libqjson.so:devel/qjson@qt4 \
libtag.so:audio/taglib \
libyaz.so:net/yaz
Index: print/cups-filters/files/patch-git_6b0747c
===================================================================
--- print/cups-filters/files/patch-git_6b0747c
+++ print/cups-filters/files/patch-git_6b0747c
@@ -0,0 +1,76 @@
+From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001
+From: Olivier Schonken <olivier.schonken@gmail.com>
+Date: Fri, 5 Oct 2018 12:05:31 +0200
+Subject: [PATCH] Poppler removed memCheck and gMemReport functions
+
+Only use gMemReport and memCheck functions if poppler version less
+than 0.69.0
+
+The poppler project removed the memCheck and gMemReport functions in
+commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM
+from Object since this uses RAII now and hence cannot leak.
+(The existing tracking also is not thread-safe and hence unreliable.)
+
+and
+
+f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging
+from gmem since external tools and compiler instrumentation achieve the
+same effect.
+
+This commit solves https://github.com/OpenPrinting/cups-filters/issues/62
+
+Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
+---
+ filter/pdftoijs.cxx | 2 ++
+ filter/pdftoopvp/pdftoopvp.cxx | 2 ++
+ filter/pdftoraster.cxx | 2 ++
+ 3 files changed, 6 insertions(+)
+
+diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
+index 22bc33f4..dd6b6fa0 100644
+--- filter/pdftoijs.cxx
++++ filter/pdftoijs.cxx
+@@ -503,9 +503,11 @@ int main(int argc, char *argv[]) {
+ ppdClose(ppd);
+ free(outputfile);
+
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
+ // Check for memory leaks
+ Object::memCheck(stderr);
+ gMemReport(stderr);
++#endif
+
+ return exitCode;
+ }
+diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
+index 024941ab..bf25983b 100644
+--- filter/pdftoopvp/pdftoopvp.cxx
++++ filter/pdftoopvp/pdftoopvp.cxx
+@@ -763,9 +763,11 @@ fprintf(stderr,"JobInfo=%s\n",jobInfo);
+ err0:
+ delete globalParams;
+
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
+ // check for memory leaks
+ Object::memCheck(stderr);
+ gMemReport(stderr);
++#endif
+
+ }
+ /* muntrace(); */
+diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
+index 0c63ab8d..4ebf02b0 100644
+--- filter/pdftoraster.cxx
++++ filter/pdftoraster.cxx
+@@ -2162,9 +2162,11 @@ int main(int argc, char *argv[]) {
+ cmsDeleteTransform(colorTransform);
+ }
+
++#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
+ // Check for memory leaks
+ Object::memCheck(stderr);
+ gMemReport(stderr);
++#endif
+
+ return exitCode;
+ }
Index: print/qpdfview/Makefile
===================================================================
--- print/qpdfview/Makefile
+++ print/qpdfview/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qpdfview
DISTVERSION= 0.4.17beta1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= https://launchpadlibrarian.net/294276875/ \
https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/
@@ -14,19 +14,20 @@
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
-USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake
+LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
+
+USES= compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:5
USE_LDCONFIG= yes
+USE_QT= buildtools_build concurrent imageformats linguisttools printsupport sql sql-sqlite3 svg xml
QMAKE_SOURCE_PATH= ${PORTNAME}.pro
DATADIR= ${PREFIX}/share/${PORTNAME}
-OPTIONS_SINGLE= TOOLKITS
-OPTIONS_SINGLE_TOOLKITS= QT4 QT5
OPTIONS_DEFINE= CUPS
OPTIONS_MULTI= BACKEND
OPTIONS_MULTI_BACKEND= DJVU PS
BACKEND_DESC= Additional documents support
-OPTIONS_DEFAULT= QT4 CUPS PS
+OPTIONS_DEFAULT= CUPS PS
OPTIONS_SUB= yes
CUPS_QMAKE_OFF= "CONFIG+=without_cups"
@@ -34,14 +35,6 @@
DJVU_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre
DJVU_QMAKE_OFF= "CONFIG+=without_djvu"
-
-QT4_USES= qt:4
-QT4_USE= qt=dbus,gui,imageformats,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml
-QT4_LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4
-
-QT5_USES= qt:5
-QT5_USE= qt=buildtools_build,concurrent,imageformats,linguisttools,printsupport,sql,sql-sqlite3,svg,xml
-QT5_LIB_DEPENDS= libpoppler-qt5.so:graphics/poppler-qt5
PS_LIB_DEPENDS= libspectre.so:print/libspectre
PS_QMAKE_OFF= "CONFIG+=without_ps"
Index: sysutils/kfilemetadata-kde4/Makefile
===================================================================
--- sysutils/kfilemetadata-kde4/Makefile
+++ sysutils/kfilemetadata-kde4/Makefile
@@ -11,8 +11,7 @@
DEPRECATED= KDE4 is EOL upstream
EXPIRATION_DATE= 2018-12-31
-LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \
- libtag.so:audio/taglib \
+LIB_DEPENDS= libtag.so:audio/taglib \
libexiv2.so:graphics/exiv2 \
libswscale.so:multimedia/ffmpeg \
libepub.so:textproc/ebook-tools \
Index: sysutils/kfilemetadata-kde4/pkg-plist
===================================================================
--- sysutils/kfilemetadata-kde4/pkg-plist
+++ sysutils/kfilemetadata-kde4/pkg-plist
@@ -17,7 +17,6 @@
lib/kde4/kfilemetadata_office2007extractor.so
lib/kde4/kfilemetadata_officeextractor.so
lib/kde4/kfilemetadata_plaintextextractor.so
-lib/kde4/kfilemetadata_popplerextractor.so
lib/kde4/kfilemetadata_taglibextractor.so
lib/libkfilemetadata.so
lib/libkfilemetadata.so.4
@@ -30,6 +29,5 @@
share/kde4/services/kfilemetadata_office2007extractor.desktop
share/kde4/services/kfilemetadata_officeextractor.desktop
share/kde4/services/kfilemetadata_plaintextextractor.desktop
-share/kde4/services/kfilemetadata_popplerextractor.desktop
share/kde4/services/kfilemetadata_taglibextractor.desktop
share/kde4/servicetypes/kfilemetadataextractor.desktop
Index: sysutils/nepomuk-core-kde4/Makefile
===================================================================
--- sysutils/nepomuk-core-kde4/Makefile
+++ sysutils/nepomuk-core-kde4/Makefile
@@ -12,8 +12,7 @@
DEPRECATED= KDE4 is EOL upstream
EXPIRATION_DATE= 2018-12-31
-LIB_DEPENDS= libpoppler-qt4.so:graphics/poppler-qt4 \
- libtag.so:audio/taglib \
+LIB_DEPENDS= libtag.so:audio/taglib \
libexiv2.so:graphics/exiv2 \
libswscale.so:multimedia/ffmpeg \
libepub.so:textproc/ebook-tools \
Index: sysutils/nepomuk-core-kde4/pkg-plist
===================================================================
--- sysutils/nepomuk-core-kde4/pkg-plist
+++ sysutils/nepomuk-core-kde4/pkg-plist
@@ -129,7 +129,6 @@
lib/kde4/nepomukoffice2007extractor.so
lib/kde4/nepomukofficeextractor.so
lib/kde4/nepomukplaintextextractor.so
-lib/kde4/nepomukpopplerextractor.so
lib/kde4/nepomuktaglibextractor.so
lib/libkdeinit4_nepomukserver.so
lib/libnepomukcleaner.so
@@ -173,7 +172,6 @@
share/kde4/services/nepomukofficeextractor.desktop
share/kde4/services/nepomukontologyloader.desktop
share/kde4/services/nepomukplaintextextractor.desktop
-share/kde4/services/nepomukpopplerextractor.desktop
share/kde4/services/nepomukqueryservice.desktop
share/kde4/services/nepomukremovablestorageservice.desktop
share/kde4/services/nepomukstorage.desktop
Index: x11/leechcraft/Makefile
===================================================================
--- x11/leechcraft/Makefile
+++ x11/leechcraft/Makefile
@@ -25,9 +25,10 @@
webkit xml qmake_build moc_build rcc_build uic_build \
linguisttools_build
USE_XORG= x11
-CMAKE_ARGS+= -DENABLE_LADS=OFF \
- -DENABLE_SYNCER=OFF \
- -DLEECHCRAFT_VERSION=${PORTVERSION}
+CMAKE_OFF= ENABLE_LADS \
+ ENABLE_SYNCER \
+ ENABLE_MONOCLE
+CMAKE_ARGS= -DLEECHCRAFT_VERSION=${PORTVERSION}
WRKSRC_SUBDIR= src
@@ -36,7 +37,7 @@
ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \
HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \
LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \
- MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
+ MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \
ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \
TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \
@@ -222,12 +223,6 @@
MELLONETRAY_CMAKE_OFF= -DENABLE_MELLONETRAY:BOOL=false
MELLONETRAY_USE= xorg=xdamage
-MONOCLE_DESC= Monocle, the modular document viewer
-MONOCLE_CMAKE_ON= -DENABLE_MONOCLE:BOOL=true
-MONOCLE_CMAKE_OFF= -DENABLE_MONOCLE:BOOL=false
-MONOCLE_LIB_DEPENDS= libdjvulibre.so:graphics/djvulibre \
- libpoppler-qt4.so:graphics/poppler-qt4
-
MUSICZOMBIE_DESC= MusicBrainz client plugin
MUSICZOMBIE_CMAKE_ON= -DENABLE_MUSICZOMBIE:BOOL=true
MUSICZOMBIE_CMAKE_OFF= -DENABLE_MUSICZOMBIE:BOOL=false
@@ -360,7 +355,7 @@
CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \
HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \
KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \
- LMP MELLONETRAY MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
+ LMP MELLONETRAY MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \
SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \
TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY
Index: x11/leechcraft/pkg-plist
===================================================================
--- x11/leechcraft/pkg-plist
+++ x11/leechcraft/pkg-plist
@@ -1722,19 +1722,6 @@
%%MELLONETRAY%%%%DATADIR%%/qml/mellonetray/TrayQuark.qml.manifest
%%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_en.qm
%%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_ru_RU.qm
-%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle.so
-%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_dik.so
-%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_fxb.so
-%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_pdf.so
-%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_postrus.so
-%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_seen.so
-%%MONOCLE%%share/applications/leechcraft-monocle-fxb.desktop
-%%MONOCLE%%share/applications/leechcraft-monocle-pdf.desktop
-%%MONOCLE%%share/applications/leechcraft-monocle-postrus.desktop
-%%MONOCLE%%share/applications/leechcraft-monocle-seen.desktop
-%%MONOCLE%%%%DATADIR%%/settings/monoclesettings.xml
-%%MONOCLE%%%%DATADIR%%/translations/leechcraft_monocle_en.qm
-%%MONOCLE%%%%DATADIR%%/translations/leechcraft_monocle_ru_RU.qm
%%MUSICZOMBIE%%lib/leechcraft/plugins/libleechcraft_musiczombie.so
%%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_en.qm
%%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_ru_RU.qm

File Metadata

Mime Type
text/plain
Expires
Thu, Feb 12, 10:35 PM (2 h, 6 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28670992
Default Alt Text
D17456.id50519.diff (74 KB)

Event Timeline