inkscape: updated dependencies, disabled eager linking with libcdr

inkscape/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF362jRlZw0LyL4UBpFs2EwoMMHWcMgN63ZAcCaBvJBgDjKXw6QZI/O9iMSbcB5Rbc+tjvGn1/PJucxfCCoOT7swQ=
-SHA256 (Pkgfile) = 9f77b9fb59e6bea1b351e555969f108133cef5ca741513622e0814a32775377a
+RWSagIOpLGJF32DpJ7/mzal0AzG8X4sPHhskDTSbqHdIpVcgsCNOm9FurA3YUoodkF+G+2qxK0KOIGqEt7jmAndmIPKnxYR3vQ8=
+SHA256 (Pkgfile) = afc619e22fe740342a6617bb3dfd9d4537446e8fae7c3b5fda86b4ea07237a5b
 SHA256 (.footprint) = 6d8b8cd774c23c747c001768fabed559e31015c6df311c4b4405c5c4cdc1a453
 SHA256 (inkscape-1.3.2.tar.xz) = dbd1844dc443fe5e10d3e9a887144e5fb7223852fff191cfb5ef7adeab0e086b
 SHA256 (6209.patch) = ab300e163ea6dafe9b242dd0f6eb4bf17e524f6391c44f45614384681211833d

inkscape/Pkgfile

@@ -1,7 +1,7 @@
 # Description: An open source SVG editor.
 # URL: https://www.inkscape.org/
 # Maintainer: John McQuah, jmcquah at disroot dot org
-# Depends on: boehm-gc double-conversion graphicsmagick gsl gtkmm3 libsoup libxslt poppler-ink popt potrace gdl
+# Depends on: boehm-gc double-conversion graphicsmagick gsl gtkmm3 librsvg libsoup libxslt poppler popt potrace gdl
 
 name=inkscape
 version=1.3.2
@@ -9,10 +9,7 @@ release=3
 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz 6209.patch)
 
 build() {
-    export CXXFLAGS+=" -I/usr/include/poppler-ink"
-    export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape"
-    export PKG_CONFIG_PATH="/usr/lib/inkscape/pkgconfig:$PKG_CONFIG_PATH"
-
+    [ -e /usr/bin/pdftocairo ] || { echo "install cairo and then rebuild poppler, else inkscape will fail to build."; exit 1; }
     cd ${name}-${version}*
 
     # patch for the new poppler ABI
@@ -26,9 +23,10 @@ build() {
         -D CMAKE_INSTALL_PREFIX=/usr \
         -D CMAKE_INSTALL_LIBDIR=lib \
         -D CMAKE_BUILD_TYPE=Release \
-        -D CMAKE_CXX_FLAGS_RELEASE="-L/usr/lib/inkscape" \
-        -D CMAKE_C_FLAGS_RELEASE="-L/usr/lib/inkscape" \
+        -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
+        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
         -D WITH_INTERNAL_2GEOM=ON \
+	-D WITH_LIBCDR=OFF \
         -D WITH_NLS=OFF \
         -Wno-dev