diff options
| -rw-r--r-- | graphics/inkscape/Makefile | 10 | ||||
| -rw-r--r-- | graphics/inkscape/distinfo | 8 | ||||
| -rw-r--r-- | graphics/inkscape/files/patch-poppler-compat.diff | 26 | ||||
| -rw-r--r-- | graphics/inkscape/files/patch-src_path-prefix.cpp | 31 | ||||
| -rw-r--r-- | graphics/inkscape/pkg-plist | 3 |
5 files changed, 8 insertions, 70 deletions
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile index 154345221632..68a126812f9a 100644 --- a/graphics/inkscape/Makefile +++ b/graphics/inkscape/Makefile @@ -1,13 +1,9 @@ # Created by: Alexander Nedotsukov <bland@FreeBSD.org> PORTNAME= inkscape -DISTVERSION= 1.1 -PORTREVISION= 8 +DISTVERSION= 1.1.2 CATEGORIES= graphics gnome -MASTER_SITES= https://inkscape.org/gallery/item/26932/ - -PATCH_SITES= https://gitlab.com/inkscape/inkscape/-/commit/ -PATCHFILES= 7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch:-p1 +MASTER_SITES= https://inkscape.org/gallery/item/31668/ MAINTAINER= gnome@FreeBSD.org COMMENT= Full featured open source SVG editor @@ -55,7 +51,7 @@ USE_GNOME= gtkmm30 libxml2 libxslt USE_XORG= sm ice x11 xext USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}_2021-05-24_c4e8f9ed74 +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}_2022-02-04_0a00cf5339 SHEBANG_FILES= share/extensions/*.py share/extensions/genpofiles.sh \ share/templates/*.py man/fix-roff-punct diff --git a/graphics/inkscape/distinfo b/graphics/inkscape/distinfo index 8a1f0bc325c6..d7db08b72f97 100644 --- a/graphics/inkscape/distinfo +++ b/graphics/inkscape/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1639251421 -SHA256 (inkscape-1.1.tar.xz) = 71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6 -SIZE (inkscape-1.1.tar.xz) = 34203156 -SHA256 (7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch) = ed61d89468901fbf8a2148d49eeb7753c40fb7f074ec7008b604f46b146c7ae7 -SIZE (7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch) = 1158 +TIMESTAMP = 1644185391 +SHA256 (inkscape-1.1.2.tar.xz) = 3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1 +SIZE (inkscape-1.1.2.tar.xz) = 34222832 diff --git a/graphics/inkscape/files/patch-poppler-compat.diff b/graphics/inkscape/files/patch-poppler-compat.diff deleted file mode 100644 index c12ac5eccdd4..000000000000 --- a/graphics/inkscape/files/patch-poppler-compat.diff +++ /dev/null @@ -1,26 +0,0 @@ -From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <evangelos@foutrelis.com> -Date: Mon, 1 Nov 2021 21:45:38 +0200 -Subject: [PATCH] Fix build with poppler 21.11.0 - -GfxFont::tag is now of type std::string instead of GooString *. ---- - src/extension/internal/pdfinput/pdf-parser.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp -index e3d04d544b..feecefa043 100644 ---- src/extension/internal/pdfinput/pdf-parser.cpp -+++ src/extension/internal/pdfinput/pdf-parser.cpp -@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /*numArgs*/) - } - if (printCommands) { - printf(" font: tag=%s name='%s' %g\n", -+#if POPPLER_CHECK_VERSION(21,11,0) -+ font->getTag().c_str(), -+#else - font->getTag()->getCString(), -+#endif - font->getName() ? font->getName()->getCString() : "???", - args[1].getNum()); - fflush(stdout); diff --git a/graphics/inkscape/files/patch-src_path-prefix.cpp b/graphics/inkscape/files/patch-src_path-prefix.cpp deleted file mode 100644 index 721e6b3e173f..000000000000 --- a/graphics/inkscape/files/patch-src_path-prefix.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- src/path-prefix.cpp.orig 2021-05-17 19:25:49 UTC -+++ src/path-prefix.cpp -@@ -20,6 +20,12 @@ - #include <mach-o/dyld.h> // for _NSGetExecutablePath - #endif - -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif -+ - #include <cassert> - #include <glib.h> - #include <glibmm.h> -@@ -123,6 +129,15 @@ char const *get_program_name() - if (!program_name) { - g_warning("get_program_name() - g_file_read_link failed"); - } -+#elif defined(__FreeBSD__) -+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; -+ char buf[MAXPATHLEN]; -+ size_t cb = sizeof(buf); -+ if (sysctl(mib, 4, buf, &cb, NULL, 0) == 0) { -+ program_name = realpath(buf, nullptr); -+ } else { -+ g_warning("get_program_name() - sysctl failed"); -+ } - #else - #warning get_program_name() - no known way to obtain executable name on this platform - g_info("get_program_name() - no known way to obtain executable name on this platform"); diff --git a/graphics/inkscape/pkg-plist b/graphics/inkscape/pkg-plist index 613faeb7bddf..9d4dea4f1f20 100644 --- a/graphics/inkscape/pkg-plist +++ b/graphics/inkscape/pkg-plist @@ -112,7 +112,6 @@ share/icons/hicolor/symbolic/apps/org.inkscape.Inkscape-symbolic.svg %%DATADIR%%/extensions/Poly3DObjects/trunc_oct.obj %%DATADIR%%/extensions/Poly3DObjects/trunc_tet.obj %%DATADIR%%/extensions/README.md -%%DATADIR%%/extensions/STYLEGUIDE.md %%DATADIR%%/extensions/TESTING.md %%DATADIR%%/extensions/addnodes.inx %%DATADIR%%/extensions/addnodes.py @@ -2467,6 +2466,7 @@ share/icons/hicolor/symbolic/apps/org.inkscape.Inkscape-symbolic.svg %%DATADIR%%/screens/start-welcome-text.pl.svg %%DATADIR%%/screens/start-welcome-text.pt.svg %%DATADIR%%/screens/start-welcome-text.pt_BR.svg +%%DATADIR%%/screens/start-welcome-text.ro.svg %%DATADIR%%/screens/start-welcome-text.ru.svg %%DATADIR%%/screens/start-welcome-text.sk.svg %%DATADIR%%/screens/start-welcome-text.svg @@ -2526,6 +2526,7 @@ share/icons/hicolor/symbolic/apps/org.inkscape.Inkscape-symbolic.svg %%NLS%%%%DATADIR%%/templates/default.ks@aran.svg %%NLS%%%%DATADIR%%/templates/default.ks@deva.svg %%NLS%%%%DATADIR%%/templates/default.lv.svg +%%NLS%%%%DATADIR%%/templates/default.lt.svg %%NLS%%%%DATADIR%%/templates/default.mai.svg %%NLS%%%%DATADIR%%/templates/default.ml.svg %%NLS%%%%DATADIR%%/templates/default.mni.svg |