CVS commit: pkgsrc/graphics/inkscape

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/inkscape
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 13 May 2019 16:17:51 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May 13 16:17:51 UTC 2019

Modified Files:
        pkgsrc/graphics/inkscape: Makefile PLIST distinfo
        pkgsrc/graphics/inkscape/patches:
            patch-src_extension_internal_pdfinput_pdf-parser.cpp
            patch-src_extension_internal_pdfinput_pdf-parser.h
Added Files:
        pkgsrc/graphics/inkscape: options.mk
Removed Files:
        pkgsrc/graphics/inkscape/patches:
            patch-CMakeScripts_DefineDependsandFlags.cmake
            patch-po_CMakeLists.txt
            patch-src_extension_internal_pdfinput_pdf-input.cpp
            patch-src_extension_internal_pdfinput_pdf-input.h
            patch-src_extension_internal_pdfinput_poppler-transition-api.h
            patch-src_extension_internal_pdfinput_svg-builder.cpp
            patch-src_extension_internal_pdfinput_svg-builder.h

Log Message:
inkscape: updated to 0.92.4

Inkscape 0.92.4 is a stability and bugfix release. It also brings some
notable performance improvements for filter rendering, measure tool,
extensions, document saving and moving paths (with a live path effect)
and includes a couple of small, but impactful usage improvements.


To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 pkgsrc/graphics/inkscape/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/graphics/inkscape/PLIST
cvs rdiff -u -r1.68 -r1.69 pkgsrc/graphics/inkscape/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/inkscape/options.mk
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/inkscape/patches/patch-po_CMakeLists.txt \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.h
cvs rdiff -u -r1.10 -r1.11 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/inkscape/Makefile
diff -u pkgsrc/graphics/inkscape/Makefile:1.187 pkgsrc/graphics/inkscape/Makefile:1.188
--- pkgsrc/graphics/inkscape/Makefile:1.187     Thu May  9 13:57:49 2019
+++ pkgsrc/graphics/inkscape/Makefile   Mon May 13 16:17:51 2019
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.187 2019/05/09 13:57:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.188 2019/05/13 16:17:51 adam Exp $
 
-DISTNAME=      inkscape-0.92.3
-PKGREVISION=   6
+DISTNAME=      inkscape-0.92.4
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.bz2
@@ -56,7 +55,9 @@ SUBST_SED.pycmd=      -e "s,COMMAND python,CO
 SUBST_CLASSES+=                bool
 SUBST_STAGE.bool=      pre-configure
 SUBST_FILES.bool+=     src/extension/internal/pdfinput/pdf-parser.*
-SUBST_SED.bool=                -e 's|gTrue|true|g' -e 's|gFalse|false|g' -e 's|GBool|bool|g'
+SUBST_SED.bool=                -e 's|gTrue|true|g'
+SUBST_SED.bool+=       -e 's|gFalse|false|g'
+SUBST_SED.bool+=       -e 's|GBool|bool|g'
 
 REPLACE_PYTHON+=       cxxtest/cxxtestgen.py
 REPLACE_PYTHON+=       share/extensions/*.py
@@ -69,18 +70,11 @@ CHECK_INTERPRETER_SKIP+=share/inkscape/e
 CHECK_PORTABILITY_SKIP+=packaging/macosx/Resources/bin/inkscape
 CHECK_PORTABILITY_SKIP+=packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.inkscape
-PKG_SUPPORTED_OPTIONS= gnome
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-# gnome-vfs support for the inkscape file open window.
-.if !empty(PKG_OPTIONS:Mgnome)
-CMAKE_ARGS+=           -DWITH_GNOME_VFS=ON
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
-.else
-CMAKE_ARGS+=           -DWITH_GNOME_VFS=OFF
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "Darwin"
+CMAKE_ARGS+=   -DIntl_INCLUDE_DIR=${BUILDLINK_PREFIX.gettext}/include
 .endif
 
 BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.12.2

Index: pkgsrc/graphics/inkscape/PLIST
diff -u pkgsrc/graphics/inkscape/PLIST:1.26 pkgsrc/graphics/inkscape/PLIST:1.27
--- pkgsrc/graphics/inkscape/PLIST:1.26 Sun Jan  6 08:41:01 2019
+++ pkgsrc/graphics/inkscape/PLIST      Mon May 13 16:17:51 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.26 2019/01/06 08:41:01 markd Exp $
+@comment $NetBSD: PLIST,v 1.27 2019/05/13 16:17:51 adam Exp $
 bin/inkscape
 bin/inkview
 lib/inkscape/lib2geom_LIB.a
@@ -745,6 +745,7 @@ share/inkscape/tutorials/tutorial-advanc
 share/inkscape/tutorials/tutorial-advanced.sk.svg
 share/inkscape/tutorials/tutorial-advanced.sl.svg
 share/inkscape/tutorials/tutorial-advanced.svg
+share/inkscape/tutorials/tutorial-advanced.uk.svg
 share/inkscape/tutorials/tutorial-advanced.vi.svg
 share/inkscape/tutorials/tutorial-advanced.zh_CN.svg
 share/inkscape/tutorials/tutorial-advanced.zh_TW.svg
@@ -775,6 +776,7 @@ share/inkscape/tutorials/tutorial-basic.
 share/inkscape/tutorials/tutorial-basic.sl.svg
 share/inkscape/tutorials/tutorial-basic.svg
 share/inkscape/tutorials/tutorial-basic.tr.svg
+share/inkscape/tutorials/tutorial-basic.uk.svg
 share/inkscape/tutorials/tutorial-basic.vi.svg
 share/inkscape/tutorials/tutorial-basic.zh_CN.svg
 share/inkscape/tutorials/tutorial-basic.zh_TW.svg
@@ -799,6 +801,7 @@ share/inkscape/tutorials/tutorial-callig
 share/inkscape/tutorials/tutorial-calligraphy.sk.svg
 share/inkscape/tutorials/tutorial-calligraphy.sl.svg
 share/inkscape/tutorials/tutorial-calligraphy.svg
+share/inkscape/tutorials/tutorial-calligraphy.uk.svg
 share/inkscape/tutorials/tutorial-calligraphy.vi.svg
 share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg
 share/inkscape/tutorials/tutorial-elements.be.svg
@@ -822,6 +825,7 @@ share/inkscape/tutorials/tutorial-elemen
 share/inkscape/tutorials/tutorial-elements.sk.svg
 share/inkscape/tutorials/tutorial-elements.sl.svg
 share/inkscape/tutorials/tutorial-elements.svg
+share/inkscape/tutorials/tutorial-elements.uk.svg
 share/inkscape/tutorials/tutorial-elements.zh_TW.svg
 share/inkscape/tutorials/tutorial-interpolate.be.svg
 share/inkscape/tutorials/tutorial-interpolate.de.svg
@@ -838,6 +842,7 @@ share/inkscape/tutorials/tutorial-interp
 share/inkscape/tutorials/tutorial-interpolate.sk.svg
 share/inkscape/tutorials/tutorial-interpolate.sl.svg
 share/inkscape/tutorials/tutorial-interpolate.svg
+share/inkscape/tutorials/tutorial-interpolate.uk.svg
 share/inkscape/tutorials/tutorial-interpolate.vi.svg
 share/inkscape/tutorials/tutorial-interpolate.zh_TW.svg
 share/inkscape/tutorials/tutorial-shapes.be.svg
@@ -862,6 +867,7 @@ share/inkscape/tutorials/tutorial-shapes
 share/inkscape/tutorials/tutorial-shapes.sk.svg
 share/inkscape/tutorials/tutorial-shapes.sl.svg
 share/inkscape/tutorials/tutorial-shapes.svg
+share/inkscape/tutorials/tutorial-shapes.uk.svg
 share/inkscape/tutorials/tutorial-shapes.vi.svg
 share/inkscape/tutorials/tutorial-shapes.zh_CN.svg
 share/inkscape/tutorials/tutorial-shapes.zh_TW.svg
@@ -886,16 +892,19 @@ share/inkscape/tutorials/tutorial-tips.r
 share/inkscape/tutorials/tutorial-tips.sk.svg
 share/inkscape/tutorials/tutorial-tips.sl.svg
 share/inkscape/tutorials/tutorial-tips.svg
+share/inkscape/tutorials/tutorial-tips.uk.svg
 share/inkscape/tutorials/tutorial-tips.vi.svg
 share/inkscape/tutorials/tutorial-tips.zh_TW.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.de.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.el.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.fr.svg
+share/inkscape/tutorials/tutorial-tracing-pixelart.hu.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.nl.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.pt.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.svg
+share/inkscape/tutorials/tutorial-tracing-pixelart.uk.svg
 share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg
 share/inkscape/tutorials/tutorial-tracing.be.svg
 share/inkscape/tutorials/tutorial-tracing.ca.svg
@@ -917,6 +926,7 @@ share/inkscape/tutorials/tutorial-tracin
 share/inkscape/tutorials/tutorial-tracing.sk.svg
 share/inkscape/tutorials/tutorial-tracing.sl.svg
 share/inkscape/tutorials/tutorial-tracing.svg
+share/inkscape/tutorials/tutorial-tracing.uk.svg
 share/inkscape/tutorials/tutorial-tracing.vi.svg
 share/inkscape/tutorials/tutorial-tracing.zh_TW.svg
 share/inkscape/tutorials/tux.png
@@ -1015,3 +1025,4 @@ share/locale/ur/LC_MESSAGES/inkscape.mo
 share/locale/vi/LC_MESSAGES/inkscape.mo
 share/locale/zh_CN/LC_MESSAGES/inkscape.mo
 share/locale/zh_TW/LC_MESSAGES/inkscape.mo
+share/metainfo/inkscape.appdata.xml

Index: pkgsrc/graphics/inkscape/distinfo
diff -u pkgsrc/graphics/inkscape/distinfo:1.68 pkgsrc/graphics/inkscape/distinfo:1.69
--- pkgsrc/graphics/inkscape/distinfo:1.68      Mon Feb 25 18:57:03 2019
+++ pkgsrc/graphics/inkscape/distinfo   Mon May 13 16:17:51 2019
@@ -1,27 +1,20 @@
-$NetBSD: distinfo,v 1.68 2019/02/25 18:57:03 maya Exp $
+$NetBSD: distinfo,v 1.69 2019/05/13 16:17:51 adam Exp $
 
-SHA1 (inkscape-0.92.3.tar.bz2) = e1886317f8e6d4fb340f6a783fe410aaff9f28a7
-RMD160 (inkscape-0.92.3.tar.bz2) = 95648c6b491e09920662e03a51f2278a0ff10392
-SHA512 (inkscape-0.92.3.tar.bz2) = af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687
-Size (inkscape-0.92.3.tar.bz2) = 31606442 bytes
-SHA1 (patch-CMakeScripts_DefineDependsandFlags.cmake) = e8182366802adb05073efdc03a73202fd9b8d18b
+SHA1 (inkscape-0.92.4.tar.bz2) = 5dfabeab9f6925bf098b5eeba2fe2c82e36927cc
+RMD160 (inkscape-0.92.4.tar.bz2) = 18a998ed050030a6c89621f47e2e11b69d9f151b
+SHA512 (inkscape-0.92.4.tar.bz2) = b9034605a79cd8aea808edf42e284819951ae1ea67778f0922f4c10224e94aca6c844acbc2294625773f0a7047d4e32ccdada876238a792a2c17db172c88e120
+Size (inkscape-0.92.4.tar.bz2) = 31929728 bytes
 SHA1 (patch-CMakeScripts_Pod2man.cmake) = 6176956791ae3e8eb007345e5ec19100812bdeb8
 SHA1 (patch-ag) = 6b6000f3940ec6db9404a206f9757928c1d5740b
 SHA1 (patch-aj) = 31d6cc8bb179629023bd04bcac0fd935b2c9636d
 SHA1 (patch-ap) = 412509a03d26e925548e3371529a1273db958611
 SHA1 (patch-aq) = fb7de44d33fdc5895ce84ca8d44ff6a6c328c402
-SHA1 (patch-po_CMakeLists.txt) = aa03a91f656c239b8bfaeae8acd753b16be58aca
 SHA1 (patch-src_CMakeLists.txt) = ccd5eeca81891f83c5eaf8cb80d33f001beaf55c
 SHA1 (patch-src_extension_internal_emf-inout.cpp) = 4fe6c24007b54d55d11502876e759f62a290922e
 SHA1 (patch-src_extension_internal_emf-print.cpp) = 5da493a452afa4b11bbb204c430fc3e63332c927
 SHA1 (patch-src_extension_internal_metafile-print.cpp) = 798a2f15986cd81d13bf576b1641a810d4d40573
-SHA1 (patch-src_extension_internal_pdfinput_pdf-input.cpp) = 8bee946274725c12a3c743e8dec3e235c1402fcc
-SHA1 (patch-src_extension_internal_pdfinput_pdf-input.h) = d437b4994d66099ac2c1eaf6bac5d29bd83f9a76
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 6ce050246963f762dd97992bfb96f3af5989ccae
-SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = 93d0758b279b179c574a1a42483b02e80f680198
-SHA1 (patch-src_extension_internal_pdfinput_poppler-transition-api.h) = 2a1fc9ceee5d9bcb6138950661c61d6bd70fdd3d
-SHA1 (patch-src_extension_internal_pdfinput_svg-builder.cpp) = dd3f5b8678fbfaf9829fa5d33c8ff8882d337196
-SHA1 (patch-src_extension_internal_pdfinput_svg-builder.h) = ac05f9bed662705dcdfca8b791a348fb5350873c
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.cpp) = 3bdeda1bccad64f10c20c62a2b99dbcb779f081f
+SHA1 (patch-src_extension_internal_pdfinput_pdf-parser.h) = f0ba86dca2fa52eec64aee8d0d92739422ae86ca
 SHA1 (patch-src_extension_internal_wmf-inout.cpp) = b49b504d1cf9388d2ad7e1c91c339e7c3d5ffdf5
 SHA1 (patch-src_extension_internal_wmf-print.cpp) = b658d7a0697aaed55671507fe88ce93619ef1070
 SHA1 (patch-src_gradient-drag.cpp) = d6fc1f587a9ad404715fa6e70fe07823a3c68b0c

Index: pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
diff -u pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp:1.10 pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp:1.11
--- pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp:1.10  Sun Jan  6 08:41:01 2019
+++ pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp       Mon May 13 16:17:51 2019
@@ -1,187 +1,24 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.10 2019/01/06 08:41:01 markd Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.11 2019/05/13 16:17:51 adam Exp $
 
-- Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
-- Support for poppler 0.72 from upstream by way of linuxfromscratch 
+Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
+Fix building with poppler 0.76.x.
 
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2018-03-11 20:38:09.000000000 +0000
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2019-01-15 04:29:27.000000000 +0000
 +++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -36,12 +36,11 @@ extern "C" {
- #include "pdf-parser.h"
- #include "util/units.h"
- 
-+#include "glib/poppler-features.h"
- #include "goo/gmem.h"
--#include "goo/GooTimer.h"
--#include "goo/GooHash.h"
-+#include "goo/GooString.h"
+@@ -41,7 +41,6 @@ extern "C" {
+ #include "goo/GooString.h"
  #include "GlobalParams.h"
  #include "CharTypes.h"
 -#include "Object.h"
  #include "Array.h"
  #include "Dict.h"
  #include "Stream.h"
-@@ -295,8 +294,8 @@ PdfParser::PdfParser(XRef *xrefA,
-                      int /*pageNum*/,
-                    int rotate,
-                    Dict *resDict,
--                     PDFRectangle *box,
--                   PDFRectangle *cropBox) :
-+                     _POPPLER_CONST PDFRectangle *box,
-+                     _POPPLER_CONST PDFRectangle *cropBox) :
-     xref(xrefA),
-     builder(builderA),
-     subPage(gFalse),
-@@ -318,7 +317,7 @@ PdfParser::PdfParser(XRef *xrefA,
-   builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
-                            Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
- 
--  double *ctm = state->getCTM();
-+  const double *ctm = state->getCTM();
-   double scaledCTM[6];
-   for (int i = 0; i < 6; ++i) {
-     baseMatrix[i] = ctm[i];
-@@ -353,7 +352,7 @@ PdfParser::PdfParser(XRef *xrefA,
- PdfParser::PdfParser(XRef *xrefA,
-                    Inkscape::Extension::Internal::SvgBuilder *builderA,
-                      Dict *resDict,
--                   PDFRectangle *box) :
-+                   _POPPLER_CONST PDFRectangle *box) :
-     xref(xrefA),
-     builder(builderA),
-     subPage(gTrue),
-@@ -572,7 +571,7 @@ const char *PdfParser::getPreviousOperat
- 
- void PdfParser::execOp(Object *cmd, Object args[], int numArgs) {
-   PdfOperator *op;
--  char *name;
-+  const char *name;
-   Object *argPtr;
-   int i;
- 
-@@ -620,7 +619,7 @@ void PdfParser::execOp(Object *cmd, Obje
-   (this->*op->func)(argPtr, numArgs);
- }
- 
--PdfOperator* PdfParser::findOp(char *name) {
-+PdfOperator* PdfParser::findOp(const char *name) {
-   int a = -1;
-   int b = numOps;
-   int cmp = -1;
-@@ -1752,7 +1751,7 @@ void PdfParser::doShadingPatternFillFall
-                                              GBool stroke, GBool eoFill) {
-   GfxShading *shading;
-   GfxPath *savedPath;
--  double *ctm, *btm, *ptm;
-+  const double *ctm, *btm, *ptm;
-   double m[6], ictm[6], m1[6];
-   double xMin, yMin, xMax, yMax;
-   double det;
-@@ -1994,7 +1993,7 @@ void PdfParser::doFunctionShFill1(GfxFun
-   GfxColor color0M, color1M, colorM0, colorM1, colorMM;
-   GfxColor colors2[4];
-   double functionColorDelta = colorDeltas[pdfFunctionShading-1];
--  double *matrix;
-+  const double *matrix;
-   double xM, yM;
-   int nComps, i, j;
- 
-@@ -2174,7 +2173,7 @@ void PdfParser::doPatchMeshShFill(GfxPat
+@@ -426,7 +425,7 @@ void PdfParser::parse(Object *obj, GBool
+       error(errInternal, -1, "Weird page contents");
+       return;
    }
- }
- 
--void PdfParser::fillPatch(GfxPatch *patch, int nComps, int depth) {
-+void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) {
-   GfxPatch patch00 = blankPatch();
-   GfxPatch patch01 = blankPatch();
-   GfxPatch patch10 = blankPatch();
-@@ -2582,7 +2581,11 @@ void PdfParser::opShowSpaceText(Object a
-   }
- }
- 
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+void PdfParser::doShowText(const GooString *s) {
-+#else
- void PdfParser::doShowText(GooString *s) {
-+#endif
-   GfxFont *font;
-   int wMode;
-   double riseX, riseY;
-@@ -2591,17 +2594,21 @@ void PdfParser::doShowText(GooString *s)
-   double x, y, dx, dy, tdx, tdy;
-   double originX, originY, tOriginX, tOriginY;
-   double oldCTM[6], newCTM[6];
--  double *mat;
-+  const double *mat;
-   Object charProc;
-   Dict *resDict;
-   Parser *oldParser;
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+  const char *p;
-+#else
-   char *p;
-+#endif
-   int len, n, uLen;
- 
-   font = state->getFont();
-   wMode = font->getWMode();
- 
--  builder->beginString(state, s);
-+  builder->beginString(state);
- 
-   // handle a Type 3 char
-   if (font->getType() == fontType3 && 0) {//out->interpretType3Chars()) {
-@@ -2732,7 +2739,11 @@ void PdfParser::opXObject(Object args[],
- {
-   Object obj1, obj2, obj3, refObj;
- 
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+  const char *name = args[0].getName();
-+#else
-   char *name = args[0].getName();
-+#endif
- #if defined(POPPLER_NEW_OBJECT_API)
-   if ((obj1 = res->lookupXObject(name)).isNull()) {
- #else
-@@ -3657,7 +3668,6 @@ void PdfParser::opBeginImage(Object /*ar
- Stream *PdfParser::buildImageStream() {
-   Object dict;
-   Object obj;
--  char *key;
-   Stream *str;
- 
-   // build dictionary
-@@ -3675,26 +3685,17 @@ Stream *PdfParser::buildImageStream() {
-       obj.free();
- #endif
-     } else {
--      key = copyString(obj.getName());
--#if defined(POPPLER_NEW_OBJECT_API)
--      obj = parser->getObj();
--#else
--      obj.free();
--      parser->getObj(&obj);
--#endif
--      if (obj.isEOF() || obj.isError()) {
--      gfree(key);
-+      Object obj2;
-+      _POPPLER_CALL(obj2, parser->getObj);
-+      if (obj2.isEOF() || obj2.isError()) {
-+        _POPPLER_FREE(obj);
-       break;
-       }
--#if defined(POPPLER_NEW_OBJECT_API)
--      dict.dictAdd(key, std::move(obj));
--    }
--    obj = parser->getObj();
--#else
--      dict.dictAdd(key, &obj);
-+      _POPPLER_DICTADD(dict, obj.getName(), obj2);
-+      _POPPLER_FREE(obj);
-+      _POPPLER_FREE(obj2);
-     }
--    parser->getObj(&obj);
--#endif
-+    _POPPLER_CALL(obj, parser->getObj);
-   }
-   if (obj.isEOF()) {
-     error(errSyntaxError, getPos(), "End of file in inline image");
+-  parser = new Parser(xref, new Lexer(xref, obj), gFalse);
++  parser = new Parser(xref, obj, gFalse);
+   go(topLevel);
+   delete parser;
+   parser = NULL;

Index: pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h
diff -u pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h:1.5 pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h:1.6
--- pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h:1.5     Mon Feb 25 18:57:03 2019
+++ pkgsrc/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h Mon May 13 16:17:51 2019
@@ -1,74 +1,15 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.5 2019/02/25 18:57:03 maya Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.h,v 1.6 2019/05/13 16:17:51 adam Exp $
 
 Explicitly include poppler/Object.h; otherwise Python's Object.h gets included.
-Support for poppler 0.72 from upstream by way of linuxfromscratch 
 
---- src/extension/internal/pdfinput/pdf-parser.h.orig  2018-03-11 20:38:09.000000000 +0000
+--- src/extension/internal/pdfinput/pdf-parser.h.orig  2019-05-13 08:02:45.000000000 +0000
 +++ src/extension/internal/pdfinput/pdf-parser.h
-@@ -9,6 +9,7 @@
- #define PDF_PARSER_H
- 
- #ifdef HAVE_POPPLER
-+#include "poppler-transition-api.h"
- 
- #ifdef USE_GCC_PRAGMAS
- #pragma interface
-@@ -25,8 +26,8 @@ namespace Inkscape {
- // TODO clean up and remove using:
+@@ -27,7 +27,7 @@ namespace Inkscape {
  using Inkscape::Extension::Internal::SvgBuilder;
  
-+#include "glib/poppler-features.h"
--#include "goo/gtypes.h"
+ #include "glib/poppler-features.h"
 -#include "Object.h"
 +#include "poppler/Object.h"
  
  class GooString;
  class XRef;
-@@ -127,11 +129,14 @@ public:
- 
-   // Constructor for regular output.
-   PdfParser(XRef *xrefA, SvgBuilder *builderA, int pageNum, int rotate,
--            Dict *resDict, PDFRectangle *box, PDFRectangle *cropBox);
-+            Dict *resDict,
-+            _POPPLER_CONST PDFRectangle *box,
-+            _POPPLER_CONST PDFRectangle *cropBox);
- 
-   // Constructor for a sub-page object.
-   PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *builderA,
--            Dict *resDict, PDFRectangle *box);
-+            Dict *resDict,
-+            _POPPLER_CONST PDFRectangle *box);
- 
-   virtual ~PdfParser();
- 
-@@ -185,7 +190,7 @@ private:
- 
-   void go(GBool topLevel);
-   void execOp(Object *cmd, Object args[], int numArgs);
--  PdfOperator *findOp(char *name);
-+  PdfOperator *findOp(const char *name);
-   GBool checkArg(Object *arg, TchkType type);
-   int getPos();
- 
-@@ -256,7 +261,7 @@ private:
-                          double x2, double y2, GfxColor *color2,
-                          int nComps, int depth);
-   void doPatchMeshShFill(GfxPatchMeshShading *shading);
--  void fillPatch(GfxPatch *patch, int nComps, int depth);
-+  void fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth);
-   void doEndPath();
- 
-   // path clipping operators
-@@ -287,7 +292,12 @@ private:
-   void opMoveShowText(Object args[], int numArgs);
-   void opMoveSetShowText(Object args[], int numArgs);
-   void opShowSpaceText(Object args[], int numArgs);
-+#if POPPLER_CHECK_VERSION(0,64,0)
-+  void doShowText(const GooString *s);
-+#else
-   void doShowText(GooString *s);
-+#endif
-+  
- 
-   // XObject operators
-   void opXObject(Object args[], int numArgs);

Added files:

Index: pkgsrc/graphics/inkscape/options.mk
diff -u /dev/null pkgsrc/graphics/inkscape/options.mk:1.1
--- /dev/null   Mon May 13 16:17:51 2019
+++ pkgsrc/graphics/inkscape/options.mk Mon May 13 16:17:51 2019
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2019/05/13 16:17:51 adam Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.inkscape
+PKG_SUPPORTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
+
+# gnome-vfs support for the inkscape file open window.
+.if !empty(PKG_OPTIONS:Mgnome)
+CMAKE_ARGS+=           -DWITH_GNOME_VFS=ON
+.include "../../sysutils/gnome-vfs/buildlink3.mk"
+.else
+CMAKE_ARGS+=           -DWITH_GNOME_VFS=OFF
+.endif

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index