diff -urN inkscape.orig/Makefile inkscape/Makefile --- inkscape.orig/Makefile 2020-04-02 12:59:48.983938000 +0200 +++ inkscape/Makefile 2020-04-20 13:32:38.894159000 +0200 @@ -2,8 +2,7 @@ # $FreeBSD: head/graphics/inkscape/Makefile 530258 2020-04-02 04:41:02Z tcberner $ PORTNAME= inkscape -PORTVERSION= 0.92.4 -PORTREVISION= 16 +PORTVERSION= 0.92.5 CATEGORIES= graphics gnome MASTER_SITES= https://media.inkscape.org/dl/resources/file/ @@ -20,26 +19,30 @@ LIB_DEPENDS= libpopt.so:devel/popt \ libgc.so:devel/boehm-gc \ libgsl.so:math/gsl \ - libgtkspell.so:textproc/gtkspell \ + libgtkspell3-3.so:textproc/gtkspell3 \ liblcms2.so:graphics/lcms2 \ libfribidi.so:converters/fribidi \ libaspell.so:textproc/aspell \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ + libGraphicsMagick.so:graphics/GraphicsMagick \ libpotrace.so:graphics/libpotrace \ - libpng.so:graphics/png \ - libMagick++-6.so:graphics/ImageMagick6 + libpng.so:graphics/png RUN_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}scour>0:textproc/py-scour@${PY_FLAVOR} USES= compiler:c++11-lib cmake cpe desktop-file-utils gnome \ - iconv:wchar_t jpeg pathfix pkgconfig python:2.7 \ - shebangfix tar:bzip2 xorg + iconv:wchar_t jpeg pathfix pkgconfig python \ + shebangfix tar:bzip2 USE_GNOME= gtkmm24 libxml2 libxslt -USE_XORG= x11 +USE_LDCONFIG= yes INSTALLS_ICONS= yes -CMAKE_ARGS+= -DWITH_GNOME_VFS:BOOL=NO +# CMake: Allow to build with GraphicsMagick instead of ImageMagick +# https://gitlab.com/inkscape/inkscape/-/commit/e4c44f8b4674b88c0174270f27d61db808f66bc6 +CMAKE_ARGS+= -DWITH_GNOME_VFS:BOOL=NO \ + -DWITH_IMAGE_MAGICK=OFF \ + -DWITH_GRAPHICS_MAGICK=ON SHEBANG_FILES= cxxtest/cxxtestgen.pl share/extensions/*.p[lm] \ share/extensions/*.py share/extensions/genpofiles.sh \ @@ -58,10 +61,8 @@ DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus -#OPENMP_USES= compiler:openmp -#OPENMP_USES_OFF= compiler:c++11-lib -#OPENMP_CMAKE_BOOL= WITH_OPENMP -CMAKE_ARGS+= -DWITH_OPENMP:BOOL=NO +CMAKE_ARGS+= -DCMAKE_POLICY_DEFAULT_CMP0075:STRING=NEW \ + -DWITH_OPENMP:BOOL=true POPPLER_DESC= PDF preview rendering POPPLER_CMAKE_BOOL= ENABLE_POPPLER ENABLE_POPPLER_CAIRO diff -urN inkscape.orig/distinfo inkscape/distinfo --- inkscape.orig/distinfo 2019-05-13 21:16:02.060092000 +0200 +++ inkscape/distinfo 2020-04-18 22:12:34.000000000 +0200 @@ -1,3 +1,3 @@ -TIMESTAMP = 1557601550 -SHA256 (inkscape-0.92.4.tar.bz2) = 57ec2da8177b36614a513e2822efd73af721e690f7ddc6bd0a5fbb1525b4515e -SIZE (inkscape-0.92.4.tar.bz2) = 31929728 +TIMESTAMP = 1587240754 +SHA256 (inkscape-0.92.5.tar.bz2) = 81ee7f69e2bd64a97343d8395a4a7a7905b21b861566ed5e5d9179178d519a0b +SIZE (inkscape-0.92.5.tar.bz2) = 32175410 diff -urN inkscape.orig/files/patch-src_extension_internal_pdfinput_pdf-input.cpp inkscape/files/patch-src_extension_internal_pdfinput_pdf-input.cpp --- inkscape.orig/files/patch-src_extension_internal_pdfinput_pdf-input.cpp 2020-01-27 06:24:03.589447000 +0100 +++ inkscape/files/patch-src_extension_internal_pdfinput_pdf-input.cpp 2020-04-18 22:21:14.000000000 +0200 @@ -1,17 +1,17 @@ ---- src/extension/internal/pdfinput/pdf-input.cpp.orig 2020-01-25 21:47:43 UTC +--- src/extension/internal/pdfinput/pdf-input.cpp.orig 2020-04-09 21:37:16 UTC +++ src/extension/internal/pdfinput/pdf-input.cpp @@ -689,12 +689,12 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, // gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); if (poppler_datadir != NULL) { -- globalParams = new GlobalParams(poppler_datadir); +- globalParams = _POPPLER_NEW_GLOBAL_PARAMS(poppler_datadir); + globalParams = std::unique_ptr(new GlobalParams(poppler_datadir)); } else { -- globalParams = new GlobalParams(); -+ globalParams = std::unique_ptr(new GlobalParams()); +- globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); ++ globalParams = std::unique_ptr(new GlobalParams()); } #else -- globalParams = new GlobalParams(); +- globalParams = _POPPLER_NEW_GLOBAL_PARAMS(); + globalParams = std::unique_ptr(new GlobalParams()); #endif // ENABLE_OSX_APP_LOCATIONS } diff -urN inkscape.orig/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp --- inkscape.orig/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp 2020-01-27 06:24:03.568614000 +0100 +++ inkscape/files/patch-src_extension_internal_pdfinput_pdf-parser.cpp 2020-04-19 08:12:56.000000000 +0200 @@ -1,4 +1,4 @@ ---- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2020-01-25 21:47:43 UTC +--- src/extension/internal/pdfinput/pdf-parser.cpp.orig 2020-04-09 21:37:16 UTC +++ src/extension/internal/pdfinput/pdf-parser.cpp @@ -265,14 +265,14 @@ GfxPatch blankPatch() class ClipHistoryEntry { @@ -12,7 +12,7 @@ ClipHistoryEntry *save(); ClipHistoryEntry *restore(); - GBool hasSaves() { return saved != NULL; } -- void setClip(GfxPath *newClipPath, GfxClipType newClipType = clipNormal); +- void setClip(_POPPLER_CONST_83 GfxPath *newClipPath, GfxClipType newClipType = clipNormal); + bool hasSaves() { return saved != NULL; } + void setClip(const GfxPath *newClipPath, GfxClipType newClipType = clipNormal); GfxPath *getClipPath() { return clipPath; } @@ -57,14 +57,7 @@ Object obj2; if (obj->isArray()) { -@@ -426,13 +426,13 @@ void PdfParser::parse(Object *obj, GBool topLevel) { - error(errInternal, -1, "Weird page contents"); - return; - } -- parser = new Parser(xref, new Lexer(xref, obj), gFalse); -+ parser = new _POPPLER_NEW_PARSER(xref, obj); - go(topLevel); - delete parser; +@@ -432,7 +432,7 @@ void PdfParser::parse(Object *obj, GBool topLevel) { parser = NULL; } @@ -109,8 +102,8 @@ GfxColor backdropColor; - GBool haveBackdropColor = gFalse; - GBool alpha = gFalse; -+ bool haveBackdropColor = false; -+ bool alpha = false; ++ GBool haveBackdropColor = false; ++ GBool alpha = false; _POPPLER_CALL_ARGS(obj1, res->lookupGState, args[0].getName()); if (obj1.isNull()) { @@ -141,8 +134,8 @@ GfxColorSpace *blendingColorSpace = 0; - GBool isolated = gFalse; - GBool knockout = gFalse; -+ bool isolated = false; -+ bool knockout = false; ++ GBool isolated = false; ++ GBool knockout = false; if (!_POPPLER_CALL_ARGS_DEREF(obj5, obj4.dictLookup, "CS").isNull()) { #if defined(POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API) blendingColorSpace = GfxColorSpace::parse(NULL, &obj5, NULL, NULL); @@ -225,7 +218,7 @@ -void PdfParser::doFillAndStroke(GBool eoFill) { - GBool fillOk = gTrue, strokeOk = gTrue; +void PdfParser::doFillAndStroke(bool eoFill) { -+ bool fillOk = true, strokeOk = true; ++ GBool fillOk = true, strokeOk = true; if (state->getFillColorSpace()->getMode() == csPattern && !builder->isPatternTypeSupported(state->getFillPattern())) { - fillOk = gFalse; @@ -279,7 +272,7 @@ double gradientTransform[6]; double *matrix = NULL; - GBool savedState = gFalse; -+ bool savedState = false; ++ GBool savedState = false; #if defined(POPPLER_EVEN_NEWER_COLOR_SPACE_API) if (!(shading = res->lookupShading(args[0].getName(), NULL, NULL))) { @@ -390,15 +383,6 @@ } wMode = state->getFont()->getWMode(); a = args[0].getArray(); -@@ -2414,7 +2414,7 @@ void PdfParser::doShowText(GooString *s) { - int wMode; - double riseX, riseY; - CharCode code; -- Unicode *u = NULL; -+ const Unicode *u = NULL; - double x, y, dx, dy, tdx, tdy; - double originX, originY, tOriginX, tOriginY; - double oldCTM[6], newCTM[6]; @@ -2487,7 +2487,7 @@ void PdfParser::doShowText(GooString *s) { pushResources(resDict); } @@ -599,11 +583,11 @@ void PdfParser::doForm1(Object *str, Dict *resDict, double *matrix, double *bbox, - GBool transpGroup, GBool softMask, -+ bool transpGroup, bool softMask, ++ bool transpGroup, GBool softMask, GfxColorSpace *blendingColorSpace, - GBool isolated, GBool knockout, - GBool alpha, Function *transferFunc, -+ bool isolated, bool knockout, ++ bool isolated, GBool knockout, + bool alpha, Function *transferFunc, GfxColor *backdropColor) { Parser *oldParser; @@ -648,12 +632,3 @@ saved(NULL), clipPath((clipPathA) ? clipPathA->copy() : NULL), clipType(clipTypeA) -@@ -3394,7 +3394,7 @@ ClipHistoryEntry::~ClipHistoryEntry() - } - } - --void ClipHistoryEntry::setClip(GfxPath *clipPathA, GfxClipType clipTypeA) { -+void ClipHistoryEntry::setClip(const GfxPath *clipPathA, GfxClipType clipTypeA) { - // Free previous clip path - if (clipPath) { - delete clipPath; diff -urN inkscape.orig/files/patch-src_extension_internal_pdfinput_svg-builder.cpp inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp --- inkscape.orig/files/patch-src_extension_internal_pdfinput_svg-builder.cpp 2020-01-27 06:24:03.589979000 +0100 +++ inkscape/files/patch-src_extension_internal_pdfinput_svg-builder.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ ---- src/extension/internal/pdfinput/svg-builder.cpp.orig 2020-01-25 21:47:43 UTC -+++ src/extension/internal/pdfinput/svg-builder.cpp -@@ -264,10 +264,10 @@ static void svgSetTransform(Inkscape::XML::Node *node, - /** - * \brief Generates a SVG path string from poppler's data structure - */ --static gchar *svgInterpretPath(GfxPath *path) { -+static gchar *svgInterpretPath(const GfxPath *path) { - Inkscape::SVG::PathString pathString; - for (int i = 0 ; i < path->getNumSubpaths() ; ++i ) { -- GfxSubpath *subpath = path->getSubpath(i); -+ const GfxSubpath *subpath = path->getSubpath(i); - if (subpath->getNumPoints() > 0) { - pathString.moveTo(subpath->getX(0), subpath->getY(0)); - int j = 1; diff -urN inkscape.orig/pkg-plist inkscape/pkg-plist --- inkscape.orig/pkg-plist 2019-05-13 21:16:02.133664000 +0200 +++ inkscape/pkg-plist 2020-04-19 08:19:39.000000000 +0200 @@ -307,7 +307,6 @@ %%DATADIR%%/extensions/gcodetools.py %%DATADIR%%/extensions/gcodetools_about.inx %%DATADIR%%/extensions/gcodetools_area.inx -%%DATADIR%%/extensions/gcodetools_check_for_updates.inx %%DATADIR%%/extensions/gcodetools_dxf_points.inx %%DATADIR%%/extensions/gcodetools_engraving.inx %%DATADIR%%/extensions/gcodetools_graffiti.inx @@ -694,7 +693,6 @@ %%DATADIR%%/tutorials/oldguitar.jpg %%DATADIR%%/tutorials/pixelart-dialog.de.png %%DATADIR%%/tutorials/pixelart-dialog.el.png -%%DATADIR%%/tutorials/pixelart-dialog.en.png %%DATADIR%%/tutorials/pixelart-dialog.fr.png %%DATADIR%%/tutorials/pixelart-dialog.nl.png %%DATADIR%%/tutorials/pixelart-dialog.png @@ -704,7 +702,6 @@ %%DATADIR%%/tutorials/pixelart-dialog.zh_TW.png %%DATADIR%%/tutorials/potrace.de.png %%DATADIR%%/tutorials/potrace.el.png -%%DATADIR%%/tutorials/potrace.en.png %%DATADIR%%/tutorials/potrace.es.png %%DATADIR%%/tutorials/potrace.eu.png %%DATADIR%%/tutorials/potrace.fr.png @@ -736,6 +733,7 @@ %%DATADIR%%/tutorials/tutorial-advanced.id.svg %%DATADIR%%/tutorials/tutorial-advanced.it.svg %%DATADIR%%/tutorials/tutorial-advanced.ja.svg +%%DATADIR%%/tutorials/tutorial-advanced.ko.svg %%DATADIR%%/tutorials/tutorial-advanced.nl.svg %%DATADIR%%/tutorials/tutorial-advanced.pl.svg %%DATADIR%%/tutorials/tutorial-advanced.pt.svg @@ -765,6 +763,7 @@ %%DATADIR%%/tutorials/tutorial-basic.id.svg %%DATADIR%%/tutorials/tutorial-basic.it.svg %%DATADIR%%/tutorials/tutorial-basic.ja.svg +%%DATADIR%%/tutorials/tutorial-basic.ko.svg %%DATADIR%%/tutorials/tutorial-basic.nl.svg %%DATADIR%%/tutorials/tutorial-basic.nn.svg %%DATADIR%%/tutorials/tutorial-basic.pl.svg @@ -792,6 +791,7 @@ %%DATADIR%%/tutorials/tutorial-calligraphy.hu.svg %%DATADIR%%/tutorials/tutorial-calligraphy.id.svg %%DATADIR%%/tutorials/tutorial-calligraphy.ja.svg +%%DATADIR%%/tutorials/tutorial-calligraphy.ko.svg %%DATADIR%%/tutorials/tutorial-calligraphy.nl.svg %%DATADIR%%/tutorials/tutorial-calligraphy.pl.svg %%DATADIR%%/tutorials/tutorial-calligraphy.pt.svg @@ -816,6 +816,7 @@ %%DATADIR%%/tutorials/tutorial-elements.id.svg %%DATADIR%%/tutorials/tutorial-elements.it.svg %%DATADIR%%/tutorials/tutorial-elements.ja.svg +%%DATADIR%%/tutorials/tutorial-elements.ko.svg %%DATADIR%%/tutorials/tutorial-elements.nl.svg %%DATADIR%%/tutorials/tutorial-elements.pl.svg %%DATADIR%%/tutorials/tutorial-elements.pt.svg @@ -858,6 +859,7 @@ %%DATADIR%%/tutorials/tutorial-shapes.id.svg %%DATADIR%%/tutorials/tutorial-shapes.it.svg %%DATADIR%%/tutorials/tutorial-shapes.ja.svg +%%DATADIR%%/tutorials/tutorial-shapes.ko.svg %%DATADIR%%/tutorials/tutorial-shapes.nl.svg %%DATADIR%%/tutorials/tutorial-shapes.pl.svg %%DATADIR%%/tutorials/tutorial-shapes.pt.svg @@ -883,6 +885,7 @@ %%DATADIR%%/tutorials/tutorial-tips.id.svg %%DATADIR%%/tutorials/tutorial-tips.it.svg %%DATADIR%%/tutorials/tutorial-tips.ja.svg +%%DATADIR%%/tutorials/tutorial-tips.ko.svg %%DATADIR%%/tutorials/tutorial-tips.nl.svg %%DATADIR%%/tutorials/tutorial-tips.pl.svg %%DATADIR%%/tutorials/tutorial-tips.pt.svg @@ -898,6 +901,7 @@ %%DATADIR%%/tutorials/tutorial-tracing-pixelart.el.svg %%DATADIR%%/tutorials/tutorial-tracing-pixelart.fr.svg %%DATADIR%%/tutorials/tutorial-tracing-pixelart.hu.svg +%%DATADIR%%/tutorials/tutorial-tracing-pixelart.ko.svg %%DATADIR%%/tutorials/tutorial-tracing-pixelart.nl.svg %%DATADIR%%/tutorials/tutorial-tracing-pixelart.pt.svg %%DATADIR%%/tutorials/tutorial-tracing-pixelart.ru.svg @@ -917,6 +921,7 @@ %%DATADIR%%/tutorials/tutorial-tracing.hu.svg %%DATADIR%%/tutorials/tutorial-tracing.id.svg %%DATADIR%%/tutorials/tutorial-tracing.ja.svg +%%DATADIR%%/tutorials/tutorial-tracing.ko.svg %%DATADIR%%/tutorials/tutorial-tracing.nl.svg %%DATADIR%%/tutorials/tutorial-tracing.pl.svg %%DATADIR%%/tutorials/tutorial-tracing.pt.svg