ports/contrib (3.7): inkscape: fixed build
commit 10a2eb640c591542d6d0f5dee361043fcd42aa58 Author: Tim Biermann <tbier@posteo.de> Date: Sun Nov 13 16:19:30 2022 +0000 inkscape: fixed build diff --git a/inkscape/.footprint b/inkscape/.footprint index dfc23a21e..55ea3e11a 100644 --- a/inkscape/.footprint +++ b/inkscape/.footprint @@ -4208,8 +4208,8 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.tutorial-advanced.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.vi.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-advanced.zh_CN.svg @@ -4238,8 +4238,8 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.tutorial-basic.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.vi.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-basic.zh_CN.svg @@ -4263,10 +4263,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.tutorial-calligraphy.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-calligraphy.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.de.svg @@ -4288,9 +4289,10 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.tutorial-elements.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.uk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-elements.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.de.svg @@ -4305,10 +4307,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.pt_BR.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.sk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.tutorial-interpolate.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-interpolate.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.de.svg @@ -4330,8 +4333,8 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.tutorial-shapes.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.vi.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-shapes.zh_CN.svg @@ -4356,10 +4359,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.tutorial-tips.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tips.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.de.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.el.svg @@ -4371,9 +4375,10 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.pt_BR.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.sk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.tutorial-tracing-pixelart.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.uk.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing-pixelart.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.be.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.de.svg @@ -4394,10 +4399,11 @@ drwxr-xr-x root/root usr/share/inkscape/tutorials/ -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.ru.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.sk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.sl.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.svg --rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.tutorial-tracing.sr.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.uk.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.vi.svg +-rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.zh_CN.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tutorial-tracing.zh_TW.svg -rw-r--r-- root/root usr/share/inkscape/tutorials/tux.png drwxr-xr-x root/root usr/share/inkscape/ui/ diff --git a/inkscape/.signature b/inkscape/.signature index 81e8cd483..0758bf813 100644 --- a/inkscape/.signature +++ b/inkscape/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF3wU2L/4bYLCn3HOPpd2EQvv07FCalkev/0iaoSZjy/xAv1ocfvLp8COUxWXCruu5lD1rn0A4/CDO50Auyvzn+gY= -SHA256 (Pkgfile) = 67e291813b6553ae19da01c292b4c4ee0b0e0cd63300674410fdd3554225cc63 -SHA256 (.footprint) = 1c24d3b5ba0c986a1b9f7dc00485cb6f433fe75ad2332bf4e12001e4ef454b6e -SHA256 (inkscape-1.2_2022-05-15_dc2aedaf03.tar.xz) = 8d9b31142554945664edfefe2d6b55910a5099765f7176a71107c34f1dcde6ad +RWSagIOpLGJF38PaOV7SSt23Xz8BarFh3+aESLPNXI6APT1BH9b47Gfd5MNSay0f7S1SiUf/UpUPte5L9ZANd4UD3SM1szlkVg8= +SHA256 (Pkgfile) = 934003e1692d951024ae8c6bdc238585a13eafdc8847e6943aa57a563f7618c3 +SHA256 (.footprint) = 50d4df1c4e5c01b01a53d984f35aad272b72f63502122f5926ccfc538d125258 +SHA256 (inkscape-1.2.1.tar.xz) = 46ce7da0eba7ca4badc1db70e9cbb67e0adf9bb342687dc6e08b5ca21b8d4c1b SHA256 (poppler-22.09.0.tar.xz) = d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e SHA256 (inkscape-1.2.1-poppler-22.09.0.patch) = 5e847d11c1c42db717ad39bc03708e3b855f0e0a99ee4ac8d97f5bfe4af8985c diff --git a/inkscape/Pkgfile b/inkscape/Pkgfile index 6212772f3..c34294366 100644 --- a/inkscape/Pkgfile +++ b/inkscape/Pkgfile @@ -10,7 +10,7 @@ _version=1.2_2022-05-15_dc2aedaf03 _pversion=22.09.0 _psoversion=124 release=2 -source=(https://media.inkscape.org/dl/resources/file/inkscape-$_version.tar.xz +source=(https://inkscape.org/gallery/item/34673/inkscape-1.2.1.tar.xz https://poppler.freedesktop.org/poppler-$_pversion.tar.xz inkscape-1.2.1-poppler-22.09.0.patch) @@ -41,18 +41,18 @@ poppler() { } build() { - #[ ! -e "/usr/lib/inkscape/libpoppler.so.$_psoversion" ] && + #[ ! -e "/usr/lib/inkscape/libpoppler.so.$_psoversion" ] && poppler # https://gitlab.com/inkscape/inkscape/-/merge_requests/4719 - patch -d $name-$_version -p1 -i $SRC/inkscape-1.2.1-poppler-22.09.0.patch + patch -d inkscape-1.2.1_2022-07-14_9c6d41e410 -p1 -i $SRC/inkscape-1.2.1-poppler-22.09.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 -L/usr/lib/inkscape' CXXFLAGS+=' -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_66 -L/usr/lib/inkscape' export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape" - cmake -S $name-$_version -B build -G Ninja \ + cmake -S inkscape-1.2.1_2022-07-14_9c6d41e410 -B build -G Ninja \ -D CMAKE_INSTALL_PREFIX=/usr \ -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ @@ -73,4 +73,6 @@ build() { /usr/bin/python3 -mcompileall $PKG /usr/bin/python3 -O -m compileall $PKG /usr/bin/python3 -OO -m compileall $PKG + + rm -rf $PKG/usr/share/man/zh_TW }
participants (1)
-
crux＠crux.nu