[crux-commits] ports/contrib (3.6): inkscape: fix compile

crux at crux.nu crux at crux.nu
Sat Aug 22 16:33:29 UTC 2020


commit 6896d4525a1ebb04c61ec677e0391ba76e7a7a4f
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Fri Aug 21 21:58:52 2020 +1000

    inkscape: fix compile

diff --git a/inkscape/.footprint b/inkscape/.footprint
index 1fc74e25b..fbacbed29 100644
--- a/inkscape/.footprint
+++ b/inkscape/.footprint
@@ -5,6 +5,7 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/inkscape/
 -rwxr-xr-x	root/root	usr/lib/inkscape/libinkscape_base.so
+-rwxr-xr-x	root/root	usr/lib/libpoppler.so.101
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/org.inkscape.Inkscape.desktop
diff --git a/inkscape/.signature b/inkscape/.signature
index 063bdc953..e04047105 100644
--- a/inkscape/.signature
+++ b/inkscape/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35/1dcLAholGwfR2MzXEuVJpj3+QYHYq/HFskQxh5zYRfOuiQPIIDZvIrOd/5r3GqwoDAGeqmNqJI4+AtHPFagg=
-SHA256 (Pkgfile) = b3f6b9086677ef5ee52fdeef75df5489d8b327e46b8b2bfedad293d438ef1893
-SHA256 (.footprint) = 5ad09c891de18fb7c8a2f346f6724e48634dd7da8a4990a78d0ac28a1972f2af
+RWSagIOpLGJF3zaY1cDcQh1mxk303Vi/+mB+l4HWjwJqO6wblgdy3Ese7xCtCRo3Bg7dwZhfin9aXzMAS7UV1IDsTXVYYTYfAQ0=
+SHA256 (Pkgfile) = 569b64c4951da5055e7e23f2b2dd2ace7c2188b760e703949ff1790a1208fbb2
+SHA256 (.footprint) = 423c13e6e5aac3e044a0db45102de9afa7ea7c1d4776841ceda9215e7e6ef7b9
 SHA256 (inkscape-1.0.tar.xz) = 89c123d1a62ac52db6a08fe3be730584411b89a88ecc528a410b4f3fa53f94bb
-SHA256 (poppler-0.88.0.tar.xz) = b4453804e9a5a519e6ceee0ac8f5efc229e3b0bf70419263c239124474d256c7
+SHA256 (poppler-0.90.1.tar.xz) = 984d82e72e91418d280885298c8bdc855a2fd92665fd52a1345b27235e0c71c4
+SHA256 (inkscape.patch) = 0cb8b48ace0fb6756c931312591b5ad7681bd95e0a6eb40ad2639daca6d3603c
diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile
index e7ba87bb2..bbd6cfcd7 100644
--- a/inkscape/Pkgfile
+++ b/inkscape/Pkgfile
@@ -5,12 +5,13 @@
 
 name=inkscape
 version=1.0
-release=1
+release=2
 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz
-	https://poppler.freedesktop.org/poppler-0.88.0.tar.xz)
+	https://poppler.freedesktop.org/poppler-0.90.1.tar.xz
+	inkscape.patch)
 
 poppler() {
-	cmake -Spoppler-0.88.0 -Bbuild-poppler -GNinja \
+	cmake -Spoppler-0.90.1 -Bbuild-poppler -GNinja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
@@ -26,14 +27,16 @@ poppler() {
 
 	cmake --build build-poppler
 	DESTDIR=$SRC/poppler cmake --build build-poppler --target install
-	install -D -t $PKG/usr/lib $SRC/poppler/usr/lib/libpoppler.so.99
+	install -D -t $PKG/usr/lib $SRC/poppler/usr/lib/libpoppler.so.101
 
 	export CXXFLAGS+=" -I$SRC/poppler/usr/include -I$SRC/poppler/usr/include/poppler"
 	export PKG_CONFIG_PATH="$SRC/poppler/usr/lib/pkgconfig:$PKG_CONFIG_PATH"
 }
 
 build() {
-	[ ! -e '/usr/lib/libpoppler.so.99' ] && poppler
+	[ ! -e '/usr/lib/libpoppler.so.101' ] && poppler
+
+	patch -d $name-${version}_2020-05-01_4035a4fb49 -p1 -i $SRC/inkscape.patch
 
 	export PKG_CONFIG_PATH="/usr/lib/imagemagick6/pkgconfig:$PKG_CONFIG_PATH"
 
diff --git a/inkscape/inkscape.patch b/inkscape/inkscape.patch
new file mode 100644
index 000000000..c1950ffd5
--- /dev/null
+++ b/inkscape/inkscape.patch
@@ -0,0 +1,11 @@
+diff -urN inkscape-1.0_2020-05-01_4035a4fb49.orig/src/preferences.h inkscape-1.0_2020-05-01_4035a4fb49/src/preferences.h
+--- inkscape-1.0_2020-05-01_4035a4fb49.orig/src/preferences.h	2020-05-01 13:18:52.000000000 +0000
++++ inkscape-1.0_2020-05-01_4035a4fb49/src/preferences.h	2020-08-20 23:20:11.501230191 +0000
+@@ -14,6 +14,7 @@
+ #ifndef INKSCAPE_PREFSTORE_H
+ #define INKSCAPE_PREFSTORE_H
+ 
++#include <atomic>
+ #include <climits>
+ #include <cfloat>
+ #include <glibmm/ustring.h>


More information about the crux-commits mailing list