4 files changed, 94 insertions, 28 deletions
diff --git a/graphics/inkscape/README b/graphics/inkscape/README
index 1d9e9dd712..61391c1df2 100644
--- a/graphics/inkscape/README
+++ b/graphics/inkscape/README
@@ -7,5 +7,3 @@ 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).
diff --git a/graphics/inkscape/glib-2.68.patch b/graphics/inkscape/glib-2.68.patch
new file mode 100644
index 0000000000..bc23d7df01
--- /dev/null
+++ b/graphics/inkscape/glib-2.68.patch
@@ -0,0 +1,47 @@
+diff --git a/src/3rdparty/autotrace/autotrace.h b/src/3rdparty/autotrace/autotrace.h
+index 2ce6f272a997cee8c7839412a520106d5584ce4c..e56be9a74c4308cacc4043ef0855edae9cdef0a6 100644
+--- a/src/3rdparty/autotrace/autotrace.h
++++ b/src/3rdparty/autotrace/autotrace.h
+@@ -23,6 +23,9 @@
+ 
+ #include <stdio.h>
+ 
++#include "types.h"
++#include "color.h"
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif                          /* __cplusplus */
+@@ -35,9 +38,6 @@ extern "C" {
+  * Typedefs
+  * ===================================================================== */
+ 
+-#include "types.h"
+-#include "color.h"
+-
+ /* Third degree is the highest we deal with.  */
+   enum _at_polynomial_degree {
+     AT_LINEARTYPE = 1,
+diff --git a/src/3rdparty/autotrace/color.h b/src/3rdparty/autotrace/color.h
+index e50ab30ae04d1861c4d9aa0f393650d2f2c102da..88651db9f73571cdc5f14cdf4645e8fa69e03912 100644
+--- a/src/3rdparty/autotrace/color.h
++++ b/src/3rdparty/autotrace/color.h
+@@ -24,6 +24,10 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif                          /* __cplusplus */
++
+ typedef struct _at_color at_color;
+ struct _at_color {
+   guint8 r;
+@@ -43,4 +47,7 @@ void at_color_free(at_color * color);
+ GType at_color_get_type(void);
+ #define AT_TYPE_COLOR (at_color_get_type ())
+ 
++#ifdef __cplusplus
++}
++#endif                          /* __cplusplus */
+ #endif /* not AT_COLOR_H */
diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild
index 4471bf3c1b..d61c6507a8 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.2}
+EXTRAVER=${EXTRAVER:-2021-01-15_e86c870879}
 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,51 @@ 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
+patch -p1 < $CWD/glib-2.68.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
+
+# Fix man page location:
+sed -i CMakeScripts/Pod2man.cmake -e "s/SHARE_INSTALL/CMAKE_INSTALL_PREFIX/g"
+
+mkdir -p build
+cd build
+  # imagemagick >= 7.x is unsupported yet, so use GraphicsMagick
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_MANDIR=/usr/man \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DINKSCAPE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    -DBUILD_SHARED_LIBS=ON \
+    -DWITH_DBUS=ON \
+    -DWITH_GRAPHICS_MAGICK=ON \
+    -DWITH_IMAGE_MAGICK=OFF \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
 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..9e0d9b3bb9 100644
--- a/graphics/inkscape/inkscape.info
+++ b/graphics/inkscape/inkscape.info
@@ -1,10 +1,10 @@
 PRGNAM="inkscape"
-VERSION="0.92.4"
+VERSION="1.0.2"
 HOMEPAGE="http://www.inkscape.org/"
-DOWNLOAD="https://inkscape.org/gallery/item/13330/inkscape-0.92.4.tar.bz2"
-MD5SUM="ac30f6d5747fd9c620c00dad500f414f"
+DOWNLOAD="https://inkscape.org/gallery/item/23820/inkscape-1.0.2.tar.xz"
+MD5SUM="ec90e0c1e4c7e3dba8f46b16c73462b3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lxml numpy"
+REQUIRES="GraphicsMagick gdl dos2unix double-conversion libcdr lxml numpy potrace pstoedit scour"
 MAINTAINER="Fernando Lopez Jr."
 EMAIL="fernando.lopezjr@gmail.com"