4 files changed, 63 insertions, 31 deletions
diff --git a/graphics/inkscape/README b/graphics/inkscape/README
index 1d9e9dd712..fede57c765 100644
--- a/graphics/inkscape/README
+++ b/graphics/inkscape/README
@@ -4,8 +4,6 @@ standard Scalable Vector Graphics (SVG) file format.  Supported SVG
 features include shapes, paths, text, markers, clones, alpha blending,
 transforms, gradients, patterns, and grouping.  Inkscape also supports
 Creative Commons meta-data, node editing, layers, complex path
-operations, bitmap tracing, text-on-path, flowed text, direct XML
-editing, and more.  It imports formats such as JPEG, PNG, TIFF, and
-others and exports PNG as well as multiple vector-based formats.
-
-Optional dependency: potrace (for bitmap tracing functionality).
++operations, bitmap tracing, text-on-path, flowed text, direct XML
++editing, and more.  It imports formats such as JPEG, PNG, TIFF, and
++others and exports PNG as well as multiple vector-based formats.
diff --git a/graphics/inkscape/fix_atomic_rel_error.patch b/graphics/inkscape/fix_atomic_rel_error.patch
new file mode 100644
index 0000000000..b298550c5c
--- /dev/null
+++ b/graphics/inkscape/fix_atomic_rel_error.patch
@@ -0,0 +1,10 @@
+--- a/src/ui/tool/node.cpp	2020-05-01 15:18:52.000000000 +0200
++++ b/src/ui/tool/node.cpp	2020-08-18 01:25:05.266412299 +0200
+@@ -7,6 +7,7 @@
+  * Released under GNU GPL v2+, read the file 'COPYING' for more information.
+  */
+ 
++#include <atomic>
+ #include <iostream>
+ #include <stdexcept>
+ #include <boost/utility.hpp>
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index 4471bf3c1b..2db0f55407 100644
--- a/graphics/inkscape/inkscape.SlackBuild
+++ b/graphics/inkscape/inkscape.SlackBuild
@@ -23,7 +23,8 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=inkscape
-VERSION=${VERSION:-0.92.4}
+VERSION=${VERSION:-1.0.1}
+EXTRAVER=${EXTRAVER:-2020-09-07_3bc2e813f5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf ${PRGNAM}-${VERSION}_${EXTRAVER}
 tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
-cd $PRGNAM-$VERSION
+cd ${PRGNAM}-${VERSION}_${EXTRAVER}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,31 +70,54 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -std=c++11" \
-./configure \
-  --enable-strict-build=no \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
+# https://bugs.gentoo.org/737596
+patch -p1 < $CWD/fix_atomic_rel_error.patch
+
+# strip invalid tag
+sed -i /url/d org.inkscape.Inkscape.appdata.xml.in
+
+# https://bugs.launchpad.net/inkscape/+bug/314381
+# a couple of files have executable bits set,
+# despite not being executable
+find . -name '*.cpp' | xargs chmod -x
+find . -name '*.h' | xargs chmod -x
+# Fix end of line encodings
+dos2unix -k -q share/extensions/*.py
+
+mkdir -p build
+cd build
+  # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick
+  cmake \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
+    -DCMAKE_Fortran_FLAGS_RELEASE:STRING="-DNDEBUG" \
+    -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \
+    -DINCLUDE_INSTALL_DIR=/usr/include \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DSYSCONF_INSTALL_DIR=/etc \
+    -DSHARE_INSTALL_PREFIX=/usr/share \
+    -DBUILD_SHARED_LIBS:BOOL=OFF \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DWITH_GRAPHICS_MAGICK:BOOL=ON \
+    -DWITH_IMAGE_MAGICK:BOOL=OFF \
+    -DENABLE_POPPLER=no \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
+
+mv $PKG/usr/share/man $PKG/usr/man
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README TRANSLATORS doc/* \
+  AUTHORS COPYING* README* TRANSLATORS LICENSES *.md doc/* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -name "Makefile*" -exec rm {} \;
diff --git a/graphics/inkscape/inkscape.info b/graphics/inkscape/inkscape.info
index 39fe0759fd..e6c6bd418e 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,10 +1,10 @@
 PRGNAM="inkscape"
-VERSION="0.92.4"
+VERSION="1.0.1"
 HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2"
-MD5SUM="ac30f6d5747fd9c620c00dad500f414f"
+DOWNLOAD="http://ponce.cc/slackware/sources/repo/inkscape-1.0.1.tar.xz"
+MD5SUM="daefc5212b72e49eff41a7681fd5e993"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lxml numpy"
+REQUIRES="GraphicsMagick gdl dos2unix double-conversion lxml numpy potrace"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"