inkscape: updated to 1.2.2

1 files changed, 7 insertions, 16 deletions

diff --git a/inkscape/build/inkscape.SlackBuild b/inkscape/build/inkscape.SlackBuild
index 5f6239b6..ba227e58 100755
--- a/inkscape/build/inkscape.SlackBuild
+++ b/inkscape/build/inkscape.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2020, 2021  Eric Hameleers, Eindhoven, NL
+# Copyright 2020, 2021, 2023  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -30,7 +30,7 @@
 # URL:         https://inkscape.org/
 # Build needs: 
 # Needs:       double-conversion, gdl, graphicsmagick, libcdr, potrace,
-#              pstoedit, python-lxml, python-numpy, scour
+#              pstoedit, python-cssselect, python-lxml, python-numpy, scour
 # Changelog:   
 # 1.0.1-1:     09/nov/2020 by Eric Hameleers <alien@slackware.com>
 #              * Initial build.
@@ -38,6 +38,8 @@
 #              * Update.
 # 1.1.1-2:     05/nov/2021 by Eric Hameleers <alien@slackware.com>
 #              * Rebuilt against python 3.9 in -current.
+# 1.2.2-1:     05/jan/2023 by Eric Hameleers <alien@slackware.com>
+#              * Update.
 # 
 # Run 'sh inkscape.SlackBuild' to build a Slackware package.
 # The package (.t?z) and .txt file as well as build logs are created in /tmp .
@@ -46,8 +48,8 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=inkscape
-VERSION=${VERSION:-1.1.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.2.2}
+BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
 
@@ -63,7 +65,7 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
-SRCURL="https://media.inkscape.org/dl/resources/file/${PRGNAM}-${VERSION}_2021-09-20_3bf5ae0d25.tar.xz"
+SRCURL="https://inkscape.org/gallery/item/37360/${PRGNAM}-${VERSION}.tar.xz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -156,13 +158,6 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE}
 cd ${PRGNAM}-${VERSION} 2>/dev/null || cd ${PRGNAM}-${VERSION}_*
 
-# Fix build failure with glibc 2.32:
-sed -i src/ui/tool/node.cpp -e '/#include <iostream>/a #include <atomic>'
-
-# Fix build against poppler-21.11.0 (patch from Arch Linux):
-cat $SRCDIR/patches/inkscape_poppler_21.11.0.patch | patch -p1 --verbose \
-  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
-
 # Fix man page location:
 sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g"
 
@@ -190,10 +185,6 @@ cd build-${PRGNAM}
   make DESTDIR=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 cd -
 
-# Irrelevant pkgconfig file with wrong library path on 64bit also:
-rm -rf $PKG/usr/lib/pkgconfig
-rmdir $PKG/usr/lib || true
-
 # Add this to the doinst.sh:
 mkdir -p $PKG/install
 cat <<EOINS >> $PKG/install/doinst.sh