Attachment #231603 for bug #261774

View | Details | Raw Unified | Return to bug 261774
Collapse All | Expand All




# Created by: Alexander Nedotsukov <bland@FreeBSD.org>

PORTNAME=	inkscape
DISTVERSION=	1.1.2
PORTREVISION=	8
CATEGORIES=	graphics gnome
MASTER_SITES=	https://inkscape.org/gallery/item/31668/

PATCH_SITES=	https://gitlab.com/inkscape/inkscape/-/commit/
PATCHFILES=	7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch:-p1

MAINTAINER=	gnome@FreeBSD.org
COMMENT=	Full featured open source SVG editor


USE_XORG=	sm ice x11 xext
USE_LDCONFIG=	yes

WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}_2022-02-04_0a00cf5339

SHEBANG_FILES=	share/extensions/*.py share/extensions/genpofiles.sh \
		share/templates/*.py man/fix-roff-punct

Lines 1-5 Link Here

(-)graphics/inkscape/distinfo (-5 / +3 lines)
1	TIMESTAMP = 1639251421	1	TIMESTAMP = 1644185391
2	SHA256 (inkscape-1.1.tar.xz) = 71e6e8ce3fdf702f59dbc4a276665eb982eb7822b029bbdbeced2df4301795e6	2	SHA256 (inkscape-1.1.2.tar.xz) = 3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1
3	SIZE (inkscape-1.1.tar.xz) = 34203156	3	SIZE (inkscape-1.1.2.tar.xz) = 34222832
4	SHA256 (7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch) = ed61d89468901fbf8a2148d49eeb7753c40fb7f074ec7008b604f46b146c7ae7
5	SIZE (7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch) = 1158




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);




--- 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");




%%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

%%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

%%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

Return to bug 261774

Lines 1-14 Link Here

(-)graphics/inkscape/Makefile (-7 / +3 lines)
1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>	1	# Created by: Alexander Nedotsukov <bland@FreeBSD.org>
2		2
3	PORTNAME= inkscape	3	PORTNAME= inkscape
4	DISTVERSION= 1.1	4	DISTVERSION= 1.1.2
5	PORTREVISION= 8
6	CATEGORIES= graphics gnome	5	CATEGORIES= graphics gnome
7	MASTER_SITES= https://inkscape.org/gallery/item/26932/	6	MASTER_SITES= https://inkscape.org/gallery/item/31668/
8		7
9	PATCH_SITES= https://gitlab.com/inkscape/inkscape/-/commit/
10	PATCHFILES= 7d9497b64df1ec3ddfb65efd105dd11212014ce9.patch:-p1
11
12	MAINTAINER= gnome@FreeBSD.org	8	MAINTAINER= gnome@FreeBSD.org
13	COMMENT= Full featured open source SVG editor	9	COMMENT= Full featured open source SVG editor
14		10
Lines 55-61 Link Here
55	USE_XORG= sm ice x11 xext	51	USE_XORG= sm ice x11 xext
56	USE_LDCONFIG= yes	52	USE_LDCONFIG= yes
57		53
58	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}_2021-05-24_c4e8f9ed74	54	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}_2022-02-04_0a00cf5339
59		55
60	SHEBANG_FILES= share/extensions/*.py share/extensions/genpofiles.sh \	56	SHEBANG_FILES= share/extensions/*.py share/extensions/genpofiles.sh \
61	share/templates/*.py man/fix-roff-punct	57	share/templates/*.py man/fix-roff-punct

Lines 1-26 Link Here

(-)graphics/inkscape/files/patch-poppler-compat.diff (-26 lines)
1	From ff61b5e3df3351d4ab5437181fe6d34729f4cbbb Mon Sep 17 00:00:00 2001
2	From: Evangelos Foutras <evangelos@foutrelis.com>
3	Date: Mon, 1 Nov 2021 21:45:38 +0200
4	Subject: [PATCH] Fix build with poppler 21.11.0
5
6	GfxFont::tag is now of type std::string instead of GooString *.
7	---
8	src/extension/internal/pdfinput/pdf-parser.cpp \| 4 ++++
9	1 file changed, 4 insertions(+)
10
11	diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
12	index e3d04d544b..feecefa043 100644
13	--- src/extension/internal/pdfinput/pdf-parser.cpp
14	+++ src/extension/internal/pdfinput/pdf-parser.cpp
15	@@ -2169,7 +2169,11 @@ void PdfParser::opSetFont(Object args[], int /numArgs/)
16	}
17	if (printCommands) {
18	printf(" font: tag=%s name='%s' %g\n",
19	+#if POPPLER_CHECK_VERSION(21,11,0)
20	+ font->getTag().c_str(),
21	+#else
22	font->getTag()->getCString(),
23	+#endif
24	font->getName() ? font->getName()->getCString() : "???",
25	args[1].getNum());
26	fflush(stdout);

Lines 1-31 Link Here

(-)graphics/inkscape/files/patch-src_path-prefix.cpp (-31 lines)
1	--- src/path-prefix.cpp.orig 2021-05-17 19:25:49 UTC
2	+++ src/path-prefix.cpp
3	@@ -20,6 +20,12 @@
4	#include <mach-o/dyld.h> // for _NSGetExecutablePath
5	#endif
6
7	+#ifdef __FreeBSD__
8	+#include <sys/param.h>
9	+#include <sys/types.h>
10	+#include <sys/sysctl.h>
11	+#endif
12	+
13	#include <cassert>
14	#include <glib.h>
15	#include <glibmm.h>
16	@@ -123,6 +129,15 @@ char const *get_program_name()
17	if (!program_name) {
18	g_warning("get_program_name() - g_file_read_link failed");
19	}
20	+#elif defined(__FreeBSD__)
21	+ int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
22	+ char buf[MAXPATHLEN];
23	+ size_t cb = sizeof(buf);
24	+ if (sysctl(mib, 4, buf, &cb, NULL, 0) == 0) {
25	+ program_name = realpath(buf, nullptr);
26	+ } else {
27	+ g_warning("get_program_name() - sysctl failed");
28	+ }
29	#else
30	#warning get_program_name() - no known way to obtain executable name on this platform
31	g_info("get_program_name() - no known way to obtain executable name on this platform");

Lines 112-118 Link Here

(-)graphics/inkscape/pkg-plist (-1 / +2 lines)
112	%%DATADIR%%/extensions/Poly3DObjects/trunc_oct.obj	112	%%DATADIR%%/extensions/Poly3DObjects/trunc_oct.obj
113	%%DATADIR%%/extensions/Poly3DObjects/trunc_tet.obj	113	%%DATADIR%%/extensions/Poly3DObjects/trunc_tet.obj
114	%%DATADIR%%/extensions/README.md	114	%%DATADIR%%/extensions/README.md
115	%%DATADIR%%/extensions/STYLEGUIDE.md
116	%%DATADIR%%/extensions/TESTING.md	115	%%DATADIR%%/extensions/TESTING.md
117	%%DATADIR%%/extensions/addnodes.inx	116	%%DATADIR%%/extensions/addnodes.inx
118	%%DATADIR%%/extensions/addnodes.py	117	%%DATADIR%%/extensions/addnodes.py
Lines 2467-2472 Link Here
2467	%%DATADIR%%/screens/start-welcome-text.pl.svg	2466	%%DATADIR%%/screens/start-welcome-text.pl.svg
2468	%%DATADIR%%/screens/start-welcome-text.pt.svg	2467	%%DATADIR%%/screens/start-welcome-text.pt.svg
2469	%%DATADIR%%/screens/start-welcome-text.pt_BR.svg	2468	%%DATADIR%%/screens/start-welcome-text.pt_BR.svg
		2469	%%DATADIR%%/screens/start-welcome-text.ro.svg
2470	%%DATADIR%%/screens/start-welcome-text.ru.svg	2470	%%DATADIR%%/screens/start-welcome-text.ru.svg
2471	%%DATADIR%%/screens/start-welcome-text.sk.svg	2471	%%DATADIR%%/screens/start-welcome-text.sk.svg
2472	%%DATADIR%%/screens/start-welcome-text.svg	2472	%%DATADIR%%/screens/start-welcome-text.svg
Lines 2526-2531 Link Here
2526	%%NLS%%%%DATADIR%%/templates/default.ks@aran.svg	2526	%%NLS%%%%DATADIR%%/templates/default.ks@aran.svg
2527	%%NLS%%%%DATADIR%%/templates/default.ks@deva.svg	2527	%%NLS%%%%DATADIR%%/templates/default.ks@deva.svg
2528	%%NLS%%%%DATADIR%%/templates/default.lv.svg	2528	%%NLS%%%%DATADIR%%/templates/default.lv.svg
		2529	%%NLS%%%%DATADIR%%/templates/default.lt.svg
2529	%%NLS%%%%DATADIR%%/templates/default.mai.svg	2530	%%NLS%%%%DATADIR%%/templates/default.mai.svg
2530	%%NLS%%%%DATADIR%%/templates/default.ml.svg	2531	%%NLS%%%%DATADIR%%/templates/default.ml.svg
2531	%%NLS%%%%DATADIR%%/templates/default.mni.svg	2532	%%NLS%%%%DATADIR%%/templates/default.mni.svg