View | Details | Raw Unified | Return to bug 233452 | Differences between
and this patch

Collapse All | Expand All

(-)MOVED (+1 lines)
Lines 10639-10641 Link Here
10639
textproc/rubygem-github-linguist53|textproc/rubygem-github-linguist|2018-11-23|Obsolete by www/gitlab-ce 11.5.x upgrade, please use textproc/rubygem-github-linguist
10639
textproc/rubygem-github-linguist53|textproc/rubygem-github-linguist|2018-11-23|Obsolete by www/gitlab-ce 11.5.x upgrade, please use textproc/rubygem-github-linguist
10640
devel/rubygem-google-protobuf351|devel/rubygem-google-protobuf|2018-11-23|Obsolete by www/gitlab-ce 11.5.x upgrade, please use devel/rubygem-google-protobuf
10640
devel/rubygem-google-protobuf351|devel/rubygem-google-protobuf|2018-11-23|Obsolete by www/gitlab-ce 11.5.x upgrade, please use devel/rubygem-google-protobuf
10641
devel/giggle|devel/gitg|2018-11-23|Has expired: Development stalled. Please switch to devel/gitg.
10641
devel/giggle|devel/gitg|2018-11-23|Has expired: Development stalled. Please switch to devel/gitg.
10642
graphics/diffpdf||2018-11-31|Depends on non-existent poppler-qt4
(-)databases/kbibtex/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	kbibtex
4
PORTNAME=	kbibtex
5
DISTVERSION=	0.8.1
5
DISTVERSION=	0.8.1
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	databases kde
7
CATEGORIES=	databases kde
8
MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}/
8
MASTER_SITES=	KDE/stable/KBibTeX/${DISTVERSION}/
9
9
(-)devel/efl/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	efl
4
PORTNAME=	efl
5
DISTVERSION=	1.20.7
5
DISTVERSION=	1.20.7
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	devel enlightenment
7
CATEGORIES=	devel enlightenment
8
MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
8
MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
9
DIST_SUBDIR=	enlightenment
9
DIST_SUBDIR=	enlightenment
(-)devel/kf5-kfilemetadata/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	kfilemetadata
3
PORTNAME=	kfilemetadata
4
DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
4
DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	devel kde kde-frameworks
6
CATEGORIES=	devel kde kde-frameworks
6
7
7
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
(-)editors/calligra/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	calligra
3
PORTNAME=	calligra
4
DISTVERSION=	3.1.0
4
DISTVERSION=	3.1.0
5
PORTREVISION=	5
5
PORTREVISION=	6
6
CATEGORIES=	editors kde
6
CATEGORIES=	editors kde
7
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
7
MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
8
DIST_SUBDIR=	KDE/${PORTNAME}
8
DIST_SUBDIR=	KDE/${PORTNAME}
(-)editors/libreoffice/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
.include "${.CURDIR}/Makefile.common"
3
.include "${.CURDIR}/Makefile.common"
4
4
5
PORTREVISION=	1
5
PORTREVISION=	2
6
MASTER_SITES=	https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
6
MASTER_SITES=	https://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
7
		https://dev-www.libreoffice.org/src/:src \
7
		https://dev-www.libreoffice.org/src/:src \
8
		https://dev-www.libreoffice.org/extern/:ext
8
		https://dev-www.libreoffice.org/extern/:ext
(-)editors/openoffice-devel/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	apache-openoffice
4
PORTNAME=	apache-openoffice
5
PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
5
PORTVERSION=	${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION}
6
PORTREVISION=	2
6
PORTREVISION=	3
7
PORTEPOCH=	4
7
PORTEPOCH=	4
8
CATEGORIES=	editors java
8
CATEGORIES=	editors java
9
MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
9
MASTER_SITES=	https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \
(-)editors/texmaker/Makefile (-2 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	texmaker
4
PORTNAME=	texmaker
5
PORTVERSION=	4.5
5
PORTVERSION=	4.5
6
PORTREVISION=	10
6
PORTREVISION=	11
7
PORTEPOCH=	3
7
PORTEPOCH=	3
8
CATEGORIES=	editors
8
CATEGORIES=	editors
9
MASTER_SITES=	http://www.xm1math.net/texmaker/
9
MASTER_SITES=	http://www.xm1math.net/texmaker/
Lines 33-39 Link Here
33
TOOLKIT_DESC=	Qt toolkit
33
TOOLKIT_DESC=	Qt toolkit
34
QT4_USES=	qt:4
34
QT4_USES=	qt:4
35
QT4_USE=	${_USE_QT4:S/^/QT=/}
35
QT4_USE=	${_USE_QT4:S/^/QT=/}
36
QT4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
37
QT5_USES=	qt:5
36
QT5_USES=	qt:5
38
QT5_USE=	${_USE_QT5:S/^/QT=/}
37
QT5_USE=	${_USE_QT5:S/^/QT=/}
39
QT5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
38
QT5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
(-)editors/texstudio/Makefile (-22 / +5 lines)
Lines 1-9 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	texstudio
3
PORTNAME=	texstudio
4
DISTVERSION=	2.12.8
4
DISTVERSION=	2.12.10
5
CATEGORIES=	editors
5
CATEGORIES=	editors
6
PKGNAMESUFFIX=	-${FLAVOR}
7
6
8
MAINTAINER=	abiliojr@gmail.com
7
MAINTAINER=	abiliojr@gmail.com
9
COMMENT=	Integrated writing environment for LaTeX documents
8
COMMENT=	Integrated writing environment for LaTeX documents
Lines 14-46 Link Here
14
BROKEN_armv6=		fails to compile: error: no member named mc_eip in __mcontext
13
BROKEN_armv6=		fails to compile: error: no member named mc_eip in __mcontext
15
14
16
LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
15
LIB_DEPENDS=	libhunspell-1.6.so:textproc/hunspell \
17
		libpoppler.so:graphics/poppler
16
		libpoppler.so:graphics/poppler \
17
		libpoppler-qt5.so:graphics/poppler-qt5 \
18
		libquazip5.so:archivers/quazip@qt5
18
19
19
FLAVORS=	qt5 qt4
20
FLAVOR?=	${FLAVORS:[1]}
21
22
qt4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
23
			libquazip.so:archivers/quazip@qt4
24
qt5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5 \
25
			libquazip5.so:archivers/quazip@qt5
26
27
USES=		desktop-file-utils dos2unix ghostscript:run \
20
USES=		desktop-file-utils dos2unix ghostscript:run \
28
		pkgconfig qmake
21
		pkgconfig qmake qt:5
29
30
.if ${FLAVOR} == qt4
31
USES+=		qt:4
32
USE_QT=		corelib gui network script svg xml \
33
		iconengines_run designer_build moc_build rcc_build uic_build
34
QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
35
		QUAZIP_LIB="-lquazip"
36
.else
37
USES+=		qt:5
38
USE_QT	=	core gui network script svg widgets xml \
22
USE_QT	=	core gui network script svg widgets xml \
39
		printsupport concurrent uitools buildtools_build
23
		printsupport concurrent uitools buildtools_build
40
QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
24
QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
41
		QUAZIP_LIB="-lquazip5"
25
		QUAZIP_LIB="-lquazip5"
42
QTVER_SUFFIX=	5
26
QTVER_SUFFIX=	5
43
.endif
44
27
45
USE_XORG=	x11
28
USE_XORG=	x11
46
USE_GL=		gl
29
USE_GL=		gl
(-)editors/texstudio/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1523190835
1
TIMESTAMP = 1538913866
2
SHA256 (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 3dec30ded3f36bb0591f8ed1b78b86fa23f276f5744925bc91075715c3f58062
2
SHA256 (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 92cf9cbb536e58a5929611fa40438cd9d7ea6880022cd3c5de0483fd15d3df0b
3
SIZE (texstudio-org-texstudio-2.12.8_GH0.tar.gz) = 26555418
3
SIZE (texstudio-org-texstudio-2.12.10_GH0.tar.gz) = 26770850
(-)editors/texstudio/pkg-plist (+2 lines)
Lines 128-133 Link Here
128
%%DATADIR%%/texstudio_hu.qm
128
%%DATADIR%%/texstudio_hu.qm
129
%%DATADIR%%/texstudio_it.qm
129
%%DATADIR%%/texstudio_it.qm
130
%%DATADIR%%/texstudio_ja.qm
130
%%DATADIR%%/texstudio_ja.qm
131
%%DATADIR%%/texstudio_ko.qm
132
%%DATADIR%%/texstudio_ko_KR.qm
131
%%DATADIR%%/texstudio_nl.qm
133
%%DATADIR%%/texstudio_nl.qm
132
%%DATADIR%%/texstudio_pl.qm
134
%%DATADIR%%/texstudio_pl.qm
133
%%DATADIR%%/texstudio_pt_BR.qm
135
%%DATADIR%%/texstudio_pt_BR.qm
(-)graphics/Makefile (-3 lines)
Lines 138-144 Link Here
138
    SUBDIR += devil
138
    SUBDIR += devil
139
    SUBDIR += dia
139
    SUBDIR += dia
140
    SUBDIR += diff-pdf
140
    SUBDIR += diff-pdf
141
    SUBDIR += diffpdf
142
    SUBDIR += digikam
141
    SUBDIR += digikam
143
    SUBDIR += digikam-kde4
142
    SUBDIR += digikam-kde4
144
    SUBDIR += digikam-kde4-doc
143
    SUBDIR += digikam-kde4-doc
Lines 868-874 Link Here
868
    SUBDIR += poppler
867
    SUBDIR += poppler
869
    SUBDIR += poppler-data
868
    SUBDIR += poppler-data
870
    SUBDIR += poppler-glib
869
    SUBDIR += poppler-glib
871
    SUBDIR += poppler-qt4
872
    SUBDIR += poppler-qt5
870
    SUBDIR += poppler-qt5
873
    SUBDIR += poppler-utils
871
    SUBDIR += poppler-utils
874
    SUBDIR += potrace
872
    SUBDIR += potrace
Lines 939-945 Link Here
939
    SUBDIR += py-plotly
937
    SUBDIR += py-plotly
940
    SUBDIR += py-png
938
    SUBDIR += py-png
941
    SUBDIR += py-poppler
939
    SUBDIR += py-poppler
942
    SUBDIR += py-poppler-qt4
943
    SUBDIR += py-pycha
940
    SUBDIR += py-pycha
944
    SUBDIR += py-pycollada
941
    SUBDIR += py-pycollada
945
    SUBDIR += py-pydot
942
    SUBDIR += py-pydot
(-)graphics/diff-pdf/Makefile (+1 lines)
Lines 4-9 Link Here
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	0.2-27
5
DISTVERSION=	0.2-27
6
DISTVERSIONSUFFIX=	-gc4d6722
6
DISTVERSIONSUFFIX=	-gc4d6722
7
PORTREVISION=	1
7
CATEGORIES=	graphics
8
CATEGORIES=	graphics
8
9
9
MAINTAINER=	uzsolt@uzsolt.hu
10
MAINTAINER=	uzsolt@uzsolt.hu
(-)graphics/diffpdf/Makefile (-27 lines)
Lines 1-27 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	diffpdf
4
PORTVERSION=	2.1.3
5
PORTREVISION=	2
6
CATEGORIES=	graphics
7
MASTER_SITES=	http://www.qtrac.eu/
8
9
MAINTAINER=	dinoex@FreeBSD.org
10
COMMENT=	Compare two PDF files-textually or visually
11
12
LICENSE=	GPLv2+
13
14
LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
15
16
USES=		compiler:c++11-lang qmake qt:4
17
USE_QT=		qmake_build moc_build rcc_build uic_build linguist_build
18
19
PLIST_FILES=	bin/diffpdf
20
21
pre-configure:
22
	${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
23
24
do-install:
25
	${INSTALL_PROGRAM} ${WRKSRC}/diffpdf ${STAGEDIR}${PREFIX}/bin/
26
27
.include <bsd.port.mk>
(-)graphics/diffpdf/distinfo (-3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1485019097
2
SHA256 (diffpdf-2.1.3.tar.gz) = c6142ee038a78108397f45b0c456dca7a4fe1d75250f21a514a134101d322433
3
SIZE (diffpdf-2.1.3.tar.gz) = 91856
(-)graphics/diffpdf/pkg-descr (-8 lines)
Lines 1-8 Link Here
1
DiffPDF is used to compare two PDF files-textually or visually.
2
3
DiffPDF can compare two PDF files.
4
It offers three comparison modes: Words, Characters, and Appearance.
5
6
LICENSE: GPL2 or later
7
8
WWW: http://www.qtrac.eu/diffpdf-foss.html
(-)graphics/inkscape/Makefile (-1 / +4 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	inkscape
4
PORTNAME=	inkscape
5
PORTVERSION=	0.92.3
5
PORTVERSION=	0.92.3
6
PORTREVISION=	4
6
PORTREVISION=	5
7
CATEGORIES=	graphics gnome
7
CATEGORIES=	graphics gnome
8
MASTER_SITES=	https://inkscape.org/en/gallery/item/12187/
8
MASTER_SITES=	https://inkscape.org/en/gallery/item/12187/
9
9
Lines 82-86 Link Here
82
post-patch:
82
post-patch:
83
	@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \
83
	@${REINPLACE_CMD} -e 's|COMMAND python|COMMAND ${PYTHON_VERSION}|g' \
84
		${WRKSRC}/share/*/CMakeLists.txt
84
		${WRKSRC}/share/*/CMakeLists.txt
85
	# Obtained from Arch Linux
86
	@${REINPLACE_CMD} -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g' \
87
		${WRKSRC}/src/extension/internal/pdfinput/pdf-parser.*
85
88
86
.include <bsd.port.mk>
89
.include <bsd.port.mk>
(-)graphics/inkscape/files/patch-archgit_bee18ea (+713 lines)
Line 0 Link Here
1
Obtained from: Arch Linux
2
	https://git.archlinux.org/svntogit/packages.git/plain/trunk/poppler-fixes-from-master.patch?h=packages/inkscape
3
4
From bee18ea9799e34aaf9141141f14384fd6b9cf7bd Mon Sep 17 00:00:00 2001
5
From: Eduard Braun <eduard.braun2@gmx.de>
6
Date: Tue, 24 Apr 2018 19:18:26 +0200
7
Subject: [PATCH 1/4] Fix compilation with poppler 0.64
8
9
---
10
 src/extension/internal/pdfinput/pdf-parser.cpp  | 10 +++++-----
11
 src/extension/internal/pdfinput/pdf-parser.h    |  2 +-
12
 src/extension/internal/pdfinput/svg-builder.cpp |  4 ++--
13
 src/extension/internal/pdfinput/svg-builder.h   |  3 +--
14
 4 files changed, 9 insertions(+), 10 deletions(-)
15
16
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
17
index 604b7f8079..721524e10a 100644
18
--- src/extension/internal/pdfinput/pdf-parser.cpp
19
+++ src/extension/internal/pdfinput/pdf-parser.cpp
20
@@ -2582,7 +2582,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
21
   }
22
 }
23
 
24
-void PdfParser::doShowText(GooString *s) {
25
+void PdfParser::doShowText(const GooString *s) {
26
   GfxFont *font;
27
   int wMode;
28
   double riseX, riseY;
29
@@ -2601,7 +2601,7 @@ void PdfParser::doShowText(GooString *s) {
30
   font = state->getFont();
31
   wMode = font->getWMode();
32
 
33
-  builder->beginString(state, s);
34
+  builder->beginString(state);
35
 
36
   // handle a Type 3 char
37
   if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
38
@@ -2631,7 +2631,7 @@ void PdfParser::doShowText(GooString *s) {
39
     double lineX = state->getLineX();
40
     double lineY = state->getLineY();
41
     oldParser = parser;
42
-    p = s->getCString();
43
+    p = g_strdup(s->getCString());
44
     len = s->getLength();
45
     while (len > 0) {
46
       n = font->getNextChar(p, len, &code,
47
@@ -2686,7 +2686,7 @@ void PdfParser::doShowText(GooString *s) {
48
 
49
   } else {
50
     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
51
-    p = s->getCString();
52
+    p = g_strdup(s->getCString());
53
     len = s->getLength();
54
     while (len > 0) {
55
       n = font->getNextChar(p, len, &code,
56
@@ -2732,7 +2732,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
57
 {
58
   Object obj1, obj2, obj3, refObj;
59
 
60
-  char *name = args[0].getName();
61
+  char *name = g_strdup(args[0].getName());
62
 #if defined(POPPLER_NEW_OBJECT_API)
63
   if ((obj1 = res->lookupXObject(name)).isNull()) {
64
 #else
65
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
66
index e28fecc2e1..f985b15cad 100644
67
--- src/extension/internal/pdfinput/pdf-parser.h
68
+++ src/extension/internal/pdfinput/pdf-parser.h
69
@@ -287,7 +287,7 @@ private:
70
   void opMoveShowText(Object args[], int numArgs);
71
   void opMoveSetShowText(Object args[], int numArgs);
72
   void opShowSpaceText(Object args[], int numArgs);
73
-  void doShowText(GooString *s);
74
+  void doShowText(const GooString *s);
75
 
76
   // XObject operators
77
   void opXObject(Object args[], int numArgs);
78
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
79
index a448be6397..617861928d 100644
80
--- src/extension/internal/pdfinput/svg-builder.cpp
81
+++ src/extension/internal/pdfinput/svg-builder.cpp
82
@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
83
     GfxFont *font = state->getFont();
84
     // Store original name
85
     if (font->getName()) {
86
-        _font_specification = font->getName()->getCString();
87
+        _font_specification = g_strdup(font->getName()->getCString());
88
     } else {
89
         _font_specification = (char*) "Arial";
90
     }
91
@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
92
     _glyphs.clear();
93
 }
94
 
95
-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
96
+void SvgBuilder::beginString(GfxState *state) {
97
     if (_need_font_update) {
98
         updateFont(state);
99
     }
100
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
101
index ad15c9c06f..ed2a4d48e0 100644
102
--- src/extension/internal/pdfinput/svg-builder.h
103
+++ src/extension/internal/pdfinput/svg-builder.h
104
@@ -29,7 +29,6 @@ namespace Inkscape {
105
 #include <glibmm/ustring.h>
106
 
107
 #include "CharTypes.h"
108
-class GooString;
109
 class Function;
110
 class GfxState;
111
 struct GfxColor;
112
@@ -136,7 +135,7 @@ public:
113
     void clearSoftMask(GfxState *state);
114
 
115
     // Text handling
116
-    void beginString(GfxState *state, GooString *s);
117
+    void beginString(GfxState *state);
118
     void endString(GfxState *state);
119
     void addChar(GfxState *state, double x, double y,
120
                  double dx, double dy,
121
-- 
122
2.19.1
123
124
125
From 60d37b26a344a749c0b2eda003c92bad7470ebba Mon Sep 17 00:00:00 2001
126
From: Jan Palus <atler@pld-linux.org>
127
Date: Fri, 25 May 2018 00:30:17 +0200
128
Subject: [PATCH 2/4] Fix compilation with poppler 0.65.0
129
130
replace unused includes with one that is actually used
131
132
Signed-off-by: Jan Palus <atler@pld-linux.org>
133
---
134
 src/extension/internal/pdfinput/pdf-parser.cpp | 3 +--
135
 1 file changed, 1 insertion(+), 2 deletions(-)
136
137
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
138
index 721524e10a..a3aa3213a1 100644
139
--- src/extension/internal/pdfinput/pdf-parser.cpp
140
+++ src/extension/internal/pdfinput/pdf-parser.cpp
141
@@ -37,8 +37,7 @@ extern "C" {
142
 #include "util/units.h"
143
 
144
 #include "goo/gmem.h"
145
-#include "goo/GooTimer.h"
146
-#include "goo/GooHash.h"
147
+#include "goo/GooString.h"
148
 #include "GlobalParams.h"
149
 #include "CharTypes.h"
150
 #include "Object.h"
151
-- 
152
2.19.1
153
154
155
From 20795fdf1314a2f0047d6834f290a92e493764c7 Mon Sep 17 00:00:00 2001
156
From: Eduard Braun <eduard.braun2@gmx.de>
157
Date: Wed, 5 Sep 2018 00:31:06 +0200
158
Subject: [PATCH 3/4] Modified fix for compatibility with poppler 0.64
159
160
This is slightly uglier than a600c6438fef2f4c06f9a4a7d933d99fb054a973
161
but avoids duplicating strings (which is unnecessary and leaked memory).
162
163
It's also closer to what upstream intended with the changes in 0.64.
164
---
165
 .../internal/pdfinput/pdf-parser.cpp          | 19 ++++++++++++++++---
166
 src/extension/internal/pdfinput/pdf-parser.h  |  6 ++++++
167
 .../internal/pdfinput/svg-builder.cpp         |  6 +++---
168
 src/extension/internal/pdfinput/svg-builder.h |  4 ++--
169
 4 files changed, 27 insertions(+), 8 deletions(-)
170
171
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
172
index a3aa3213a1..ea9f902e09 100644
173
--- src/extension/internal/pdfinput/pdf-parser.cpp
174
+++ src/extension/internal/pdfinput/pdf-parser.cpp
175
@@ -36,6 +36,7 @@ extern "C" {
176
 #include "pdf-parser.h"
177
 #include "util/units.h"
178
 
179
+#include "glib/poppler-features.h"
180
 #include "goo/gmem.h"
181
 #include "goo/GooString.h"
182
 #include "GlobalParams.h"
183
@@ -2581,7 +2582,11 @@ void PdfParser::opShowSpaceText(Object args[], int /*numArgs*/)
184
   }
185
 }
186
 
187
+#if POPPLER_CHECK_VERSION(0,64,0)
188
 void PdfParser::doShowText(const GooString *s) {
189
+#else
190
+void PdfParser::doShowText(GooString *s) {
191
+#endif
192
   GfxFont *font;
193
   int wMode;
194
   double riseX, riseY;
195
@@ -2594,7 +2599,11 @@ void PdfParser::doShowText(const GooString *s) {
196
   Object charProc;
197
   Dict *resDict;
198
   Parser *oldParser;
199
+#if POPPLER_CHECK_VERSION(0,64,0)
200
+  const char *p;
201
+#else
202
   char *p;
203
+#endif
204
   int len, n, uLen;
205
 
206
   font = state->getFont();
207
@@ -2630,7 +2639,7 @@ void PdfParser::doShowText(const GooString *s) {
208
     double lineX = state->getLineX();
209
     double lineY = state->getLineY();
210
     oldParser = parser;
211
-    p = g_strdup(s->getCString());
212
+    p = s->getCString();
213
     len = s->getLength();
214
     while (len > 0) {
215
       n = font->getNextChar(p, len, &code,
216
@@ -2685,7 +2694,7 @@ void PdfParser::doShowText(const GooString *s) {
217
 
218
   } else {
219
     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
220
-    p = g_strdup(s->getCString());
221
+    p = s->getCString();
222
     len = s->getLength();
223
     while (len > 0) {
224
       n = font->getNextChar(p, len, &code,
225
@@ -2731,7 +2740,11 @@ void PdfParser::opXObject(Object args[], int /*numArgs*/)
226
 {
227
   Object obj1, obj2, obj3, refObj;
228
 
229
-  char *name = g_strdup(args[0].getName());
230
+#if POPPLER_CHECK_VERSION(0,64,0)
231
+  const char *name = args[0].getName();
232
+#else
233
+  char *name = args[0].getName();
234
+#endif
235
 #if defined(POPPLER_NEW_OBJECT_API)
236
   if ((obj1 = res->lookupXObject(name)).isNull()) {
237
 #else
238
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
239
index f985b15cad..ed28274f42 100644
240
--- src/extension/internal/pdfinput/pdf-parser.h
241
+++ src/extension/internal/pdfinput/pdf-parser.h
242
@@ -25,6 +25,7 @@ namespace Inkscape {
243
 // TODO clean up and remove using:
244
 using Inkscape::Extension::Internal::SvgBuilder;
245
 
246
+#include "glib/poppler-features.h"
247
 #include "goo/gtypes.h"
248
 #include "Object.h"
249
 
250
@@ -287,7 +288,12 @@ private:
251
   void opMoveShowText(Object args[], int numArgs);
252
   void opMoveSetShowText(Object args[], int numArgs);
253
   void opShowSpaceText(Object args[], int numArgs);
254
+#if POPPLER_CHECK_VERSION(0,64,0)
255
   void doShowText(const GooString *s);
256
+#else
257
+  void doShowText(GooString *s);
258
+#endif
259
+  
260
 
261
   // XObject operators
262
   void opXObject(Object args[], int numArgs);
263
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
264
index 617861928d..767c8af4d4 100644
265
--- src/extension/internal/pdfinput/svg-builder.cpp
266
+++ src/extension/internal/pdfinput/svg-builder.cpp
267
@@ -1020,9 +1020,9 @@ void SvgBuilder::updateFont(GfxState *state) {
268
     GfxFont *font = state->getFont();
269
     // Store original name
270
     if (font->getName()) {
271
-        _font_specification = g_strdup(font->getName()->getCString());
272
+        _font_specification = font->getName()->getCString();
273
     } else {
274
-        _font_specification = (char*) "Arial";
275
+        _font_specification = "Arial";
276
     }
277
 
278
     // Prune the font name to get the correct font family name
279
@@ -1030,7 +1030,7 @@ void SvgBuilder::updateFont(GfxState *state) {
280
     char *font_family = NULL;
281
     char *font_style = NULL;
282
     char *font_style_lowercase = NULL;
283
-    char *plus_sign = strstr(_font_specification, "+");
284
+    const char *plus_sign = strstr(_font_specification, "+");
285
     if (plus_sign) {
286
         font_family = g_strdup(plus_sign + 1);
287
         _font_specification = plus_sign + 1;
288
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
289
index ed2a4d48e0..55daacee74 100644
290
--- src/extension/internal/pdfinput/svg-builder.h
291
+++ src/extension/internal/pdfinput/svg-builder.h
292
@@ -80,7 +80,7 @@ struct SvgGlyph {
293
     bool style_changed;  // Set to true if style has to be reset
294
     SPCSSAttr *style;
295
     int render_mode;    // Text render mode
296
-    char *font_specification;   // Pointer to current font specification
297
+    const char *font_specification;   // Pointer to current font specification
298
 };
299
 
300
 /**
301
@@ -202,7 +202,7 @@ private:
302
 
303
     SPCSSAttr *_font_style;          // Current font style
304
     GfxFont *_current_font;
305
-    char *_font_specification;
306
+    const char *_font_specification;
307
     double _font_scaling;
308
     bool _need_font_update;
309
     Geom::Affine _text_matrix;
310
-- 
311
2.19.1
312
313
314
From bc2b40c17dc4fdbb90675b6dc80e30e7e08c4488 Mon Sep 17 00:00:00 2001
315
From: Thomas Holder <thomas@thomas-holder.de>
316
Date: Fri, 28 Sep 2018 18:05:30 +0000
317
Subject: [PATCH 4/4] fix 1789208 poppler 0.69
318
319
---
320
 CMakeScripts/DefineDependsandFlags.cmake      | 12 -----
321
 src/extension/internal/pdfinput/pdf-input.cpp |  2 +-
322
 src/extension/internal/pdfinput/pdf-input.h   |  1 +
323
 .../internal/pdfinput/pdf-parser.cpp          | 46 ++++++++-----------
324
 src/extension/internal/pdfinput/pdf-parser.h  | 12 +++--
325
 .../pdfinput/poppler-transition-api.h         | 39 ++++++++++++++++
326
 .../internal/pdfinput/svg-builder.cpp         | 22 ++++-----
327
 src/extension/internal/pdfinput/svg-builder.h |  3 +-
328
 8 files changed, 80 insertions(+), 57 deletions(-)
329
 create mode 100644 src/extension/internal/pdfinput/poppler-transition-api.h
330
331
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
332
index c33a3bfb5e..fa67f67714 100644
333
--- CMakeScripts/DefineDependsandFlags.cmake
334
+++ CMakeScripts/DefineDependsandFlags.cmake
335
@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
336
 		set(HAVE_POPPLER_GLIB ON)
337
 	    endif()
338
 	endif()
339
-	if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
340
-		POPPLER_VERSION VERSION_EQUAL   "0.26.0")
341
-	    set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
342
-	endif()
343
-	if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
344
-		POPPLER_VERSION VERSION_EQUAL   "0.29.0")
345
-	    set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
346
-	endif()
347
-	if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
348
-		POPPLER_VERSION VERSION_EQUAL   "0.58.0")
349
-            set(POPPLER_NEW_OBJECT_API ON)
350
-	endif()
351
     else()
352
 	set(ENABLE_POPPLER_CAIRO OFF)
353
     endif()
354
diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp
355
index e3115620e3..9621e306a0 100644
356
--- src/extension/internal/pdfinput/pdf-input.cpp
357
+++ src/extension/internal/pdfinput/pdf-input.cpp
358
@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) {
359
             dlg->getImportSettings(prefs);
360
 
361
         // Apply crop settings
362
-        PDFRectangle *clipToBox = NULL;
363
+        _POPPLER_CONST PDFRectangle *clipToBox = NULL;
364
         double crop_setting;
365
         sp_repr_get_double(prefs, "cropTo", &crop_setting);
366
 
367
diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h
368
index 6e36603c31..73bbfe2a71 100644
369
--- src/extension/internal/pdfinput/pdf-input.h
370
+++ src/extension/internal/pdfinput/pdf-input.h
371
@@ -15,6 +15,7 @@
372
 #endif
373
 
374
 #ifdef HAVE_POPPLER
375
+#include "poppler-transition-api.h"
376
 
377
 #include <gtkmm/dialog.h>
378
 
379
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
380
index ea9f902e09..4a7fd8a5e5 100644
381
--- src/extension/internal/pdfinput/pdf-parser.cpp
382
+++ src/extension/internal/pdfinput/pdf-parser.cpp
383
@@ -295,8 +295,8 @@ PdfParser::PdfParser(XRef *xrefA,
384
                      int /*pageNum*/,
385
 		     int rotate,
386
 		     Dict *resDict,
387
-                     PDFRectangle *box,
388
-		     PDFRectangle *cropBox) :
389
+                     _POPPLER_CONST PDFRectangle *box,
390
+                     _POPPLER_CONST PDFRectangle *cropBox) :
391
     xref(xrefA),
392
     builder(builderA),
393
     subPage(gFalse),
394
@@ -318,7 +318,7 @@ PdfParser::PdfParser(XRef *xrefA,
395
   builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
396
                            Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
397
 
398
-  double *ctm = state->getCTM();
399
+  const double *ctm = state->getCTM();
400
   double scaledCTM[6];
401
   for (int i = 0; i < 6; ++i) {
402
     baseMatrix[i] = ctm[i];
403
@@ -353,7 +353,7 @@ PdfParser::PdfParser(XRef *xrefA,
404
 PdfParser::PdfParser(XRef *xrefA,
405
 		     Inkscape::Extension::Internal::SvgBuilder *builderA,
406
                      Dict *resDict,
407
-		     PDFRectangle *box) :
408
+		     _POPPLER_CONST PDFRectangle *box) :
409
     xref(xrefA),
410
     builder(builderA),
411
     subPage(gTrue),
412
@@ -572,7 +572,7 @@ const char *PdfParser::getPreviousOperator(unsigned int look_back) {
413
 
414
 void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
415
   PdfOperator *op;
416
-  char *name;
417
+  const char *name;
418
   Object *argPtr;
419
   int i;
420
 
421
@@ -620,7 +620,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
422
   (this->*op->func)(argPtr, numArgs);
423
 }
424
 
425
-PdfOperator* PdfParser::findOp(char *name) {
426
+PdfOperator* PdfParser::findOp(const char *name) {
427
   int a = -1;
428
   int b = numOps;
429
   int cmp = -1;
430
@@ -1752,7 +1752,7 @@ void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
431
                                              GBool stroke, GBool eoFill) {
432
   GfxShading *shading;
433
   GfxPath *savedPath;
434
-  double *ctm, *btm, *ptm;
435
+  const double *ctm, *btm, *ptm;
436
   double m[6], ictm[6], m1[6];
437
   double xMin, yMin, xMax, yMax;
438
   double det;
439
@@ -1994,7 +1994,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading,
440
   GfxColor color0M, color1M, colorM0, colorM1, colorMM;
441
   GfxColor colors2[4];
442
   double functionColorDelta = colorDeltas[pdfFunctionShading-1];
443
-  double *matrix;
444
+  const double *matrix;
445
   double xM, yM;
446
   int nComps, i, j;
447
 
448
@@ -2174,7 +2174,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading *shading) {
449
   }
450
 }
451
 
452
-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
453
+void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
454
   GfxPatch patch00 = blankPatch();
455
   GfxPatch patch01 = blankPatch();
456
   GfxPatch patch10 = blankPatch();
457
@@ -2595,7 +2595,7 @@ void PdfParser::doShowText(GooString *s) {
458
   double x, y, dx, dy, tdx, tdy;
459
   double originX, originY, tOriginX, tOriginY;
460
   double oldCTM[6], newCTM[6];
461
-  double *mat;
462
+  const double *mat;
463
   Object charProc;
464
   Dict *resDict;
465
   Parser *oldParser;
466
@@ -3669,7 +3669,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*numArgs*/)
467
 Stream *PdfParser::buildImageStream() {
468
   Object dict;
469
   Object obj;
470
-  char *key;
471
   Stream *str;
472
 
473
   // build dictionary
474
@@ -3687,26 +3686,17 @@ Stream *PdfParser::buildImageStream() {
475
       obj.free();
476
 #endif
477
     } else {
478
-      key = copyString(obj.getName());
479
-#if defined(POPPLER_NEW_OBJECT_API)
480
-      obj = parser->getObj();
481
-#else
482
-      obj.free();
483
-      parser->getObj(&obj);
484
-#endif
485
-      if (obj.isEOF() || obj.isError()) {
486
-	gfree(key);
487
+      Object obj2;
488
+      _POPPLER_CALL(obj2, parser->getObj);
489
+      if (obj2.isEOF() || obj2.isError()) {
490
+        _POPPLER_FREE(obj);
491
 	break;
492
       }
493
-#if defined(POPPLER_NEW_OBJECT_API)
494
-      dict.dictAdd(key, std::move(obj));
495
+      _POPPLER_DICTADD(dict, obj.getName(), obj2);
496
+      _POPPLER_FREE(obj);
497
+      _POPPLER_FREE(obj2);
498
     }
499
-    obj = parser->getObj();
500
-#else
501
-      dict.dictAdd(key, &obj);
502
-    }
503
-    parser->getObj(&obj);
504
-#endif
505
+    _POPPLER_CALL(obj, parser->getObj);
506
   }
507
   if (obj.isEOF()) {
508
     error(errSyntaxError, getPos(), "End of file in inline image");
509
diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h
510
index ed28274f42..0a04c81d46 100644
511
--- src/extension/internal/pdfinput/pdf-parser.h
512
+++ src/extension/internal/pdfinput/pdf-parser.h
513
@@ -9,6 +9,7 @@
514
 #define PDF_PARSER_H
515
 
516
 #ifdef HAVE_POPPLER
517
+#include "poppler-transition-api.h"
518
 
519
 #ifdef USE_GCC_PRAGMAS
520
 #pragma interface
521
@@ -128,11 +129,14 @@ public:
522
 
523
   // Constructor for regular output.
524
   PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
525
-            Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
526
+            Dict *resDict,
527
+            _POPPLER_CONST PDFRectangle *box,
528
+            _POPPLER_CONST PDFRectangle *cropBox);
529
 
530
   // Constructor for a sub-page object.
531
   PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
532
-            Dict *resDict, PDFRectangle *box);
533
+            Dict *resDict,
534
+            _POPPLER_CONST PDFRectangle *box);
535
 
536
   virtual ~PdfParser();
537
 
538
@@ -186,7 +190,7 @@ private:
539
 
540
   void go(GBool topLevel);
541
   void execOp(Object *cmd, Object args[], int numArgs);
542
-  PdfOperator *findOp(char *name);
543
+  PdfOperator *findOp(const char *name);
544
   GBool checkArg(Object *arg, TchkType type);
545
   int getPos();
546
 
547
@@ -257,7 +261,7 @@ private:
548
 			   double x2, double y2, GfxColor *color2,
549
 			   int nComps, int depth);
550
   void doPatchMeshShFill(GfxPatchMeshShading *shading);
551
-  void fillPatch(GfxPatch *patch, int nComps, int depth);
552
+  void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
553
   void doEndPath();
554
 
555
   // path clipping operators
556
diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
557
new file mode 100644
558
index 0000000000..898e64bf2b
559
--- /dev/null
560
+++ src/extension/internal/pdfinput/poppler-transition-api.h
561
@@ -0,0 +1,39 @@
562
+#ifndef SEEN_POPPLER_TRANSITION_API_H
563
+#define SEEN_POPPLER_TRANSITION_API_H
564
+
565
+#include <glib/poppler-features.h>
566
+
567
+#if POPPLER_CHECK_VERSION(0,70,0)
568
+#define _POPPLER_CONST const
569
+#else
570
+#define _POPPLER_CONST
571
+#endif
572
+
573
+#if POPPLER_CHECK_VERSION(0,69,0)
574
+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
575
+#elif POPPLER_CHECK_VERSION(0,58,0)
576
+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
577
+#else
578
+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
579
+#endif
580
+
581
+#if POPPLER_CHECK_VERSION(0,58,0)
582
+#define POPPLER_NEW_OBJECT_API
583
+#define _POPPLER_FREE(obj)
584
+#define _POPPLER_CALL(ret, func) (ret = func())
585
+#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
586
+#else
587
+#define _POPPLER_FREE(obj) (obj).free()
588
+#define _POPPLER_CALL(ret, func) (*func(&ret))
589
+#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
590
+#endif
591
+
592
+#if POPPLER_CHECK_VERSION(0, 29, 0)
593
+#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
594
+#endif
595
+
596
+#if POPPLER_CHECK_VERSION(0, 25, 0)
597
+#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
598
+#endif
599
+
600
+#endif
601
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
602
index 767c8af4d4..d449d1af52 100644
603
--- src/extension/internal/pdfinput/svg-builder.cpp
604
+++ src/extension/internal/pdfinput/svg-builder.cpp
605
@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern, GfxState *state, bool is_
606
     if ( pattern != NULL ) {
607
         if ( pattern->getType() == 2 ) {  // Shading pattern
608
             GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
609
-            double *ptm;
610
+            const double *ptm;
611
             double m[6] = {1, 0, 0, 1, 0, 0};
612
             double det;
613
 
614
@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
615
 
616
     Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
617
     // Set pattern transform matrix
618
-    double *p2u = tiling_pattern->getMatrix();
619
+    const double *p2u = tiling_pattern->getMatrix();
620
     double m[6] = {1, 0, 0, 1, 0, 0};
621
     double det;
622
     det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2];    // see LP Bug 1168908
623
@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
624
     pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
625
     // Set pattern tiling
626
     // FIXME: don't ignore XStep and YStep
627
-    double *bbox = tiling_pattern->getBBox();
628
+    const double *bbox = tiling_pattern->getBBox();
629
     sp_repr_set_svg_double(pattern_node, "x", 0.0);
630
     sp_repr_set_svg_double(pattern_node, "y", 0.0);
631
     sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
632
@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPattern *tiling_pattern,
633
  */
634
 gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
635
     Inkscape::XML::Node *gradient;
636
-    Function *func;
637
+    _POPPLER_CONST Function *func;
638
     int num_funcs;
639
     bool extend0, extend1;
640
 
641
@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading, double offset, GfxRGB *re
642
 
643
 #define INT_EPSILON 8
644
 bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
645
-                                   Function *func) {
646
+                                   _POPPLER_CONST Function *func) {
647
     int type = func->getType();
648
     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
649
         GfxRGB stop1, stop2;
650
@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
651
             _addStopToGradient(gradient, 1.0, &stop2, 1.0);
652
         }
653
     } else if ( type == 3 ) { // Stitching
654
-        StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
655
-        double *bounds = stitchingFunc->getBounds();
656
-        double *encode = stitchingFunc->getEncode();
657
+        auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
658
+        const double *bounds = stitchingFunc->getBounds();
659
+        const double *encode = stitchingFunc->getEncode();
660
         int num_funcs = stitchingFunc->getNumFuncs();
661
 
662
         // Add stops from all the stitched functions
663
@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh
664
             svgGetShadingColorRGB(shading, bounds[i + 1], &color);
665
             // Add stops
666
             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
667
-                double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
668
+                double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
669
                 if (expE > 1.0) {
670
                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
671
                     if (encode[2*i] == 0) {    // normal sequence
672
@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
673
     Inkscape::CSSOStringStream os_font_size;
674
     double css_font_size = _font_scaling * state->getFontSize();
675
     if ( font->getType() == fontType3 ) {
676
-        double *font_matrix = font->getFontMatrix();
677
+        const double *font_matrix = font->getFontMatrix();
678
         if ( font_matrix[0] != 0.0 ) {
679
             css_font_size *= font_matrix[3] / font_matrix[0];
680
         }
681
@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double ty) {
682
 void SvgBuilder::updateTextMatrix(GfxState *state) {
683
     _flushText();
684
     // Update text matrix
685
-    double *text_matrix = state->getTextMat();
686
+    const double *text_matrix = state->getTextMat();
687
     double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
688
     double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
689
     double max_scale;
690
diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h
691
index 55daacee74..34b42e17b8 100644
692
--- src/extension/internal/pdfinput/svg-builder.h
693
+++ src/extension/internal/pdfinput/svg-builder.h
694
@@ -15,6 +15,7 @@
695
 #endif
696
 
697
 #ifdef HAVE_POPPLER
698
+#include "poppler-transition-api.h"
699
 
700
 class SPDocument;
701
 namespace Inkscape {
702
@@ -174,7 +175,7 @@ private:
703
     void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
704
                             GfxRGB *color, double opacity);
705
     bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
706
-                           Function *func);
707
+                           _POPPLER_CONST Function *func);
708
     gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
709
                                 bool is_stroke=false);
710
     // Image/mask creation
711
-- 
712
2.19.1
713
(-)graphics/krita/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	krita
3
PORTNAME=	krita
4
DISTVERSION=	4.1.5
4
DISTVERSION=	4.1.5
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	graphics kde
6
CATEGORIES=	graphics kde
7
MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
7
MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
8
DIST_SUBDIR=	KDE/${PORTNAME}
8
DIST_SUBDIR=	KDE/${PORTNAME}
(-)graphics/okular/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	okular
3
PORTNAME=	okular
4
DISTVERSION=	${KDE_APPLICATIONS_VERSION}
4
DISTVERSION=	${KDE_APPLICATIONS_VERSION}
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	graphics kde kde-applications
6
CATEGORIES=	graphics kde kde-applications
7
7
8
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
(-)graphics/okular-kde4/Makefile (-2 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	okular
3
PORTNAME=	okular
4
PORTVERSION=	${KDE4_VERSION}
4
PORTVERSION=	${KDE4_VERSION}
5
PORTREVISION=	12
5
PORTREVISION=	13
6
CATEGORIES=	graphics kde kde-kde4
6
CATEGORIES=	graphics kde kde-kde4
7
7
8
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
Lines 15-21 Link Here
15
		libkscreen.so:graphics/libkscreen \
15
		libkscreen.so:graphics/libkscreen \
16
		libqca.so:devel/qca@qt4 \
16
		libqca.so:devel/qca@qt4 \
17
		libtiff.so:graphics/tiff \
17
		libtiff.so:graphics/tiff \
18
		libpoppler-qt4.so:graphics/poppler-qt4 \
19
		libspectre.so:print/libspectre \
18
		libspectre.so:print/libspectre \
20
		libchm.so:misc/chmlib \
19
		libchm.so:misc/chmlib \
21
		libfreetype.so:print/freetype2 \
20
		libfreetype.so:print/freetype2 \
(-)graphics/okular-kde4/pkg-plist (-6 lines)
Lines 44-50 Link Here
44
lib/kde4/okularGenerator_mobi.so
44
lib/kde4/okularGenerator_mobi.so
45
lib/kde4/okularGenerator_ooo.so
45
lib/kde4/okularGenerator_ooo.so
46
lib/kde4/okularGenerator_plucker.so
46
lib/kde4/okularGenerator_plucker.so
47
lib/kde4/okularGenerator_poppler.so
48
lib/kde4/okularGenerator_tiff.so
47
lib/kde4/okularGenerator_tiff.so
49
lib/kde4/okularGenerator_txt.so
48
lib/kde4/okularGenerator_txt.so
50
lib/kde4/okularGenerator_xps.so
49
lib/kde4/okularGenerator_xps.so
Lines 63-69 Link Here
63
share/applications/kde4/active-documentviewer_ghostview.desktop
62
share/applications/kde4/active-documentviewer_ghostview.desktop
64
share/applications/kde4/active-documentviewer_kimgio.desktop
63
share/applications/kde4/active-documentviewer_kimgio.desktop
65
share/applications/kde4/active-documentviewer_ooo.desktop
64
share/applications/kde4/active-documentviewer_ooo.desktop
66
share/applications/kde4/active-documentviewer_pdf.desktop
67
share/applications/kde4/active-documentviewer_plucker.desktop
65
share/applications/kde4/active-documentviewer_plucker.desktop
68
share/applications/kde4/active-documentviewer_tiff.desktop
66
share/applications/kde4/active-documentviewer_tiff.desktop
69
share/applications/kde4/active-documentviewer_txt.desktop
67
share/applications/kde4/active-documentviewer_txt.desktop
Lines 80-86 Link Here
80
share/applications/kde4/okularApplication_kimgio.desktop
78
share/applications/kde4/okularApplication_kimgio.desktop
81
share/applications/kde4/okularApplication_mobi.desktop
79
share/applications/kde4/okularApplication_mobi.desktop
82
share/applications/kde4/okularApplication_ooo.desktop
80
share/applications/kde4/okularApplication_ooo.desktop
83
share/applications/kde4/okularApplication_pdf.desktop
84
share/applications/kde4/okularApplication_plucker.desktop
81
share/applications/kde4/okularApplication_plucker.desktop
85
share/applications/kde4/okularApplication_tiff.desktop
82
share/applications/kde4/okularApplication_tiff.desktop
86
share/applications/kde4/okularApplication_txt.desktop
83
share/applications/kde4/okularApplication_txt.desktop
Lines 125-131 Link Here
125
share/config.kcfg/gssettings.kcfg
122
share/config.kcfg/gssettings.kcfg
126
share/config.kcfg/okular.kcfg
123
share/config.kcfg/okular.kcfg
127
share/config.kcfg/okular_core.kcfg
124
share/config.kcfg/okular_core.kcfg
128
share/config.kcfg/pdfsettings.kcfg
129
share/doc/HTML/en/okular/annotation-properties.png
125
share/doc/HTML/en/okular/annotation-properties.png
130
share/doc/HTML/en/okular/annotations.png
126
share/doc/HTML/en/okular/annotations.png
131
share/doc/HTML/en/okular/bookmark-management.png
127
share/doc/HTML/en/okular/bookmark-management.png
Lines 174-180 Link Here
174
share/kde4/services/libokularGenerator_mobi.desktop
170
share/kde4/services/libokularGenerator_mobi.desktop
175
share/kde4/services/libokularGenerator_ooo.desktop
171
share/kde4/services/libokularGenerator_ooo.desktop
176
share/kde4/services/libokularGenerator_plucker.desktop
172
share/kde4/services/libokularGenerator_plucker.desktop
177
share/kde4/services/libokularGenerator_poppler.desktop
178
share/kde4/services/libokularGenerator_tiff.desktop
173
share/kde4/services/libokularGenerator_tiff.desktop
179
share/kde4/services/libokularGenerator_txt.desktop
174
share/kde4/services/libokularGenerator_txt.desktop
180
share/kde4/services/libokularGenerator_xps.desktop
175
share/kde4/services/libokularGenerator_xps.desktop
Lines 191-197 Link Here
191
share/kde4/services/okularMobi.desktop
186
share/kde4/services/okularMobi.desktop
192
share/kde4/services/okularOoo.desktop
187
share/kde4/services/okularOoo.desktop
193
share/kde4/services/okularPlucker.desktop
188
share/kde4/services/okularPlucker.desktop
194
share/kde4/services/okularPoppler.desktop
195
share/kde4/services/okularTiff.desktop
189
share/kde4/services/okularTiff.desktop
196
share/kde4/services/okularTxt.desktop
190
share/kde4/services/okularTxt.desktop
197
share/kde4/services/okularXps.desktop
191
share/kde4/services/okularXps.desktop
(-)graphics/openfx-arena/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
PORTNAME=	openfx-arena
3
PORTNAME=	openfx-arena
4
PORTVERSION=	2.3.14
4
PORTVERSION=	2.3.14
5
DISTVERSIONPREFIX=	Natron-
5
DISTVERSIONPREFIX=	Natron-
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
8
9
MAINTAINER=	olivier@FreeBSD.org
9
MAINTAINER=	olivier@FreeBSD.org
(-)graphics/poppler/Makefile (-101 / +51 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	poppler
4
PORTNAME=	poppler
5
PORTVERSION=	0.57.0
5
DISTVERSION=	0.71.0
6
PORTREVISION=	1
7
CATEGORIES=	graphics print
6
CATEGORIES=	graphics print
8
MASTER_SITES=	http://poppler.freedesktop.org/
7
MASTER_SITES=	http://poppler.freedesktop.org/
9
8
Lines 13-145 Link Here
13
LICENSE=	GPLv2
12
LICENSE=	GPLv2
14
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
15
14
16
LIB_DEPENDS=	libpng.so:graphics/png \
15
LIB_DEPENDS=	libnspr4.so:devel/nspr \
16
		liblcms2.so:graphics/lcms2 \
17
		libpng.so:graphics/png \
17
		libtiff.so:graphics/tiff \
18
		libtiff.so:graphics/tiff \
18
		libfontconfig.so:x11-fonts/fontconfig \
19
		liblcms2.so:graphics/lcms2 \
20
		libfreetype.so:print/freetype2 \
19
		libfreetype.so:print/freetype2 \
21
		libnss3.so:security/nss \
20
		libnss3.so:security/nss \
22
		libnspr4.so:devel/nspr
21
		libfontconfig.so:x11-fonts/fontconfig
23
RUN_DEPENDS=	poppler-data>0:graphics/poppler-data
22
RUN_DEPENDS=	poppler-data>0:graphics/poppler-data
24
23
25
USES=		compiler:c++11-lang cpe gmake jpeg libtool localbase pathfix pkgconfig tar:xz
24
USES=		compiler:c++11-lang cpe cmake gnome jpeg libtool \
25
		localbase pathfix pkgconfig tar:xz
26
CPE_VENDOR=	freedesktop
26
CPE_VENDOR=	freedesktop
27
USE_GNOME=	libxml2
27
USE_GNOME=	cairo libxml2
28
GNU_CONFIGURE=	yes
29
USE_LDCONFIG=	yes
28
USE_LDCONFIG=	yes
30
CONFIGURE_ARGS=	--enable-zlib \
29
CMAKE_ON=	ENABLE_LIBJPEG  \
31
		--enable-xpdf-headers \
30
		ENABLE_LIBPNG \
32
		--disable-libnss \
31
		ENABLE_LIBTIFF \
33
		--disable-gtk-test \
32
		ENABLE_XPDF_HEADERS \
34
		--without-html-dir \
33
		ENABLE_ZLIB \
35
		--disable-static \
34
		ENABLE_NSS \
36
		--enable-libnss
35
		ENABLE_SPLASH
37
36
38
INSTALL_TARGET=	install-strip
39
37
40
.if !defined(SLAVEPORT)
38
# Slave ports.
41
PORTSCOUT=	limitw:1,even
39
_POPPLER_SLAVES=	library glib qt5 utils
40
_SLAVE_PORT?=		library
42
41
43
OPTIONS_DEFINE=	CAIRO CURL OPENJPEG
42
# Activate the wanted module, and deactivate the others.
44
OPTIONS_DEFAULT=CAIRO OPENJPEG
43
CMAKE_ON+=	ENABLE_${_SLAVE_PORT:tu}
44
CMAKE_OFF+=	${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/}
45
45
46
.if ${_SLAVE_PORT} == library
47
PORTSCOUT=	limitw:1,even
46
USES+=		iconv
48
USES+=		iconv
47
.endif
49
CMAKE_ON+=	ENABLE_CPP
48
50
49
.include <bsd.port.options.mk>
51
OPTIONS_DEFINE=		CURL OPENJPEG
50
52
OPTIONS_DEFAULT=	OPENJPEG
51
.if defined(SLAVEPORT)
53
OPTIONS_SUB=		yes
52
PORTSCOUT=	ignore:1
53
LIB_DEPENDS+=	libpoppler.so:graphics/poppler
54
55
.if ${SLAVEPORT}==glib
56
CONFIGURE_ARGS+=--enable-poppler-glib --enable-introspection=yes
57
USE_GNOME+=	cairo glib20 introspection:build
58
BUILD_WRKSRC=	${WRKSRC}/glib
59
INSTALL_WRKSRC=	${WRKSRC}/glib
60
.else
54
.else
61
CONFIGURE_ARGS+=--disable-poppler-glib
55
PORTSCOUT=		ignore:1
62
.endif
63
56
64
.if ${SLAVEPORT}==qt4
57
LIB_DEPENDS+=		libpoppler.so:graphics/poppler
65
CONFIGURE_ARGS+=--enable-poppler-qt4
58
PKGNAMESUFFIX=		-${_SLAVE_PORT}
66
CONFIGURE_ENV+=	MOCQT4=${MOC}
67
USES+=		qt:4
68
USE_QT=		gui corelib xml qtestlib moc_build
69
BUILD_WRKSRC=	${WRKSRC}/qt4
70
INSTALL_WRKSRC=	${WRKSRC}/qt4
71
.else
72
CONFIGURE_ARGS+=--disable-poppler-qt4
73
.endif
74
59
75
.if ${SLAVEPORT}==qt5
60
BUILD_WRKSRC=		${WRKSRC}/${_SLAVE_PORT}
76
CONFIGURE_ARGS+=--enable-poppler-qt5
61
INSTALL_WRKSRC=		${WRKSRC}/${_SLAVE_PORT}
77
CONFIGURE_ENV+=	MOCQT5=${MOC}
78
USES+=		qt:5
79
USE_QT=		core gui widgets xml buildtools_build testlib_build
80
# Qt from 5.7.0 on requires c++11.
81
USE_CXXSTD=	c++11
82
BUILD_WRKSRC=	${WRKSRC}/qt5
83
INSTALL_WRKSRC=	${WRKSRC}/qt5
84
.else
85
CONFIGURE_ARGS+=--disable-poppler-qt5
86
.endif
87
62
88
.if ${SLAVEPORT}==utils
63
CMAKE_ARGS+=		-DENABLE_LIBOPENJPEG:STRING="none" \
89
LIB_DEPENDS+=	libpoppler-glib.so:graphics/poppler-glib
64
			-DENABLE_LIBCURL:BOOL=FALSE
90
CONFIGURE_ARGS+=--enable-utils
91
BUILD_WRKSRC=	${WRKSRC}/utils
92
INSTALL_WRKSRC=	${WRKSRC}/utils
93
.else
94
CONFIGURE_ARGS+=--disable-utils
95
.endif
96
65
97
.else # ! SLAVE options below
66
.  if ${_SLAVE_PORT} == glib
98
CONFIGURE_ARGS+=--disable-poppler-glib \
67
USE_GNOME+=		glib20 introspection:Build
99
		--disable-poppler-qt4 \
68
.  elif ${_SLAVE_PORT} == qt5
100
		--disable-poppler-qt5 \
69
USES+=			qt:5
101
		--disable-utils
70
USE_QT=			core gui widgets xml \
71
			buildtools_build qmake_build testlib_build
72
.  elif ${_SLAVE_PORT} == utils
73
LIB_DEPENDS+=		libpoppler-glib.so:graphics/poppler-glib
74
USES+=			gnome
75
.  endif
102
76
103
.if ${PORT_OPTIONS:MCAIRO}
104
LIB_DEPENDS+=	libcairo.so:graphics/cairo
105
PLIST_SUB+=	CAIRO=""
106
.else
107
CONFIGURE_ARGS+=--disable-cairo-output
108
PLIST_SUB+=	CAIRO="@comment "
109
.endif
77
.endif
110
78
111
.if ${PORT_OPTIONS:MCURL}
79
CURL_CMAKE_BOOL=	ENABLE_LIBCURL
112
LIB_DEPENDS+=	libcurl.so:ftp/curl
80
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
113
CONFIGURE_ARGS+=--enable-libcurl
114
PLIST_SUB+=	CURL=""
115
.else
116
CONFIGURE_ARGS+=--disable-libcurl
117
PLIST_SUB+=	CURL="@comment "
118
.endif
119
81
120
.if ${PORT_OPTIONS:MOPENJPEG}
82
OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
121
CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2
83
OPENJPEG_CMAKE_ON=	-DENABLE_LIBOPENJPEG:STRING="openjpeg2"
122
LIB_DEPENDS+=	libopenjp2.so:graphics/openjpeg
84
OPENJPEG_CMAKE_OFF=	-DENABLE_LIBOPENJPEG:STRING="none"
123
.else
124
CONFIGURE_ARGS+=--enable-libopenjpeg=none
125
.endif
126
.endif # end of options
127
85
128
post-patch:
129
	@${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure
130
131
post-install:
86
post-install:
132
.if defined(SLAVEPORT)
87
.if ${_SLAVE_PORT} == glib
133
. if ${SLAVEPORT}==glib
134
	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
88
	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
135
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
89
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
136
. elif ${SLAVEPORT}==qt4
90
.elif ${_SLAVE_PORT} == qt5
137
	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \
138
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
139
. elif ${SLAVEPORT}==qt5
140
	${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
91
	${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
141
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
92
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
142
. endif
143
.endif
93
.endif
144
94
145
.include <bsd.port.mk>
95
.include <bsd.port.mk>
(-)graphics/poppler/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1503426409
1
TIMESTAMP = 1542396664
2
SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
2
SHA256 (poppler-0.71.0.tar.xz) = badbecd2dddf63352fd85ec08a9c2ed122fdadacf2a34fcb4cc227c4d01f2cf9
3
SIZE (poppler-0.57.0.tar.xz) = 1703300
3
SIZE (poppler-0.71.0.tar.xz) = 1480852
(-)graphics/poppler/files/patch-CMakeLists.txt (+10 lines)
Line 0 Link Here
1
--- CMakeLists.txt.orig	2018-10-07 08:06:59 UTC
2
+++ CMakeLists.txt
3
@@ -263,6 +263,7 @@ endif()
4
 
5
 if (NSS3_FOUND)
6
   add_definitions(${NSS3_CFLAGS})
7
+  link_directories(${NSS3_LIBRARY_DIRS})
8
   set(ENABLE_NSS3 ON)
9
 endif()
10
 if(JPEG_FOUND)
(-)graphics/poppler/files/patch-configure (-29 lines)
Lines 1-29 Link Here
1
--- configure.orig	2016-07-24 22:14:28 UTC
2
+++ configure
3
@@ -20556,7 +20556,7 @@ fi
4
 
5
 ac_save_CPPFLAGS="$CPPFLAGS"
6
 ac_save_CXXFLAGS="$CXXFLAGS"
7
-ac_save_LIBS="$LDFLAGS"
8
+ac_save_LIBS="$LIBS"
9
 CPPFLAGS="$CPPFLAGS $LIBTIFF_CFLAGS"
10
 CXXFLAGS="$CXXFLAGS $LIBTIFF_CFLAGS"
11
 LIBS="$LIBS $LIBTIFF_LIBS"
12
@@ -21387,7 +21387,7 @@ if ${ac_cv_lib_jpeg_6b+:} false; then :
13
 else
14
 
15
 ac_save_LIBS="$LIBS"
16
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg6b -lm"
17
+LIBS="$LIBS $USER_LDFLAGS -ljpeg6b -lm"
18
 ac_save_CFLAGS="$CFLAGS"
19
 CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
20
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
21
@@ -21438,7 +21438,7 @@ if ${ac_cv_lib_jpeg_normal+:} false; the
22
 else
23
 
24
 ac_save_LIBS="$LIBS"
25
-LIBS="$all_libraries $USER_LDFLAGS -ljpeg -lm"
26
+LIBS="$LIBS $USER_LDFLAGS -ljpeg -lm"
27
 ac_save_CFLAGS="$CFLAGS"
28
 CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
29
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
(-)graphics/poppler/files/patch-glib_Makefile.in (-28 lines)
Lines 1-28 Link Here
1
--- glib/Makefile.in.orig	2015-01-19 11:51:06.175898921 +0100
2
+++ glib/Makefile.in	2015-01-19 11:51:27.026898915 +0100
3
@@ -134,7 +134,6 @@
4
 LTLIBRARIES = $(lib_LTLIBRARIES)
5
 am__DEPENDENCIES_1 =
6
 libpoppler_glib_la_DEPENDENCIES =  \
7
-	$(top_builddir)/poppler/libpoppler.la \
8
 	$(top_builddir)/poppler/libpoppler-cairo.la \
9
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
10
 am__objects_1 = libpoppler_glib_la-poppler-enums.lo
11
@@ -553,7 +552,7 @@
12
 	$(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES)
13
 
14
 libpoppler_glib_la_LIBADD = \
15
-	$(top_builddir)/poppler/libpoppler.la		\
16
+	-lpoppler		\
17
 	$(top_builddir)/poppler/libpoppler-cairo.la	\
18
 	$(POPPLER_GLIB_LIBS)				\
19
 	$(FREETYPE_LIBS)
20
@@ -576,7 +575,7 @@
21
 @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)
22
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_INCLUDES = GObject-2.0 Gio-2.0 cairo-1.0
23
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_CFLAGS = $(INCLUDES) -I$(top_builddir)
24
-@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la $(top_builddir)/poppler/libpoppler.la $(top_builddir)/poppler/libpoppler-cairo.la
25
+@HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_LIBS = libpoppler-glib.la poppler $(top_builddir)/poppler/libpoppler-cairo.la
26
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_FILES = $(introspection_files)
27
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_SCANNERFLAGS = --c-include poppler.h
28
 @HAVE_INTROSPECTION_TRUE@Poppler_0_18_gir_EXPORT_PACKAGES = poppler-glib
(-)graphics/poppler/files/patch-glib_demo_Makefile.in (-20 lines)
Lines 1-20 Link Here
1
--- glib/demo/Makefile.in.orig	2012-06-13 13:31:37.000000000 +0200
2
+++ glib/demo/Makefile.in	2012-06-13 13:32:45.000000000 +0200
3
@@ -66,7 +66,7 @@
4
 am__DEPENDENCIES_1 =
5
 poppler_glib_demo_DEPENDENCIES =  \
6
 	$(top_builddir)/glib/libpoppler-glib.la \
7
-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
8
+	$(am__DEPENDENCIES_1)
9
 AM_V_lt = $(am__v_lt_@AM_V@)
10
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
11
 am__v_lt_0 = --silent
12
@@ -365,7 +365,7 @@
13
 
14
 LDADD = \
15
 	$(top_builddir)/glib/libpoppler-glib.la	\
16
-	$(top_builddir)/poppler/libpoppler.la	\
17
+	-lpoppler	\
18
 	$(GTK_TEST_LIBS)
19
 
20
 all: all-am
(-)graphics/poppler/files/patch-qt4_Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- qt4/Makefile.in.orig	2008-03-24 08:30:49.000000000 -0400
2
+++ qt4/Makefile.in	2008-03-24 08:30:34.000000000 -0400
3
@@ -223,7 +223,7 @@
4
 sysconfdir = @sysconfdir@
5
 target_alias = @target_alias@
6
 win32_libs = @win32_libs@
7
-SUBDIRS = src tests demos
8
+SUBDIRS = src
9
 all: all-recursive
10
 
11
 .SUFFIXES:
(-)graphics/poppler/files/patch-qt4_src_Makefile.in (-20 lines)
Lines 1-20 Link Here
1
--- qt4/src/Makefile.in.orig	2013-12-02 18:58:51.000000000 +0100
2
+++ qt4/src/Makefile.in	2013-12-02 18:59:39.000000000 +0100
3
@@ -129,7 +129,7 @@
4
 LTLIBRARIES = $(lib_LTLIBRARIES)
5
 am__DEPENDENCIES_1 =
6
 libpoppler_qt4_la_DEPENDENCIES =  \
7
-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
8
+	$(am__DEPENDENCIES_1)
9
 am_libpoppler_qt4_la_OBJECTS = libpoppler_qt4_la-poppler-document.lo \
10
 	libpoppler_qt4_la-poppler-page.lo \
11
 	libpoppler_qt4_la-poppler-fontinfo.lo \
12
@@ -505,7 +505,7 @@
13
 	-Dpoppler_qt4_EXPORTS
14
 
15
 libpoppler_qt4_la_LIBADD = \
16
-	$(top_builddir)/poppler/libpoppler.la	\
17
+	-lpoppler	\
18
 	$(POPPLER_QT4_LIBS)
19
 
20
 libpoppler_qt4_la_LDFLAGS = -version-info 7:0:3 @create_shared_lib@ @auto_import_flags@
(-)graphics/poppler/files/patch-qt5_Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- qt5/Makefile.in.orig	2014-11-25 11:49:19 UTC
2
+++ qt5/Makefile.in
3
@@ -384,7 +384,7 @@ top_build_prefix = @top_build_prefix@
4
 top_builddir = @top_builddir@
5
 top_srcdir = @top_srcdir@
6
 win32_libs = @win32_libs@
7
-SUBDIRS = src tests demos
8
+SUBDIRS = src
9
 all: all-recursive
10
 
11
 .SUFFIXES:
(-)graphics/poppler/files/patch-qt5_src_Makefile.in (-20 lines)
Lines 1-20 Link Here
1
--- qt5/src/Makefile.in.orig	2014-11-25 11:49:19 UTC
2
+++ qt5/src/Makefile.in
3
@@ -129,7 +129,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" 
4
 LTLIBRARIES = $(lib_LTLIBRARIES)
5
 am__DEPENDENCIES_1 =
6
 libpoppler_qt5_la_DEPENDENCIES =  \
7
-	$(top_builddir)/poppler/libpoppler.la $(am__DEPENDENCIES_1)
8
+	$(am__DEPENDENCIES_1)
9
 am_libpoppler_qt5_la_OBJECTS = libpoppler_qt5_la-poppler-document.lo \
10
 	libpoppler_qt5_la-poppler-page.lo \
11
 	libpoppler_qt5_la-poppler-fontinfo.lo \
12
@@ -505,7 +505,7 @@ libpoppler_qt5_la_CXXFLAGS = \
13
 	-Dpoppler_qt5_EXPORTS -fPIC
14
 
15
 libpoppler_qt5_la_LIBADD = \
16
-	$(top_builddir)/poppler/libpoppler.la	\
17
+	-lpoppler	\
18
 	$(POPPLER_QT5_LIBS)
19
 
20
 libpoppler_qt5_la_LDFLAGS = -version-info 2:0:1 @create_shared_lib@ @auto_import_flags@
(-)graphics/poppler/files/patch-qt5_src_poppler-form.h (-10 lines)
Lines 1-10 Link Here
1
--- qt5/src/poppler-form.h.orig	2017-07-02 21:00:50 UTC
2
+++ qt5/src/poppler-form.h
3
@@ -26,6 +26,7 @@
4
 #include <QtCore/QStringList>
5
 #include <QtCore/QSharedPointer>
6
 #include "poppler-export.h"
7
+#include <ctime> // time_t
8
 
9
 class Page;
10
 class FormWidget;
(-)graphics/poppler/files/patch-utils_Makefile.in (-111 lines)
Lines 1-111 Link Here
1
--- utils/Makefile.in.orig	2016-03-16 22:22:14 UTC
2
+++ utils/Makefile.in
3
@@ -136,45 +136,38 @@ PROGRAMS = $(bin_PROGRAMS)
4
 am_pdfdetach_OBJECTS = pdfdetach.$(OBJEXT)
5
 pdfdetach_OBJECTS = $(am_pdfdetach_OBJECTS)
6
 pdfdetach_LDADD = $(LDADD)
7
-pdfdetach_DEPENDENCIES = libparseargs.la \
8
-	$(top_builddir)/poppler/libpoppler.la
9
+pdfdetach_DEPENDENCIES = libparseargs.la
10
 am_pdffonts_OBJECTS = pdffonts.$(OBJEXT)
11
 pdffonts_OBJECTS = $(am_pdffonts_OBJECTS)
12
 pdffonts_LDADD = $(LDADD)
13
-pdffonts_DEPENDENCIES = libparseargs.la \
14
-	$(top_builddir)/poppler/libpoppler.la
15
+pdffonts_DEPENDENCIES = libparseargs.la
16
 am_pdfimages_OBJECTS = pdfimages.$(OBJEXT) ImageOutputDev.$(OBJEXT) \
17
 	JSInfo.$(OBJEXT)
18
 pdfimages_OBJECTS = $(am_pdfimages_OBJECTS)
19
 pdfimages_LDADD = $(LDADD)
20
-pdfimages_DEPENDENCIES = libparseargs.la \
21
-	$(top_builddir)/poppler/libpoppler.la
22
+pdfimages_DEPENDENCIES = libparseargs.la
23
 am_pdfinfo_OBJECTS = pdfinfo.$(OBJEXT) printencodings.$(OBJEXT) \
24
 	JSInfo.$(OBJEXT)
25
 pdfinfo_OBJECTS = $(am_pdfinfo_OBJECTS)
26
 pdfinfo_LDADD = $(LDADD)
27
-pdfinfo_DEPENDENCIES = libparseargs.la \
28
-	$(top_builddir)/poppler/libpoppler.la
29
+pdfinfo_DEPENDENCIES = libparseargs.la
30
 am_pdfseparate_OBJECTS = pdfseparate.$(OBJEXT)
31
 pdfseparate_OBJECTS = $(am_pdfseparate_OBJECTS)
32
 pdfseparate_LDADD = $(LDADD)
33
-pdfseparate_DEPENDENCIES = libparseargs.la \
34
-	$(top_builddir)/poppler/libpoppler.la
35
+pdfseparate_DEPENDENCIES = libparseargs.la
36
 am_pdfsig_OBJECTS = pdfsig.$(OBJEXT)
37
 pdfsig_OBJECTS = $(am_pdfsig_OBJECTS)
38
 pdfsig_LDADD = $(LDADD)
39
-pdfsig_DEPENDENCIES = libparseargs.la \
40
-	$(top_builddir)/poppler/libpoppler.la
41
+pdfsig_DEPENDENCIES = libparseargs.la
42
 am_pdftocairo_OBJECTS = pdftocairo-pdftocairo.$(OBJEXT) \
43
 	pdftocairo-pdftocairo-win32.$(OBJEXT)
44
 pdftocairo_OBJECTS = $(am_pdftocairo_OBJECTS)
45
-am__DEPENDENCIES_1 = libparseargs.la \
46
-	$(top_builddir)/poppler/libpoppler.la
47
+am__DEPENDENCIES_1 = libparseargs.la
48
 am__DEPENDENCIES_2 =
49
 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@am__DEPENDENCIES_3 =  \
50
 @BUILD_CAIRO_OUTPUT_TRUE@@USE_CMS_TRUE@	$(am__DEPENDENCIES_2)
51
 am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
52
-pdftocairo_DEPENDENCIES = $(top_builddir)/poppler/libpoppler-cairo.la \
53
+pdftocairo_DEPENDENCIES = \
54
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
55
 	$(am__DEPENDENCIES_2)
56
 am_pdftohtml_OBJECTS = pdftohtml-pdftohtml.$(OBJEXT) \
57
@@ -182,31 +175,26 @@ am_pdftohtml_OBJECTS = pdftohtml-pdftoht
58
 	pdftohtml-HtmlOutputDev.$(OBJEXT)
59
 pdftohtml_OBJECTS = $(am_pdftohtml_OBJECTS)
60
 pdftohtml_LDADD = $(LDADD)
61
-pdftohtml_DEPENDENCIES = libparseargs.la \
62
-	$(top_builddir)/poppler/libpoppler.la
63
+pdftohtml_DEPENDENCIES = libparseargs.la
64
 pdftohtml_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
65
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(pdftohtml_CXXFLAGS) \
66
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
67
 am_pdftoppm_OBJECTS = pdftoppm.$(OBJEXT)
68
 pdftoppm_OBJECTS = $(am_pdftoppm_OBJECTS)
69
 pdftoppm_LDADD = $(LDADD)
70
-pdftoppm_DEPENDENCIES = libparseargs.la \
71
-	$(top_builddir)/poppler/libpoppler.la
72
+pdftoppm_DEPENDENCIES = libparseargs.la
73
 am_pdftops_OBJECTS = pdftops.$(OBJEXT)
74
 pdftops_OBJECTS = $(am_pdftops_OBJECTS)
75
 pdftops_LDADD = $(LDADD)
76
-pdftops_DEPENDENCIES = libparseargs.la \
77
-	$(top_builddir)/poppler/libpoppler.la
78
+pdftops_DEPENDENCIES = libparseargs.la
79
 am_pdftotext_OBJECTS = pdftotext.$(OBJEXT) printencodings.$(OBJEXT)
80
 pdftotext_OBJECTS = $(am_pdftotext_OBJECTS)
81
 pdftotext_LDADD = $(LDADD)
82
-pdftotext_DEPENDENCIES = libparseargs.la \
83
-	$(top_builddir)/poppler/libpoppler.la
84
+pdftotext_DEPENDENCIES = libparseargs.la
85
 am_pdfunite_OBJECTS = pdfunite.$(OBJEXT)
86
 pdfunite_OBJECTS = $(am_pdfunite_OBJECTS)
87
 pdfunite_LDADD = $(LDADD)
88
-pdfunite_DEPENDENCIES = libparseargs.la \
89
-	$(top_builddir)/poppler/libpoppler.la
90
+pdfunite_DEPENDENCIES = libparseargs.la
91
 AM_V_P = $(am__v_P_@AM_V@)
92
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
93
 am__v_P_0 = false
94
@@ -549,7 +537,7 @@ AM_CPPFLAGS = \
95
 
96
 LDADD = \
97
 	libparseargs.la				\
98
-	$(top_builddir)/poppler/libpoppler.la	\
99
+	-lpoppler	\
100
 	$(UTILS_LIBS)
101
 
102
 @BUILD_UTILS_TRUE@dist_man1_MANS = pdfdetach.1 pdffonts.1 pdfimages.1 \
103
@@ -615,7 +603,7 @@ pdftocairo_SOURCES = \
104
 	pdftocairo-win32.h
105
 
106
 pdftocairo_LDADD = \
107
-	$(top_builddir)/poppler/libpoppler-cairo.la	\
108
+	-lpoppler-glib	\
109
 	$(LDADD)					\
110
 	$(PDFTOCAIRO_LIBS)				\
111
 	$(PTHREAD_LIBS)
(-)graphics/poppler/pkg-plist (-14 / +9 lines)
Lines 28-33 Link Here
28
include/poppler/Hints.h
28
include/poppler/Hints.h
29
include/poppler/JArithmeticDecoder.h
29
include/poppler/JArithmeticDecoder.h
30
include/poppler/JBIG2Stream.h
30
include/poppler/JBIG2Stream.h
31
%%OPENJPEG%%include/poppler/JPEG2000Stream.h
32
%%NO_OPENJPEG%%include/poppler/JPXStream.h
31
include/poppler/Lexer.h
33
include/poppler/Lexer.h
32
include/poppler/Linearization.h
34
include/poppler/Linearization.h
33
include/poppler/Link.h
35
include/poppler/Link.h
Lines 54-61 Link Here
54
include/poppler/ProfileData.h
56
include/poppler/ProfileData.h
55
include/poppler/Rendition.h
57
include/poppler/Rendition.h
56
include/poppler/SecurityHandler.h
58
include/poppler/SecurityHandler.h
57
include/poppler/SignatureHandler.h
58
include/poppler/SignatureInfo.h
59
include/poppler/Sound.h
59
include/poppler/Sound.h
60
include/poppler/SplashOutputDev.h
60
include/poppler/SplashOutputDev.h
61
include/poppler/StdinCachedFile.h
61
include/poppler/StdinCachedFile.h
Lines 66-81 Link Here
66
include/poppler/StructTreeRoot.h
66
include/poppler/StructTreeRoot.h
67
include/poppler/TextOutputDev.h
67
include/poppler/TextOutputDev.h
68
include/poppler/UTF.h
68
include/poppler/UTF.h
69
include/poppler/UTF8.h
70
include/poppler/UnicodeCClassTables.h
69
include/poppler/UnicodeCClassTables.h
71
include/poppler/UnicodeCompTables.h
70
include/poppler/UnicodeCompTables.h
72
include/poppler/UnicodeDecompTables.h
71
include/poppler/UnicodeDecompTables.h
73
include/poppler/UnicodeMap.h
72
include/poppler/UnicodeMap.h
73
include/poppler/UnicodeMapFuncs.h
74
include/poppler/UnicodeMapTables.h
74
include/poppler/UnicodeMapTables.h
75
include/poppler/UnicodeTypeTable.h
75
include/poppler/UnicodeTypeTable.h
76
include/poppler/ViewerPreferences.h
76
include/poppler/ViewerPreferences.h
77
include/poppler/XRef.h
77
include/poppler/XRef.h
78
include/poppler/XpdfPluginAPI.h
79
include/poppler/cpp/poppler-document.h
78
include/poppler/cpp/poppler-document.h
80
include/poppler/cpp/poppler-embedded-file.h
79
include/poppler/cpp/poppler-embedded-file.h
81
include/poppler/cpp/poppler-font.h
80
include/poppler/cpp/poppler-font.h
Lines 94-110 Link Here
94
include/poppler/fofi/FoFiType1.h
93
include/poppler/fofi/FoFiType1.h
95
include/poppler/fofi/FoFiType1C.h
94
include/poppler/fofi/FoFiType1C.h
96
include/poppler/goo/FixedPoint.h
95
include/poppler/goo/FixedPoint.h
97
include/poppler/goo/GooHash.h
96
include/poppler/goo/GooCheckedOps.h
98
include/poppler/goo/GooLikely.h
97
include/poppler/goo/GooLikely.h
99
include/poppler/goo/GooList.h
98
include/poppler/goo/GooList.h
100
include/poppler/goo/GooMutex.h
101
include/poppler/goo/GooString.h
99
include/poppler/goo/GooString.h
102
include/poppler/goo/GooTimer.h
100
include/poppler/goo/GooTimer.h
103
include/poppler/goo/ImgWriter.h
101
include/poppler/goo/ImgWriter.h
104
include/poppler/goo/JpegWriter.h
102
include/poppler/goo/JpegWriter.h
105
include/poppler/goo/NetPBMWriter.h
106
include/poppler/goo/PNGWriter.h
103
include/poppler/goo/PNGWriter.h
107
include/poppler/goo/TiffWriter.h
104
include/poppler/goo/TiffWriter.h
105
include/poppler/goo/gdir.h
108
include/poppler/goo/gfile.h
106
include/poppler/goo/gfile.h
109
include/poppler/goo/gmem.h
107
include/poppler/goo/gmem.h
110
include/poppler/goo/grandom.h
108
include/poppler/goo/grandom.h
Lines 128-146 Link Here
128
include/poppler/splash/SplashPattern.h
126
include/poppler/splash/SplashPattern.h
129
include/poppler/splash/SplashScreen.h
127
include/poppler/splash/SplashScreen.h
130
include/poppler/splash/SplashState.h
128
include/poppler/splash/SplashState.h
131
include/poppler/splash/SplashT1Font.h
132
include/poppler/splash/SplashT1FontEngine.h
133
include/poppler/splash/SplashT1FontFile.h
134
include/poppler/splash/SplashTypes.h
129
include/poppler/splash/SplashTypes.h
135
include/poppler/splash/SplashXPath.h
130
include/poppler/splash/SplashXPath.h
136
include/poppler/splash/SplashXPathScanner.h
131
include/poppler/splash/SplashXPathScanner.h
137
lib/libpoppler-cpp.so
132
lib/libpoppler-cpp.so
138
lib/libpoppler-cpp.so.0
133
lib/libpoppler-cpp.so.0
139
lib/libpoppler-cpp.so.0.3.0
134
lib/libpoppler-cpp.so.0.5.0
140
lib/libpoppler.so
135
lib/libpoppler.so
141
lib/libpoppler.so.68
136
lib/libpoppler.so.82
142
lib/libpoppler.so.68.0.0
137
lib/libpoppler.so.82.0.0
143
%%CAIRO%%libdata/pkgconfig/poppler-cairo.pc
138
libdata/pkgconfig/poppler-cairo.pc
144
libdata/pkgconfig/poppler-cpp.pc
139
libdata/pkgconfig/poppler-cpp.pc
145
libdata/pkgconfig/poppler-splash.pc
140
libdata/pkgconfig/poppler-splash.pc
146
libdata/pkgconfig/poppler.pc
141
libdata/pkgconfig/poppler.pc
(-)graphics/poppler-glib/Makefile (-7 / +1 lines)
Lines 2-18 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	0
4
PORTREVISION=	0
5
PKGNAMESUFFIX=	-glib
6
5
7
MAINTAINER=	gnome@FreeBSD.org
8
COMMENT=	GLib bindings to poppler
6
COMMENT=	GLib bindings to poppler
9
7
10
MASTERDIR=	${.CURDIR}/../../graphics/poppler
8
MASTERDIR=	${.CURDIR}/../../graphics/poppler
11
SLAVEPORT=	glib
9
_SLAVE_PORT=	glib
12
PLIST=		${.CURDIR}/pkg-plist
10
PLIST=		${.CURDIR}/pkg-plist
13
11
14
pre-build:
15
	@cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
16
		Makefile ${MAKE_ARGS} libpoppler-cairo.la
17
18
.include "${MASTERDIR}/Makefile"
12
.include "${MASTERDIR}/Makefile"
(-)graphics/poppler-glib/pkg-plist (-1 / +2 lines)
Lines 7-12 Link Here
7
include/poppler/glib/poppler-features.h
7
include/poppler/glib/poppler-features.h
8
include/poppler/glib/poppler-form-field.h
8
include/poppler/glib/poppler-form-field.h
9
include/poppler/glib/poppler-layer.h
9
include/poppler/glib/poppler-layer.h
10
include/poppler/glib/poppler-macros.h
10
include/poppler/glib/poppler-media.h
11
include/poppler/glib/poppler-media.h
11
include/poppler/glib/poppler-movie.h
12
include/poppler/glib/poppler-movie.h
12
include/poppler/glib/poppler-page.h
13
include/poppler/glib/poppler-page.h
Lines 15-20 Link Here
15
lib/girepository-1.0/Poppler-0.18.typelib
16
lib/girepository-1.0/Poppler-0.18.typelib
16
lib/libpoppler-glib.so
17
lib/libpoppler-glib.so
17
lib/libpoppler-glib.so.8
18
lib/libpoppler-glib.so.8
18
lib/libpoppler-glib.so.8.9.0
19
lib/libpoppler-glib.so.8.10.0
19
libdata/pkgconfig/poppler-glib.pc
20
libdata/pkgconfig/poppler-glib.pc
20
share/gir-1.0/Poppler-0.18.gir
21
share/gir-1.0/Poppler-0.18.gir
(-)graphics/poppler-qt4/Makefile (-14 lines)
Lines 1-14 Link Here
1
# Created by: Michael Johnson <ahze@FreeBSD.org>
2
# $FreeBSD$
3
4
PORTREVISION=	1
5
PKGNAMESUFFIX=	-qt4
6
7
MAINTAINER=	gnome@FreeBSD.org
8
COMMENT=	Qt 4 bindings to poppler
9
10
MASTERDIR=	${.CURDIR}/../../graphics/poppler
11
SLAVEPORT=	qt4
12
PLIST=		${.CURDIR}/pkg-plist
13
14
.include "${MASTERDIR}/Makefile"
(-)graphics/poppler-qt4/pkg-plist (-13 lines)
Lines 1-13 Link Here
1
include/poppler/qt4/poppler-annotation.h
2
include/poppler/qt4/poppler-export.h
3
include/poppler/qt4/poppler-form.h
4
include/poppler/qt4/poppler-link.h
5
include/poppler/qt4/poppler-link-private.h
6
include/poppler/qt4/poppler-media.h
7
include/poppler/qt4/poppler-optcontent.h
8
include/poppler/qt4/poppler-page-transition.h
9
include/poppler/qt4/poppler-qt4.h
10
lib/libpoppler-qt4.so
11
lib/libpoppler-qt4.so.4
12
lib/libpoppler-qt4.so.4.11.0
13
libdata/pkgconfig/poppler-qt4.pc
(-)graphics/poppler-qt5/Makefile (-3 / +2 lines)
Lines 1-13 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTREVISION=	2
3
PORTREVISION=	0
4
PKGNAMESUFFIX=	-qt5
4
PKGNAMESUFFIX=	-qt5
5
5
6
MAINTAINER=	gnome@FreeBSD.org
7
COMMENT=	Qt 5 bindings to poppler
6
COMMENT=	Qt 5 bindings to poppler
8
7
9
MASTERDIR=	${.CURDIR}/../../graphics/poppler
8
MASTERDIR=	${.CURDIR}/../../graphics/poppler
10
SLAVEPORT=	qt5
9
_SLAVE_PORT=	qt5
11
PLIST=		${.CURDIR}/pkg-plist
10
PLIST=		${.CURDIR}/pkg-plist
12
11
13
.include "${MASTERDIR}/Makefile"
12
.include "${MASTERDIR}/Makefile"
(-)graphics/poppler-qt5/pkg-plist (-2 / +1 lines)
Lines 2-8 Link Here
2
include/poppler/qt5/poppler-export.h
2
include/poppler/qt5/poppler-export.h
3
include/poppler/qt5/poppler-form.h
3
include/poppler/qt5/poppler-form.h
4
include/poppler/qt5/poppler-link.h
4
include/poppler/qt5/poppler-link.h
5
include/poppler/qt5/poppler-link-private.h
6
include/poppler/qt5/poppler-media.h
5
include/poppler/qt5/poppler-media.h
7
include/poppler/qt5/poppler-optcontent.h
6
include/poppler/qt5/poppler-optcontent.h
8
include/poppler/qt5/poppler-page-transition.h
7
include/poppler/qt5/poppler-page-transition.h
Lines 9-13 Link Here
9
include/poppler/qt5/poppler-qt5.h
8
include/poppler/qt5/poppler-qt5.h
10
lib/libpoppler-qt5.so
9
lib/libpoppler-qt5.so
11
lib/libpoppler-qt5.so.1
10
lib/libpoppler-qt5.so.1
12
lib/libpoppler-qt5.so.1.10.0
11
lib/libpoppler-qt5.so.1.17.0
13
libdata/pkgconfig/poppler-qt5.pc
12
libdata/pkgconfig/poppler-qt5.pc
(-)graphics/poppler-utils/Makefile (-5 / +3 lines)
Lines 1-14 Link Here
1
# Created by: Michael Nottebrock <lofi@FreeBSD.org>
1
# Created by: Michael Nottebrock <lofi@FreeBSD.org>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTREVISION=	1
4
PORTREVISION=	0
5
PKGNAMESUFFIX=	-utils
6
5
7
MAINTAINER=	gnome@FreeBSD.org
6
COMMENT=	Poppler's xpdf-workalike command line utilities # '
8
COMMENT=	Poppler's xpdf-workalike command line utilities
9
7
10
MASTERDIR=	${.CURDIR}/../../graphics/poppler
8
MASTERDIR=	${.CURDIR}/../../graphics/poppler
11
SLAVEPORT=	utils
9
_SLAVE_PORT=	utils
12
PLIST=		${.CURDIR}/pkg-plist
10
PLIST=		${.CURDIR}/pkg-plist
13
11
14
.include "${MASTERDIR}/Makefile"
12
.include "${MASTERDIR}/Makefile"
(-)graphics/py-poppler/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	poppler
4
PORTNAME=	poppler
5
PORTVERSION=	0.12.1
5
PORTVERSION=	0.12.1
6
PORTREVISION=	11
6
PORTREVISION=	12
7
CATEGORIES=	graphics python
7
CATEGORIES=	graphics python
8
MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/ \
8
MASTER_SITES=	https://launchpad.net/poppler-python/trunk/development/+download/ \
9
		http://launchpadlibrarian.net/30270080/ \
9
		http://launchpadlibrarian.net/30270080/ \
(-)graphics/py-poppler-qt4/Makefile (-23 lines)
Lines 1-23 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	poppler-qt4
4
PORTVERSION=	0.18.1
5
PORTREVISION=	11
6
CATEGORIES=	graphics python
7
MASTER_SITES=	CHEESESHOP
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
DISTNAME=	python-${PORTNAME}-${PORTVERSION}
10
11
MAINTAINER=	martin.dieringer@gmx.de
12
COMMENT=	Python bindings for the Poppler-Qt4 PDF rendering library
13
14
LICENSE=	LGPL21 LGPL3
15
LICENSE_COMB=	dual
16
17
LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
18
19
USES=		compiler:c++11-lang pkgconfig pyqt:4 python
20
USE_PYQT=	gui xml sip_build
21
USE_PYTHON=	distutils autoplist
22
23
.include <bsd.port.mk>
(-)graphics/py-poppler-qt4/distinfo (-2 lines)
Lines 1-2 Link Here
1
SHA256 (python-poppler-qt4-0.18.1.tar.gz) = 00e3f89f4e23a844844d082918a89c2cbb1e8231ecb011b81d592e7e3c33a74c
2
SIZE (python-poppler-qt4-0.18.1.tar.gz) = 15523
(-)graphics/py-poppler-qt4/files/patch-types.sip (-16 lines)
Lines 1-16 Link Here
1
PyList_SET_ITEM() is supposed to be void, but as a macro it's an
2
expression and has a pointer value. Clang 4.0 trips on the bogus
3
pointer comparison; given the comparison, it should be PyList_SetItem()
4
which returns -1 on failure.
5
6
--- types.sip.orig	2017-01-21 07:19:29 UTC
7
+++ types.sip
8
@@ -27,7 +27,7 @@
9
     foreach (Poppler::Document::RenderBackend value, set)
10
     {
11
         PyObject *obj = PyLong_FromLong ((long) value);
12
-        if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
13
+        if (obj == NULL || PyList_SetItem (l, i, obj) < 0)
14
         {
15
             Py_DECREF(l);
16
 
(-)graphics/py-poppler-qt4/pkg-descr (-3 lines)
Lines 1-3 Link Here
1
Python bindings for graphics/poppler-qt4.
2
3
WWW: https://pypi.org/project/python-poppler-qt4/
(-)misc/tellico-kde4/Makefile (-2 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	tellico
4
PORTNAME=	tellico
5
PORTVERSION=	2.3.12
5
PORTVERSION=	2.3.12
6
PORTREVISION=	6
6
PORTREVISION=	7
7
CATEGORIES=	misc kde
7
CATEGORIES=	misc kde
8
MASTER_SITES=	http://tellico-project.org/files/
8
MASTER_SITES=	http://tellico-project.org/files/
9
9
Lines 18-24 Link Here
18
LIB_DEPENDS=	libexempi.so:textproc/exempi \
18
LIB_DEPENDS=	libexempi.so:textproc/exempi \
19
		libgcrypt.so:security/libgcrypt \
19
		libgcrypt.so:security/libgcrypt \
20
		libgpg-error.so:security/libgpg-error \
20
		libgpg-error.so:security/libgpg-error \
21
		libpoppler-qt4.so:graphics/poppler-qt4 \
22
		libqjson.so:devel/qjson@qt4 \
21
		libqjson.so:devel/qjson@qt4 \
23
		libtag.so:audio/taglib \
22
		libtag.so:audio/taglib \
24
		libyaz.so:net/yaz
23
		libyaz.so:net/yaz
(-)net/kitinerary/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	kitinerary
3
PORTNAME=	kitinerary
4
DISTVERSION=	${KDE_APPLICATIONS_VERSION}
4
DISTVERSION=	${KDE_APPLICATIONS_VERSION}
5
PORTREVISION=	1
5
CATEGORIES=	net kde kde-applications
6
CATEGORIES=	net kde kde-applications
6
7
7
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
(-)print/cups-filters/files/patch-git_6b0747c (+76 lines)
Line 0 Link Here
1
From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001
2
From: Olivier Schonken <olivier.schonken@gmail.com>
3
Date: Fri, 5 Oct 2018 12:05:31 +0200
4
Subject: [PATCH] Poppler removed memCheck and gMemReport functions
5
6
Only use gMemReport and memCheck functions if poppler version less
7
than 0.69.0
8
9
The poppler project removed the memCheck and gMemReport functions in
10
commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM
11
from Object since this uses RAII now and hence cannot leak.
12
(The existing tracking also is not thread-safe and hence unreliable.)
13
14
and
15
16
f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging
17
from gmem since external tools and compiler instrumentation achieve the
18
same effect.
19
20
This commit solves https://github.com/OpenPrinting/cups-filters/issues/62
21
22
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
23
---
24
 filter/pdftoijs.cxx            | 2 ++
25
 filter/pdftoopvp/pdftoopvp.cxx | 2 ++
26
 filter/pdftoraster.cxx         | 2 ++
27
 3 files changed, 6 insertions(+)
28
29
diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
30
index 22bc33f4..dd6b6fa0 100644
31
--- filter/pdftoijs.cxx
32
+++ filter/pdftoijs.cxx
33
@@ -503,9 +503,11 @@ int main(int argc, char *argv[]) {
34
   ppdClose(ppd);
35
   free(outputfile);
36
 
37
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
38
   // Check for memory leaks
39
   Object::memCheck(stderr);
40
   gMemReport(stderr);
41
+#endif
42
 
43
   return exitCode;
44
 }
45
diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
46
index 024941ab..bf25983b 100644
47
--- filter/pdftoopvp/pdftoopvp.cxx
48
+++ filter/pdftoopvp/pdftoopvp.cxx
49
@@ -763,9 +763,11 @@ fprintf(stderr,"JobInfo=%s\n",jobInfo);
50
  err0:
51
   delete globalParams;
52
 
53
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
54
   // check for memory leaks
55
   Object::memCheck(stderr);
56
   gMemReport(stderr);
57
+#endif
58
 
59
 }
60
 /* muntrace(); */
61
diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
62
index 0c63ab8d..4ebf02b0 100644
63
--- filter/pdftoraster.cxx
64
+++ filter/pdftoraster.cxx
65
@@ -2162,9 +2162,11 @@ int main(int argc, char *argv[]) {
66
     cmsDeleteTransform(colorTransform);
67
   }
68
 
69
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
70
   // Check for memory leaks
71
   Object::memCheck(stderr);
72
   gMemReport(stderr);
73
+#endif
74
 
75
   return exitCode;
76
 }
(-)print/pdf-tools/Makefile (+1 lines)
Lines 4-9 Link Here
4
DISTVERSIONPREFIX=	v
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	0.80-133
5
DISTVERSION=	0.80-133
6
DISTVERSIONSUFFIX=	-gb6c0e4f
6
DISTVERSIONSUFFIX=	-gb6c0e4f
7
PORTREVISION=	1
7
CATEGORIES=	print elisp
8
CATEGORIES=	print elisp
8
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
9
PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
9
10
(-)print/qpdfview/Makefile (-13 / +6 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	qpdfview
4
PORTNAME=	qpdfview
5
DISTVERSION=	0.4.17beta1
5
DISTVERSION=	0.4.17beta1
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	print
7
CATEGORIES=	print
8
MASTER_SITES=	https://launchpadlibrarian.net/294276875/ \
8
MASTER_SITES=	https://launchpadlibrarian.net/294276875/ \
9
		https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/
9
		https://launchpad.net/${PORTNAME}/trunk/${DISTVERSION}/+download/
Lines 14-32 Link Here
14
LICENSE=	GPLv2+
14
LICENSE=	GPLv2+
15
LICENSE_FILE=	${WRKSRC}/COPYING
15
LICENSE_FILE=	${WRKSRC}/COPYING
16
16
17
USES=		compiler:c++11-lang desktop-file-utils pkgconfig qmake
17
LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
18
19
USES=		compiler:c++11-lang desktop-file-utils pkgconfig qmake qt:5
18
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
USE_QT=		buildtools_build concurrent imageformats linguisttools printsupport sql sql-sqlite3 svg xml
19
QMAKE_SOURCE_PATH=	${PORTNAME}.pro
22
QMAKE_SOURCE_PATH=	${PORTNAME}.pro
20
23
21
DATADIR=	${PREFIX}/share/${PORTNAME}
24
DATADIR=	${PREFIX}/share/${PORTNAME}
22
25
23
OPTIONS_SINGLE=	TOOLKITS
24
OPTIONS_SINGLE_TOOLKITS=	QT4 QT5
25
OPTIONS_DEFINE=	CUPS
26
OPTIONS_DEFINE=	CUPS
26
OPTIONS_MULTI=	BACKEND
27
OPTIONS_MULTI=	BACKEND
27
OPTIONS_MULTI_BACKEND=	DJVU PS
28
OPTIONS_MULTI_BACKEND=	DJVU PS
28
BACKEND_DESC=	Additional documents support
29
BACKEND_DESC=	Additional documents support
29
OPTIONS_DEFAULT=	QT4 CUPS PS
30
OPTIONS_DEFAULT=	CUPS PS
30
OPTIONS_SUB=	yes
31
OPTIONS_SUB=	yes
31
32
32
CUPS_QMAKE_OFF=	"CONFIG+=without_cups"
33
CUPS_QMAKE_OFF=	"CONFIG+=without_cups"
Lines 35-48 Link Here
35
DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
36
DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
36
DJVU_QMAKE_OFF=	"CONFIG+=without_djvu"
37
DJVU_QMAKE_OFF=	"CONFIG+=without_djvu"
37
38
38
QT4_USES=	qt:4
39
QT4_USE=	qt=dbus,gui,imageformats,linguisttools,moc_build,rcc_build,sql,sql-sqlite3,svg,xml
40
QT4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4
41
42
QT5_USES=	qt:5
43
QT5_USE=	qt=buildtools_build,concurrent,imageformats,linguisttools,printsupport,sql,sql-sqlite3,svg,xml
44
QT5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5
45
46
PS_LIB_DEPENDS=	libspectre.so:print/libspectre
39
PS_LIB_DEPENDS=	libspectre.so:print/libspectre
47
PS_QMAKE_OFF=	"CONFIG+=without_ps"
40
PS_QMAKE_OFF=	"CONFIG+=without_ps"
48
41
(-)print/scribus-devel/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	scribus
4
PORTNAME=	scribus
5
PORTVERSION=	1.5.4
5
PORTVERSION=	1.5.4
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	print editors
7
CATEGORIES=	print editors
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/${PORTVERSION}/ \
9
		http://www.scribus.net/downloads/${PORTVERSION}/
9
		http://www.scribus.net/downloads/${PORTVERSION}/
(-)print/tex-luatex/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	luatex
3
PORTNAME=	luatex
4
PORTVERSION=	0.80.0
4
PORTVERSION=	0.80.0
5
PORTREVISION=	9
5
PORTREVISION=	10
6
CATEGORIES=	print
6
CATEGORIES=	print
7
MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
7
MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
8
PKGNAMEPREFIX=	tex-
8
PKGNAMEPREFIX=	tex-
(-)print/tex-xetex/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	xetex
3
PORTNAME=	xetex
4
PORTVERSION=	0.99992
4
PORTVERSION=	0.99992
5
PORTREVISION=	19
5
PORTREVISION=	20
6
CATEGORIES=	print
6
CATEGORIES=	print
7
MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
7
MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
8
PKGNAMEPREFIX=	tex-
8
PKGNAMEPREFIX=	tex-
(-)print/texlive-base/Makefile (-1 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	texlive
3
PORTNAME=	texlive
4
PORTVERSION=	20150521
4
PORTVERSION=	20150521
5
PORTREVISION=	30
5
PORTREVISION=	31
6
CATEGORIES=	print
6
CATEGORIES=	print
7
MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
7
MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
8
PKGNAMESUFFIX=	-base
8
PKGNAMESUFFIX=	-base
(-)sysutils/kfilemetadata-kde4/Makefile (-3 / +2 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	kfilemetadata
3
PORTNAME=	kfilemetadata
4
PORTVERSION=	${KDE4_VERSION}
4
PORTVERSION=	${KDE4_VERSION}
5
PORTREVISION=	19
5
PORTREVISION=	20
6
CATEGORIES=	sysutils kde kde-kde4
6
CATEGORIES=	sysutils kde kde-kde4
7
7
8
MAINTAINER=	kde@FreeBSD.org
8
MAINTAINER=	kde@FreeBSD.org
Lines 11-18 Link Here
11
DEPRECATED=	KDE4 is EOL upstream
11
DEPRECATED=	KDE4 is EOL upstream
12
EXPIRATION_DATE=	2018-12-31
12
EXPIRATION_DATE=	2018-12-31
13
13
14
LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
14
LIB_DEPENDS=	libtag.so:audio/taglib \
15
		libtag.so:audio/taglib \
16
		libexiv2.so:graphics/exiv2 \
15
		libexiv2.so:graphics/exiv2 \
17
		libswscale.so:multimedia/ffmpeg \
16
		libswscale.so:multimedia/ffmpeg \
18
		libepub.so:textproc/ebook-tools \
17
		libepub.so:textproc/ebook-tools \
(-)sysutils/kfilemetadata-kde4/pkg-plist (-2 lines)
Lines 17-23 Link Here
17
lib/kde4/kfilemetadata_office2007extractor.so
17
lib/kde4/kfilemetadata_office2007extractor.so
18
lib/kde4/kfilemetadata_officeextractor.so
18
lib/kde4/kfilemetadata_officeextractor.so
19
lib/kde4/kfilemetadata_plaintextextractor.so
19
lib/kde4/kfilemetadata_plaintextextractor.so
20
lib/kde4/kfilemetadata_popplerextractor.so
21
lib/kde4/kfilemetadata_taglibextractor.so
20
lib/kde4/kfilemetadata_taglibextractor.so
22
lib/libkfilemetadata.so
21
lib/libkfilemetadata.so
23
lib/libkfilemetadata.so.4
22
lib/libkfilemetadata.so.4
Lines 30-35 Link Here
30
share/kde4/services/kfilemetadata_office2007extractor.desktop
29
share/kde4/services/kfilemetadata_office2007extractor.desktop
31
share/kde4/services/kfilemetadata_officeextractor.desktop
30
share/kde4/services/kfilemetadata_officeextractor.desktop
32
share/kde4/services/kfilemetadata_plaintextextractor.desktop
31
share/kde4/services/kfilemetadata_plaintextextractor.desktop
33
share/kde4/services/kfilemetadata_popplerextractor.desktop
34
share/kde4/services/kfilemetadata_taglibextractor.desktop
32
share/kde4/services/kfilemetadata_taglibextractor.desktop
35
share/kde4/servicetypes/kfilemetadataextractor.desktop
33
share/kde4/servicetypes/kfilemetadataextractor.desktop
(-)sysutils/nepomuk-core-kde4/Makefile (-3 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	nepomuk-core
4
PORTNAME=	nepomuk-core
5
PORTVERSION=	${KDE4_VERSION}
5
PORTVERSION=	${KDE4_VERSION}
6
PORTREVISION=	20
6
PORTREVISION=	21
7
CATEGORIES=	sysutils kde kde-kde4
7
CATEGORIES=	sysutils kde kde-kde4
8
8
9
MAINTAINER=	kde@FreeBSD.org
9
MAINTAINER=	kde@FreeBSD.org
Lines 12-19 Link Here
12
DEPRECATED=	KDE4 is EOL upstream
12
DEPRECATED=	KDE4 is EOL upstream
13
EXPIRATION_DATE=	2018-12-31
13
EXPIRATION_DATE=	2018-12-31
14
14
15
LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
15
LIB_DEPENDS=	libtag.so:audio/taglib \
16
		libtag.so:audio/taglib \
17
		libexiv2.so:graphics/exiv2 \
16
		libexiv2.so:graphics/exiv2 \
18
		libswscale.so:multimedia/ffmpeg \
17
		libswscale.so:multimedia/ffmpeg \
19
		libepub.so:textproc/ebook-tools \
18
		libepub.so:textproc/ebook-tools \
(-)sysutils/nepomuk-core-kde4/pkg-plist (-2 lines)
Lines 129-135 Link Here
129
lib/kde4/nepomukoffice2007extractor.so
129
lib/kde4/nepomukoffice2007extractor.so
130
lib/kde4/nepomukofficeextractor.so
130
lib/kde4/nepomukofficeextractor.so
131
lib/kde4/nepomukplaintextextractor.so
131
lib/kde4/nepomukplaintextextractor.so
132
lib/kde4/nepomukpopplerextractor.so
133
lib/kde4/nepomuktaglibextractor.so
132
lib/kde4/nepomuktaglibextractor.so
134
lib/libkdeinit4_nepomukserver.so
133
lib/libkdeinit4_nepomukserver.so
135
lib/libnepomukcleaner.so
134
lib/libnepomukcleaner.so
Lines 173-179 Link Here
173
share/kde4/services/nepomukofficeextractor.desktop
172
share/kde4/services/nepomukofficeextractor.desktop
174
share/kde4/services/nepomukontologyloader.desktop
173
share/kde4/services/nepomukontologyloader.desktop
175
share/kde4/services/nepomukplaintextextractor.desktop
174
share/kde4/services/nepomukplaintextextractor.desktop
176
share/kde4/services/nepomukpopplerextractor.desktop
177
share/kde4/services/nepomukqueryservice.desktop
175
share/kde4/services/nepomukqueryservice.desktop
178
share/kde4/services/nepomukremovablestorageservice.desktop
176
share/kde4/services/nepomukremovablestorageservice.desktop
179
share/kde4/services/nepomukstorage.desktop
177
share/kde4/services/nepomukstorage.desktop
(-)textproc/pdfgrep/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	pdfgrep
4
PORTNAME=	pdfgrep
5
PORTVERSION=	2.1.1
5
PORTVERSION=	2.1.1
6
PORTREVISION=	1
6
CATEGORIES=	textproc
7
CATEGORIES=	textproc
7
MASTER_SITES=	https://pdfgrep.org/download/
8
MASTER_SITES=	https://pdfgrep.org/download/
8
9
(-)x11/leechcraft/Makefile (-11 / +6 lines)
Lines 25-33 Link Here
25
		webkit xml qmake_build moc_build rcc_build uic_build \
25
		webkit xml qmake_build moc_build rcc_build uic_build \
26
		linguisttools_build
26
		linguisttools_build
27
USE_XORG=	x11
27
USE_XORG=	x11
28
CMAKE_ARGS+=	-DENABLE_LADS=OFF \
28
CMAKE_OFF=	ENABLE_LADS \
29
		-DENABLE_SYNCER=OFF \
29
		ENABLE_SYNCER \
30
		-DLEECHCRAFT_VERSION=${PORTVERSION}
30
		ENABLE_MONOCLE
31
CMAKE_ARGS=	-DLEECHCRAFT_VERSION=${PORTVERSION}
31
32
32
WRKSRC_SUBDIR=	src
33
WRKSRC_SUBDIR=	src
33
34
Lines 36-42 Link Here
36
		ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \
37
		ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \
37
		HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \
38
		HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \
38
		LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \
39
		LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \
39
		MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
40
		MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
40
		NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \
41
		NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \
41
		ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \
42
		ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \
42
		TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \
43
		TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \
Lines 222-233 Link Here
222
MELLONETRAY_CMAKE_OFF=	-DENABLE_MELLONETRAY:BOOL=false
223
MELLONETRAY_CMAKE_OFF=	-DENABLE_MELLONETRAY:BOOL=false
223
MELLONETRAY_USE=	xorg=xdamage
224
MELLONETRAY_USE=	xorg=xdamage
224
225
225
MONOCLE_DESC=		Monocle, the modular document viewer
226
MONOCLE_CMAKE_ON=	-DENABLE_MONOCLE:BOOL=true
227
MONOCLE_CMAKE_OFF=	-DENABLE_MONOCLE:BOOL=false
228
MONOCLE_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre \
229
			libpoppler-qt4.so:graphics/poppler-qt4
230
231
MUSICZOMBIE_DESC=	MusicBrainz client plugin
226
MUSICZOMBIE_DESC=	MusicBrainz client plugin
232
MUSICZOMBIE_CMAKE_ON=	-DENABLE_MUSICZOMBIE:BOOL=true
227
MUSICZOMBIE_CMAKE_ON=	-DENABLE_MUSICZOMBIE:BOOL=true
233
MUSICZOMBIE_CMAKE_OFF=	-DENABLE_MUSICZOMBIE:BOOL=false
228
MUSICZOMBIE_CMAKE_OFF=	-DENABLE_MUSICZOMBIE:BOOL=false
Lines 360-366 Link Here
360
		CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \
355
		CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \
361
		HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \
356
		HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \
362
		KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \
357
		KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \
363
		LMP MELLONETRAY MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
358
		LMP MELLONETRAY MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
364
		NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \
359
		NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \
365
		SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \
360
		SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \
366
		TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY
361
		TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY
(-)x11/leechcraft/pkg-plist (-13 lines)
Lines 1722-1740 Link Here
1722
%%MELLONETRAY%%%%DATADIR%%/qml/mellonetray/TrayQuark.qml.manifest
1722
%%MELLONETRAY%%%%DATADIR%%/qml/mellonetray/TrayQuark.qml.manifest
1723
%%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_en.qm
1723
%%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_en.qm
1724
%%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_ru_RU.qm
1724
%%MELLONETRAY%%%%DATADIR%%/translations/leechcraft_mellonetray_ru_RU.qm
1725
%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle.so
1726
%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_dik.so
1727
%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_fxb.so
1728
%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_pdf.so
1729
%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_postrus.so
1730
%%MONOCLE%%lib/leechcraft/plugins/libleechcraft_monocle_seen.so
1731
%%MONOCLE%%share/applications/leechcraft-monocle-fxb.desktop
1732
%%MONOCLE%%share/applications/leechcraft-monocle-pdf.desktop
1733
%%MONOCLE%%share/applications/leechcraft-monocle-postrus.desktop
1734
%%MONOCLE%%share/applications/leechcraft-monocle-seen.desktop
1735
%%MONOCLE%%%%DATADIR%%/settings/monoclesettings.xml
1736
%%MONOCLE%%%%DATADIR%%/translations/leechcraft_monocle_en.qm
1737
%%MONOCLE%%%%DATADIR%%/translations/leechcraft_monocle_ru_RU.qm
1738
%%MUSICZOMBIE%%lib/leechcraft/plugins/libleechcraft_musiczombie.so
1725
%%MUSICZOMBIE%%lib/leechcraft/plugins/libleechcraft_musiczombie.so
1739
%%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_en.qm
1726
%%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_en.qm
1740
%%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_ru_RU.qm
1727
%%MUSICZOMBIE%%%%DATADIR%%/translations/leechcraft_musiczombie_ru_RU.qm

Return to bug 233452