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

Collapse All | Expand All

(-)MOVED (+2 lines)
Lines 10781-10783 Link Here
10781
sysutils/battfink||2018-12-11|Has expired: GNOME 2 application
10781
sysutils/battfink||2018-12-11|Has expired: GNOME 2 application
10782
sysutils/cog||2018-12-11|Has expired: GNOME 2 application
10782
sysutils/cog||2018-12-11|Has expired: GNOME 2 application
10783
sysutils/gcdmaster||2018-12-11|Has expired: GNOME 2 application
10783
sysutils/gcdmaster||2018-12-11|Has expired: GNOME 2 application
10784
graphics/diffpdf||2018-12-31|Depends on non-existent poppler-qt4
10785
print/frescobaldi||2018-12-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/calligra/files/patch-debian_poppler-0.69.patch (+17 lines)
Line 0 Link Here
1
Description: Fix build with poppler 0.69
2
Author: Gianfranco Costamagna <locutusofborg@debian.org>
3
Bug-Debian: https://bugs.debian.org/910873
4
Last-Update: 2018-10-22
5
6
--- filters/karbon/pdf/PdfImport.cpp
7
+++ filters/karbon/pdf/PdfImport.cpp
8
@@ -102,9 +102,6 @@ KoFilter::ConversionStatus PdfImport::co
9
     delete globalParams;
10
     globalParams = 0;
11
 
12
-    // check for memory leaks
13
-    Object::memCheck(stderr);
14
-
15
     return KoFilter::OK;
16
 }
17
(-)editors/calligra/files/patch-filters_karbon_pdf_PdfImport.cpp (+15 lines)
Line 0 Link Here
1
--- filters/karbon/pdf/PdfImport.cpp.orig	2018-12-08 16:48:32 UTC
2
+++ filters/karbon/pdf/PdfImport.cpp
3
@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QB
4
     SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile());
5
     if (dev->isOk()) {
6
         int rotate = 0;
7
-        GBool useMediaBox = gTrue;
8
-        GBool crop = gFalse;
9
-        GBool printing = gFalse;
10
+        bool useMediaBox = true;
11
+        bool crop = false;
12
+        bool printing = false;
13
         pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing);
14
         dev->dumpContent();
15
     }
(-)editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.cpp (+175 lines)
Line 0 Link Here
1
--- filters/karbon/pdf/SvgOutputDev.cpp.orig	2018-01-26 09:24:44 UTC
2
+++ filters/karbon/pdf/SvgOutputDev.cpp
3
@@ -39,7 +39,7 @@ class SvgOutputDev::Private
4
 {
5
 public:
6
     Private(const QString &fname)
7
-            : svgFile(fname), defs(0), body(0), state(gTrue)
8
+            : svgFile(fname), defs(0), body(0), state(true)
9
             , brush(Qt::SolidPattern) {}
10
 
11
     ~Private() {
12
@@ -52,7 +52,7 @@ class SvgOutputDev::Private
13
     QString defsData;
14
     QTextStream * defs;
15
     QTextStream * body;
16
-    GBool state;
17
+    bool state;
18
     QSizeF pageSize;
19
     QPen pen;
20
     QBrush brush;
21
@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName)
22
         : d(new Private(fileName))
23
 {
24
     if (! d->svgFile.open(QIODevice::WriteOnly)) {
25
-        d->state = gFalse;
26
+        d->state = false;
27
         return;
28
     }
29
 
30
@@ -75,24 +75,24 @@ SvgOutputDev::~SvgOutputDev()
31
     delete d;
32
 }
33
 
34
-GBool SvgOutputDev::isOk()
35
+bool SvgOutputDev::isOk()
36
 {
37
     return d->state;
38
 }
39
 
40
-GBool SvgOutputDev::upsideDown()
41
+bool SvgOutputDev::upsideDown()
42
 {
43
-    return gTrue;
44
+    return true;
45
 }
46
 
47
-GBool SvgOutputDev::useDrawChar()
48
+bool SvgOutputDev::useDrawChar()
49
 {
50
-    return gFalse;
51
+    return false;
52
 }
53
 
54
-GBool SvgOutputDev::interpretType3Chars()
55
+bool SvgOutputDev::interpretType3Chars()
56
 {
57
-    return gFalse;
58
+    return false;
59
 }
60
 
61
 void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/)
62
@@ -143,7 +143,9 @@ void SvgOutputDev::stroke(GfxState * state)
63
 {
64
     QString path = convertPath(state->getPath());
65
     *d->body << "<path";
66
-    *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\"";
67
+    const double * ctm = state->getCTM();
68
+    QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
69
+    *d->body << " transform=\"" << convertMatrix(transform) << "\"";
70
     *d->body << printStroke();
71
     *d->body << " fill=\"none\"";
72
     *d->body << " d=\"" << path << "\"";
73
@@ -154,7 +156,9 @@ void SvgOutputDev::fill(GfxState * state)
74
 {
75
     QString path = convertPath(state->getPath());
76
     *d->body << "<path";
77
-    *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\"";
78
+    const double * ctm = state->getCTM();
79
+    QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
80
+    *d->body << " transform=\"" << convertMatrix(transform) << "\"";
81
     *d->body << printFill();
82
     *d->body << " fill-rule=\"nonzero\"";
83
     *d->body << " d=\"" << path << "\"";
84
@@ -165,7 +169,9 @@ void SvgOutputDev::eoFill(GfxState *state)
85
 {
86
     QString path = convertPath(state->getPath());
87
     *d->body << "<path";
88
-    *d->body << " transform=\"" << convertMatrix(state->getCTM()) << "\"";
89
+    const double * ctm = state->getCTM();
90
+    QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
91
+    *d->body << " transform=\"" << convertMatrix(transform) << "\"";
92
     *d->body << printFill();
93
     *d->body << " fill-rule=\"evenodd\"";
94
     *d->body << " d=\"" << path << "\"";
95
@@ -387,7 +393,7 @@ QString SvgOutputDev::printStroke()
96
     return stroke;
97
 }
98
 
99
-void SvgOutputDev::drawString(GfxState * state, GooString * s)
100
+void SvgOutputDev::drawString(GfxState * state, const GooString * s)
101
 {
102
     int render = state->getRender();
103
     // check for invisible text -- this is used by Acrobat Capture
104
@@ -402,7 +408,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
105
 
106
     QString str;
107
 
108
-    char * p = s->getCString();
109
+    const char * p = s->c_str();
110
     int len = s->getLength();
111
     CharCode code;
112
     Unicode *u = nullptr;
113
@@ -429,7 +435,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
114
     double x = state->getCurX();
115
     double y = state->getCurY();
116
 
117
-    double * ctm = state->getCTM();
118
+    const double * ctm = state->getCTM();
119
     QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
120
 
121
     QMatrix mirror;
122
@@ -451,11 +457,11 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
123
     *d->body << " y=\"" << y << "px\"";
124
 
125
     if (font && font->getFamily()) {
126
-        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\"";
127
-        //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() );
128
+        *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\"";
129
+        //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() );
130
     } else if (font && font->getName()) {
131
-        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\"";
132
-        //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() );
133
+        *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\"";
134
+        //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() );
135
     }
136
     *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\"";
137
 
138
@@ -476,7 +482,7 @@ void SvgOutputDev::drawString(GfxState * state, GooStr
139
 
140
 void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str,
141
                              int width, int height, GfxImageColorMap *colorMap,
142
-                             int *maskColors, GBool /*inlineImg*/)
143
+                             int *maskColors, bool /*inlineImg*/)
144
 {
145
     ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
146
     imgStr->reset();
147
@@ -522,7 +528,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
148
         return;
149
     }
150
 
151
-    double * ctm = state->getCTM();
152
+    const double * ctm = state->getCTM();
153
     QMatrix m;
154
     m.setMatrix(ctm[0] / width, ctm[1] / width, -ctm[2] / height, -ctm[3] / height, ctm[2] + ctm[4], ctm[3] + ctm[5]);
155
 
156
@@ -531,7 +537,9 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
157
     device.open(QIODevice::WriteOnly);
158
     if (image->save(&device, "PNG")) {
159
         *d->body << "<image";
160
-        *d->body << " transform=\"" << convertMatrix(m) << "\"";
161
+        const double * ctm = state->getCTM();
162
+        QMatrix transform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
163
+        *d->body << " transform=\"" << convertMatrix(transform) << "\"";
164
         *d->body << " width=\"" << width << "px\"";
165
         *d->body << " height=\"" << height << "px\"";
166
         *d->body << " xlink:href=\"data:image/png;base64," << ba.toBase64() <<  "\"";
167
@@ -545,7 +553,7 @@ void SvgOutputDev::drawImage(GfxState *state, Object *
168
 
169
 void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
170
                              int width, int height, GfxImageColorMap *colorMap,
171
-                             GBool /*interpolate*/, int *maskColors, GBool inlineImg)
172
+                             bool /*interpolate*/, int *maskColors, bool inlineImg)
173
 {
174
     drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg);
175
 }
(-)editors/calligra/files/patch-filters_karbon_pdf_SvgOutputDev.h (+37 lines)
Line 0 Link Here
1
--- filters/karbon/pdf/SvgOutputDev.h.orig	2018-01-26 09:24:44 UTC
2
+++ filters/karbon/pdf/SvgOutputDev.h
3
@@ -44,11 +44,11 @@ class SvgOutputDev : public OutputDev (public)
4
     explicit SvgOutputDev(const QString &fileName);
5
     virtual ~SvgOutputDev();
6
 
7
-    GBool isOk();
8
+    bool isOk();
9
 
10
-    virtual GBool upsideDown();
11
-    virtual GBool useDrawChar();
12
-    virtual GBool interpretType3Chars();
13
+    virtual bool upsideDown();
14
+    virtual bool useDrawChar();
15
+    virtual bool interpretType3Chars();
16
     virtual void startPage(int pageNum, GfxState *state, XRef *xref);
17
     virtual void endPage();
18
 
19
@@ -58,15 +58,15 @@ class SvgOutputDev : public OutputDev (public)
20
     virtual void eoFill(GfxState *state);
21
 
22
     // text
23
-    virtual void drawString(GfxState * state, GooString * s);
24
+    virtual void drawString(GfxState * state, const GooString * s);
25
 
26
     // images
27
     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
28
                            int width, int height, GfxImageColorMap *colorMap,
29
-                           int *maskColors, GBool inlineImg);
30
+                           int *maskColors, bool inlineImg);
31
     virtual void drawImage(GfxState *state, Object *ref, Stream *str,
32
                            int width, int height, GfxImageColorMap *colorMap,
33
-                           GBool interpolate, int *maskColors, GBool inlineImg);
34
+                           bool interpolate, int *maskColors, bool inlineImg);
35
 
36
     // styles
37
     virtual void updateAll(GfxState *state);
(-)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/libreoffice/files/patch-archgit_poppler-0.70.patch (-29 / +163 lines)
Lines 1-45 Link Here
1
From 557ee0a0f4e40b934c72515f41f3a605803ddb1d Mon Sep 17 00:00:00 2001
1
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig	2018-10-30 16:55:21 UTC
2
From: Evangelos Foutras <evangelos@foutrelis.com>
3
Date: Wed, 24 Oct 2018 17:48:53 +0300
4
Subject: [PATCH] fix build with poppler 0.70
5
6
---
7
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx | 4 ++++
8
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx | 4 ++++
9
 2 files changed, 8 insertions(+)
10
11
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
12
index 575a90acb..99219f7e6 100644
13
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
14
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
2
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
15
@@ -578,7 +578,11 @@ void PDFOutDev::restoreState(GfxState*)
3
@@ -528,7 +528,7 @@ void PDFOutDev::printPath( GfxPath* pPath )
4
 PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
5
     m_pDoc( pDoc ),
6
     m_aFontMap(),
7
-    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
8
+    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
9
     m_bSkipImages(false)
10
 {
11
 }
12
@@ -569,7 +569,7 @@ void PDFOutDev::processLink(Link* link, Catalog*)
13
     LinkAction* pAction = link->getAction();
14
     if (pAction && pAction->getKind() == actionURI)
15
     {
16
-        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->getCString();
17
+        const char* pURI = static_cast<LinkURI*>(pAction)->getURI()->c_str();
18
 
19
         std::vector<char> aEsc( lcl_escapeLineFeeds(pURI) );
20
 
21
@@ -592,7 +592,7 @@ void PDFOutDev::restoreState(GfxState*)
16
     printf( "restoreState\n" );
22
     printf( "restoreState\n" );
17
 }
23
 }
18
 
24
 
19
+#if POPPLER_CHECK_VERSION(0, 70, 0)
25
-void PDFOutDev::setDefaultCTM(double *pMat)
20
+void PDFOutDev::setDefaultCTM(const double *pMat)
26
+void PDFOutDev::setDefaultCTM(const double *pMat)
21
+#else
22
 void PDFOutDev::setDefaultCTM(double *pMat)
23
+#endif
24
 {
27
 {
25
     assert(pMat);
28
     assert(pMat);
26
 
29
 
27
diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
30
@@ -767,7 +767,7 @@ void PDFOutDev::updateFont(GfxState *state)
28
index da021a2a0..27440f2bb 100644
31
 
29
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
32
             aFont = it->second;
33
 
34
-            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.getCString()) );
35
+            std::vector<char> aEsc( lcl_escapeLineFeeds(aFont.familyName.c_str()) );
36
             printf( " %d %d %d %d %f %d %s",
37
                     aFont.isEmbedded,
38
                     aFont.isBold,
39
@@ -953,11 +953,11 @@ void PDFOutDev::endTextObject(GfxState*)
40
 }
41
 
42
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
43
-                              int width, int height, GBool invert,
44
+                              int width, int height, bool invert,
45
 #if POPPLER_CHECK_VERSION(0, 12, 0)
46
-                              GBool /*interpolate*/,
47
+                              bool /*interpolate*/,
48
 #endif
49
-                              GBool /*inlineImg*/ )
50
+                              bool /*inlineImg*/ )
51
 {
52
     if (m_bSkipImages)
53
         return;
54
@@ -986,9 +986,9 @@ void PDFOutDev::drawImageMask(GfxState* pState, Object
55
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
56
                           int width, int height, GfxImageColorMap* colorMap,
57
 #if POPPLER_CHECK_VERSION(0, 12, 0)
58
-                          GBool /*interpolate*/,
59
+                          bool /*interpolate*/,
60
 #endif
61
-                          int* maskColors, GBool /*inlineImg*/ )
62
+                          int* maskColors, bool /*inlineImg*/ )
63
 {
64
     if (m_bSkipImages)
65
         return;
66
@@ -1037,13 +1037,13 @@ void PDFOutDev::drawMaskedImage(GfxState*, Object*, St
67
                                 int width, int height,
68
                                 GfxImageColorMap* colorMap,
69
 #if POPPLER_CHECK_VERSION(0, 12, 0)
70
-                                GBool /*interpolate*/,
71
+                                bool /*interpolate*/,
72
 #endif
73
                                 Stream* maskStr,
74
                                 int maskWidth, int maskHeight,
75
-                                GBool maskInvert
76
+                                bool maskInvert
77
 #if POPPLER_CHECK_VERSION(0, 12, 0)
78
-                                , GBool /*maskInterpolate*/
79
+                                , bool /*maskInterpolate*/
80
 #endif
81
                                )
82
 {
83
@@ -1059,13 +1059,13 @@ void PDFOutDev::drawSoftMaskedImage(GfxState*, Object*
84
                                     int width, int height,
85
                                     GfxImageColorMap* colorMap,
86
 #if POPPLER_CHECK_VERSION(0, 12, 0)
87
-                                    GBool /*interpolate*/,
88
+                                    bool /*interpolate*/,
89
 #endif
90
                                     Stream* maskStr,
91
                                     int maskWidth, int maskHeight,
92
                                     GfxImageColorMap* maskColorMap
93
 #if POPPLER_CHECK_VERSION(0, 12, 0)
94
-                                    , GBool /*maskInterpolate*/
95
+                                    , bool /*maskInterpolate*/
96
 #endif
97
                                    )
98
 {
99
--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx.orig	2018-10-30 16:55:21 UTC
30
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
100
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
31
@@ -166,7 +166,11 @@ namespace pdfi
101
@@ -150,22 +150,22 @@ namespace pdfi
102
 
103
         // Does this device use upside-down coordinates?
104
         // (Upside-down means (0,0) is the top left corner of the page.)
105
-        virtual GBool upsideDown() override { return gTrue; }
106
+        virtual bool upsideDown() override { return true; }
107
 
108
         // Does this device use drawChar() or drawString()?
109
-        virtual GBool useDrawChar() override { return gTrue; }
110
+        virtual bool useDrawChar() override { return true; }
111
 
112
         // Does this device use beginType3Char/endType3Char?  Otherwise,
113
         // text in Type 3 fonts will be drawn with drawChar/drawString.
114
-        virtual GBool interpretType3Chars() override { return gFalse; }
115
+        virtual bool interpretType3Chars() override { return false; }
116
 
117
         // Does this device need non-text content?
118
-        virtual GBool needNonText() override { return gTrue; }
119
+        virtual bool needNonText() override { return true; }
120
 
32
         //----- initialization and control
121
         //----- initialization and control
33
 
122
 
34
         // Set default transform matrix.
123
         // Set default transform matrix.
35
+#if POPPLER_CHECK_VERSION(0, 70, 0)
124
-        virtual void setDefaultCTM(double *ctm) override;
36
+        virtual void setDefaultCTM(const double *ctm) override;
125
+        virtual void setDefaultCTM(const double *ctm) override;
37
+#else
38
         virtual void setDefaultCTM(double *ctm) override;
39
+#endif
40
 
126
 
41
         // Start a page.
127
         // Start a page.
42
         virtual void startPage(int pageNum, GfxState *state
128
         virtual void startPage(int pageNum, GfxState *state
43
-- 
129
@@ -232,40 +232,40 @@ namespace pdfi
44
2.19.1
130
 
45
131
         //----- image drawing
132
         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
133
-                                   int width, int height, GBool invert,
134
+                                   int width, int height, bool invert,
135
 #if POPPLER_CHECK_VERSION(0, 12, 0)
136
-                                   GBool interpolate,
137
+                                   bool interpolate,
138
 #endif
139
-                                   GBool inlineImg) override;
140
+                                   bool inlineImg) override;
141
         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
142
                                int width, int height, GfxImageColorMap *colorMap,
143
 #if POPPLER_CHECK_VERSION(0, 12, 0)
144
-                               GBool interpolate,
145
+                               bool interpolate,
146
 #endif
147
-                               int *maskColors, GBool inlineImg) override;
148
+                               int *maskColors, bool inlineImg) override;
149
         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
150
                                      int width, int height,
151
                                      GfxImageColorMap *colorMap,
152
 #if POPPLER_CHECK_VERSION(0, 12, 0)
153
-                                     GBool interpolate,
154
+                                     bool interpolate,
155
 #endif
156
                                      Stream *maskStr, int maskWidth, int maskHeight,
157
-                                     GBool maskInvert
158
+                                     bool maskInvert
159
 #if POPPLER_CHECK_VERSION(0, 12, 0)
160
-                                     , GBool maskInterpolate
161
+                                     , bool maskInterpolate
162
 #endif
163
                                     ) override;
164
         virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
165
                                          int width, int height,
166
                                          GfxImageColorMap *colorMap,
167
 #if POPPLER_CHECK_VERSION(0, 12, 0)
168
-                                         GBool interpolate,
169
+                                         bool interpolate,
170
 #endif
171
                                          Stream *maskStr,
172
                                          int maskWidth, int maskHeight,
173
                                          GfxImageColorMap *maskColorMap
174
 #if POPPLER_CHECK_VERSION(0, 12, 0)
175
-                                         , GBool maskInterpolate
176
+                                         , bool maskInterpolate
177
 #endif
178
                                         ) override;
179
 
(-)editors/libreoffice/files/patch-archgit_poppler-0.71.patch (-154 / +4 lines)
Lines 1-156 Link Here
1
diff -ru sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
1
--- sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx.orig	2018-10-30 16:55:21 UTC
2
--- sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.cxx	2018-11-01 20:43:55.802520387 +0000
2
+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
3
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx	2018-11-01 20:44:33.399286879 +0000
3
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
4
@@ -514,7 +514,7 @@
5
 PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
6
     m_pDoc( pDoc ),
7
     m_aFontMap(),
8
-    m_pUtf8Map( new UnicodeMap("UTF-8", gTrue, &mapUTF8) ),
9
+    m_pUtf8Map( new UnicodeMap("UTF-8", true, &mapUTF8) ),
10
     m_bSkipImages(false)
11
 {
12
 }
13
@@ -943,11 +943,11 @@
14
 }
15
 
4
 
16
 void PDFOutDev::drawImageMask(GfxState* pState, Object*, Stream* str,
17
-                              int width, int height, GBool invert,
18
+                              int width, int height, bool invert,
19
 #if POPPLER_CHECK_VERSION(0, 12, 0)
20
-                              GBool /*interpolate*/,
21
+                              bool /*interpolate*/,
22
 #endif
23
-                              GBool /*inlineImg*/ )
24
+                              bool /*inlineImg*/ )
25
 {
26
     if (m_bSkipImages)
27
         return;
28
@@ -976,9 +976,9 @@
29
 void PDFOutDev::drawImage(GfxState*, Object*, Stream* str,
30
                           int width, int height, GfxImageColorMap* colorMap,
31
 #if POPPLER_CHECK_VERSION(0, 12, 0)
32
-                          GBool /*interpolate*/,
33
+                          bool /*interpolate*/,
34
 #endif
35
-                          int* maskColors, GBool /*inlineImg*/ )
36
+                          int* maskColors, bool /*inlineImg*/ )
37
 {
38
     if (m_bSkipImages)
39
         return;
40
@@ -1027,13 +1027,13 @@
41
                                 int width, int height,
42
                                 GfxImageColorMap* colorMap,
43
 #if POPPLER_CHECK_VERSION(0, 12, 0)
44
-                                GBool /*interpolate*/,
45
+                                bool /*interpolate*/,
46
 #endif
47
                                 Stream* maskStr,
48
                                 int maskWidth, int maskHeight,
49
-                                GBool maskInvert
50
+                                bool maskInvert
51
 #if POPPLER_CHECK_VERSION(0, 12, 0)
52
-                                , GBool /*maskInterpolate*/
53
+                                , bool /*maskInterpolate*/
54
 #endif
55
                                )
56
 {
57
@@ -1049,13 +1049,13 @@
58
                                     int width, int height,
59
                                     GfxImageColorMap* colorMap,
60
 #if POPPLER_CHECK_VERSION(0, 12, 0)
61
-                                    GBool /*interpolate*/,
62
+                                    bool /*interpolate*/,
63
 #endif
64
                                     Stream* maskStr,
65
                                     int maskWidth, int maskHeight,
66
                                     GfxImageColorMap* maskColorMap
67
 #if POPPLER_CHECK_VERSION(0, 12, 0)
68
-                                    , GBool /*maskInterpolate*/
69
+                                    , bool /*maskInterpolate*/
70
 #endif
71
                                    )
72
 {
73
diff -ru sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
74
--- sdext/source/pdfimport/xpdfwrapper.orig/pdfioutdev_gpl.hxx	2018-11-01 20:43:55.802520387 +0000
75
+++ sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx	2018-11-01 20:44:33.402620221 +0000
76
@@ -151,17 +151,17 @@
77
 
78
         // Does this device use upside-down coordinates?
79
         // (Upside-down means (0,0) is the top left corner of the page.)
80
-        virtual GBool upsideDown() override { return gTrue; }
81
+        virtual bool upsideDown() override { return true; }
82
 
83
         // Does this device use drawChar() or drawString()?
84
-        virtual GBool useDrawChar() override { return gTrue; }
85
+        virtual bool useDrawChar() override { return true; }
86
 
87
         // Does this device use beginType3Char/endType3Char?  Otherwise,
88
         // text in Type 3 fonts will be drawn with drawChar/drawString.
89
-        virtual GBool interpretType3Chars() override { return gFalse; }
90
+        virtual bool interpretType3Chars() override { return false; }
91
 
92
         // Does this device need non-text content?
93
-        virtual GBool needNonText() override { return gTrue; }
94
+        virtual bool needNonText() override { return true; }
95
 
96
         //----- initialization and control
97
 
98
@@ -237,40 +237,40 @@
99
 
100
         //----- image drawing
101
         virtual void drawImageMask(GfxState *state, Object *ref, Stream *str,
102
-                                   int width, int height, GBool invert,
103
+                                   int width, int height, bool invert,
104
 #if POPPLER_CHECK_VERSION(0, 12, 0)
105
-                                   GBool interpolate,
106
+                                   bool interpolate,
107
 #endif
108
-                                   GBool inlineImg) override;
109
+                                   bool inlineImg) override;
110
         virtual void drawImage(GfxState *state, Object *ref, Stream *str,
111
                                int width, int height, GfxImageColorMap *colorMap,
112
 #if POPPLER_CHECK_VERSION(0, 12, 0)
113
-                               GBool interpolate,
114
+                               bool interpolate,
115
 #endif
116
-                               int *maskColors, GBool inlineImg) override;
117
+                               int *maskColors, bool inlineImg) override;
118
         virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
119
                                      int width, int height,
120
                                      GfxImageColorMap *colorMap,
121
 #if POPPLER_CHECK_VERSION(0, 12, 0)
122
-                                     GBool interpolate,
123
+                                     bool interpolate,
124
 #endif
125
                                      Stream *maskStr, int maskWidth, int maskHeight,
126
-                                     GBool maskInvert
127
+                                     bool maskInvert
128
 #if POPPLER_CHECK_VERSION(0, 12, 0)
129
-                                     , GBool maskInterpolate
130
+                                     , bool maskInterpolate
131
 #endif
132
                                     ) override;
133
         virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
134
                                          int width, int height,
135
                                          GfxImageColorMap *colorMap,
136
 #if POPPLER_CHECK_VERSION(0, 12, 0)
137
-                                         GBool interpolate,
138
+                                         bool interpolate,
139
 #endif
140
                                          Stream *maskStr,
141
                                          int maskWidth, int maskHeight,
142
                                          GfxImageColorMap *maskColorMap
143
 #if POPPLER_CHECK_VERSION(0, 12, 0)
144
-                                         , GBool maskInterpolate
145
+                                         , bool maskInterpolate
146
 #endif
147
                                         ) override;
148
 
149
diff -ru sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
150
--- sdext/source/pdfimport/xpdfwrapper.orig/wrapper_gpl.cxx	2018-11-01 20:43:55.802520387 +0000
151
+++ sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx	2018-11-01 20:44:33.402620221 +0000
152
@@ -69,7 +69,7 @@
153
 
154
     // read config file
5
     // read config file
155
     globalParams = new GlobalParams();
6
     globalParams = new GlobalParams();
156
-    globalParams->setErrQuiet(gTrue);
7
-    globalParams->setErrQuiet(gTrue);
Lines 158-164 Link Here
158
 #if defined(_MSC_VER)
9
 #if defined(_MSC_VER)
159
     globalParams->setupBaseFonts(nullptr);
10
     globalParams->setupBaseFonts(nullptr);
160
 #endif
11
 #endif
161
@@ -143,7 +143,7 @@
12
@@ -143,7 +143,7 @@ int main(int argc, char **argv)
162
                 i,
13
                 i,
163
                 PDFI_OUTDEV_RESOLUTION,
14
                 PDFI_OUTDEV_RESOLUTION,
164
                 PDFI_OUTDEV_RESOLUTION,
15
                 PDFI_OUTDEV_RESOLUTION,
Lines 167-170 Link Here
167
         rDoc.processLinks(&aOutDev, i);
18
         rDoc.processLinks(&aOutDev, i);
168
     }
19
     }
169
 
20
 
170
(-)editors/openoffice-devel/Makefile (-3 / +4 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/ \
Lines 196-204 Link Here
196
SDK_CONFIGURE_ENABLE=		odk
196
SDK_CONFIGURE_ENABLE=		odk
197
SDK_DISTFILES=			unowinreg.dll:unoreg
197
SDK_DISTFILES=			unowinreg.dll:unoreg
198
198
199
# The current version of openoffice is not compatible with the changed API and
200
# requirements of popller-0.7x. Switch to using bundled version for now.
201
CONFIGURE_ARGS+=		--without-system-poppler
199
PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
202
PDFIMPORT_CONFIGURE_ENABLE=	pdfimport
200
PDFIMPORT_CONFIGURE_WITH=	system-poppler
201
PDFIMPORT_LIB_DEPENDS=		libpoppler.so:graphics/poppler
202
203
203
REPORT_BUILDER_BROKEN=		REPORT_BUILDER option requires additional .jar files
204
REPORT_BUILDER_BROKEN=		REPORT_BUILDER option requires additional .jar files
204
REPORT_BUILDER_CONFIGURE_ENABLE=	report-builder
205
REPORT_BUILDER_CONFIGURE_ENABLE=	report-builder
(-)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 (-25 / +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-49 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_DEPRECATED=		Qt4 has been EOL since december 2015
23
qt4_EXPIRATION_DATE=	2019-03-15
24
25
qt4_LIB_DEPENDS=	libpoppler-qt4.so:graphics/poppler-qt4 \
26
			libquazip.so:archivers/quazip@qt4
27
qt5_LIB_DEPENDS=	libpoppler-qt5.so:graphics/poppler-qt5 \
28
			libquazip5.so:archivers/quazip@qt5
29
30
USES=		desktop-file-utils dos2unix ghostscript:run \
20
USES=		desktop-file-utils dos2unix ghostscript:run \
31
		pkgconfig qmake
21
		pkgconfig qmake qt:5
32
33
.if ${FLAVOR} == qt4
34
USES+=		qt:4
35
USE_QT=		corelib gui network script svg xml \
36
		iconengines_run designer_build moc_build rcc_build uic_build
37
QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip" \
38
		QUAZIP_LIB="-lquazip"
39
.else
40
USES+=		qt:5
41
USE_QT	=	core gui network script svg widgets xml \
22
USE_QT	=	core gui network script svg widgets xml \
42
		printsupport concurrent uitools buildtools_build
23
		printsupport concurrent uitools buildtools_build
43
QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
24
QMAKE_ARGS=	QUAZIP_INCLUDE="${LOCALBASE}/include/quazip5" \
44
		QUAZIP_LIB="-lquazip5"
25
		QUAZIP_LIB="-lquazip5"
45
QTVER_SUFFIX=	5
26
QTVER_SUFFIX=	5
46
.endif
47
27
48
USE_XORG=	x11
28
USE_XORG=	x11
49
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 136-142 Link Here
136
    SUBDIR += devil
136
    SUBDIR += devil
137
    SUBDIR += dia
137
    SUBDIR += dia
138
    SUBDIR += diff-pdf
138
    SUBDIR += diff-pdf
139
    SUBDIR += diffpdf
140
    SUBDIR += digikam
139
    SUBDIR += digikam
141
    SUBDIR += digikam-kde4
140
    SUBDIR += digikam-kde4
142
    SUBDIR += digikam-kde4-doc
141
    SUBDIR += digikam-kde4-doc
Lines 863-869 Link Here
863
    SUBDIR += poppler
862
    SUBDIR += poppler
864
    SUBDIR += poppler-data
863
    SUBDIR += poppler-data
865
    SUBDIR += poppler-glib
864
    SUBDIR += poppler-glib
866
    SUBDIR += poppler-qt4
867
    SUBDIR += poppler-qt5
865
    SUBDIR += poppler-qt5
868
    SUBDIR += poppler-utils
866
    SUBDIR += poppler-utils
869
    SUBDIR += potrace
867
    SUBDIR += potrace
Lines 934-940 Link Here
934
    SUBDIR += py-plotly
932
    SUBDIR += py-plotly
935
    SUBDIR += py-png
933
    SUBDIR += py-png
936
    SUBDIR += py-poppler
934
    SUBDIR += py-poppler
937
    SUBDIR += py-poppler-qt4
938
    SUBDIR += py-pycha
935
    SUBDIR += py-pycha
939
    SUBDIR += py-pycollada
936
    SUBDIR += py-pycollada
940
    SUBDIR += py-pydot
937
    SUBDIR += py-pydot
(-)graphics/diff-pdf/Makefile (-31 lines)
Lines 1-31 Link Here
1
# $FreeBSD$
2
3
PORTNAME=	diff-pdf
4
DISTVERSIONPREFIX=	v
5
DISTVERSION=	0.2-27
6
DISTVERSIONSUFFIX=	-gc4d6722
7
CATEGORIES=	graphics
8
9
MAINTAINER=	uzsolt@uzsolt.hu
10
COMMENT=	Tool for visually comparing two PDFs
11
12
LICENSE=	GPLv2
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
15
LIB_DEPENDS=	libpoppler.so:graphics/poppler \
16
		libpoppler-glib.so:graphics/poppler-glib
17
18
USES=		autoreconf pkgconfig
19
USE_GITHUB=	yes
20
GH_ACCOUNT=	vslavik
21
GNU_CONFIGURE=	yes
22
CONFIGURE_ARGS=	--with-wx-config=${WX_CONFIG}
23
USE_GNOME=	cairo glib20
24
USE_WX=		2.8+
25
26
PLIST_FILES=	bin/${PORTNAME}
27
28
post-patch:
29
	@${REINPLACE_CMD} '/AM_PATH_WXCONFIG/ s,3.0.0,2.8.0,' ${WRKSRC}/configure.ac
30
31
.include <bsd.port.mk>
(-)graphics/diff-pdf/distinfo (-3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1531601752
2
SHA256 (vslavik-diff-pdf-v0.2-27-gc4d6722_GH0.tar.gz) = 98273411476598dd69b61d13f360303ca2b81b97c56af930a9228d05a75deadb
3
SIZE (vslavik-diff-pdf-v0.2-27-gc4d6722_GH0.tar.gz) = 35829
(-)graphics/diff-pdf/pkg-descr (-9 lines)
Lines 1-9 Link Here
1
A tool for visual comparison of two PDFs.
2
3
It takes two PDF files as arguments.
4
If given the --pdf option, output-diff produces a PDF file with
5
visually highlighted differences.
6
Another option is to compare the two files visually in a simple GUI,
7
using the --view argument.
8
9
WWW: http://vslavik.github.io/diff-pdf/
(-)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-CMakeScripts_Pod2man.cmake (-3 / +3 lines)
Lines 1-6 Link Here
1
--- CMakeScripts/Pod2man.cmake.orig	2017-01-06 16:19:54.351838000 +0100
1
--- CMakeScripts/Pod2man.cmake.orig	2018-03-11 20:38:09 UTC
2
+++ CMakeScripts/Pod2man.cmake	2017-01-06 16:20:26.957487000 +0100
2
+++ CMakeScripts/Pod2man.cmake
3
@@ -48,7 +48,7 @@
3
@@ -48,7 +48,7 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
4
         )
4
         )
5
         install(
5
         install(
6
             FILES ${MANFILE_FULL}
6
             FILES ${MANFILE_FULL}
(-)graphics/inkscape/files/patch-archgit_bee18ea (+1156 lines)
Line 0 Link Here
1
--- CMakeScripts/DefineDependsandFlags.cmake.orig	2018-03-11 20:38:09 UTC
2
+++ CMakeScripts/DefineDependsandFlags.cmake
3
@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
4
 		set(HAVE_POPPLER_GLIB ON)
5
 	    endif()
6
 	endif()
7
-	if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
8
-		POPPLER_VERSION VERSION_EQUAL   "0.26.0")
9
-	    set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
10
-	endif()
11
-	if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
12
-		POPPLER_VERSION VERSION_EQUAL   "0.29.0")
13
-	    set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
14
-	endif()
15
-	if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
16
-		POPPLER_VERSION VERSION_EQUAL   "0.58.0")
17
-            set(POPPLER_NEW_OBJECT_API ON)
18
-	endif()
19
     else()
20
 	set(ENABLE_POPPLER_CAIRO OFF)
21
     endif()
22
--- src/extension/internal/pdfinput/pdf-input.cpp.orig	2018-03-11 20:38:09 UTC
23
+++ src/extension/internal/pdfinput/pdf-input.cpp
24
@@ -319,7 +319,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gc
25
     _render_thumb = true;
26
 
27
     // Create PopplerDocument
28
-    Glib::ustring filename = _pdf_doc->getFileName()->getCString();
29
+    Glib::ustring filename = _pdf_doc->getFileName()->c_str();
30
     if (!Glib::path_is_absolute(filename)) {
31
         filename = Glib::build_filename(Glib::get_current_dir(),filename);
32
     }
33
@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/,
34
             dlg->getImportSettings(prefs);
35
 
36
         // Apply crop settings
37
-        PDFRectangle *clipToBox = NULL;
38
+        _POPPLER_CONST PDFRectangle *clipToBox = NULL;
39
         double crop_setting;
40
         sp_repr_get_double(prefs, "cropTo", &crop_setting);
41
 
42
--- src/extension/internal/pdfinput/pdf-input.h.orig	2018-03-11 20:38:09 UTC
43
+++ src/extension/internal/pdfinput/pdf-input.h
44
@@ -15,6 +15,7 @@
45
 #endif
46
 
47
 #ifdef HAVE_POPPLER
48
+#include "poppler-transition-api.h"
49
 
50
 #include <gtkmm/dialog.h>
51
 
52
--- src/extension/internal/pdfinput/pdf-parser.cpp.orig	2018-03-11 20:38:09 UTC
53
+++ src/extension/internal/pdfinput/pdf-parser.cpp
54
@@ -38,7 +38,6 @@ extern "C" {
55
 
56
 #include "goo/gmem.h"
57
 #include "goo/GooTimer.h"
58
-#include "goo/GooHash.h"
59
 #include "GlobalParams.h"
60
 #include "CharTypes.h"
61
 #include "Object.h"
62
@@ -271,7 +270,7 @@ class ClipHistoryEntry { (public)
63
     // Manipulate clip path stack
64
     ClipHistoryEntry *save();
65
     ClipHistoryEntry *restore();
66
-    GBool hasSaves() { return saved != NULL; }
67
+    bool hasSaves() { return saved != NULL; }
68
     void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal);
69
     GfxPath *getClipPath() { return clipPath; }
70
     GfxClipType getClipType() { return clipType; }
71
@@ -295,15 +294,15 @@ PdfParser::PdfParser(XRef *xrefA,
72
                      int /*pageNum*/,
73
 		     int rotate,
74
 		     Dict *resDict,
75
-                     PDFRectangle *box,
76
-		     PDFRectangle *cropBox) :
77
+                     _POPPLER_CONST PDFRectangle *box,
78
+                     _POPPLER_CONST PDFRectangle *cropBox) :
79
     xref(xrefA),
80
     builder(builderA),
81
-    subPage(gFalse),
82
+    subPage(false),
83
     printCommands(false),
84
     res(new GfxResources(xref, resDict, NULL)), // start the resource stack
85
-    state(new GfxState(72.0, 72.0, box, rotate, gTrue)),
86
-    fontChanged(gFalse),
87
+    state(new GfxState(72.0, 72.0, box, rotate, true)),
88
+    fontChanged(false),
89
     clip(clipNone),
90
     ignoreUndef(0),
91
     baseMatrix(),
92
@@ -318,7 +317,7 @@ PdfParser::PdfParser(XRef *xrefA,
93
   builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
94
                            Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
95
 
96
-  double *ctm = state->getCTM();
97
+  const double *ctm = state->getCTM();
98
   double scaledCTM[6];
99
   for (int i = 0; i < 6; ++i) {
100
     baseMatrix[i] = ctm[i];
101
@@ -353,14 +352,14 @@ PdfParser::PdfParser(XRef *xrefA,
102
 PdfParser::PdfParser(XRef *xrefA,
103
 		     Inkscape::Extension::Internal::SvgBuilder *builderA,
104
                      Dict *resDict,
105
-		     PDFRectangle *box) :
106
+		     _POPPLER_CONST PDFRectangle *box) :
107
     xref(xrefA),
108
     builder(builderA),
109
-    subPage(gTrue),
110
+    subPage(true),
111
     printCommands(false),
112
     res(new GfxResources(xref, resDict, NULL)), // start the resource stack
113
-    state(new GfxState(72, 72, box, 0, gFalse)),
114
-    fontChanged(gFalse),
115
+    state(new GfxState(72, 72, box, 0, false)),
116
+    fontChanged(false),
117
     clip(clipNone),
118
     ignoreUndef(0),
119
     baseMatrix(),
120
@@ -409,7 +408,7 @@ PdfParser::~PdfParser() {
121
   }
122
 }
123
 
124
-void PdfParser::parse(Object *obj, GBool topLevel) {
125
+void PdfParser::parse(Object *obj, bool topLevel) {
126
   Object obj2;
127
 
128
   if (obj->isArray()) {
129
@@ -434,13 +433,13 @@ void PdfParser::parse(Object *obj, GBool topLevel) {
130
 	error(errInternal, -1, "Weird page contents");
131
     	return;
132
   }
133
-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
134
+  parser = new Parser(xref, new Lexer(xref, obj), false);
135
   go(topLevel);
136
   delete parser;
137
   parser = NULL;
138
 }
139
 
140
-void PdfParser::go(GBool /*topLevel*/)
141
+void PdfParser::go(bool /*topLevel*/)
142
 {
143
   Object obj;
144
   Object args[maxArgs];
145
@@ -572,7 +571,7 @@ const char *PdfParser::getPreviousOperator(unsigned in
146
 
147
 void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
148
   PdfOperator *op;
149
-  char *name;
150
+  const char *name;
151
   Object *argPtr;
152
   int i;
153
 
154
@@ -620,7 +619,7 @@ void PdfParser::execOp(Object *cmd, Object args[], int
155
   (this->*op->func)(argPtr, numArgs);
156
 }
157
 
158
-PdfOperator* PdfParser::findOp(char *name) {
159
+PdfOperator* PdfParser::findOp(const char *name) {
160
   int a = -1;
161
   int b = numOps;
162
   int cmp = -1;
163
@@ -640,7 +639,7 @@ PdfOperator* PdfParser::findOp(char *name) {
164
   return &opTab[a];
165
 }
166
 
167
-GBool PdfParser::checkArg(Object *arg, TchkType type) {
168
+bool PdfParser::checkArg(Object *arg, TchkType type) {
169
   switch (type) {
170
   case tchkBool:   return arg->isBool();
171
   case tchkInt:    return arg->isInt();
172
@@ -650,9 +649,9 @@ GBool PdfParser::checkArg(Object *arg, TchkType type) 
173
   case tchkArray:  return arg->isArray();
174
   case tchkProps:  return arg->isDict() || arg->isName();
175
   case tchkSCN:    return arg->isNum() || arg->isName();
176
-  case tchkNone:   return gFalse;
177
+  case tchkNone:   return false;
178
   }
179
-  return gFalse;
180
+  return false;
181
 }
182
 
183
 int PdfParser::getPos() {
184
@@ -707,7 +706,7 @@ void PdfParser::opConcat(Object args[], int /*numArgs*
185
       builder->pushGroup();
186
       builder->setTransform(a0, a1, a2, a3, a4, a5);
187
   }
188
-  fontChanged = gTrue;
189
+  fontChanged = true;
190
 }
191
 
192
 // TODO not good that numArgs is ignored but args[] is used:
193
@@ -773,8 +772,8 @@ void PdfParser::opSetExtGState(Object args[], int /*nu
194
   Object obj1, obj2, obj3, obj4, obj5;
195
   Function *funcs[4] = {0, 0, 0, 0};
196
   GfxColor backdropColor;
197
-  GBool haveBackdropColor = gFalse;
198
-  GBool alpha = gFalse;
199
+  bool haveBackdropColor = false;
200
+  bool alpha = false;
201
 
202
 #if defined(POPPLER_NEW_OBJECT_API)
203
   if ((obj1 = res->lookupGState(args[0].getName())).isNull()) {
204
@@ -830,7 +829,7 @@ void PdfParser::opSetExtGState(Object args[], int /*nu
205
 #endif
206
 
207
   // fill/stroke overprint
208
-  GBool haveFillOP = gFalse;
209
+  bool haveFillOP = false;
210
 #if defined(POPPLER_NEW_OBJECT_API)
211
   if ((haveFillOP = (obj2 = obj1.dictLookup(const_cast<char*>("op"))).isBool())) {
212
 #else
213
@@ -925,9 +924,9 @@ void PdfParser::opSetExtGState(Object args[], int /*nu
214
 #else
215
       if (obj2.dictLookup(const_cast<char*>("S"), &obj3)->isName(const_cast<char*>("Alpha"))) {
216
 #endif
217
-	alpha = gTrue;
218
+	alpha = true;
219
       } else { // "Luminosity"
220
-	alpha = gFalse;
221
+	alpha = false;
222
       }
223
 #if !defined(POPPLER_NEW_OBJECT_API)
224
       obj3.free();
225
@@ -978,8 +977,8 @@ void PdfParser::opSetExtGState(Object args[], int /*nu
226
 	if (obj3.streamGetDict()->lookup(const_cast<char*>("Group"), &obj4)->isDict()) {
227
 #endif
228
 	  GfxColorSpace *blendingColorSpace = 0;
229
-	  GBool isolated = gFalse;
230
-	  GBool knockout = gFalse;
231
+	  bool isolated = false;
232
+	  bool knockout = false;
233
 #if defined(POPPLER_NEW_OBJECT_API)
234
 	  if (!((obj5 = obj4.dictLookup(const_cast<char*>("CS"))).isNull())) {
235
 #else
236
@@ -1050,9 +1049,9 @@ void PdfParser::opSetExtGState(Object args[], int /*nu
237
 #endif
238
 }
239
 
240
-void PdfParser::doSoftMask(Object *str, GBool alpha,
241
+void PdfParser::doSoftMask(Object *str, bool alpha,
242
 		     GfxColorSpace *blendingColorSpace,
243
-		     GBool isolated, GBool knockout,
244
+		     bool isolated, bool knockout,
245
 		     Function *transferFunc, GfxColor *backdropColor) {
246
   Dict *dict, *resDict;
247
   double m[6], bbox[4];
248
@@ -1145,7 +1144,7 @@ void PdfParser::doSoftMask(Object *str, GBool alpha,
249
 
250
   // draw it
251
   ++formDepth;
252
-  doForm1(str, resDict, m, bbox, gTrue, gTrue,
253
+  doForm1(str, resDict, m, bbox, true, true,
254
 	  blendingColorSpace, isolated, knockout,
255
 	  alpha, transferFunc, backdropColor);
256
   --formDepth;
257
@@ -1615,7 +1614,7 @@ void PdfParser::opFill(Object /*args*/[], int /*numArg
258
   if (state->isPath()) {
259
     if (state->getFillColorSpace()->getMode() == csPattern &&
260
         !builder->isPatternTypeSupported(state->getFillPattern())) {
261
-      doPatternFillFallback(gFalse);
262
+      doPatternFillFallback(false);
263
     } else {
264
       builder->addPath(state, true, false);
265
     }
266
@@ -1632,7 +1631,7 @@ void PdfParser::opEOFill(Object /*args*/[], int /*numA
267
   if (state->isPath()) {
268
     if (state->getFillColorSpace()->getMode() == csPattern &&
269
         !builder->isPatternTypeSupported(state->getFillPattern())) {
270
-      doPatternFillFallback(gTrue);
271
+      doPatternFillFallback(true);
272
     } else {
273
       builder->addPath(state, true, false, true);
274
     }
275
@@ -1647,7 +1646,7 @@ void PdfParser::opFillStroke(Object /*args*/[], int /*
276
     return;
277
   }
278
   if (state->isPath()) {
279
-    doFillAndStroke(gFalse);
280
+    doFillAndStroke(false);
281
   } else {
282
     builder->addPath(state, true, true);
283
   }
284
@@ -1662,7 +1661,7 @@ void PdfParser::opCloseFillStroke(Object /*args*/[], i
285
   }
286
   if (state->isPath()) {
287
     state->closePath();
288
-    doFillAndStroke(gFalse);
289
+    doFillAndStroke(false);
290
   }
291
   doEndPath();
292
 }
293
@@ -1674,7 +1673,7 @@ void PdfParser::opEOFillStroke(Object /*args*/[], int 
294
     return;
295
   }
296
   if (state->isPath()) {
297
-    doFillAndStroke(gTrue);
298
+    doFillAndStroke(true);
299
   }
300
   doEndPath();
301
 }
302
@@ -1687,20 +1686,20 @@ void PdfParser::opCloseEOFillStroke(Object /*args*/[],
303
   }
304
   if (state->isPath()) {
305
     state->closePath();
306
-    doFillAndStroke(gTrue);
307
+    doFillAndStroke(true);
308
   }
309
   doEndPath();
310
 }
311
 
312
-void PdfParser::doFillAndStroke(GBool eoFill) {
313
-    GBool fillOk = gTrue, strokeOk = gTrue;
314
+void PdfParser::doFillAndStroke(bool eoFill) {
315
+    bool fillOk = true, strokeOk = true;
316
     if (state->getFillColorSpace()->getMode() == csPattern &&
317
         !builder->isPatternTypeSupported(state->getFillPattern())) {
318
-        fillOk = gFalse;
319
+        fillOk = false;
320
     }
321
     if (state->getStrokeColorSpace()->getMode() == csPattern &&
322
         !builder->isPatternTypeSupported(state->getStrokePattern())) {
323
-        strokeOk = gFalse;
324
+        strokeOk = false;
325
     }
326
     if (fillOk && strokeOk) {
327
         builder->addPath(state, true, true, eoFill);
328
@@ -1710,7 +1709,7 @@ void PdfParser::doFillAndStroke(GBool eoFill) {
329
     }
330
 }
331
 
332
-void PdfParser::doPatternFillFallback(GBool eoFill) {
333
+void PdfParser::doPatternFillFallback(bool eoFill) {
334
   GfxPattern *pattern;
335
 
336
   if (!(pattern = state->getFillPattern())) {
337
@@ -1720,7 +1719,7 @@ void PdfParser::doPatternFillFallback(GBool eoFill) {
338
   case 1:
339
     break;
340
   case 2:
341
-    doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), gFalse, eoFill);
342
+    doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), false, eoFill);
343
     break;
344
   default:
345
     error(errUnimplemented, getPos(), "Unimplemented pattern type (%d) in fill",
346
@@ -1739,7 +1738,7 @@ void PdfParser::doPatternStrokeFallback() {
347
   case 1:
348
     break;
349
   case 2:
350
-    doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), gTrue, gFalse);
351
+    doShadingPatternFillFallback(static_cast<GfxShadingPattern *>(pattern), true, false);
352
     break;
353
   default:
354
     error(errUnimplemented, getPos(), "Unimplemented pattern type ({0:d}) in stroke",
355
@@ -1749,10 +1748,10 @@ void PdfParser::doPatternStrokeFallback() {
356
 }
357
 
358
 void PdfParser::doShadingPatternFillFallback(GfxShadingPattern *sPat,
359
-                                             GBool stroke, GBool eoFill) {
360
+                                             bool stroke, bool eoFill) {
361
   GfxShading *shading;
362
   GfxPath *savedPath;
363
-  double *ctm, *btm, *ptm;
364
+  const double *ctm, *btm, *ptm;
365
   double m[6], ictm[6], m1[6];
366
   double xMin, yMin, xMax, yMax;
367
   double det;
368
@@ -1863,7 +1862,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs*
369
   double xTemp, yTemp;
370
   double gradientTransform[6];
371
   double *matrix = NULL;
372
-  GBool savedState = gFalse;
373
+  bool savedState = false;
374
 
375
 #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API)
376
   if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) {
377
@@ -1879,13 +1878,13 @@ void PdfParser::opShFill(Object args[], int /*numArgs*
378
   if (shading->getType() != 2 && shading->getType() != 3) {
379
     savedPath = state->getPath()->copy();
380
     saveState();
381
-    savedState = gTrue;
382
+    savedState = true;
383
   } else {  // get gradient transform if possible
384
       // check proper operator sequence
385
       // first there should be one W(*) and then one 'cm' somewhere before 'sh'
386
-      GBool seenClip, seenConcat;
387
+      bool seenClip, seenConcat;
388
       seenClip = (clipHistory->getClipPath() != NULL);
389
-      seenConcat = gFalse;
390
+      seenConcat = false;
391
       int i = 1;
392
       while (i <= maxOperatorHistoryDepth) {
393
         const char *opName = getPreviousOperator(i);
394
@@ -1893,7 +1892,7 @@ void PdfParser::opShFill(Object args[], int /*numArgs*
395
           if (seenConcat) {   // more than one 'cm'
396
             break;
397
           } else {
398
-            seenConcat = gTrue;
399
+            seenConcat = true;
400
           }
401
         }
402
         i++;
403
@@ -1994,7 +1993,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *
404
   GfxColor color0M, color1M, colorM0, colorM1, colorMM;
405
   GfxColor colors2[4];
406
   double functionColorDelta = colorDeltas[pdfFunctionShading-1];
407
-  double *matrix;
408
+  const double *matrix;
409
   double xM, yM;
410
   int nComps, i, j;
411
 
412
@@ -2174,7 +2173,7 @@ void PdfParser::doPatchMeshShFill(GfxPatchMeshShading 
413
   }
414
 }
415
 
416
-void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
417
+void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
418
   GfxPatch patch00 = blankPatch();
419
   GfxPatch patch01 = blankPatch();
420
   GfxPatch patch10 = blankPatch();
421
@@ -2348,7 +2347,7 @@ void PdfParser::opBeginText(Object /*args*/[], int /*n
422
   state->setTextMat(1, 0, 0, 1, 0, 0);
423
   state->textMoveTo(0, 0);
424
   builder->updateTextPosition(0.0, 0.0);
425
-  fontChanged = gTrue;
426
+  fontChanged = true;
427
   builder->beginTextObject(state);
428
 }
429
 
430
@@ -2376,20 +2375,20 @@ void PdfParser::opSetFont(Object args[], int /*numArgs
431
     // unsetting the font (drawing no text) is better than using the
432
     // previous one and drawing random glyphs from it
433
     state->setFont(NULL, args[1].getNum());
434
-    fontChanged = gTrue;
435
+    fontChanged = true;
436
     return;
437
   }
438
   if (printCommands) {
439
     printf("  font: tag=%s name='%s' %g\n",
440
-	   font->getTag()->getCString(),
441
-	   font->getName() ? font->getName()->getCString() : "???",
442
+	   font->getTag()->c_str(),
443
+	   font->getName() ? font->getName()->c_str() : "???",
444
 	   args[1].getNum());
445
     fflush(stdout);
446
   }
447
 
448
   font->incRefCnt();
449
   state->setFont(font, args[1].getNum());
450
-  fontChanged = gTrue;
451
+  fontChanged = true;
452
 }
453
 
454
 // TODO not good that numArgs is ignored but args[] is used:
455
@@ -2422,7 +2421,7 @@ void PdfParser::opSetHorizScaling(Object args[], int /
456
 {
457
   state->setHorizScaling(args[0].getNum());
458
   builder->updateTextMatrix(state);
459
-  fontChanged = gTrue;
460
+  fontChanged = true;
461
 }
462
 
463
 //------------------------------------------------------------------------
464
@@ -2462,7 +2461,7 @@ void PdfParser::opSetTextMatrix(Object args[], int /*n
465
   state->textMoveTo(0, 0);
466
   builder->updateTextMatrix(state);
467
   builder->updateTextPosition(0.0, 0.0);
468
-  fontChanged = gTrue;
469
+  fontChanged = true;
470
 }
471
 
472
 void PdfParser::opTextNextLine(Object /*args*/[], int /*numArgs*/)
473
@@ -2488,7 +2487,7 @@ void PdfParser::opShowText(Object args[], int /*numArg
474
   }
475
   if (fontChanged) {
476
     builder->updateFont(state);
477
-    fontChanged = gFalse;
478
+    fontChanged = false;
479
   }
480
   doShowText(args[0].getString());
481
 }
482
@@ -2505,7 +2504,7 @@ void PdfParser::opMoveShowText(Object args[], int /*nu
483
   }
484
   if (fontChanged) {
485
     builder->updateFont(state);
486
-    fontChanged = gFalse;
487
+    fontChanged = false;
488
   }
489
   tx = state->getLineX();
490
   ty = state->getLineY() - state->getLeading();
491
@@ -2526,7 +2525,7 @@ void PdfParser::opMoveSetShowText(Object args[], int /
492
   }
493
   if (fontChanged) {
494
     builder->updateFont(state);
495
-    fontChanged = gFalse;
496
+    fontChanged = false;
497
   }
498
   state->setWordSpace(args[0].getNum());
499
   state->setCharSpace(args[1].getNum());
500
@@ -2550,7 +2549,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*n
501
   }
502
   if (fontChanged) {
503
     builder->updateFont(state);
504
-    fontChanged = gFalse;
505
+    fontChanged = false;
506
   }
507
   wMode = state->getFont()->getWMode();
508
   a = args[0].getArray();
509
@@ -2582,7 +2581,7 @@ void PdfParser::opShowSpaceText(Object args[], int /*n
510
   }
511
 }
512
 
513
-void PdfParser::doShowText(GooString *s) {
514
+void PdfParser::doShowText(const GooString *s) {
515
   GfxFont *font;
516
   int wMode;
517
   double riseX, riseY;
518
@@ -2591,11 +2590,11 @@ void PdfParser::doShowText(GooString *s) {
519
   double x, y, dx, dy, tdx, tdy;
520
   double originX, originY, tOriginX, tOriginY;
521
   double oldCTM[6], newCTM[6];
522
-  double *mat;
523
+  const double *mat;
524
   Object charProc;
525
   Dict *resDict;
526
   Parser *oldParser;
527
-  char *p;
528
+  const char *p;
529
   int len, n, uLen;
530
 
531
   font = state->getFont();
532
@@ -2631,7 +2630,7 @@ void PdfParser::doShowText(GooString *s) {
533
     double lineX = state->getLineX();
534
     double lineY = state->getLineY();
535
     oldParser = parser;
536
-    p = s->getCString();
537
+    p = s->c_str();
538
     len = s->getLength();
539
     while (len > 0) {
540
       n = font->getNextChar(p, len, &code,
541
@@ -2660,7 +2659,7 @@ void PdfParser::doShowText(GooString *s) {
542
 	  pushResources(resDict);
543
 	}
544
 	if (charProc.isStream()) {
545
-	  //parse(&charProc, gFalse); // TODO: parse into SVG font
546
+	  //parse(&charProc, false); // TODO: parse into SVG font
547
 	} else {
548
 	  error(errSyntaxError, getPos(), "Missing or bad Type3 CharProc entry");
549
 	}
550
@@ -2686,7 +2685,7 @@ void PdfParser::doShowText(GooString *s) {
551
 
552
   } else {
553
     state->textTransformDelta(0, state->getRise(), &riseX, &riseY);
554
-    p = s->getCString();
555
+    p = s->c_str();
556
     len = s->getLength();
557
     while (len > 0) {
558
       n = font->getNextChar(p, len, &code,
559
@@ -2732,7 +2731,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs
560
 {
561
   Object obj1, obj2, obj3, refObj;
562
 
563
-  char *name = args[0].getName();
564
+  const char *name = args[0].getName();
565
 #if defined(POPPLER_NEW_OBJECT_API)
566
   if ((obj1 = res->lookupXObject(name)).isNull()) {
567
 #else
568
@@ -2758,7 +2757,7 @@ void PdfParser::opXObject(Object args[], int /*numArgs
569
 #else
570
     res->lookupXObjectNF(name, &refObj);
571
 #endif
572
-    doImage(&refObj, obj1.getStream(), gFalse);
573
+    doImage(&refObj, obj1.getStream(), false);
574
 #if !defined(POPPLER_NEW_OBJECT_API)
575
     refObj.free();
576
 #endif
577
@@ -2783,19 +2782,19 @@ void PdfParser::opXObject(Object args[], int /*numArgs
578
 #endif
579
 }
580
 
581
-void PdfParser::doImage(Object * /*ref*/, Stream *str, GBool inlineImg)
582
+void PdfParser::doImage(Object * /*ref*/, Stream *str, bool inlineImg)
583
 {
584
     Dict *dict;
585
     int width, height;
586
     int bits;
587
-    GBool interpolate;
588
+    bool interpolate;
589
     StreamColorSpaceMode csMode;
590
-    GBool mask;
591
-    GBool invert;
592
+    bool mask;
593
+    bool invert;
594
     Object maskObj, smaskObj;
595
-    GBool haveColorKeyMask, haveExplicitMask, haveSoftMask;
596
-    GBool maskInvert;
597
-    GBool maskInterpolate;
598
+    bool haveColorKeyMask, haveExplicitMask, haveSoftMask;
599
+    bool maskInvert;
600
+    bool maskInterpolate;
601
     Object obj1, obj2;
602
     
603
     // get info from the stream
604
@@ -2873,11 +2872,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
605
     if (obj1.isBool())
606
       interpolate = obj1.getBool();
607
     else
608
-      interpolate = gFalse;
609
+      interpolate = false;
610
 #if !defined(POPPLER_NEW_OBJECT_API)
611
     obj1.free();
612
 #endif
613
-    maskInterpolate = gFalse;
614
+    maskInterpolate = false;
615
 
616
     // image or mask?
617
 #if defined(POPPLER_NEW_OBJECT_API)
618
@@ -2893,7 +2892,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
619
         dict->lookup(const_cast<char*>("IM"), &obj1);
620
 #endif
621
     }
622
-    mask = gFalse;
623
+    mask = false;
624
     if (obj1.isBool()) {
625
         mask = obj1.getBool();
626
     }
627
@@ -2937,7 +2936,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
628
         if (bits != 1) {
629
             goto err1;
630
         }
631
-        invert = gFalse;
632
+        invert = false;
633
 #if defined(POPPLER_NEW_OBJECT_API)
634
         obj1 = dict->lookup(const_cast<char*>("Decode"));
635
 #else
636
@@ -2958,7 +2957,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
637
             obj1.arrayGet(0, &obj2);
638
 #endif
639
             if (obj2.isInt() && obj2.getInt() == 1) {
640
-                invert = gTrue;
641
+                invert = true;
642
             }
643
 #if !defined(POPPLER_NEW_OBJECT_API)
644
             obj2.free();
645
@@ -3055,11 +3054,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
646
         
647
         // get the mask
648
         int maskColors[2*gfxColorMaxComps];
649
-        haveColorKeyMask = haveExplicitMask = haveSoftMask = gFalse;
650
+        haveColorKeyMask = haveExplicitMask = haveSoftMask = false;
651
         Stream *maskStr = NULL;
652
         int maskWidth = 0;
653
         int maskHeight = 0;
654
-        maskInvert = gFalse;
655
+        maskInvert = false;
656
         GfxImageColorMap *maskColorMap = NULL;
657
 #if defined(POPPLER_NEW_OBJECT_API)
658
         maskObj = dict->lookup(const_cast<char*>("Mask"));
659
@@ -3146,7 +3145,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
660
 	    if (obj1.isBool())
661
 	      maskInterpolate = obj1.getBool();
662
 	    else
663
-	      maskInterpolate = gFalse;
664
+	      maskInterpolate = false;
665
 #if defined(POPPLER_NEW_OBJECT_API)
666
             obj1 = maskDict->lookup(const_cast<char*>("ColorSpace"));
667
 #else
668
@@ -3215,7 +3214,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
669
                 goto err1;
670
             }
671
             //~ handle the Matte entry
672
-            haveSoftMask = gTrue;
673
+            haveSoftMask = true;
674
         } else if (maskObj.isArray()) {
675
             // color key mask
676
             int i;
677
@@ -3230,7 +3229,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
678
                 obj1.free();
679
 #endif
680
             }
681
-              haveColorKeyMask = gTrue;
682
+              haveColorKeyMask = true;
683
         } else if (maskObj.isStream()) {
684
             // explicit mask
685
             if (inlineImg) {
686
@@ -3307,11 +3306,11 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
687
 	    if (obj1.isBool())
688
 	      maskInterpolate = obj1.getBool();
689
 	    else
690
-	      maskInterpolate = gFalse;
691
+	      maskInterpolate = false;
692
 #if !defined(POPPLER_NEW_OBJECT_API)
693
 	    obj1.free();
694
 #endif
695
-            maskInvert = gFalse;
696
+            maskInvert = false;
697
 #if defined(POPPLER_NEW_OBJECT_API)
698
             obj1 = maskDict->lookup(const_cast<char*>("Decode"));
699
 #else
700
@@ -3332,7 +3331,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
701
                 obj1.arrayGet(0, &obj2);
702
 #endif
703
                 if (obj2.isInt() && obj2.getInt() == 1) {
704
-                    maskInvert = gTrue;
705
+                    maskInvert = true;
706
                 }
707
 #if !defined(POPPLER_NEW_OBJECT_API)
708
                 obj2.free();
709
@@ -3343,7 +3342,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
710
 #if !defined(POPPLER_NEW_OBJECT_API)
711
             obj1.free();
712
 #endif
713
-            haveExplicitMask = gTrue;
714
+            haveExplicitMask = true;
715
         }
716
         
717
         // draw it
718
@@ -3378,7 +3377,7 @@ void PdfParser::doImage(Object * /*ref*/, Stream *str,
719
 
720
 void PdfParser::doForm(Object *str) {
721
   Dict *dict;
722
-  GBool transpGroup, isolated, knockout;
723
+  bool transpGroup, isolated, knockout;
724
   GfxColorSpace *blendingColorSpace;
725
   Object matrixObj, bboxObj;
726
   double m[6], bbox[4];
727
@@ -3472,7 +3471,7 @@ void PdfParser::doForm(Object *str) {
728
   resDict = resObj.isDict() ? resObj.getDict() : (Dict *)NULL;
729
 
730
   // check for a transparency group
731
-  transpGroup = isolated = knockout = gFalse;
732
+  transpGroup = isolated = knockout = false;
733
   blendingColorSpace = NULL;
734
 #if defined(POPPLER_NEW_OBJECT_API)
735
   if ((obj1 = dict->lookup(const_cast<char*>("Group"))).isDict()) {
736
@@ -3481,7 +3480,7 @@ void PdfParser::doForm(Object *str) {
737
   if (dict->lookup(const_cast<char*>("Group"), &obj1)->isDict()) {
738
     if (obj1.dictLookup(const_cast<char*>("S"), &obj2)->isName(const_cast<char*>("Transparency"))) {
739
 #endif
740
-      transpGroup = gTrue;
741
+      transpGroup = true;
742
 #if defined(POPPLER_NEW_OBJECT_API)
743
       if (!((obj3 = obj1.dictLookup(const_cast<char*>("CS"))).isNull())) {
744
 #else
745
@@ -3525,7 +3524,7 @@ void PdfParser::doForm(Object *str) {
746
   // draw it
747
   ++formDepth;
748
   doForm1(str, resDict, m, bbox,
749
-	  transpGroup, gFalse, blendingColorSpace, isolated, knockout);
750
+	  transpGroup, false, blendingColorSpace, isolated, knockout);
751
   --formDepth;
752
 
753
   if (blendingColorSpace) {
754
@@ -3537,10 +3536,10 @@ void PdfParser::doForm(Object *str) {
755
 }
756
 
757
 void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox,
758
-		  GBool transpGroup, GBool softMask,
759
+		  bool transpGroup, bool softMask,
760
 		  GfxColorSpace *blendingColorSpace,
761
-		  GBool isolated, GBool knockout,
762
-		  GBool alpha, Function *transferFunc,
763
+		  bool isolated, bool knockout,
764
+		  bool alpha, Function *transferFunc,
765
 		  GfxColor *backdropColor) {
766
   Parser *oldParser;
767
   double oldBaseMatrix[6];
768
@@ -3601,7 +3600,7 @@ void PdfParser::doForm1(Object *str, Dict *resDict, do
769
   }
770
 
771
   // draw the form
772
-  parse(str, gFalse);
773
+  parse(str, false);
774
 
775
   // restore base matrix
776
   for (i = 0; i < 6; ++i) {
777
@@ -3641,7 +3640,7 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*
778
 
779
   // display the image
780
   if (str) {
781
-    doImage(NULL, str, gTrue);
782
+    doImage(NULL, str, true);
783
   
784
     // skip 'EI' tag
785
     int c1 = str->getUndecodedStream()->getChar();
786
@@ -3657,7 +3656,6 @@ void PdfParser::opBeginImage(Object /*args*/[], int /*
787
 Stream *PdfParser::buildImageStream() {
788
   Object dict;
789
   Object obj;
790
-  char *key;
791
   Stream *str;
792
 
793
   // build dictionary
794
@@ -3675,26 +3673,17 @@ Stream *PdfParser::buildImageStream() {
795
       obj.free();
796
 #endif
797
     } else {
798
-      key = copyString(obj.getName());
799
-#if defined(POPPLER_NEW_OBJECT_API)
800
-      obj = parser->getObj();
801
-#else
802
-      obj.free();
803
-      parser->getObj(&obj);
804
-#endif
805
-      if (obj.isEOF() || obj.isError()) {
806
-	gfree(key);
807
+      Object obj2;
808
+      _POPPLER_CALL(obj2, parser->getObj);
809
+      if (obj2.isEOF() || obj2.isError()) {
810
+        _POPPLER_FREE(obj);
811
 	break;
812
       }
813
-#if defined(POPPLER_NEW_OBJECT_API)
814
-      dict.dictAdd(key, std::move(obj));
815
+      _POPPLER_DICTADD(dict, obj.getName(), obj2);
816
+      _POPPLER_FREE(obj);
817
+      _POPPLER_FREE(obj2);
818
     }
819
-    obj = parser->getObj();
820
-#else
821
-      dict.dictAdd(key, &obj);
822
-    }
823
-    parser->getObj(&obj);
824
-#endif
825
+    _POPPLER_CALL(obj, parser->getObj);
826
   }
827
   if (obj.isEOF()) {
828
     error(errSyntaxError, getPos(), "End of file in inline image");
829
@@ -3710,10 +3699,10 @@ Stream *PdfParser::buildImageStream() {
830
 
831
   // make stream
832
 #if defined(POPPLER_NEW_OBJECT_API)
833
-  str = new EmbedStream(parser->getStream(), dict.copy(), gFalse, 0);
834
+  str = new EmbedStream(parser->getStream(), dict.copy(), false, 0);
835
   str = str->addFilters(dict.getDict());
836
 #else
837
-  str = new EmbedStream(parser->getStream(), &dict, gFalse, 0);
838
+  str = new EmbedStream(parser->getStream(), &dict, false, 0);
839
   str = str->addFilters(&dict);
840
 #endif
841
 
842
--- src/extension/internal/pdfinput/pdf-parser.h.orig	2018-03-11 20:38:09 UTC
843
+++ src/extension/internal/pdfinput/pdf-parser.h
844
@@ -9,6 +9,7 @@
845
 #define PDF_PARSER_H
846
 
847
 #ifdef HAVE_POPPLER
848
+#include "poppler-transition-api.h"
849
 
850
 #ifdef USE_GCC_PRAGMAS
851
 #pragma interface
852
@@ -96,7 +97,7 @@ struct PdfOperator {
853
 struct OpHistoryEntry {
854
     const char *name;       // operator's name
855
     GfxState *state;        // saved state, NULL if none
856
-    GBool executed;         // whether the operator has been executed
857
+    bool executed;         // whether the operator has been executed
858
 
859
     OpHistoryEntry *next;   // next entry on stack
860
     unsigned depth;         // total number of entries descending from this
861
@@ -127,16 +128,19 @@ class PdfParser { (public)
862
 
863
   // Constructor for regular output.
864
   PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
865
-            Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
866
+            Dict *resDict,
867
+            _POPPLER_CONST PDFRectangle *box,
868
+            _POPPLER_CONST PDFRectangle *cropBox);
869
 
870
   // Constructor for a sub-page object.
871
   PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
872
-            Dict *resDict, PDFRectangle *box);
873
+            Dict *resDict,
874
+            _POPPLER_CONST PDFRectangle *box);
875
 
876
   virtual ~PdfParser();
877
 
878
   // Interpret a stream or array of streams.
879
-  void parse(Object *obj, GBool topLevel = gTrue);
880
+  void parse(Object *obj, bool topLevel = true);
881
 
882
   // Save graphics state.
883
   void saveState();
884
@@ -154,12 +158,12 @@ class PdfParser { (public)
885
 
886
   XRef *xref;			// the xref table for this PDF file
887
   SvgBuilder *builder;          // SVG generator
888
-  GBool subPage;		// is this a sub-page object?
889
-  GBool printCommands;		// print the drawing commands (for debugging)
890
+  bool subPage;		// is this a sub-page object?
891
+  bool printCommands;		// print the drawing commands (for debugging)
892
   GfxResources *res;		// resource stack
893
 
894
   GfxState *state;		// current graphics state
895
-  GBool fontChanged;		// set if font or text matrix has changed
896
+  bool fontChanged;		// set if font or text matrix has changed
897
   GfxClipType clip;		// do a clip?
898
   int ignoreUndef;		// current BX/EX nesting level
899
   double baseMatrix[6];		// default matrix for most recent
900
@@ -183,10 +187,10 @@ class PdfParser { (public)
901
   OpHistoryEntry *popOperator();
902
   const char *getPreviousOperator(unsigned int look_back=1);    // returns the nth previous operator's name
903
 
904
-  void go(GBool topLevel);
905
+  void go(bool topLevel);
906
   void execOp(Object *cmd, Object args[], int numArgs);
907
-  PdfOperator *findOp(char *name);
908
-  GBool checkArg(Object *arg, TchkType type);
909
+  PdfOperator *findOp(const char *name);
910
+  bool checkArg(Object *arg, TchkType type);
911
   int getPos();
912
 
913
   // graphics state operators
914
@@ -200,9 +204,9 @@ class PdfParser { (public)
915
   void opSetMiterLimit(Object args[], int numArgs);
916
   void opSetLineWidth(Object args[], int numArgs);
917
   void opSetExtGState(Object args[], int numArgs);
918
-  void doSoftMask(Object *str, GBool alpha,
919
+  void doSoftMask(Object *str, bool alpha,
920
 		  GfxColorSpace *blendingColorSpace,
921
-		  GBool isolated, GBool knockout,
922
+		  bool isolated, bool knockout,
923
 		  Function *transferFunc, GfxColor *backdropColor);
924
   void opSetRenderingIntent(Object args[], int numArgs);
925
 
926
@@ -239,11 +243,11 @@ class PdfParser { (public)
927
   void opCloseFillStroke(Object args[], int numArgs);
928
   void opEOFillStroke(Object args[], int numArgs);
929
   void opCloseEOFillStroke(Object args[], int numArgs);
930
-  void doFillAndStroke(GBool eoFill);
931
-  void doPatternFillFallback(GBool eoFill);
932
+  void doFillAndStroke(bool eoFill);
933
+  void doPatternFillFallback(bool eoFill);
934
   void doPatternStrokeFallback();
935
   void doShadingPatternFillFallback(GfxShadingPattern *sPat,
936
-                                    GBool stroke, GBool eoFill);
937
+                                    bool stroke, bool eoFill);
938
   void opShFill(Object args[], int numArgs);
939
   void doFunctionShFill(GfxFunctionShading *shading);
940
   void doFunctionShFill1(GfxFunctionShading *shading,
941
@@ -256,7 +260,7 @@ class PdfParser { (public)
942
 			   double x2, double y2, GfxColor *color2,
943
 			   int nComps, int depth);
944
   void doPatchMeshShFill(GfxPatchMeshShading *shading);
945
-  void fillPatch(GfxPatch *patch, int nComps, int depth);
946
+  void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
947
   void doEndPath();
948
 
949
   // path clipping operators
950
@@ -287,17 +291,17 @@ class PdfParser { (public)
951
   void opMoveShowText(Object args[], int numArgs);
952
   void opMoveSetShowText(Object args[], int numArgs);
953
   void opShowSpaceText(Object args[], int numArgs);
954
-  void doShowText(GooString *s);
955
+  void doShowText(const GooString *s);
956
 
957
   // XObject operators
958
   void opXObject(Object args[], int numArgs);
959
-  void doImage(Object *ref, Stream *str, GBool inlineImg);
960
+  void doImage(Object *ref, Stream *str, bool inlineImg);
961
   void doForm(Object *str);
962
   void doForm1(Object *str, Dict *resDict, double *matrix, double *bbox,
963
-	       GBool transpGroup = gFalse, GBool softMask = gFalse,
964
+	       bool transpGroup = false, bool softMask = false,
965
 	       GfxColorSpace *blendingColorSpace = NULL,
966
-	       GBool isolated = gFalse, GBool knockout = gFalse,
967
-	       GBool alpha = gFalse, Function *transferFunc = NULL,
968
+	       bool isolated = false, bool knockout = false,
969
+	       bool alpha = false, Function *transferFunc = NULL,
970
 	       GfxColor *backdropColor = NULL);
971
 
972
   // in-line image operators
973
--- src/extension/internal/pdfinput/poppler-transition-api.h.orig	2018-12-09 09:09:13 UTC
974
+++ src/extension/internal/pdfinput/poppler-transition-api.h
975
@@ -0,0 +1,39 @@
976
+#ifndef SEEN_POPPLER_TRANSITION_API_H
977
+#define SEEN_POPPLER_TRANSITION_API_H
978
+
979
+#include <glib/poppler-features.h>
980
+
981
+#if POPPLER_CHECK_VERSION(0,70,0)
982
+#define _POPPLER_CONST const
983
+#else
984
+#define _POPPLER_CONST
985
+#endif
986
+
987
+#if POPPLER_CHECK_VERSION(0,69,0)
988
+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(key, std::move(obj))
989
+#elif POPPLER_CHECK_VERSION(0,58,0)
990
+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), std::move(obj))
991
+#else
992
+#define _POPPLER_DICTADD(dict, key, obj) (dict).dictAdd(copyString(key), &obj)
993
+#endif
994
+
995
+#if POPPLER_CHECK_VERSION(0,58,0)
996
+#define POPPLER_NEW_OBJECT_API
997
+#define _POPPLER_FREE(obj)
998
+#define _POPPLER_CALL(ret, func) (ret = func())
999
+#define _POPPLER_CALL_ARGS(ret, func, ...) (ret = func(__VA_ARGS__))
1000
+#else
1001
+#define _POPPLER_FREE(obj) (obj).free()
1002
+#define _POPPLER_CALL(ret, func) (*func(&ret))
1003
+#define _POPPLER_CALL_ARGS(ret, func, ...) (*func(__VA_ARGS__, &ret))
1004
+#endif
1005
+
1006
+#if POPPLER_CHECK_VERSION(0, 29, 0)
1007
+#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API
1008
+#endif
1009
+
1010
+#if POPPLER_CHECK_VERSION(0, 25, 0)
1011
+#define POPPLER_EVEN_NEWER_COLOR_SPACE_API
1012
+#endif
1013
+
1014
+#endif
1015
--- src/extension/internal/pdfinput/svg-builder.cpp.orig	2018-03-11 20:38:09 UTC
1016
+++ src/extension/internal/pdfinput/svg-builder.cpp
1017
@@ -625,7 +625,7 @@ gchar *SvgBuilder::_createPattern(GfxPattern *pattern,
1018
     if ( pattern != NULL ) {
1019
         if ( pattern->getType() == 2 ) {  // Shading pattern
1020
             GfxShadingPattern *shading_pattern = static_cast<GfxShadingPattern *>(pattern);
1021
-            double *ptm;
1022
+            const double *ptm;
1023
             double m[6] = {1, 0, 0, 1, 0, 0};
1024
             double det;
1025
 
1026
@@ -672,7 +672,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPatte
1027
 
1028
     Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
1029
     // Set pattern transform matrix
1030
-    double *p2u = tiling_pattern->getMatrix();
1031
+    const double *p2u = tiling_pattern->getMatrix();
1032
     double m[6] = {1, 0, 0, 1, 0, 0};
1033
     double det;
1034
     det = _ttm[0] * _ttm[3] - _ttm[1] * _ttm[2];    // see LP Bug 1168908
1035
@@ -698,7 +698,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPatte
1036
     pattern_node->setAttribute("patternUnits", "userSpaceOnUse");
1037
     // Set pattern tiling
1038
     // FIXME: don't ignore XStep and YStep
1039
-    double *bbox = tiling_pattern->getBBox();
1040
+    const double *bbox = tiling_pattern->getBBox();
1041
     sp_repr_set_svg_double(pattern_node, "x", 0.0);
1042
     sp_repr_set_svg_double(pattern_node, "y", 0.0);
1043
     sp_repr_set_svg_double(pattern_node, "width", bbox[2] - bbox[0]);
1044
@@ -751,7 +751,7 @@ gchar *SvgBuilder::_createTilingPattern(GfxTilingPatte
1045
  */
1046
 gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for_shading) {
1047
     Inkscape::XML::Node *gradient;
1048
-    Function *func;
1049
+    _POPPLER_CONST Function *func;
1050
     int num_funcs;
1051
     bool extend0, extend1;
1052
 
1053
@@ -865,7 +865,7 @@ static bool svgGetShadingColorRGB(GfxShading *shading,
1054
 
1055
 #define INT_EPSILON 8
1056
 bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
1057
-                                   Function *func) {
1058
+                                   _POPPLER_CONST Function *func) {
1059
     int type = func->getType();
1060
     if ( type == 0 || type == 2 ) {  // Sampled or exponential function
1061
         GfxRGB stop1, stop2;
1062
@@ -877,9 +877,9 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
1063
             _addStopToGradient(gradient, 1.0, &stop2, 1.0);
1064
         }
1065
     } else if ( type == 3 ) { // Stitching
1066
-        StitchingFunction *stitchingFunc = static_cast<StitchingFunction*>(func);
1067
-        double *bounds = stitchingFunc->getBounds();
1068
-        double *encode = stitchingFunc->getEncode();
1069
+        auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func);
1070
+        const double *bounds = stitchingFunc->getBounds();
1071
+        const double *encode = stitchingFunc->getEncode();
1072
         int num_funcs = stitchingFunc->getNumFuncs();
1073
 
1074
         // Add stops from all the stitched functions
1075
@@ -890,7 +890,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node
1076
             svgGetShadingColorRGB(shading, bounds[i + 1], &color);
1077
             // Add stops
1078
             if (stitchingFunc->getFunc(i)->getType() == 2) {    // process exponential fxn
1079
-                double expE = (static_cast<ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
1080
+                double expE = (static_cast<_POPPLER_CONST ExponentialFunction*>(stitchingFunc->getFunc(i)))->getE();
1081
                 if (expE > 1.0) {
1082
                     expE = (bounds[i + 1] - bounds[i])/expE;    // approximate exponential as a single straight line at x=1
1083
                     if (encode[2*i] == 0) {    // normal sequence
1084
@@ -1020,7 +1020,7 @@ void SvgBuilder::updateFont(GfxState *state) {
1085
     GfxFont *font = state->getFont();
1086
     // Store original name
1087
     if (font->getName()) {
1088
-        _font_specification = font->getName()->getCString();
1089
+        _font_specification = g_strdup(font->getName()->c_str());
1090
     } else {
1091
         _font_specification = (char*) "Arial";
1092
     }
1093
@@ -1047,7 +1047,7 @@ void SvgBuilder::updateFont(GfxState *state) {
1094
 
1095
     // Font family
1096
     if (font->getFamily()) { // if font family is explicitly given use it.
1097
-        sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->getCString());
1098
+        sp_repr_css_set_property(_font_style, "font-family", font->getFamily()->c_str());
1099
     } else { 
1100
         int attr_value = 1;
1101
         sp_repr_get_int(_preferences, "localFonts", &attr_value);
1102
@@ -1148,7 +1148,7 @@ void SvgBuilder::updateFont(GfxState *state) {
1103
     Inkscape::CSSOStringStream os_font_size;
1104
     double css_font_size = _font_scaling * state->getFontSize();
1105
     if ( font->getType() == fontType3 ) {
1106
-        double *font_matrix = font->getFontMatrix();
1107
+        const double *font_matrix = font->getFontMatrix();
1108
         if ( font_matrix[0] != 0.0 ) {
1109
             css_font_size *= font_matrix[3] / font_matrix[0];
1110
         }
1111
@@ -1193,7 +1193,7 @@ void SvgBuilder::updateTextPosition(double tx, double 
1112
 void SvgBuilder::updateTextMatrix(GfxState *state) {
1113
     _flushText();
1114
     // Update text matrix
1115
-    double *text_matrix = state->getTextMat();
1116
+    const double *text_matrix = state->getTextMat();
1117
     double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
1118
     double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
1119
     double max_scale;
1120
@@ -1361,7 +1361,7 @@ void SvgBuilder::_flushText() {
1121
     _glyphs.clear();
1122
 }
1123
 
1124
-void SvgBuilder::beginString(GfxState *state, GooString * /*s*/) {
1125
+void SvgBuilder::beginString(GfxState *state, const GooString * /*s*/) {
1126
     if (_need_font_update) {
1127
         updateFont(state);
1128
     }
1129
--- src/extension/internal/pdfinput/svg-builder.h.orig	2018-03-11 20:38:09 UTC
1130
+++ src/extension/internal/pdfinput/svg-builder.h
1131
@@ -15,6 +15,7 @@
1132
 #endif
1133
 
1134
 #ifdef HAVE_POPPLER
1135
+#include "poppler-transition-api.h"
1136
 
1137
 class SPDocument;
1138
 namespace Inkscape {
1139
@@ -136,7 +137,7 @@ class SvgBuilder { (public)
1140
     void clearSoftMask(GfxState *state);
1141
 
1142
     // Text handling
1143
-    void beginString(GfxState *state, GooString *s);
1144
+    void beginString(GfxState *state, const GooString *s);
1145
     void endString(GfxState *state);
1146
     void addChar(GfxState *state, double x, double y,
1147
                  double dx, double dy,
1148
@@ -175,7 +176,7 @@ class SvgBuilder { (public)
1149
     void _addStopToGradient(Inkscape::XML::Node *gradient, double offset,
1150
                             GfxRGB *color, double opacity);
1151
     bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading,
1152
-                           Function *func);
1153
+                           _POPPLER_CONST Function *func);
1154
     gchar *_createTilingPattern(GfxTilingPattern *tiling_pattern, GfxState *state,
1155
                                 bool is_stroke=false);
1156
     // Image/mask creation
(-)graphics/inkscape/files/patch-src_libnrtype_FontFactory.cpp (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/libnrtype/FontFactory.cpp.orig	2017-01-05 22:10:01.490293000 +0100
1
--- src/libnrtype/FontFactory.cpp.orig	2018-03-11 20:38:09 UTC
2
+++ src/libnrtype/FontFactory.cpp	2017-01-05 22:13:37.547401000 +0100
2
+++ src/libnrtype/FontFactory.cpp
3
@@ -695,8 +695,9 @@
3
@@ -704,8 +704,9 @@ font_instance *font_factory::Face(PangoFontDescription
4
             guint script_index = -1;
4
             guint script_index = -1;
5
             if( pango_ot_info_find_script( info, PANGO_OT_TABLE_GSUB, scripts[i], &script_index )) {
5
             if( pango_ot_info_find_script( info, PANGO_OT_TABLE_GSUB, scripts[i], &script_index )) {
6
 
6
 
(-)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.72.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-148 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
65
DEPRECATED=		Qt4 has been EOL since december 2015
57
DEPRECATED=		Qt4 has been EOL since december 2015
66
EXPIRATION_DATE=	2019-03-15
58
EXPIRATION_DATE=	2019-03-15
67
59
68
CONFIGURE_ARGS+=--enable-poppler-qt4
60
LIB_DEPENDS+=		libpoppler.so:graphics/poppler
69
CONFIGURE_ENV+=	MOCQT4=${MOC}
61
PKGNAMESUFFIX=		-${_SLAVE_PORT}
70
USES+=		qt:4
71
USE_QT=		gui corelib xml qtestlib moc_build
72
BUILD_WRKSRC=	${WRKSRC}/qt4
73
INSTALL_WRKSRC=	${WRKSRC}/qt4
74
.else
75
CONFIGURE_ARGS+=--disable-poppler-qt4
76
.endif
77
62
78
.if ${SLAVEPORT}==qt5
63
BUILD_WRKSRC=		${WRKSRC}/${_SLAVE_PORT}
79
CONFIGURE_ARGS+=--enable-poppler-qt5
64
INSTALL_WRKSRC=		${WRKSRC}/${_SLAVE_PORT}
80
CONFIGURE_ENV+=	MOCQT5=${MOC}
81
USES+=		qt:5
82
USE_QT=		core gui widgets xml buildtools_build testlib_build
83
# Qt from 5.7.0 on requires c++11.
84
USE_CXXSTD=	c++11
85
BUILD_WRKSRC=	${WRKSRC}/qt5
86
INSTALL_WRKSRC=	${WRKSRC}/qt5
87
.else
88
CONFIGURE_ARGS+=--disable-poppler-qt5
89
.endif
90
65
91
.if ${SLAVEPORT}==utils
66
CMAKE_ARGS+=		-DENABLE_LIBOPENJPEG:STRING="none" \
92
LIB_DEPENDS+=	libpoppler-glib.so:graphics/poppler-glib
67
			-DENABLE_LIBCURL:BOOL=FALSE
93
CONFIGURE_ARGS+=--enable-utils
94
BUILD_WRKSRC=	${WRKSRC}/utils
95
INSTALL_WRKSRC=	${WRKSRC}/utils
96
.else
97
CONFIGURE_ARGS+=--disable-utils
98
.endif
99
68
100
.else # ! SLAVE options below
69
.  if ${_SLAVE_PORT} == glib
101
CONFIGURE_ARGS+=--disable-poppler-glib \
70
USE_GNOME+=		glib20 introspection:Build
102
		--disable-poppler-qt4 \
71
.  elif ${_SLAVE_PORT} == qt5
103
		--disable-poppler-qt5 \
72
USES+=			qt:5
104
		--disable-utils
73
USE_QT=			core gui widgets xml \
74
			buildtools_build qmake_build testlib_build
75
.  elif ${_SLAVE_PORT} == utils
76
LIB_DEPENDS+=		libpoppler-glib.so:graphics/poppler-glib
77
USES+=			gnome
78
.  endif
105
79
106
.if ${PORT_OPTIONS:MCAIRO}
107
LIB_DEPENDS+=	libcairo.so:graphics/cairo
108
PLIST_SUB+=	CAIRO=""
109
.else
110
CONFIGURE_ARGS+=--disable-cairo-output
111
PLIST_SUB+=	CAIRO="@comment "
112
.endif
80
.endif
113
81
114
.if ${PORT_OPTIONS:MCURL}
82
CURL_CMAKE_BOOL=	ENABLE_LIBCURL
115
LIB_DEPENDS+=	libcurl.so:ftp/curl
83
CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
116
CONFIGURE_ARGS+=--enable-libcurl
117
PLIST_SUB+=	CURL=""
118
.else
119
CONFIGURE_ARGS+=--disable-libcurl
120
PLIST_SUB+=	CURL="@comment "
121
.endif
122
84
123
.if ${PORT_OPTIONS:MOPENJPEG}
85
OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
124
CONFIGURE_ARGS+=--enable-libopenjpeg=openjpeg2
86
OPENJPEG_CMAKE_ON=	-DENABLE_LIBOPENJPEG:STRING="openjpeg2"
125
LIB_DEPENDS+=	libopenjp2.so:graphics/openjpeg
87
OPENJPEG_CMAKE_OFF=	-DENABLE_LIBOPENJPEG:STRING="none"
126
.else
127
CONFIGURE_ARGS+=--enable-libopenjpeg=none
128
.endif
129
.endif # end of options
130
88
131
post-patch:
132
	@${REINPLACE_CMD} -e 's|-fno-check-new||g' ${WRKSRC}/configure
133
134
post-install:
89
post-install:
135
.if defined(SLAVEPORT)
90
.if ${_SLAVE_PORT} == glib
136
. if ${SLAVEPORT}==glib
137
	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
91
	${INSTALL_DATA} ${WRKSRC}/poppler-glib.pc \
138
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
92
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
139
. elif ${SLAVEPORT}==qt4
93
.elif ${_SLAVE_PORT} == qt5
140
	${INSTALL_DATA} ${WRKSRC}/poppler-qt4.pc \
141
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
142
. elif ${SLAVEPORT}==qt5
143
	${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
94
	${INSTALL_DATA} ${WRKSRC}/poppler-qt5.pc \
144
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
95
		${STAGEDIR}${PREFIX}/libdata/pkgconfig
145
. endif
146
.endif
96
.endif
147
97
148
.include <bsd.port.mk>
98
.include <bsd.port.mk>
(-)graphics/poppler/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1503426409
1
TIMESTAMP = 1544313959
2
SHA256 (poppler-0.57.0.tar.xz) = 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8
2
SHA256 (poppler-0.72.0.tar.xz) = c1747eb8f26e9e753c4001ed951db2896edc1021b6d0f547a0bd2a27c30ada51
3
SIZE (poppler-0.57.0.tar.xz) = 1703300
3
SIZE (poppler-0.72.0.tar.xz) = 1492912
(-)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.83
142
lib/libpoppler.so.68.0.0
137
lib/libpoppler.so.83.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.11.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-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/ \
(-)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
(-)net/kitinerary/files/patch-src_pdfdocument.cpp (+20 lines)
Line 0 Link Here
1
--- src/pdfdocument.cpp.orig	2018-12-09 09:38:02 UTC
2
+++ src/pdfdocument.cpp
3
@@ -306,7 +306,7 @@ QString PdfPage::textInRect(double left, double top, d
4
     const auto pageRect = d->m_doc->m_popplerDoc->getPage(d->m_pageNum + 1)->getCropBox();
5
     std::unique_ptr<GooString> s(device->getText(ratio(pageRect->x1, pageRect->x2, left), ratio(pageRect->y1, pageRect->y2, top),
6
                                                  ratio(pageRect->x1, pageRect->x2, right), ratio(pageRect->y1, pageRect->y2, bottom)));
7
-    return QString::fromUtf8(s->getCString());
8
+    return QString::fromUtf8(s->c_str());
9
 #else
10
     Q_UNUSED(left);
11
     Q_UNUSED(top);
12
@@ -440,7 +440,7 @@ PdfDocument* PdfDocument::fromData(const QByteArray &d
13
         PdfPage page;
14
         page.d->m_pageNum = i;
15
         page.d->m_doc = doc->d.get();
16
-        page.d->m_text = QString::fromUtf8(s->getCString());
17
+        page.d->m_text = QString::fromUtf8(s->c_str());
18
         page.d->m_images = std::move(device->m_images);
19
         for (auto it = page.d->m_images.begin(); it != page.d->m_images.end(); ++it) {
20
             (*it).d->m_page = page.d.data();
(-)print/Makefile (-1 lines)
Lines 60-66 Link Here
60
    SUBDIR += fpdf
60
    SUBDIR += fpdf
61
    SUBDIR += freetype
61
    SUBDIR += freetype
62
    SUBDIR += freetype2
62
    SUBDIR += freetype2
63
    SUBDIR += frescobaldi
64
    SUBDIR += ft2demos
63
    SUBDIR += ft2demos
65
    SUBDIR += ghostscript7-base
64
    SUBDIR += ghostscript7-base
66
    SUBDIR += ghostscript7-commfont
65
    SUBDIR += ghostscript7-commfont
(-)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/frescobaldi/Makefile (-42 lines)
Lines 1-42 Link Here
1
# Created by: martin.dieringer@gmx.de
2
# $FreeBSD$
3
4
PORTNAME=	frescobaldi
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	2.20.0
7
PORTREVISION=	3
8
CATEGORIES=	print kde
9
10
MAINTAINER=	martin.dieringer@gmx.de
11
COMMENT=	Music score editor for lilypond
12
13
LICENSE=	GPLv2+
14
LICENSE_FILE=	${WRKSRC}/COPYING
15
16
DEPRECATED=	KDE4 is end-of-life, upgrade this port to version 3.0.0
17
EXPIRATION_DATE=2018-12-31
18
19
RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}poppler-qt4>=0:graphics/py-poppler-qt4@${PY_FLAVOR} \
20
		${PYTHON_PKGNAMEPREFIX}python-ly>=0:print/py-python-ly@${PY_FLAVOR}
21
22
USES=		gettext kde:4 python:2.7 desktop-file-utils
23
USE_GITHUB=	yes
24
GH_ACCOUNT=	wbsoft
25
USE_KDE=	kdelibs pykde4_build pykde4_run
26
USE_PYTHON=	distutils autoplist optsuffix
27
28
INSTALLS_ICONS=	yes
29
NO_ARCH=	yes
30
31
OPTIONS_DEFINE=	LILYPOND
32
33
LILYPOND_DESC=	Use unstable LilyPond (lilypond-devel)
34
35
LILYPOND_RUN_DEPENDS=		lilypond:print/lilypond-devel
36
LILYPOND_RUN_DEPENDS_OFF=	lilypond:print/lilypond
37
38
post-patch:
39
	@${REINPLACE_CMD} -e 's|'share/man/man1'|'man/man1'|' \
40
		${WRKSRC}/setup.py
41
42
.include <bsd.port.mk>
(-)print/frescobaldi/distinfo (-3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1487410650
2
SHA256 (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 4e0bc5f371724b6c409fe5b8cbd61d05c7ca0c740c608806f09a245dae336de6
3
SIZE (wbsoft-frescobaldi-v2.20.0_GH0.tar.gz) = 7379468
(-)print/frescobaldi/pkg-descr (-5 lines)
Lines 1-5 Link Here
1
Frescobaldi is a LilyPond sheet music text editor for KDE4. It aims to be
2
powerful, yet lightweight and easy to use. Frescobaldi is Free Software,
3
available under the GNU General Public License (version 2 or later).
4
5
WWW: http://www.frescobaldi.org/
(-)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/pdf-tools/files/patch-server_poppler-hack.cc (+11 lines)
Line 0 Link Here
1
--- server/poppler-hack.cc.orig	2018-12-09 09:39:37 UTC
2
+++ server/poppler-hack.cc
3
@@ -62,7 +62,7 @@ GType poppler_annot_markup_get_type (void) G_GNUC_CONS
4
       return NULL;
5
 
6
     if (s->hasUnicodeMarker()) {
7
-      result = g_convert (s->getCString () + 2,
8
+      result = g_convert (s->c_str () + 2,
9
                           s->getLength () - 2,
10
                           "UTF-8", "UTF-16BE", NULL, NULL, NULL);
11
     } else {
(-)print/qpdfview/Makefile (-12 / +5 lines)
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=	QT5 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 (-3 / +7 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}/
Lines 36-42 Link Here
36
		libharfbuzz.so:print/harfbuzz \
36
		libharfbuzz.so:print/harfbuzz \
37
		libicuuc.so:devel/icu
37
		libicuuc.so:devel/icu
38
38
39
USES=		cmake:outsource desktop-file-utils jpeg pkgconfig python qt:5 shared-mime-info ssl tar:xz
39
USES=		cmake:outsource desktop-file-utils dos2unix jpeg pkgconfig python qt:5 shared-mime-info ssl tar:xz
40
USE_QT=		buildtools_build core declarative gui linguisttools_build network opengl \
40
USE_QT=		buildtools_build core declarative gui linguisttools_build network opengl \
41
		printsupport qmake_build widgets xml
41
		printsupport qmake_build widgets xml
42
USE_GNOME=	libxml2
42
USE_GNOME=	libxml2
Lines 43-52 Link Here
43
INSTALLS_ICONS=	yes
43
INSTALLS_ICONS=	yes
44
USE_LDCONFIG=	yes
44
USE_LDCONFIG=	yes
45
45
46
CMAKE_ARGS+=	-DWANT_HUNSPELL=YES -Wno-ferror-limit
46
CMAKE_ARGS+=	-DWANT_HUNSPELL=YES -Wno-ferror-limit -DCMAKE_COLOR_MAKEFILE:BOOL=ON
47
47
48
OPTIONS_DEFINE=	DOCS
48
OPTIONS_DEFINE=	DOCS
49
49
50
DOS2UNIX_FILE=	scribus/plugins/import/pdf/importpdf.cpp \
51
		scribus/plugins/import/pdf/slaoutput.cpp \
52
		scribus/plugins/import/pdf/slaoutput.h
53
50
post-install:
54
post-install:
51
		${LN} -sf ../share/icons/1_5_1/scribus.png \
55
		${LN} -sf ../share/icons/1_5_1/scribus.png \
52
			${STAGEDIR}${PREFIX}/share/pixmaps/
56
			${STAGEDIR}${PREFIX}/share/pixmaps/
(-)print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.cpp (+150 lines)
Line 0 Link Here
1
--- scribus/plugins/import/pdf/importpdf.cpp.orig	2018-12-11 12:42:54 UTC
2
+++ scribus/plugins/import/pdf/importpdf.cpp
3
@@ -87,7 +87,7 @@ QImage PdfPlug::readThumbnail(QString fName)
4
 #else
5
 		GooString *fname = new GooString(QFile::encodeName(pdfFile).data());
6
 #endif
7
-		globalParams->setErrQuiet(gTrue);
8
+		globalParams->setErrQuiet(true);
9
 		PDFDoc *pdfDoc = new PDFDoc(fname, NULL, NULL, NULL);
10
 		if (pdfDoc)
11
 		{
12
@@ -108,11 +108,11 @@ QImage PdfPlug::readThumbnail(QString fName)
13
 				bgColor[0] = 255;
14
 				bgColor[1] = 255;
15
 				bgColor[2] = 255;
16
-				SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue);
17
-				dev->setVectorAntialias(gTrue);
18
-				dev->setFreeTypeHinting(gTrue, gFalse);
19
+				SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true);
20
+				dev->setVectorAntialias(true);
21
+				dev->setFreeTypeHinting(true, false);
22
 				dev->startDoc(pdfDoc);
23
-				pdfDoc->displayPage(dev, 1, hDPI, vDPI, 0, gTrue, gFalse, gFalse);
24
+				pdfDoc->displayPage(dev, 1, hDPI, vDPI, 0, true, false, false);
25
 				SplashBitmap *bitmap = dev->getBitmap();
26
 				int bw = bitmap->getWidth();
27
 				int bh = bitmap->getHeight();
28
@@ -410,10 +410,10 @@ bool PdfPlug::convert(const QString& fn)
29
 #else
30
 		GooString *fname = new GooString(QFile::encodeName(fn).data());
31
 #endif
32
-		globalParams->setErrQuiet(gTrue);
33
-		GBool hasOcg = gFalse;
34
+		globalParams->setErrQuiet(true);
35
+		bool hasOcg = false;
36
 		QList<OptionalContentGroup*> ocgGroups;
37
-//		globalParams->setPrintCommands(gTrue);
38
+//		globalParams->setPrintCommands(true);
39
 		PDFDoc *pdfDoc = new PDFDoc(fname, NULL, NULL, NULL);
40
 		if (pdfDoc)
41
 		{
42
@@ -458,10 +458,10 @@ bool PdfPlug::convert(const QString& fn)
43
 				double vDPI = 72.0;
44
 				int firstPage = 1;
45
 				int lastPage = pdfDoc->getNumPages();
46
-				GBool useMediaBox = gTrue;
47
-				GBool crop = gTrue;
48
-				GBool printing = gFalse;
49
-				PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox();
50
+				bool useMediaBox = true;
51
+				bool crop = true;
52
+				bool printing = false;
53
+				const PDFRectangle *mediaBox = pdfDoc->getPage(1)->getMediaBox();
54
 				QRectF mediaRect = QRectF(QPointF(mediaBox->x1, mediaBox->y1), QPointF(mediaBox->x2, mediaBox->y2)).normalized();
55
 				bool boxesAreDifferent = false;
56
 				if (getCBox(Crop_Box, 1) != mediaRect)
57
@@ -497,7 +497,7 @@ bool PdfPlug::convert(const QString& fn)
58
 					if (!cropped)
59
 						crop = cropped;
60
 					if (contentRect != Media_Box)
61
-						useMediaBox = gFalse;
62
+						useMediaBox = false;
63
 				/*	if (cb > Media_Box)
64
 					{
65
 						cropped = true;
66
@@ -556,12 +556,10 @@ bool PdfPlug::convert(const QString& fn)
67
 									}
68
 									else
69
 									{
70
-										GooList *ocgs;
71
-										int i;
72
-										ocgs = ocg->getOCGs ();
73
-										for (i = 0; i < ocgs->getLength (); ++i)
74
+										const auto& ocgs = ocg->getOCGs ();
75
+										for (const auto& ocg : ocgs)
76
 										{
77
-											OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i);
78
+											OptionalContentGroup *oc = ocg.second.get();
79
 											QString ocgName = UnicodeParsedString(oc->getName());
80
 											if (!ocgNames.contains(ocgName))
81
 											{
82
@@ -574,12 +572,10 @@ bool PdfPlug::convert(const QString& fn)
83
 							}
84
 							else
85
 							{
86
-								GooList *ocgs;
87
-								int i;
88
-								ocgs = ocg->getOCGs ();
89
-								for (i = 0; i < ocgs->getLength (); ++i)
90
+								const auto& ocgs = ocg->getOCGs ();
91
+								for (const auto& ocg : ocgs)
92
 								{
93
-									OptionalContentGroup *oc = (OptionalContentGroup *)ocgs->get(i);
94
+									OptionalContentGroup *oc = ocg.second.get();
95
 									QString ocgName = UnicodeParsedString(oc->getName());
96
 									if (!ocgNames.contains(ocgName))
97
 									{
98
@@ -1018,11 +1014,11 @@ QImage PdfPlug::readPreview(int pgNum, int width, int 
99
 	bgColor[0] = 255;
100
 	bgColor[1] = 255;
101
 	bgColor[2] = 255;
102
-	SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, gFalse, bgColor, gTrue);
103
-	dev->setVectorAntialias(gTrue);
104
-	dev->setFreeTypeHinting(gTrue, gFalse);
105
+	SplashOutputDev *dev = new SplashOutputDev(splashModeXBGR8, 4, false, bgColor, true);
106
+	dev->setVectorAntialias(true);
107
+	dev->setFreeTypeHinting(true, false);
108
 	dev->startDoc(m_pdfDoc);
109
-	m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, gTrue, gFalse, gFalse);
110
+	m_pdfDoc->displayPage(dev, pgNum, hDPI, vDPI, 0, true, false, false);
111
 	SplashBitmap *bitmap = dev->getBitmap();
112
 	int bw = bitmap->getWidth();
113
 	int bh = bitmap->getHeight();
114
@@ -1066,7 +1062,7 @@ QImage PdfPlug::readPreview(int pgNum, int width, int 
115
 
116
 QRectF PdfPlug::getCBox(int box, int pgNum)
117
 {
118
-	PDFRectangle *cBox = NULL;
119
+	const PDFRectangle *cBox = NULL;
120
 	if (box == Media_Box)
121
 		cBox = m_pdfDoc->getPage(pgNum)->getMediaBox();
122
 	else if (box == Bleed_Box)
123
@@ -1081,23 +1077,23 @@ QRectF PdfPlug::getCBox(int box, int pgNum)
124
 	return cRect;
125
 }
126
 
127
-QString PdfPlug::UnicodeParsedString(GooString *s1)
128
+QString PdfPlug::UnicodeParsedString(const GooString *s1)
129
 {
130
 	if ( !s1 || s1->getLength() == 0 )
131
 		return QString();
132
-	GBool isUnicode;
133
+	bool isUnicode;
134
 	int i;
135
 	Unicode u;
136
 	QString result;
137
 	if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getLength() > 1 && (s1->getChar(1) & 0xff) == 0xff))
138
 	{
139
-		isUnicode = gTrue;
140
+		isUnicode = true;
141
 		i = 2;
142
 		result.reserve((s1->getLength() - 2) / 2);
143
 	}
144
 	else
145
 	{
146
-		isUnicode = gFalse;
147
+		isUnicode = false;
148
 		i = 0;
149
 		result.reserve(s1->getLength());
150
 	}
(-)print/scribus-devel/files/patch-scribus_plugins_import_pdf_importpdf.h (+11 lines)
Line 0 Link Here
1
--- scribus/plugins/import/pdf/importpdf.h.orig	2018-12-11 12:48:12 UTC
2
+++ scribus/plugins/import/pdf/importpdf.h
3
@@ -81,7 +81,7 @@ class PdfPlug : public QObject (public)
4
 private:
5
 	bool convert(const QString& fn);
6
 	QRectF getCBox(int box, int pgNum);
7
-	QString UnicodeParsedString(GooString *s1);
8
+	QString UnicodeParsedString(const GooString *s1);
9
 	
10
 	QList<PageItem*> Elements;
11
 	double baseX, baseY;
(-)print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.cpp (+823 lines)
Line 0 Link Here
1
--- scribus/plugins/import/pdf/slaoutput.cpp.orig	2018-12-11 13:04:07 UTC
2
+++ scribus/plugins/import/pdf/slaoutput.cpp
3
@@ -44,7 +44,7 @@ LinkSubmitForm::LinkSubmitForm(Object *actionObj)
4
 				{
5
 					if (obj3.isName())
6
 					{
7
-						char *name = obj3.getName();
8
+						const char *name = obj3.getName();
9
 						if (!strcmp(name, "URL"))
10
 						{
11
 							obj2 = obj1.dictLookup("F");
12
@@ -179,7 +179,7 @@ void AnoOutputDev::stroke(GfxState *state)
13
 	CurrColorStroke = getColor(state->getStrokeColorSpace(), state->getStrokeColor(), &shade);
14
 }
15
 
16
-void AnoOutputDev::drawString(GfxState *state, GooString *s)
17
+void AnoOutputDev::drawString(GfxState *state, const GooString *s)
18
 {
19
 	int shade = 100;
20
 	CurrColorText = getColor(state->getFillColorSpace(), state->getFillColor(), &shade);
21
@@ -189,7 +189,7 @@ void AnoOutputDev::drawString(GfxState *state, GooStri
22
 	m_itemText = s->copy();
23
 }
24
 
25
-QString AnoOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade)
26
+QString AnoOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade)
27
 {
28
 	QString fNam;
29
 	QString namPrefix = "FromPDF";
30
@@ -229,7 +229,7 @@ QString AnoOutputDev::getColor(GfxColorSpace *color_sp
31
 	else if (color_space->getMode() == csSeparation)
32
 	{
33
 		GfxCMYK cmyk;
34
-		QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->getCString());
35
+		QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->c_str());
36
 		double Cc, Mc, Yc, Kc;
37
 		bool isRegistrationColor = (name == "All");
38
 		if (!isRegistrationColor)
39
@@ -410,7 +410,7 @@ LinkAction* SlaOutputDev::SC_getAdditionalAction(const
40
 	return linkAction;
41
 }
42
 
43
-GBool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
44
+bool SlaOutputDev::annotations_callback(Annot *annota, void *user_data)
45
 {
46
 	SlaOutputDev *dev = (SlaOutputDev*)user_data;
47
 	PDFRectangle *box = annota->getRect();
48
@@ -509,7 +509,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub
49
 	if (act->getKind() == actionGoTo)
50
 	{
51
 		LinkGoTo *gto = (LinkGoTo*)act;
52
-		LinkDest *dst = gto->getDest();
53
+		const LinkDest *dst = gto->getDest();
54
 		if (dst)
55
 		{
56
 			if (dst->getKind() == destXYZ)
57
@@ -528,10 +528,10 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub
58
 		}
59
 		else
60
 		{
61
-			GooString *ndst = gto->getNamedDest();
62
+			const GooString *ndst = gto->getNamedDest();
63
 			if (ndst)
64
 			{
65
-				LinkDest *dstn = pdfDoc->findDest(ndst);
66
+				const LinkDest *dstn = pdfDoc->findDest(ndst);
67
 				if (dstn)
68
 				{
69
 					if (dstn->getKind() == destXYZ)
70
@@ -555,7 +555,7 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub
71
 	{
72
 		LinkGoToR *gto = (LinkGoToR*)act;
73
 		fileName = UnicodeParsedString(gto->getFileName());
74
-		LinkDest *dst = gto->getDest();
75
+		const LinkDest *dst = gto->getDest();
76
 		if (dst)
77
 		{
78
 			if (dst->getKind() == destXYZ)
79
@@ -568,10 +568,10 @@ bool SlaOutputDev::handleLinkAnnot(Annot* annota, doub
80
 		}
81
 		else
82
 		{
83
-			GooString *ndst = gto->getNamedDest();
84
+			const GooString *ndst = gto->getNamedDest();
85
 			if (ndst)
86
 			{
87
-				LinkDest *dstn = pdfDoc->findDest(ndst);
88
+				const LinkDest *dstn = pdfDoc->findDest(ndst);
89
 				if (dstn)
90
 				{
91
 					if (dstn->getKind() == destXYZ)
92
@@ -709,7 +709,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, do
93
 			bool bgFound = false;
94
 			if (achar)
95
 			{
96
-				AnnotColor *bgCol = achar->getBackColor();
97
+				const AnnotColor *bgCol = achar->getBackColor();
98
 				if (bgCol)
99
 				{
100
 					bgFound = true;
101
@@ -717,7 +717,7 @@ bool SlaOutputDev::handleWidgetAnnot(Annot* annota, do
102
 				}
103
 				else
104
 					CurrColorFill = CommonStrings::None;
105
-				AnnotColor *fgCol = achar->getBorderColor();
106
+				const AnnotColor *fgCol = achar->getBorderColor();
107
 				if (fgCol)
108
 				{
109
 					fgFound = true;
110
@@ -1054,7 +1054,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW
111
 			int xco = 0;
112
 			int yco = 0;
113
 			LinkGoTo *gto = (LinkGoTo*)Lact;
114
-			LinkDest *dst = gto->getDest();
115
+			const LinkDest *dst = gto->getDest();
116
 			if (dst)
117
 			{
118
 				if (dst->getKind() == destXYZ)
119
@@ -1075,10 +1075,10 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW
120
 			}
121
 			else
122
 			{
123
-				GooString *ndst = gto->getNamedDest();
124
+				const GooString *ndst = gto->getNamedDest();
125
 				if (ndst)
126
 				{
127
-					LinkDest *dstn = pdfDoc->findDest(ndst);
128
+					const LinkDest *dstn = pdfDoc->findDest(ndst);
129
 					if (dstn)
130
 					{
131
 						if (dstn->getKind() == destXYZ)
132
@@ -1107,7 +1107,7 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW
133
 			int yco = 0;
134
 			LinkGoToR *gto = (LinkGoToR*)Lact;
135
 			QString fileName = UnicodeParsedString(gto->getFileName());
136
-			LinkDest *dst = gto->getDest();
137
+			const LinkDest *dst = gto->getDest();
138
 			if (dst)
139
 			{
140
 				if (dst->getKind() == destXYZ)
141
@@ -1123,10 +1123,10 @@ void SlaOutputDev::handleActions(PageItem* ite, AnnotW
142
 			}
143
 			else
144
 			{
145
-				GooString *ndst = gto->getNamedDest();
146
+				const GooString *ndst = gto->getNamedDest();
147
 				if (ndst)
148
 				{
149
-					LinkDest *dstn = pdfDoc->findDest(ndst);
150
+					const LinkDest *dstn = pdfDoc->findDest(ndst);
151
 					if (dstn)
152
 					{
153
 						if (dstn->getKind() == destXYZ)
154
@@ -1462,7 +1462,7 @@ void SlaOutputDev::restoreState(GfxState *state)
155
 		m_currentClipPath = m_clipPaths.pop();
156
 }
157
 
158
-void SlaOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, GBool isolated, GBool knockout, GBool forSoftMask)
159
+void SlaOutputDev::beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool isolated, bool knockout, bool forSoftMask)
160
 {
161
 	pushGroup("", forSoftMask);
162
 	m_groupStack.top().isolated = isolated;
163
@@ -1562,7 +1562,7 @@ void SlaOutputDev::endTransparencyGroup(GfxState *stat
164
 	}
165
 }
166
 
167
-void SlaOutputDev::setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool alpha, Function *transferFunc, GfxColor * /*backdropColor*/)
168
+void SlaOutputDev::setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool alpha, Function *transferFunc, GfxColor * /*backdropColor*/)
169
 {
170
 	if (m_groupStack.count() != 0)
171
 	{
172
@@ -1604,8 +1604,7 @@ void SlaOutputDev::updateStrokeColor(GfxState *state)
173
 void SlaOutputDev::clip(GfxState *state)
174
 {
175
 //	qDebug() << "Clip";
176
-	double *ctm;
177
-	ctm = state->getCTM();
178
+	const double *ctm = state->getCTM();
179
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
180
 	QString output = convertPath(state->getPath());
181
 	FPointArray out;
182
@@ -1641,8 +1640,7 @@ void SlaOutputDev::clip(GfxState *state)
183
 void SlaOutputDev::eoClip(GfxState *state)
184
 {
185
 //	qDebug() << "EoClip";
186
-	double *ctm;
187
-	ctm = state->getCTM();
188
+	const double *ctm = state->getCTM();
189
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
190
 	QString output = convertPath(state->getPath());
191
 	FPointArray out;
192
@@ -1678,7 +1676,7 @@ void SlaOutputDev::eoClip(GfxState *state)
193
 void SlaOutputDev::stroke(GfxState *state)
194
 {
195
 //	qDebug() << "Stroke";
196
-	double *ctm;
197
+	const double *ctm;
198
 	ctm = state->getCTM();
199
 	double xCoor = m_doc->currentPage()->xOffset();
200
 	double yCoor = m_doc->currentPage()->yOffset();
201
@@ -1770,7 +1768,7 @@ void SlaOutputDev::stroke(GfxState *state)
202
 void SlaOutputDev::fill(GfxState *state)
203
 {
204
 //	qDebug() << "Fill";
205
-	double *ctm;
206
+	const double *ctm;
207
 	ctm = state->getCTM();
208
 	double xCoor = m_doc->currentPage()->xOffset();
209
 	double yCoor = m_doc->currentPage()->yOffset();
210
@@ -1815,7 +1813,7 @@ void SlaOutputDev::fill(GfxState *state)
211
 void SlaOutputDev::eoFill(GfxState *state)
212
 {
213
 //	qDebug() << "EoFill";
214
-	double *ctm;
215
+	const double *ctm;
216
 	ctm = state->getCTM();
217
 	double xCoor = m_doc->currentPage()->xOffset();
218
 	double yCoor = m_doc->currentPage()->yOffset();
219
@@ -1857,21 +1855,21 @@ void SlaOutputDev::eoFill(GfxState *state)
220
 	}
221
 }
222
 
223
-GBool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax)
224
+bool SlaOutputDev::axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax)
225
 {
226
 	double GrStartX;
227
 	double GrStartY;
228
 	double GrEndX;
229
 	double GrEndY;
230
 	int shade = 100;
231
-	Function *func = shading->getFunc(0);
232
+	const Function *func = shading->getFunc(0);
233
 	VGradient FillGradient = VGradient(VGradient::linear);
234
 	FillGradient.clearStops();
235
 	GfxColorSpace *color_space = shading->getColorSpace();
236
 	if (func->getType() == 3)
237
 	{
238
 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;
239
-		double *bounds = stitchingFunc->getBounds();
240
+		const double *bounds = stitchingFunc->getBounds();
241
 		int num_funcs = stitchingFunc->getNumFuncs();
242
 		// Add stops from all the stitched functions
243
 		for ( int i = 0 ; i < num_funcs ; i++ )
244
@@ -1905,8 +1903,7 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G
245
 	state->getClipBBox(&xmin, &ymin, &xmax, &ymax);
246
 	QRectF crect = QRectF(QPointF(xmin, ymin), QPointF(xmax, ymax));
247
 	crect = crect.normalized();
248
-	double *ctm;
249
-	ctm = state->getCTM();
250
+	const double *ctm = state->getCTM();
251
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
252
 	FPointArray gr;
253
 	gr.addPoint(GrStartX, GrStartY);
254
@@ -1965,24 +1962,24 @@ GBool SlaOutputDev::axialShadedFill(GfxState *state, G
255
 		m_groupStack.top().Items.append(ite);
256
 		applyMask(ite);
257
 	}
258
-	return gTrue;
259
+	return true;
260
 }
261
 
262
-GBool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax)
263
+bool SlaOutputDev::radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax)
264
 {
265
 	double GrStartX;
266
 	double GrStartY;
267
 	double GrEndX;
268
 	double GrEndY;
269
 	int shade = 100;
270
-	Function *func = shading->getFunc(0);
271
+	const Function *func = shading->getFunc(0);
272
 	VGradient FillGradient = VGradient(VGradient::linear);
273
 	FillGradient.clearStops();
274
 	GfxColorSpace *color_space = shading->getColorSpace();
275
 	if (func->getType() == 3)
276
 	{
277
 		StitchingFunction *stitchingFunc = (StitchingFunction*)func;
278
-		double *bounds = stitchingFunc->getBounds();
279
+		const double *bounds = stitchingFunc->getBounds();
280
 		int num_funcs = stitchingFunc->getNumFuncs();
281
 		// Add stops from all the stitched functions
282
 		for ( int i = 0 ; i < num_funcs ; i++ )
283
@@ -2021,8 +2018,7 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, 
284
 	double GrFocalY = y1;
285
 	GrEndX = GrFocalX + r1;
286
 	GrEndY = GrFocalY;
287
-	double *ctm;
288
-	ctm = state->getCTM();
289
+	const double *ctm = state->getCTM();
290
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
291
 	FPointArray gr;
292
 	gr.addPoint(GrStartX, GrStartY);
293
@@ -2084,10 +2080,10 @@ GBool SlaOutputDev::radialShadedFill(GfxState *state, 
294
 		m_groupStack.top().Items.append(ite);
295
 		applyMask(ite);
296
 	}
297
-	return gTrue;
298
+	return true;
299
 }
300
 
301
-GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading)
302
+bool SlaOutputDev::gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading)
303
 {
304
 	double xCoor = m_doc->currentPage()->xOffset();
305
 	double yCoor = m_doc->currentPage()->yOffset();
306
@@ -2104,8 +2100,7 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState
307
 	output += QString("Z");
308
 	pathIsClosed = true;
309
 	Coords = output;
310
-	double *ctm;
311
-	ctm = state->getCTM();
312
+	const double *ctm = state->getCTM();
313
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
314
 	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
315
 	PageItem* ite = m_doc->Items->at(z);
316
@@ -2164,10 +2159,10 @@ GBool SlaOutputDev::gouraudTriangleShadedFill(GfxState
317
 		ite->meshGradientPatches.append(patchM);
318
 	}
319
 	ite->GrType = 12;
320
-	return gTrue;
321
+	return true;
322
 }
323
 
324
-GBool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading)
325
+bool SlaOutputDev::patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading)
326
 {
327
 //	qDebug() << "mesh shaded fill";
328
 	double xCoor = m_doc->currentPage()->xOffset();
329
@@ -2185,8 +2180,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat
330
 	output += QString("Z");
331
 	pathIsClosed = true;
332
 	Coords = output;
333
-	double *ctm;
334
-	ctm = state->getCTM();
335
+	const double *ctm = state->getCTM();
336
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
337
 	int z = m_doc->itemAdd(PageItem::Polygon, PageItem::Rectangle, xCoor + crect.x(), yCoor + crect.y(), crect.width(), crect.height(), 0, CurrColorFill, CommonStrings::None);
338
 	PageItem* ite = m_doc->Items->at(z);
339
@@ -2211,7 +2205,7 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat
340
 	for (int i = 0; i < shading->getNPatches(); i++)
341
 	{
342
 		int shade = 100;
343
-		GfxPatch *patch = shading->getPatch(i);
344
+		const GfxPatch *patch = shading->getPatch(i);
345
 		GfxColor color;
346
 		meshGradientPatch patchM;
347
 		int u, v;
348
@@ -2314,18 +2308,18 @@ GBool SlaOutputDev::patchMeshShadedFill(GfxState *stat
349
 		ite->meshGradientPatches.append(patchM);
350
 	}
351
 	ite->GrType = 12;
352
-	return gTrue;
353
+	return true;
354
 }
355
 
356
-GBool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
357
+bool SlaOutputDev::tilingPatternFill(GfxState *state, Gfx * /*gfx*/, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep)
358
 {
359
 	PDFRectangle box;
360
 	Gfx *gfx;
361
 	QString id;
362
 	PageItem *ite;
363
 	groupEntry gElements;
364
-	gElements.forSoftMask = gFalse;
365
-	gElements.alpha = gFalse;
366
+	gElements.forSoftMask = false;
367
+	gElements.alpha = false;
368
 	gElements.inverted = false;
369
 	gElements.maskName = "";
370
 	gElements.Items.clear();
371
@@ -2334,13 +2328,12 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state,
372
 	width = bbox[2] - bbox[0];
373
 	height = bbox[3] - bbox[1];
374
 	if (xStep != width || yStep != height)
375
-		return gFalse;
376
+		return false;
377
 	box.x1 = bbox[0];
378
 	box.y1 = bbox[1];
379
 	box.x2 = bbox[2];
380
 	box.y2 = bbox[3];
381
-	double *ctm;
382
-	ctm = state->getCTM();
383
+	const double *ctm = state->getCTM();
384
 	m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
385
 	QTransform mm = QTransform(mat[0], mat[1], mat[2], mat[3], mat[4], mat[5]);
386
 	QTransform mmx = mm * m_ctm;
387
@@ -2437,10 +2430,10 @@ GBool SlaOutputDev::tilingPatternFill(GfxState *state,
388
 		applyMask(ite);
389
 	}
390
 	delete gfx;
391
-	return gTrue;
392
+	return true;
393
 }
394
 
395
-void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg)
396
+void SlaOutputDev::drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg)
397
 {
398
 //	qDebug() << "Draw Image Mask";
399
 	QImage * image = 0;
400
@@ -2512,8 +2505,7 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje
401
 			t++;
402
 		}
403
 	}
404
-	double *ctm;
405
-	ctm = state->getCTM();
406
+	const double *ctm = state->getCTM();
407
 	double xCoor = m_doc->currentPage()->xOffset();
408
 	double yCoor = m_doc->currentPage()->yOffset();
409
 	QRectF crect = QRectF(0, 0, width, height);
410
@@ -2605,8 +2597,8 @@ void SlaOutputDev::drawImageMask(GfxState *state, Obje
411
 	delete image;
412
 }
413
 
414
-void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, Stream *maskStr, int maskWidth, int maskHeight,
415
-				   GfxImageColorMap *maskColorMap, GBool maskInterpolate)
416
+void SlaOutputDev::drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight,
417
+				   GfxImageColorMap *maskColorMap, bool maskInterpolate)
418
 {
419
 //	qDebug() << "Masked Image Components" << colorMap->getNumPixelComps();
420
 	ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
421
@@ -2658,8 +2650,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state
422
 			t++;
423
 		}
424
 	}
425
-	double *ctm;
426
-	ctm = state->getCTM();
427
+	const double *ctm = state->getCTM();
428
 	double xCoor = m_doc->currentPage()->xOffset();
429
 	double yCoor = m_doc->currentPage()->yOffset();
430
 	QRectF crect = QRectF(0, 0, width, height);
431
@@ -2750,7 +2741,7 @@ void SlaOutputDev::drawSoftMaskedImage(GfxState *state
432
 	delete[] mbuffer;
433
 }
434
 
435
-void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  int width, int height, GfxImageColorMap *colorMap, GBool interpolate, Stream *maskStr, int maskWidth, int maskHeight, GBool maskInvert, GBool maskInterpolate)
436
+void SlaOutputDev::drawMaskedImage(GfxState *state, Object *ref, Stream *str,  int width, int height, GfxImageColorMap *colorMap, bool interpolate, Stream *maskStr, int maskWidth, int maskHeight, bool maskInvert, bool maskInterpolate)
437
 {
438
 	ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
439
 	imgStr->reset();
440
@@ -2808,8 +2799,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob
441
 			t++;
442
 		}
443
 	}
444
-	double *ctm;
445
-	ctm = state->getCTM();
446
+	const double *ctm = state->getCTM();
447
 	double xCoor = m_doc->currentPage()->xOffset();
448
 	double yCoor = m_doc->currentPage()->yOffset();
449
 	QRectF crect = QRectF(0, 0, width, height);
450
@@ -2900,7 +2890,7 @@ void SlaOutputDev::drawMaskedImage(GfxState *state, Ob
451
 	delete[] mbuffer;
452
 }
453
 
454
-void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg)
455
+void SlaOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg)
456
 {
457
 	ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
458
 //	qDebug() << "Image Components" << colorMap->getNumPixelComps() << "Mask" << maskColors;
459
@@ -2973,8 +2963,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object *
460
 		delete image;
461
 		return;
462
 	}
463
-	double *ctm;
464
-	ctm = state->getCTM();
465
+	const double *ctm = state->getCTM();
466
 	double xCoor = m_doc->currentPage()->xOffset();
467
 	double yCoor = m_doc->currentPage()->yOffset();
468
 	QRectF crect = QRectF(0, 0, width, height);
469
@@ -3103,7 +3092,7 @@ void SlaOutputDev::drawImage(GfxState *state, Object *
470
 	delete image;
471
 }
472
 
473
-void SlaOutputDev::beginMarkedContent(char *name, Object *dictRef)
474
+void SlaOutputDev::beginMarkedContent(const char *name, Object *dictRef)
475
 {
476
 	mContent mSte;
477
 	mSte.name = QString(name);
478
@@ -3172,7 +3161,7 @@ void SlaOutputDev::beginMarkedContent(char *name, Obje
479
 	m_mcStack.push(mSte);
480
 }
481
 
482
-void SlaOutputDev::beginMarkedContent(char *name, Dict *properties)
483
+void SlaOutputDev::beginMarkedContent(const char *name, Dict *properties)
484
 {
485
 //	qDebug() << "Begin Marked Content with Name " << QString(name);
486
 	QString nam = QString(name);
487
@@ -3190,13 +3179,13 @@ void SlaOutputDev::beginMarkedContent(char *name, Dict
488
 #if POPPLER_ENCODED_VERSION >= POPPLER_VERSION_ENCODE(0, 58, 0)
489
 			Object obj = properties->lookup((char*) "Title");
490
 			if (obj.isString())
491
-				lName = QString(obj.getString()->getCString());
492
+				lName = QString(obj.getString()->c_str());
493
 #else
494
 			Object obj;
495
 			if (properties->lookup((char*)"Title", &obj))
496
 			{
497
 				if (obj.isString())
498
-					lName =  QString(obj.getString()->getCString());
499
+					lName =  QString(obj.getString()->c_str());
500
 				obj.free();
501
 			}
502
 #endif
503
@@ -3299,12 +3288,12 @@ void SlaOutputDev::endMarkedContent(GfxState *state)
504
 	}
505
 }
506
 
507
-void SlaOutputDev::markPoint(char *name)
508
+void SlaOutputDev::markPoint(const char *name)
509
 {
510
 //	qDebug() << "Begin Marked Point with Name " << QString(name);
511
 }
512
 
513
-void SlaOutputDev::markPoint(char *name, Dict *properties)
514
+void SlaOutputDev::markPoint(const char *name, Dict *properties)
515
 {
516
 //	qDebug() << "Begin Marked Point with Name " << QString(name) << "and Properties";
517
 	beginMarkedContent(name, properties);
518
@@ -3326,7 +3315,7 @@ void SlaOutputDev::updateFont(GfxState *state)
519
 	char *tmpBuf;
520
 	int tmpBufLen = 0;
521
 	int *codeToGID;
522
-	double *textMat;
523
+	const double *textMat;
524
 	double m11, m12, m21, m22, fontSize;
525
 	SplashCoord mat[4];
526
 	int n = 0;
527
@@ -3355,7 +3344,7 @@ void SlaOutputDev::updateFont(GfxState *state)
528
 
529
 		if (!(fontLoc = gfxFont->locateFont(xref, 0))) {
530
 			error(errSyntaxError, -1, "Couldn't find a font for '{0:s}'",
531
-			gfxFont->getName() ? gfxFont->getName()->getCString()
532
+			gfxFont->getName() ? gfxFont->getName()->c_str()
533
 			: "(unnamed)");
534
 			goto err2;
535
 		}
536
@@ -3375,9 +3364,9 @@ void SlaOutputDev::updateFont(GfxState *state)
537
 
538
 		fontsrc = new SplashFontSrc;
539
 		if (fileName)
540
-			fontsrc->setFile(fileName, gFalse);
541
+			fontsrc->setFile(fileName, false);
542
 		else
543
-			fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
544
+			fontsrc->setBuf(tmpBuf, tmpBufLen, true);
545
 
546
 		// load the font file
547
 		switch (fontType) {
548
@@ -3388,7 +3377,7 @@ void SlaOutputDev::updateFont(GfxState *state)
549
 				(const char **)((Gfx8BitFont *)gfxFont)->getEncoding())))
550
 			{
551
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
552
-				gfxFont->getName() ? gfxFont->getName()->getCString()
553
+				gfxFont->getName() ? gfxFont->getName()->c_str()
554
 				: "(unnamed)");
555
 				goto err2;
556
 			}
557
@@ -3400,7 +3389,7 @@ void SlaOutputDev::updateFont(GfxState *state)
558
 							(const char **)((Gfx8BitFont *)gfxFont)->getEncoding())))
559
 			{
560
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
561
-				gfxFont->getName() ? gfxFont->getName()->getCString()
562
+				gfxFont->getName() ? gfxFont->getName()->c_str()
563
 				: "(unnamed)");
564
 				goto err2;
565
 			}
566
@@ -3412,7 +3401,7 @@ void SlaOutputDev::updateFont(GfxState *state)
567
 							(const char **)((Gfx8BitFont *)gfxFont)->getEncoding())))
568
 			{
569
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
570
-				gfxFont->getName() ? gfxFont->getName()->getCString()
571
+				gfxFont->getName() ? gfxFont->getName()->c_str()
572
 				: "(unnamed)");
573
 				goto err2;
574
 			}
575
@@ -3420,7 +3409,7 @@ void SlaOutputDev::updateFont(GfxState *state)
576
 		case fontTrueType:
577
 		case fontTrueTypeOT:
578
 			if (fileName)
579
-				ff = FoFiTrueType::load(fileName->getCString());
580
+				ff = FoFiTrueType::load(fileName->c_str());
581
 			else
582
 				ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
583
 			if (ff) {
584
@@ -3437,7 +3426,7 @@ void SlaOutputDev::updateFont(GfxState *state)
585
 							codeToGID, n)))
586
 			{
587
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
588
-				gfxFont->getName() ? gfxFont->getName()->getCString()
589
+				gfxFont->getName() ? gfxFont->getName()->c_str()
590
 				: "(unnamed)");
591
 				goto err2;
592
 			}
593
@@ -3449,7 +3438,7 @@ void SlaOutputDev::updateFont(GfxState *state)
594
 							fontsrc)))
595
 			{
596
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
597
-				gfxFont->getName() ? gfxFont->getName()->getCString()
598
+				gfxFont->getName() ? gfxFont->getName()->c_str()
599
 				: "(unnamed)");
600
 				goto err2;
601
 			}
602
@@ -3470,7 +3459,7 @@ void SlaOutputDev::updateFont(GfxState *state)
603
 							codeToGID, n)))
604
 			{
605
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
606
-				gfxFont->getName() ? gfxFont->getName()->getCString()
607
+				gfxFont->getName() ? gfxFont->getName()->c_str()
608
 				: "(unnamed)");
609
 				goto err2;
610
 			}
611
@@ -3488,7 +3477,7 @@ void SlaOutputDev::updateFont(GfxState *state)
612
 				}
613
 			} else {
614
 				if (fileName)
615
-					ff = FoFiTrueType::load(fileName->getCString());
616
+					ff = FoFiTrueType::load(fileName->c_str());
617
 				else
618
 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
619
 				if (! ff)
620
@@ -3502,7 +3491,7 @@ void SlaOutputDev::updateFont(GfxState *state)
621
 							codeToGID, n, faceIndex)))
622
 			{
623
 				error(errSyntaxError, -1, "Couldn't create a font for '{0:s}'",
624
-				gfxFont->getName() ? gfxFont->getName()->getCString()
625
+				gfxFont->getName() ? gfxFont->getName()->c_str()
626
 				: "(unnamed)");
627
 				goto err2;
628
 			}
629
@@ -3604,7 +3593,7 @@ void SlaOutputDev::updateFont(GfxState *state)
630
 			}
631
 			if (!dfp)
632
 			{
633
-		//		error(-1, "Couldn't find a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
634
+		//		error(-1, "Couldn't find a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
635
 				goto err2;
636
 			}
637
 			switch (dfp->kind)
638
@@ -3622,37 +3611,37 @@ void SlaOutputDev::updateFont(GfxState *state)
639
 		}
640
 		fontsrc = new SplashFontSrc;
641
 		if (fileName)
642
-			fontsrc->setFile(fileName, gFalse);
643
+			fontsrc->setFile(fileName, false);
644
 		else
645
-			fontsrc->setBuf(tmpBuf, tmpBufLen, gTrue);
646
+			fontsrc->setBuf(tmpBuf, tmpBufLen, true);
647
 		// load the font file
648
 		switch (fontType)
649
 		{
650
 			case fontType1:
651
 				if (!(fontFile = m_fontEngine->loadType1Font( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding())))
652
 				{
653
-			//		error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
654
+			//		error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
655
 					goto err2;
656
 				}
657
 				break;
658
 			case fontType1C:
659
 				if (!(fontFile = m_fontEngine->loadType1CFont( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding())))
660
 				{
661
-		//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
662
+		//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
663
 					goto err2;
664
 				}
665
 				break;
666
 			case fontType1COT:
667
 				if (!(fontFile = m_fontEngine->loadOpenTypeT1CFont( id, fontsrc, ((Gfx8BitFont *)gfxFont)->getEncoding())))
668
 				{
669
-		//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
670
+		//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
671
 					goto err2;
672
 				}
673
 				break;
674
 			case fontTrueType:
675
 			case fontTrueTypeOT:
676
 				if (fileName)
677
-					ff = FoFiTrueType::load(fileName->getCString());
678
+					ff = FoFiTrueType::load(fileName->c_str());
679
 				else
680
 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
681
 				if (ff)
682
@@ -3668,7 +3657,7 @@ void SlaOutputDev::updateFont(GfxState *state)
683
 				}
684
 				if (!(fontFile = m_fontEngine->loadTrueTypeFont( id, fontsrc, codeToGID, n)))
685
 				{
686
-	//				error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
687
+	//				error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
688
 					goto err2;
689
 				}
690
 			break;
691
@@ -3676,14 +3665,14 @@ void SlaOutputDev::updateFont(GfxState *state)
692
 		case fontCIDType0C:
693
 			if (!(fontFile = m_fontEngine->loadCIDFont( id, fontsrc)))
694
 			{
695
-	//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
696
+	//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
697
 				goto err2;
698
 			}
699
 			break;
700
 		case fontCIDType0COT:
701
 			if (!(fontFile = m_fontEngine->loadOpenTypeCFFFont( id, fontsrc)))
702
 			{
703
-	//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
704
+	//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
705
 				goto err2;
706
 			}
707
 			break;
708
@@ -3703,7 +3692,7 @@ void SlaOutputDev::updateFont(GfxState *state)
709
 			else
710
 			{
711
 				if (fileName)
712
-					ff = FoFiTrueType::load(fileName->getCString());
713
+					ff = FoFiTrueType::load(fileName->c_str());
714
 				else
715
 					ff = FoFiTrueType::make(tmpBuf, tmpBufLen);
716
 				if (!ff)
717
@@ -3713,7 +3702,7 @@ void SlaOutputDev::updateFont(GfxState *state)
718
 			}
719
 			if (!(fontFile = m_fontEngine->loadTrueTypeFont( id, fontsrc, codeToGID, n, faceIndex)))
720
 			{
721
-	//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->getCString() : "(unnamed)");
722
+	//			error(-1, "Couldn't create a font for '%s'", gfxFont->getName() ? gfxFont->getName()->c_str() : "(unnamed)");
723
 				goto err2;
724
 			}
725
 			break;
726
@@ -3793,8 +3782,7 @@ void SlaOutputDev::drawChar(GfxState *state, double x,
727
 				if (f & splashPathLast)
728
 					qPath.closeSubpath();
729
 			}
730
-			double *ctm;
731
-			ctm = state->getCTM();
732
+			const double *ctm = state->getCTM();
733
 			m_ctm = QTransform(ctm[0], ctm[1], ctm[2], ctm[3], ctm[4], ctm[5]);
734
 			double xCoor = m_doc->currentPage()->xOffset();
735
 			double yCoor = m_doc->currentPage()->yOffset();
736
@@ -3842,19 +3830,19 @@ void SlaOutputDev::drawChar(GfxState *state, double x,
737
 	}
738
 }
739
 
740
-GBool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
741
+bool SlaOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)
742
 {
743
 //	qDebug() << "beginType3Char";
744
 	GfxFont *gfxFont;
745
 	if (!(gfxFont = state->getFont()))
746
-		return gTrue;
747
+		return true;
748
 	if (gfxFont->getType() != fontType3)
749
-		return gTrue;
750
+		return true;
751
 	F3Entry f3e;
752
 	f3e.colored = false;
753
 	m_F3Stack.push(f3e);
754
 	pushGroup();
755
-	return gFalse;
756
+	return false;
757
 }
758
 
759
 void SlaOutputDev::endType3Char(GfxState *state)
760
@@ -3948,7 +3936,7 @@ void SlaOutputDev::endTextObject(GfxState *state)
761
 	}
762
 }
763
 
764
-QString SlaOutputDev::getColor(GfxColorSpace *color_space, GfxColor *color, int *shade)
765
+QString SlaOutputDev::getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade)
766
 {
767
 	QString fNam;
768
 	QString namPrefix = "FromPDF";
769
@@ -3993,7 +3981,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_sp
770
 	else if (color_space->getMode() == csSeparation)
771
 	{
772
 		GfxCMYK cmyk;
773
-		QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->getCString());
774
+		QString name = QString(((GfxSeparationColorSpace*)color_space)->getName()->c_str());
775
 		double Cc, Mc, Yc, Kc;
776
 		bool isRegistrationColor = (name == "All");
777
 		if (!isRegistrationColor)
778
@@ -4032,7 +4020,7 @@ QString SlaOutputDev::getColor(GfxColorSpace *color_sp
779
 	return fNam;
780
 }
781
 
782
-QString SlaOutputDev::getAnnotationColor(AnnotColor *color)
783
+QString SlaOutputDev::getAnnotationColor(const AnnotColor *color)
784
 {
785
 	QString fNam;
786
 	QString namPrefix = "FromPDF";
787
@@ -4242,7 +4230,7 @@ void SlaOutputDev::applyMask(PageItem *ite)
788
 	}
789
 }
790
 
791
-void SlaOutputDev::pushGroup(QString maskName, GBool forSoftMask, GBool alpha, bool inverted)
792
+void SlaOutputDev::pushGroup(QString maskName, bool forSoftMask, bool alpha, bool inverted)
793
 {
794
 	groupEntry gElements;
795
 	gElements.forSoftMask = forSoftMask;
796
@@ -4252,23 +4240,23 @@ void SlaOutputDev::pushGroup(QString maskName, GBool f
797
 	m_groupStack.push(gElements);
798
 }
799
 
800
-QString SlaOutputDev::UnicodeParsedString(GooString *s1)
801
+QString SlaOutputDev::UnicodeParsedString(const GooString *s1)
802
 {
803
 	if ( !s1 || s1->getLength() == 0 )
804
 		return QString();
805
-	GBool isUnicode;
806
+	bool isUnicode;
807
 	int i;
808
 	Unicode u;
809
 	QString result;
810
 	if ((s1->getChar(0) & 0xff) == 0xfe && (s1->getLength() > 1 && (s1->getChar(1) & 0xff) == 0xff))
811
 	{
812
-		isUnicode = gTrue;
813
+		isUnicode = true;
814
 		i = 2;
815
 		result.reserve((s1->getLength() - 2) / 2);
816
 	}
817
 	else
818
 	{
819
-		isUnicode = gFalse;
820
+		isUnicode = false;
821
 		i = 0;
822
 		result.reserve(s1->getLength());
823
 	}
(-)print/scribus-devel/files/patch-scribus_plugins_import_pdf_slaoutput.h (+240 lines)
Line 0 Link Here
1
--- scribus/plugins/import/pdf/slaoutput.h.orig	2018-12-11 13:04:07 UTC
2
+++ scribus/plugins/import/pdf/slaoutput.h
3
@@ -61,9 +61,9 @@ class LinkSubmitForm: public LinkAction (public)
4
 	// Destructor.
5
 	virtual ~LinkSubmitForm();
6
 	// Was the LinkImportData created successfully?
7
-	virtual GBool isOk() { return fileName != NULL; }
8
+	virtual bool isOk() const { return fileName != NULL; }
9
 	// Accessors.
10
-	virtual LinkActionKind getKind() { return actionUnknown; }
11
+	virtual LinkActionKind getKind() const { return actionUnknown; }
12
 	GooString *getFileName() { return fileName; }
13
 	int getFlags() { return m_flags; }
14
 private:
15
@@ -83,9 +83,9 @@ class LinkImportData: public LinkAction (public)
16
 	// Destructor.
17
 	virtual ~LinkImportData();
18
 	// Was the LinkImportData created successfully?
19
-	virtual GBool isOk() { return fileName != NULL; }
20
+	virtual bool isOk() const { return fileName != NULL; }
21
 	// Accessors.
22
-	virtual LinkActionKind getKind() { return actionUnknown; }
23
+	virtual LinkActionKind getKind() const { return actionUnknown; }
24
 	GooString *getFileName() { return fileName; }
25
 private:
26
 	GooString *fileName;		// file name
27
@@ -98,9 +98,9 @@ class SplashOutFontFileID: public SplashFontFileID
28
 {
29
 public:
30
 
31
-	SplashOutFontFileID(Ref *rA) { r = *rA; }
32
+	SplashOutFontFileID(const Ref *rA) { r = *rA; }
33
 	~SplashOutFontFileID() {}
34
-	GBool matches(SplashFontFileID *id)
35
+	bool matches(SplashFontFileID *id)
36
 	{
37
 		return ((SplashOutFontFileID *)id)->r.num == r.num && ((SplashOutFontFileID *)id)->r.gen == r.gen;
38
 	}
39
@@ -115,18 +115,18 @@ class AnoOutputDev : public OutputDev
40
 public:
41
 	AnoOutputDev(ScribusDoc* doc, QStringList *importedColors);
42
 	virtual ~AnoOutputDev();
43
-	GBool isOk() { return gTrue; }
44
-	virtual GBool upsideDown() { return gTrue; }
45
-	virtual GBool useDrawChar() { return gFalse; }
46
-	virtual GBool interpretType3Chars() { return gFalse; }
47
-	virtual GBool useTilingPatternFill() { return gFalse; }
48
-	virtual GBool useShadedFills(int type) { return gFalse; }
49
-	virtual GBool useFillColorStop() { return gFalse; }
50
-	virtual GBool useDrawForm() { return gFalse; }
51
+	bool isOk() { return true; }
52
+	virtual bool upsideDown() { return true; }
53
+	virtual bool useDrawChar() { return false; }
54
+	virtual bool interpretType3Chars() { return false; }
55
+	virtual bool useTilingPatternFill() { return false; }
56
+	virtual bool useShadedFills(int type) { return false; }
57
+	virtual bool useFillColorStop() { return false; }
58
+	virtual bool useDrawForm() { return false; }
59
 	virtual void stroke(GfxState *state);
60
 	virtual void eoFill(GfxState *state);
61
 	virtual void fill(GfxState *state);
62
-	virtual void drawString(GfxState *state, GooString *s);
63
+	virtual void drawString(GfxState *state, const GooString *s);
64
 
65
 	QString CurrColorText;
66
 	QString CurrColorFill;
67
@@ -135,7 +135,7 @@ class AnoOutputDev : public OutputDev
68
 	GooString *m_fontName;
69
 	GooString *m_itemText;
70
 private:
71
-	QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade);
72
+	QString getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade);
73
 	ScribusDoc* m_doc;
74
 	QStringList *m_importedColors;
75
 };
76
@@ -148,7 +148,7 @@ class SlaOutputDev : public OutputDev (public)
77
 	virtual ~SlaOutputDev();
78
 	LinkAction* SC_getAction(AnnotWidget *ano);
79
 	LinkAction* SC_getAdditionalAction(const char *key, AnnotWidget *ano);
80
-	static GBool annotations_callback(Annot *annota, void *user_data);
81
+	static bool annotations_callback(Annot *annota, void *user_data);
82
 	bool handleTextAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);
83
 	bool handleLinkAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);
84
 	bool handleWidgetAnnot(Annot* annota, double xCoor, double yCoor, double width, double height);
85
@@ -156,15 +156,15 @@ class SlaOutputDev : public OutputDev (public)
86
 	void handleActions(PageItem* ite, AnnotWidget *ano);
87
 	void startDoc(PDFDoc *doc, XRef *xrefA, Catalog *catA);
88
 
89
-	GBool isOk() { return gTrue; }
90
-	virtual GBool upsideDown() { return gTrue; }
91
-	virtual GBool useDrawChar() { return gTrue; }
92
-	virtual GBool interpretType3Chars() { return gTrue; }
93
-	virtual GBool useTilingPatternFill() { return gTrue; }
94
-	virtual GBool useShadedFills(int type) { return type <= 7; }
95
-	virtual GBool useFillColorStop() { return gTrue; }
96
-	virtual GBool useDrawForm() { return gFalse; }
97
-//	virtual GBool needClipToCropBox() { return gTrue; }
98
+	bool isOk() { return true; }
99
+	virtual bool upsideDown() { return true; }
100
+	virtual bool useDrawChar() { return true; }
101
+	virtual bool interpretType3Chars() { return true; }
102
+	virtual bool useTilingPatternFill() { return true; }
103
+	virtual bool useShadedFills(int type) { return type <= 7; }
104
+	virtual bool useFillColorStop() { return true; }
105
+	virtual bool useDrawForm() { return false; }
106
+//	virtual bool needClipToCropBox() { return true; }
107
 	virtual void startPage(int pageNum, GfxState *, XRef *);
108
 	virtual void endPage();
109
 	// graphics state
110
@@ -175,30 +175,30 @@ class SlaOutputDev : public OutputDev (public)
111
 	virtual void stroke(GfxState *state);
112
 	virtual void fill(GfxState *state);
113
 	virtual void eoFill(GfxState *state);
114
-	GBool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep);
115
-	virtual GBool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) { qDebug() << "Function Shaded Fill";  return gFalse; }
116
-	virtual GBool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
117
-	virtual GBool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); }
118
-	virtual GBool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
119
-	virtual GBool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); }
120
-	virtual GBool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
121
-	virtual GBool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading);
122
+	bool tilingPatternFill(GfxState *state, Gfx *gfx, Catalog *cat, Object *str, double *pmat, int paintType, int tilingType, Dict *resDict, double *mat, double *bbox, int x0, int y0, int x1, int y1, double xStep, double yStep);
123
+	virtual bool functionShadedFill(GfxState * /*state*/, GfxFunctionShading * /*shading*/) { qDebug() << "Function Shaded Fill";  return false; }
124
+	virtual bool axialShadedFill(GfxState *state, GfxAxialShading *shading, double tMin, double tMax);
125
+	virtual bool axialShadedSupportExtend(GfxState *state, GfxAxialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); }
126
+	virtual bool radialShadedFill(GfxState *state, GfxRadialShading *shading, double sMin, double sMax);
127
+	virtual bool radialShadedSupportExtend(GfxState *state, GfxRadialShading *shading) { return (shading->getExtend0() == shading->getExtend1()); }
128
+	virtual bool gouraudTriangleShadedFill(GfxState *state, GfxGouraudTriangleShading *shading);
129
+	virtual bool patchMeshShadedFill(GfxState *state, GfxPatchMeshShading *shading);
130
 	//----- path clipping
131
 	virtual void clip(GfxState *state);
132
 	virtual void eoClip(GfxState *state);
133
 	virtual void clipToStrokePath(GfxState * /*state*/) { qDebug() << "Clip to StrokePath"; }
134
-	virtual GBool deviceHasTextClip(GfxState *state) { return gFalse; }
135
+	virtual bool deviceHasTextClip(GfxState *state) { return false; }
136
 
137
   // If current colorspace is pattern,
138
   // does this device support text in pattern colorspace?
139
-	virtual GBool supportTextCSPattern(GfxState *state)
140
+	virtual bool supportTextCSPattern(GfxState *state)
141
 	{
142
 		return state->getFillColorSpace()->getMode() == csPattern;
143
 	}
144
 
145
   // If current colorspace is pattern,
146
   // need this device special handling for masks in pattern colorspace?
147
-	virtual GBool fillMaskCSPattern(GfxState * state)
148
+	virtual bool fillMaskCSPattern(GfxState * state)
149
 	{
150
 		return state->getFillColorSpace()->getMode() == csPattern;
151
 	}
152
@@ -206,36 +206,36 @@ class SlaOutputDev : public OutputDev (public)
153
 	virtual void endMaskClip(GfxState *state) { qDebug() << "End Mask Clip"; }
154
 
155
   //----- grouping operators
156
-	virtual void beginMarkedContent(char *name, Dict *properties);
157
-	virtual void beginMarkedContent(char *name, Object *dictRef);
158
+	virtual void beginMarkedContent(const char *name, Dict *properties);
159
+	virtual void beginMarkedContent(const char *name, Object *dictRef);
160
 	virtual void endMarkedContent(GfxState *state);
161
-	virtual void markPoint(char *name);
162
-	virtual void markPoint(char *name, Dict *properties);
163
+	virtual void markPoint(const char *name);
164
+	virtual void markPoint(const char *name, Dict *properties);
165
 	//----- image drawing
166
-	virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, GBool invert, GBool interpolate, GBool inlineImg);
167
-	virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, GBool interpolate, int *maskColors, GBool inlineImg);
168
+	virtual void drawImageMask(GfxState *state, Object *ref, Stream *str, int width, int height, bool invert, bool interpolate, bool inlineImg);
169
+	virtual void drawImage(GfxState *state, Object *ref, Stream *str, int width, int height, GfxImageColorMap *colorMap, bool interpolate, int *maskColors, bool inlineImg);
170
 	virtual void drawSoftMaskedImage(GfxState *state, Object *ref, Stream *str,
171
 				   int width, int height,
172
 				   GfxImageColorMap *colorMap,
173
-				   GBool interpolate,
174
+				   bool interpolate,
175
 				   Stream *maskStr,
176
 				   int maskWidth, int maskHeight,
177
 				   GfxImageColorMap *maskColorMap,
178
-				   GBool maskInterpolate);
179
+				   bool maskInterpolate);
180
 
181
 	virtual void drawMaskedImage(GfxState *state, Object *ref, Stream *str,
182
 				   int width, int height,
183
 				   GfxImageColorMap *colorMap,
184
-				   GBool interpolate,
185
+				   bool interpolate,
186
 				   Stream *maskStr,
187
 				   int maskWidth, int maskHeight,
188
-				   GBool maskInvert, GBool maskInterpolate); // { qDebug() << "Draw Masked Image"; }
189
+				   bool maskInvert, bool maskInterpolate); // { qDebug() << "Draw Masked Image"; }
190
 
191
 	//----- transparency groups and soft masks
192
-	virtual void beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, GBool /*isolated*/, GBool /*knockout*/, GBool /*forSoftMask*/);
193
+	virtual void beginTransparencyGroup(GfxState *state, double *bbox, GfxColorSpace * /*blendingColorSpace*/, bool /*isolated*/, bool /*knockout*/, bool /*forSoftMask*/);
194
 	virtual void paintTransparencyGroup(GfxState *state, double *bbox);
195
 	virtual void endTransparencyGroup(GfxState *state);
196
-	virtual void setSoftMask(GfxState * /*state*/, double * /*bbox*/, GBool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/);
197
+	virtual void setSoftMask(GfxState * /*state*/, const double * /*bbox*/, bool /*alpha*/, Function * /*transferFunc*/, GfxColor * /*backdropColor*/);
198
 	virtual void clearSoftMask(GfxState * /*state*/);
199
 
200
 	virtual void updateFillColor(GfxState *state);
201
@@ -245,7 +245,7 @@ class SlaOutputDev : public OutputDev (public)
202
 	virtual void beginTextObject(GfxState *state);
203
 	virtual void endTextObject(GfxState *state);
204
 	virtual void drawChar(GfxState *state, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, double /*originX*/, double /*originY*/, CharCode /*code*/, int /*nBytes*/, Unicode * /*u*/, int /*uLen*/);
205
-	virtual GBool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/);
206
+	virtual bool beginType3Char(GfxState * /*state*/, double /*x*/, double /*y*/, double /*dx*/, double /*dy*/, CharCode /*code*/, Unicode * /*u*/, int /*uLen*/);
207
 	virtual void endType3Char(GfxState * /*state*/);
208
 	virtual void type3D0(GfxState * /*state*/, double /*wx*/, double /*wy*/);
209
 	virtual void type3D1(GfxState * /*state*/, double /*wx*/, double /*wy*/, double /*llx*/, double /*lly*/, double /*urx*/, double /*ury*/);
210
@@ -260,13 +260,13 @@ class SlaOutputDev : public OutputDev (public)
211
 
212
 private:
213
 	void getPenState(GfxState *state);
214
-	QString getColor(GfxColorSpace *color_space, GfxColor *color, int *shade);
215
-	QString getAnnotationColor(AnnotColor *color);
216
+	QString getColor(GfxColorSpace *color_space, const GfxColor *color, int *shade);
217
+	QString getAnnotationColor(const AnnotColor *color);
218
 	QString convertPath(GfxPath *path);
219
 	int getBlendMode(GfxState *state);
220
 	void applyMask(PageItem *ite);
221
-	void pushGroup(QString maskName = "", GBool forSoftMask = gFalse, GBool alpha = gFalse, bool inverted = false);
222
-	QString UnicodeParsedString(GooString *s1);
223
+	void pushGroup(QString maskName = "", bool forSoftMask = false, bool alpha = false, bool inverted = false);
224
+	QString UnicodeParsedString(const GooString *s1);
225
 	bool checkClip();
226
 	bool pathIsClosed;
227
 	QString CurrColorFill;
228
@@ -283,9 +283,9 @@ class SlaOutputDev : public OutputDev (public)
229
 	struct groupEntry
230
 	{
231
 		QList<PageItem*> Items;
232
-		GBool forSoftMask;
233
-		GBool isolated;
234
-		GBool alpha;
235
+		bool forSoftMask;
236
+		bool isolated;
237
+		bool alpha;
238
 		QString maskName;
239
 		bool inverted;
240
 	};
(-)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 28-36 Link Here
28
		webkit xml qmake_build moc_build rcc_build uic_build \
28
		webkit xml qmake_build moc_build rcc_build uic_build \
29
		linguisttools_build
29
		linguisttools_build
30
USE_XORG=	x11
30
USE_XORG=	x11
31
CMAKE_ARGS+=	-DENABLE_LADS=OFF \
31
CMAKE_OFF=	ENABLE_LADS \
32
		-DENABLE_SYNCER=OFF \
32
		ENABLE_SYNCER \
33
		-DLEECHCRAFT_VERSION=${PORTVERSION}
33
		ENABLE_MONOCLE
34
CMAKE_ARGS=	-DLEECHCRAFT_VERSION=${PORTVERSION}
34
35
35
WRKSRC_SUBDIR=	src
36
WRKSRC_SUBDIR=	src
36
37
Lines 39-45 Link Here
39
		ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \
40
		ELEEMINATOR FENET GACTS GLANCE GNOTIFI HARBINGER HISTORYHOLDER \
40
		HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \
41
		HOTSENSORS HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY KNOWHOW KRIGSTASK \
41
		LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \
42
		LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LEMON LHTR LIZNOO LMP MELLONETRAY \
42
		MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
43
		MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
43
		NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \
44
		NEWLIFE OORONEE OTLOZHU PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP \
44
		ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \
45
		ROSENTHAL SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER \
45
		TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \
46
		TABSLIST TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC \
Lines 225-236 Link Here
225
MELLONETRAY_CMAKE_OFF=	-DENABLE_MELLONETRAY:BOOL=false
226
MELLONETRAY_CMAKE_OFF=	-DENABLE_MELLONETRAY:BOOL=false
226
MELLONETRAY_USE=	xorg=xdamage
227
MELLONETRAY_USE=	xorg=xdamage
227
228
228
MONOCLE_DESC=		Monocle, the modular document viewer
229
MONOCLE_CMAKE_ON=	-DENABLE_MONOCLE:BOOL=true
230
MONOCLE_CMAKE_OFF=	-DENABLE_MONOCLE:BOOL=false
231
MONOCLE_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre \
232
			libpoppler-qt4.so:graphics/poppler-qt4
233
234
MUSICZOMBIE_DESC=	MusicBrainz client plugin
229
MUSICZOMBIE_DESC=	MusicBrainz client plugin
235
MUSICZOMBIE_CMAKE_ON=	-DENABLE_MUSICZOMBIE:BOOL=true
230
MUSICZOMBIE_CMAKE_ON=	-DENABLE_MUSICZOMBIE:BOOL=true
236
MUSICZOMBIE_CMAKE_OFF=	-DENABLE_MUSICZOMBIE:BOOL=false
231
MUSICZOMBIE_CMAKE_OFF=	-DENABLE_MUSICZOMBIE:BOOL=false
Lines 363-369 Link Here
363
		CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \
358
		CPULOAD CSTP DBUSMANAGER DEADLYRICS DOLOZHEE FENET GACTS GLANCE GNOTIFI \
364
		HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \
359
		HARBINGER HISTORYHOLDER HOTSTREAMS HTTHARE IMGASTE KBSWITCH KINOTIFY \
365
		KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \
360
		KNOWHOW KRIGSTASK LACKMAN LASTFMSCROBBLE LAUGHTY LAUNCHY LHTR LIZNOO \
366
		LMP MELLONETRAY MONOCLE MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
361
		LMP MELLONETRAY MUSICZOMBIE NACHEKU NETSTOREMANAGER NETWORKMONITOR \
367
		NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \
362
		NEWLIFE OORONEE PINTAB POGOOGLUE POLEEMERY POPISHU POSHUKU QROSP ROSENTHAL \
368
		SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \
363
		SB2 SCROBLIBRE SECMAN SEEKTHRU SUMMARY SYSNOTIFY TABSESSMANAGER TABSLIST \
369
		TEXTOGROOSE TOUCHSTREAMS TPI VGRABBER VROOBY VTYULC XPROXY XTAZY
364
		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