inkscape: explicitly declare the poppler includedir

inkscape/.signature

@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32DpJ7/mzal0AzG8X4sPHhskDTSbqHdIpVcgsCNOm9FurA3YUoodkF+G+2qxK0KOIGqEt7jmAndmIPKnxYR3vQ8=
-SHA256 (Pkgfile) = afc619e22fe740342a6617bb3dfd9d4537446e8fae7c3b5fda86b4ea07237a5b
+RWSagIOpLGJF39LcNVlXRcXmv9WJ8C8YzBZYgPaUTbMaWyocSRIJKEXD6svImWs7MLu49d+gLSXJiOL+jK3NzPHoo1Gmrshj5Qs=
+SHA256 (Pkgfile) = 95f7113f4f369c67109e3e094b3b3e1bc5409a02726462a69fd0f63092f752cc
 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 librsvg libsoup libxslt poppler popt potrace gdl
+# Depends on: boehm-gc double-conversion graphicsmagick gsl gtkmm3 libsoup libxslt poppler-ink popt potrace gdl
 
 name=inkscape
 version=1.3.2
@@ -9,7 +9,9 @@ release=3
 source=(https://media.inkscape.org/dl/resources/file/$name-$version.tar.xz 6209.patch)
 
 build() {
-    [ -e /usr/bin/pdftocairo ] || { echo "install cairo and then rebuild poppler, else inkscape will fail to build."; exit 1; }
+    export LDFLAGS+=" -Wl,-rpath=/usr/lib/inkscape"
+    export PKG_CONFIG_PATH="/usr/lib/inkscape/pkgconfig:$PKG_CONFIG_PATH"
+
     cd ${name}-${version}*
 
     # patch for the new poppler ABI
@@ -23,13 +25,19 @@ build() {
         -D CMAKE_INSTALL_PREFIX=/usr \
         -D CMAKE_INSTALL_LIBDIR=lib \
         -D CMAKE_BUILD_TYPE=Release \
-        -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \
-        -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+        -D CMAKE_CXX_FLAGS_RELEASE="-L/usr/lib/inkscape $CFLAGS" \
+        -D CMAKE_C_FLAGS_RELEASE="-L/usr/lib/inkscape $CXXFLAGS" \
+	-D POPPLER_INCLUDE_DIR="/usr/include/poppler-ink" \
+	-D POPPLER_GLIB_INCLUDE_DIR="/usr/include/poppler-ink/glib" \
         -D WITH_INTERNAL_2GEOM=ON \
+	-D BUILD_TESTING=OFF \
 	-D WITH_LIBCDR=OFF \
         -D WITH_NLS=OFF \
         -Wno-dev
 
+    sed -e '/^#include <poppler/s;poppler/;;' \
+        -i src/extension/internal/pdfinput/pdf-input.cpp
+
     cmake --build build
     DESTDIR=$PKG cmake --install build
 

poppler-ink/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF32YyVs2krTKxqgBR1/mUpTLyjGOnfZDtsXGkmV6Hr9miHRHIxrdmxzEZI6qaClpd89HZhcixFtZEkEeVYspA9AE=
-SHA256 (Pkgfile) = da038bc1aa4bc6df4fdaa1b478d87947c167850d4f31e2dcfeb7f490a8b95061
+RWSagIOpLGJF36I/Z7h87GYp5iuH0SMp5FnhIX/j1uzWK4XZtPBqYjaSlVlkfOawlD7nhbNgAQ8QGJp/dl+wmmH5ea3FNFuyQA0=
+SHA256 (Pkgfile) = 3baf13a2546409c119bf5f5c4e69662a5d4307795de0d21d0d484b2bbc4a53d9
 SHA256 (.footprint) = 4f77314c94c13d837dbf34638db60fab49f4a5bd2eb2c4f374b986cf43e5b7df
 SHA256 (poppler-24.04.0.tar.xz) = 1e804ec565acf7126eb2e9bb3b56422ab2039f7e05863a5dfabdd1ffd1bb77a7

poppler-ink/Pkgfile

@@ -1,11 +1,11 @@
 # Description: PDF rendering library needed for inkscape
 # URL: https://poppler.freedesktop.org/
 # Maintainer: John McQuah, jmcquah at disroot dot org
-# Depends on: fontconfig boost lcms2 libjpeg-turbo cairo
+# Depends on: fontconfig boost lcms2 librsvg libjpeg-turbo cairo
 
 name=poppler-ink
 version=24.04.0
-release=1
+release=2
 source=(https://poppler.freedesktop.org/poppler-$version.tar.xz)
 
 build() {
@@ -31,14 +31,18 @@ build() {
            -D BUILD_QT6_TESTS=OFF
            -Wno-dev"
 
-    cmake -S poppler-$version -B build $PKGMK_INKPOP \
-          -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
-          -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS"
+    cd poppler-$version
+    sed -e "/ENABLE_RELOCATABLE OFF/s/OFF/ON/" -i CMakeLists.txt
 
+    cmake -S . -B build $PKGMK_INKPOP \
+           -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \
+           -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" 
     cmake --build build -j ${JOBS:-1}
+
+    sed -e "s;include/poppler;include/poppler-ink;" \
+        -i build/{,cpp,glib}/cmake_install.cmake
     DESTDIR=$PKG cmake --install build
 
-    mv $PKG/usr/include/poppler{,-ink}
     sed -e "/^Cflags/s;poppler;poppler-ink;" \
         -i $PKG/usr/lib/inkscape/pkgconfig/poppler{,-cpp,-glib}.pc