From nobody Tue Feb 08 08:19:43 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4751119C7B8D; Tue, 8 Feb 2022 08:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JtGC41VWzz3QrZ; Tue, 8 Feb 2022 08:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644308384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0NzShO5/5t96gY0w60vjZGtCS1B8xYD9DaHIJR4ceo4=; b=NjZFAF1wlOCjv7NO2HwRcanY9jg2k8ze3OcLNBxjTOen8IkT5SLwy7U2KPyIhgRM/r49KX EKJT8vul962XwmVUDu7wsOxKj1DkeTnadlxfsA+rGt9ar2xC19S+OcE2Rpj8xqJ18Xnais 5tHJgRuIzziE76cCvVtIKVhEMT/qOB/UtSCgyLENJZAcULwO2UtfEHTYDviQp9FXKYNK5L VZDe4AVc7qXX1Nx+JAn6x66qQF0nh2/cm9j5yHtEEZp1EHRuU/5KVPb3164ch8QxBhUlIr ScvRCo7kXK+gaeYMeFPrlI1MBjh4+tjQ7X2fwyJIXoGzYgsFvb5G9VR5ulcMSw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0568016159; Tue, 8 Feb 2022 08:19:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2188JhvX060791; Tue, 8 Feb 2022 08:19:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2188Jh7C060790; Tue, 8 Feb 2022 08:19:43 GMT (envelope-from git) Date: Tue, 8 Feb 2022 08:19:43 GMT Message-Id: <202202080819.2188Jh7C060790@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 2e70c7a666a9 - main - graphics/inkscape: update to 1.1.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e70c7a666a98ef455c815a8d96088f6a5efd3cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644308384; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0NzShO5/5t96gY0w60vjZGtCS1B8xYD9DaHIJR4ceo4=; b=B430AOxqKqncbcgaKRe0z3npfvkQlM8/DKHr7V9t8g9oQX/DSp+p2wQxqravNDZec/QMwo g0FTJCaVG1Q7jyG4YhWt+vtP1OTb6VBcKVnZHfGl+/Yvoi9PI/AjXoTkZ6LFq7J/uVuboZ tX1TlRYiMsshSysDqfJH2ymgk8+ZAdIxeKQXc//7Mx1SocOg2fXKFauLpOG1WMOf5jh8Zq M4XqSnnB4ml3LjWAZO2Zp/Kz23rk0TZ9d52lH6tlUdRx4GmLGLBlrSDv10M7krdaCBwD9A KmPRDDMjMHs9kdLDSjFUtGRxp6e0TqE9mZij4zdAxtx0nBFFr7iq6b4NtBFLMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644308384; a=rsa-sha256; cv=none; b=rrbOY0a242WITP2nyDIgl6RPpBLK9aLeTleGy3Rqi0aQA37DMhKZGqsfSZ/ETNW1GekqQc SbaTIWhVc8/r6CeyTe2gkyVw+bucb6JTXfxowiX9w0+o1WKNNRhE+71K3d/IHYp6n2sI9N zfPpXmL7k4bVV6rG21iWKtvDQwhHJ89aFAgETrJXC4N0IZALiLxFdLTkgdezdnzJrn2Nh9 kLkw630fdxSuWMCr0TzwaY64IeTxlUkMpLZHrLnAZy/J1JRrEoJf5KmuQ6lgNuGUxP6IXx g3hQxbEEZj1MAtUnu7xKxqwWJKlaNBAyMVzrG34fkf5DUlstNZPYgmz0stGSQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e70c7a666a98ef455c815a8d96088f6a5efd3cc commit 2e70c7a666a98ef455c815a8d96088f6a5efd3cc Author: VVD AuthorDate: 2022-02-08 06:06:41 +0000 Commit: Tobias C. Berner CommitDate: 2022-02-08 07:49:31 +0000 graphics/inkscape: update to 1.1.2 This release includes many crash fixes and resolves issues with a number of broken extensions. Download Inkscape 1.1.2 now for a smoother experience. PR: 261774 --- graphics/inkscape/Makefile | 10 +++----- graphics/inkscape/distinfo | 8 +++--- graphics/inkscape/files/patch-poppler-compat.diff | 26 ------------------- graphics/inkscape/files/patch-src_path-prefix.cpp | 31 ----------------------- 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 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 -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 // for _NSGetExecutablePath - #endif - -+#ifdef __FreeBSD__ -+#include -+#include -+#include -+#endif -+ - #include - #include - #include -@@ -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