[pkgsrc/trunk]: pkgsrc/graphics/inkscape inkscape: update to 0.92.3

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/graphics/inkscape inkscape: update to 0.92.3
From: markd <markd%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 10:29:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/5180e3c65459
branches:  trunk
changeset: 389676:5180e3c65459
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Jan 06 08:41:01 2019 +0000

description:
inkscape: update to 0.92.3

Also post 0.92.3 updates from upstream for poppler-0.72 by way of
linuxfromscratch.
http://www.linuxfromscratch.org/patches/blfs/svn/inkscape-0.92.3-consolidated_fixes-1.patch

Inkscape 0.92.3 is a maintenance release resolving numerous bugs and making
this the most stable release of the series. Among the most reported bugs
addressed were:

* Blank pages being output when attempting to print multiple copies of a
  document
* The inability to cancel during the export of large files
* Application crashes caused by attempting to drag a path at a cap or line
  join
* Some issues with keyboard shortcut functionality on non-Latin keyboard
  layouts

A few performance improvements and usability enhancements that made it into
the release, include:

* New SVG export options from the command line
* Support for right-to-left text
* Improved ellipse controls
* Multi-line text support for the PDF+LaTeX export
* New render tile preferences for performance tuning
* Better startup performance for many Windows users

diffstat:

 graphics/inkscape/Makefile                                                               |    10 +-
 graphics/inkscape/PLIST                                                                  |    10 +-
 graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake                 |    29 +-
 graphics/inkscape/patches/patch-config.h.cmake                                           |    17 -
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp            |    33 +-
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h              |    14 +
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp           |  1459 +---------
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.h             |    77 +-
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_poppler-transition-api.h |    50 +
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.cpp          |   121 +-
 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_svg-builder.h            |    58 +
 11 files changed, 443 insertions(+), 1435 deletions(-)

diffs (truncated from 2094 to 300 lines):

diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/Makefile
--- a/graphics/inkscape/Makefile        Sun Jan 06 05:45:29 2019 +0000
+++ b/graphics/inkscape/Makefile        Sun Jan 06 08:41:01 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.180 2018/12/13 19:52:00 adam Exp $
+# $NetBSD: Makefile,v 1.181 2019/01/06 08:41:01 markd Exp $
 
-DISTNAME=      inkscape-0.92.2
-PKGREVISION=   22
+DISTNAME=      inkscape-0.92.3
 CATEGORIES=    graphics
 MASTER_SITES=  https://media.inkscape.org/dl/resources/file/
 EXTRACT_SUFX=  .tar.bz2
@@ -53,6 +52,11 @@
 SUBST_FILES.pycmd+=    share/templates/CMakeLists.txt
 SUBST_SED.pycmd=       -e "s,COMMAND python,COMMAND ${PYTHONBIN},g"
 
+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'
+
 REPLACE_PYTHON+=       cxxtest/cxxtestgen.py
 REPLACE_PYTHON+=       share/extensions/*.py
 REPLACE_PYTHON+=       share/extensions/Barcode/*.py
diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/PLIST
--- a/graphics/inkscape/PLIST   Sun Jan 06 05:45:29 2019 +0000
+++ b/graphics/inkscape/PLIST   Sun Jan 06 08:41:01 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2017/12/19 09:28:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.26 2019/01/06 08:41:01 markd Exp $
 bin/inkscape
 bin/inkview
 lib/inkscape/lib2geom_LIB.a
@@ -703,8 +703,6 @@
 share/inkscape/tutorials/pixelart-dialog.ru.png
 share/inkscape/tutorials/pixelart-dialog.sk.png
 share/inkscape/tutorials/pixelart-dialog.zh_TW.png
-share/inkscape/tutorials/potrace.be.png
-share/inkscape/tutorials/potrace.ca.png
 share/inkscape/tutorials/potrace.de.png
 share/inkscape/tutorials/potrace.el.png
 share/inkscape/tutorials/potrace.en.png
@@ -724,7 +722,6 @@
 share/inkscape/tutorials/potrace.sk.png
 share/inkscape/tutorials/potrace.sl.png
 share/inkscape/tutorials/potrace.vi.png
-share/inkscape/tutorials/potrace.zh_CN.png
 share/inkscape/tutorials/potrace.zh_TW.png
 share/inkscape/tutorials/tutorial-advanced.be.svg
 share/inkscape/tutorials/tutorial-advanced.ca.svg
@@ -735,6 +732,7 @@
 share/inkscape/tutorials/tutorial-advanced.eu.svg
 share/inkscape/tutorials/tutorial-advanced.fa.svg
 share/inkscape/tutorials/tutorial-advanced.fr.svg
+share/inkscape/tutorials/tutorial-advanced.gl.svg
 share/inkscape/tutorials/tutorial-advanced.hu.svg
 share/inkscape/tutorials/tutorial-advanced.id.svg
 share/inkscape/tutorials/tutorial-advanced.it.svg
@@ -789,6 +787,7 @@
 share/inkscape/tutorials/tutorial-calligraphy.eu.svg
 share/inkscape/tutorials/tutorial-calligraphy.fa.svg
 share/inkscape/tutorials/tutorial-calligraphy.fr.svg
+share/inkscape/tutorials/tutorial-calligraphy.gl.svg
 share/inkscape/tutorials/tutorial-calligraphy.hu.svg
 share/inkscape/tutorials/tutorial-calligraphy.id.svg
 share/inkscape/tutorials/tutorial-calligraphy.ja.svg
@@ -810,6 +809,7 @@
 share/inkscape/tutorials/tutorial-elements.eu.svg
 share/inkscape/tutorials/tutorial-elements.fa.svg
 share/inkscape/tutorials/tutorial-elements.fr.svg
+share/inkscape/tutorials/tutorial-elements.gl.svg
 share/inkscape/tutorials/tutorial-elements.hu.svg
 share/inkscape/tutorials/tutorial-elements.id.svg
 share/inkscape/tutorials/tutorial-elements.it.svg
@@ -827,6 +827,7 @@
 share/inkscape/tutorials/tutorial-interpolate.de.svg
 share/inkscape/tutorials/tutorial-interpolate.el.svg
 share/inkscape/tutorials/tutorial-interpolate.fr.svg
+share/inkscape/tutorials/tutorial-interpolate.gl.svg
 share/inkscape/tutorials/tutorial-interpolate.hu.svg
 share/inkscape/tutorials/tutorial-interpolate.ja.svg
 share/inkscape/tutorials/tutorial-interpolate.nl.svg
@@ -872,6 +873,7 @@
 share/inkscape/tutorials/tutorial-tips.eu.svg
 share/inkscape/tutorials/tutorial-tips.fa.svg
 share/inkscape/tutorials/tutorial-tips.fr.svg
+share/inkscape/tutorials/tutorial-tips.gl.svg
 share/inkscape/tutorials/tutorial-tips.hu.svg
 share/inkscape/tutorials/tutorial-tips.id.svg
 share/inkscape/tutorials/tutorial-tips.it.svg
diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake
--- a/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake  Sun Jan 06 05:45:29 2019 +0000
+++ b/graphics/inkscape/patches/patch-CMakeScripts_DefineDependsandFlags.cmake  Sun Jan 06 08:41:01 2019 +0000
@@ -1,18 +1,25 @@
-$NetBSD: patch-CMakeScripts_DefineDependsandFlags.cmake,v 1.1 2017/09/09 21:48:56 prlw1 Exp $
+$NetBSD: patch-CMakeScripts_DefineDependsandFlags.cmake,v 1.2 2019/01/06 08:41:01 markd Exp $
 
-Support poppler 0.58
-https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0
+support for poppler 0.72 from upstream by way of linuxfromscratch 
 
---- CMakeScripts/DefineDependsandFlags.cmake.orig      2017-02-13 23:46:57.000000000 +0000
+--- CMakeScripts/DefineDependsandFlags.cmake.orig      2018-03-11 20:38:09.000000000 +0000
 +++ CMakeScripts/DefineDependsandFlags.cmake
-@@ -126,6 +126,10 @@ if(ENABLE_POPPLER)
-               POPPLER_VERSION VERSION_EQUAL   "0.29.0")
-           set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
+@@ -116,18 +116,6 @@ if(ENABLE_POPPLER)
+               set(HAVE_POPPLER_GLIB ON)
+           endif()
        endif()
-+      if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
-+              POPPLER_VERSION VERSION_EQUAL   "0.58.0")
-+            set(POPPLER_NEW_OBJECT_API ON)
-+      endif()
+-      if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR
+-              POPPLER_VERSION VERSION_EQUAL   "0.26.0")
+-          set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON)
+-      endif()
+-      if(POPPLER_VERSION VERSION_GREATER "0.29.0" OR
+-              POPPLER_VERSION VERSION_EQUAL   "0.29.0")
+-          set(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API ON)
+-      endif()
+-      if(POPPLER_VERSION VERSION_GREATER "0.58.0" OR
+-              POPPLER_VERSION VERSION_EQUAL   "0.58.0")
+-            set(POPPLER_NEW_OBJECT_API ON)
+-      endif()
      else()
        set(ENABLE_POPPLER_CAIRO OFF)
      endif()
diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/patches/patch-config.h.cmake
--- a/graphics/inkscape/patches/patch-config.h.cmake    Sun Jan 06 05:45:29 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-config.h.cmake,v 1.1 2017/09/09 21:48:56 prlw1 Exp $
-
-Support poppler 0.58
-https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0
-
---- config.h.cmake.orig        2017-02-13 23:46:57.000000000 +0000
-+++ config.h.cmake
-@@ -149,6 +149,9 @@
- /* Use color space API from Poppler >= 0.29.0 */
- #cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1
- 
-+/* Use object API from Poppler >= 0.58.0 */
-+#cmakedefine POPPLER_NEW_OBJECT_API 1
-+
- /* Define to 1 if you have the `pow' function. */
- #cmakedefine HAVE_POW 1
- 
diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp
--- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp     Sun Jan 06 05:45:29 2019 +0000
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.cpp     Sun Jan 06 08:41:01 2019 +0000
@@ -1,28 +1,15 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-input.cpp,v 1.1 2017/09/09 21:48:56 prlw1 Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-input.cpp,v 1.2 2019/01/06 08:41:01 markd Exp $
 
-Support poppler 0.58
-https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0
+support for poppler 0.72 from upstream by way of linuxfromscratch
 
---- src/extension/internal/pdfinput/pdf-input.cpp.orig 2017-02-13 23:46:57.000000000 +0000
+--- src/extension/internal/pdfinput/pdf-input.cpp.orig 2018-03-11 20:38:09.000000000 +0000
 +++ src/extension/internal/pdfinput/pdf-input.cpp
-@@ -840,14 +840,20 @@ PdfInput::open(::Inkscape::Extension::In
-         }
+@@ -793,7 +793,7 @@ PdfInput::open(::Inkscape::Extension::In
+             dlg->getImportSettings(prefs);
  
-         // Parse the document structure
-+#if defined(POPPLER_NEW_OBJECT_API)
-+        Object obj = page->getContents();
-+#else
-         Object obj;
-         page->getContents(&obj);
-+#endif
-         if (!obj.isNull()) {
-             pdf_parser->parse(&obj);
-         }
+         // Apply crop settings
+-        PDFRectangle *clipToBox = NULL;
++        _POPPLER_CONST PDFRectangle *clipToBox = NULL;
+         double crop_setting;
+         sp_repr_get_double(prefs, "cropTo", &crop_setting);
  
-         // Cleanup
-+#if !defined(POPPLER_NEW_OBJECT_API)
-         obj.free();
-+#endif
-         delete pdf_parser;
-         delete builder;
-         g_free(docname);
diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-input.h       Sun Jan 06 08:41:01 2019 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-input.h,v 1.1 2019/01/06 08:41:01 markd Exp $
+
+support for poppler 0.72 from upstream by way of linuxfromscratch 
+
+--- src/extension/internal/pdfinput/pdf-input.h.orig   2018-03-11 20:38:09.000000000 +0000
++++ src/extension/internal/pdfinput/pdf-input.h
+@@ -15,6 +15,7 @@
+ #endif
+ 
+ #ifdef HAVE_POPPLER
++#include "poppler-transition-api.h"
+ 
+ #include <gtkmm/dialog.h>
+ 
diff -r ab2cdb7fe878 -r 5180e3c65459 graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp
--- a/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp    Sun Jan 06 05:45:29 2019 +0000
+++ b/graphics/inkscape/patches/patch-src_extension_internal_pdfinput_pdf-parser.cpp    Sun Jan 06 08:41:01 2019 +0000
@@ -1,553 +1,91 @@
-$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.9 2018/12/21 08:46:16 wiz Exp $
+$NetBSD: patch-src_extension_internal_pdfinput_pdf-parser.cpp,v 1.10 2019/01/06 08:41:01 markd Exp $
 
 - Object.h is included in pdf-parser.h -- see patch for pdf-parser.h.
-- Support poppler 0.58
-  https://gitlab.com/inkscape/inkscape/commit/9418824967eb4c53371ef8588243fed4cab496e0
-- Support poppler 0.64
+- Support for poppler 0.72 from upstream by way of linuxfromscratch 
 
---- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2017-08-06 20:44:00.000000000 +0000
+--- src/extension/internal/pdfinput/pdf-parser.cpp.orig        2018-03-11 20:38:09.000000000 +0000
 +++ src/extension/internal/pdfinput/pdf-parser.cpp
-@@ -38,10 +38,9 @@ extern "C" {
+@@ -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/GooTimer.h"
 -#include "goo/GooHash.h"
++#include "goo/GooString.h"
  #include "GlobalParams.h"
  #include "CharTypes.h"
 -#include "Object.h"
-+#define POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1
  #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();
-+  _POPPLER_CONST double *ctm = state->getCTM();
++  const double *ctm = state->getCTM();
    double scaledCTM[6];
    for (int i = 0; i < 6; ++i) {
      baseMatrix[i] = ctm[i];
-@@ -414,13 +413,21 @@ void PdfParser::parse(Object *obj, GBool
- 
-   if (obj->isArray()) {
-     for (int i = 0; i < obj->arrayGetLength(); ++i) {
-+#if defined(POPPLER_NEW_OBJECT_API)
-+      obj2 = obj->arrayGet(i);
-+#else
-       obj->arrayGet(i, &obj2);
-+#endif
-       if (!obj2.isStream()) {
-       error(errInternal, -1, "Weird page contents");
-+#if !defined(POPPLER_NEW_OBJECT_API)
-       obj2.free();
-+#endif
-       return;
-       }
-+#if !defined(POPPLER_NEW_OBJECT_API)
-       obj2.free();
-+#endif
-     }
-   } else if (!obj->isStream()) {
-       error(errInternal, -1, "Weird page contents");
-@@ -439,7 +446,11 @@ void PdfParser::go(GBool /*topLevel*/)
- 
-   // scan a sequence of objects
-   int numArgs = 0;
-+#if defined(POPPLER_NEW_OBJECT_API)
-+  obj = parser->getObj();
-+#else
-   parser->getObj(&obj);
-+#endif
-   while (!obj.isEOF()) {
-
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/m4 devel/m4: add patches to fix building with gl...
Next by Date: [pkgsrc/trunk]: pkgsrc/lang/swi-prolog-lite swi-prolog-lite: fix linux build
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/m4 devel/m4: add patches to fix building with gl...
Next by Thread: [pkgsrc/trunk]: pkgsrc/lang/swi-prolog-lite swi-prolog-lite: fix linux build
Indexes:
Home | Main Index | Thread Index | Old Index