tek/contrib-tek
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

inkscape: 1.1.1 -> 1.1.2

Browse Source
This commit is contained in:
Danny Rawlins 2022-02-11 20:26:33 +11:00
parent 2126a3a56d
commit e750edc8c6
4 changed files with 14 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inkscape/.footprint
View File

@ -110,6 +110,7 @@ drwxr-xr-x root/root usr/lib/inkscape/
-rwxr-xr-x root/root usr/lib/inkscape/libinkscape_base.so
lrwxrwxrwx root/root usr/lib/lib2geom.so -> lib2geom.so.1.1.0
-rwxr-xr-x root/root usr/lib/lib2geom.so.1.1.0
-rwxr-xr-x root/root usr/lib/libpoppler.so.118
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/2geom.pc
drwxr-xr-x root/root usr/share/
@ -219,7 +220,6 @@ drwxr-xr-x root/root usr/share/inkscape/extensions/Poly3DObjects/
-rw-r--r-- root/root usr/share/inkscape/extensions/Poly3DObjects/trunc_icos.obj
-rw-r--r-- root/root usr/share/inkscape/extensions/Poly3DObjects/trunc_oct.obj
-rw-r--r-- root/root usr/share/inkscape/extensions/Poly3DObjects/trunc_tet.obj
-rw-r--r-- root/root usr/share/inkscape/extensions/STYLEGUIDE.md
-rw-r--r-- root/root usr/share/inkscape/extensions/TESTING.md
drwxr-xr-x root/root usr/share/inkscape/extensions/__pycache__/
-rw-r--r-- root/root usr/share/inkscape/extensions/__pycache__/addnodes.cpython-39.opt-1.pyc
@ -3286,6 +3286,7 @@ drwxr-xr-x root/root usr/share/inkscape/screens/
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.pl.svg
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.pt.svg
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.pt_BR.svg
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.ro.svg
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.ru.svg
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.sk.svg
-rw-r--r-- root/root usr/share/inkscape/screens/start-welcome-text.svg
@ -3344,6 +3345,7 @@ drwxr-xr-x root/root usr/share/inkscape/templates/
-rw-r--r-- root/root usr/share/inkscape/templates/default.kok@latin.svg
-rw-r--r-- root/root usr/share/inkscape/templates/default.ks@aran.svg
-rw-r--r-- root/root usr/share/inkscape/templates/default.ks@deva.svg
-rw-r--r-- root/root usr/share/inkscape/templates/default.lt.svg
-rw-r--r-- root/root usr/share/inkscape/templates/default.lv.svg
-rw-r--r-- root/root usr/share/inkscape/templates/default.mai.svg
-rw-r--r-- root/root usr/share/inkscape/templates/default.ml.svg

11
inkscape/.signature
View File

@ -1,7 +1,6 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3x1/fZo6ycnk059O3cLvIiJYwN6PZcRnIhYgrPMWxzs8oQPtS9nqfZJqno5Z4E8ZPyEtCmyJFVZ4W0rkjvyGVwA=
SHA256 (Pkgfile) = fe282a8284dabe047c5d511e4b2635149b5849b869ce0c87caa645eabc5c013d
SHA256 (.footprint) = 8a957107d077ffd8cdedcb76c718f9f2796605e628afb302f1ab99a91743bcae
SHA256 (inkscape-1.1.1.tar.xz) = aeca0b9d33b5b1cfa9aa70433bdee6a8c3d020ffafc2e6f0c9a60eed7a7978af
SHA256 (poppler-21.11.0.tar.xz) = 31b76b5cac0a48612fdd154c02d9eca01fd38fb8eaa77c1196840ecdeb53a584
SHA256 (poppler-21.11.0.patch) = 76bd1cc64ce7abef0f1758a7f05d9ca9e2cf44506318fb8ae9da029543aa1762
RWSagIOpLGJF33IV2XPNAmZYUxE8ozI/uUuUE4dpTHAtgs1RNK9FL+6RRcbkKHLPsZOmPlOfwcYvj5V6k/YuNYqBNZTqsHCO4wc=
SHA256 (Pkgfile) = 13fd864ba3c4e3a18ebf4de4344829e9f044e8e823931d5d9f03286d28641047
SHA256 (.footprint) = 0c862881b5f22d9749cf274600bd44419258e4ac3121b918aedf73ad25f2d297
SHA256 (inkscape-1.1.2.tar.xz) = 3ffe54a06d0b25a4cd8b6eb424536ef1ed205be13443a39cd437c8c7b89b96d1
SHA256 (poppler-22.02.0.tar.xz) = e390c8b806f6c9f0e35c8462033e0a738bb2460ebd660bdb8b6dca01556193e1

16
inkscape/Pkgfile
View File

@ -5,14 +5,13 @@
name=inkscape
_name=inkscape-INKSCAPE
version=1.1.1
_version=1.1.1_2021-09-20_3bf5ae0d25
_pversion=21.11.0
_psoversion=115
version=1.1.2
_version=1.1.2_2022-02-04_0a00cf5339
_pversion=22.02.0
_psoversion=118
release=1
source=(https://inkscape.org/gallery/item/29255/inkscape-$version.tar.xz
https://poppler.freedesktop.org/poppler-$_pversion.tar.xz
poppler-21.11.0.patch)
source=(https://inkscape.org/gallery/item/31668/inkscape-$version.tar.xz
https://poppler.freedesktop.org/poppler-$_pversion.tar.xz)
poppler() {
cmake -S poppler-$_pversion -B build-poppler -G Ninja \
@ -43,9 +42,6 @@ poppler() {
build() {
[ ! -e "/usr/lib/libpoppler.so.$_psoversion" ] && poppler
# https://gitlab.com/inkscape/inkscape/-/merge_requests/3622
patch -d $name-$_version -p1 -i $SRC/poppler-21.11.0.patch
# https://gitlab.gnome.org/GNOME/glib/-/issues/2331
CFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'
CXXFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66'

26
inkscape/poppler-21.11.0.patch
View File

@ -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
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/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);