From 4c6b2d745af6b85b81c57a9d043caad1ccc0cdd3 Mon Sep 17 00:00:00 2001
From: John McQuah <jquah@mx.sdf.org>
Date: Mon, 11 Dec 2023 03:09:16 +0000
Subject: [PATCH] xournalpp: clean up dependencies

---
 REPO                 | 15 +++++++--------
 xournalpp/.signature |  4 ++--
 xournalpp/Pkgfile    |  6 +++++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/REPO b/REPO
index 8dc123d..4acddb1 100644
--- a/REPO
+++ b/REPO
@@ -93,8 +93,8 @@ f:1ff4aa0bb14d7fb4e64fb1ddf757b979:libjxl/.footprint
 f:2ee96ffa1eb73caa8437f5bcbb22b810:python3-slugify/.signature
 f:86357648c850d82b1edd510314bc7152:python3-slugify/Pkgfile
 f:6bc6bfa36d846e62c63348b2f8d54569:python3-slugify/.footprint
-f:615f8de7422c720af34722f316b71e35:xournalpp/.signature
-f:08388ff582eb8d0f887351afac434ab3:xournalpp/Pkgfile
+f:c17e1db3e7aa595faa8dcad9f97613f3:xournalpp/.signature
+f:b2716c54b4640b1e57b7b392b4ae0345:xournalpp/Pkgfile
 f:73f43a5bbfc666d2fc31825ca6991b0d:xournalpp/.footprint
 f:b4876d82493de47a71ef1562e613539d:texlive-base/README
 f:85d9a28badf0967c2b3a29aa5a320e4f:texlive-base/tabu.sty.diff
@@ -148,8 +148,8 @@ f:69ec1eeafad09bbecb022c340af66853:lbreakouthd/.footprint
 f:d8f351d4fb547859ae62a6aec84e2a2e:xclock/.signature
 f:63dd2c0915dada0d2d57d4973852e693:xclock/Pkgfile
 f:9e7fd2d9b0727049d7af602113e27204:xclock/.footprint
-f:15f4d974ce6edac189097b833790020b:wf-recorder/.signature
-f:3b507d750eb51a6cfa446014e270a1ab:wf-recorder/Pkgfile
+f:7c95c71930e51d5d23f1cc849b16ab4f:wf-recorder/.signature
+f:3d96897e5a6a37cb150bbbc4d5d3b92f:wf-recorder/Pkgfile
 f:a73c76b58ce320bdc2c96e10e6bea7e6:wf-recorder/.footprint
 f:b805ec30f0bf5689ff06a08168726c0f:fortune-mod/.signature
 f:017679266fb4234007ea9068a755a6a1:fortune-mod/Pkgfile
@@ -183,10 +183,9 @@ f:93b0c55f975a99354fc78cc8a0d6506c:zathura-pdf-poppler/.signature
 f:ae30d3e814516e1b46ffe0900f5b6b22:zathura-pdf-poppler/Pkgfile
 f:3961411333908c5200c5ba74f8240798:zathura-pdf-poppler/.footprint
 f:95ed2c92dd96132378050eca03da25c6:webkitgtk-60/README
-f:cad94c47b122c27d68dfc0b8eb02831c:webkitgtk-60/1bad176b2496579d760852c80cff3ad9fb7c3a4b.patch
-f:689def4cd2753cc704c0d0e38eefc6b2:webkitgtk-60/.signature
-f:906c84f2660c92040cdaee890f7866ad:webkitgtk-60/Pkgfile
-f:a6a01373c6f9e7ee98a04ff2fae200f6:webkitgtk-60/.footprint
+f:18e20ca2d2e015fc7d2e4c1a15a0b73b:webkitgtk-60/.signature
+f:6a873d3204cfd7b6e39ea741b94e13c3:webkitgtk-60/Pkgfile
+f:9b94cbdaa307d66f46de0026bbb3b5d2:webkitgtk-60/.footprint
 f:0cc425d03faffdcc793b0af7ec749893:libfreeimage-lite/.signature
 f:c4a660d93a260478a5f4d246be1c260d:libfreeimage-lite/Pkgfile
 f:55654b9c5c4042bbd1ca6d158629d37a:libfreeimage-lite/.footprint
diff --git a/xournalpp/.signature b/xournalpp/.signature
index 121bd95..62e4c0b 100644
--- a/xournalpp/.signature
+++ b/xournalpp/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/jmq.pub
-RWTTPlFarK9CxLo7LUrwrvoRlFcie5pHWP9/XLDvlCEJXR0gn4Z0sL5VGxSwMWUuD6cIJ3EOsmANNIH7jO0zFhiuaAzAsoBZYwY=
-SHA256 (Pkgfile) = 984a531be04775a1763cdd305cf0ec7464a91fea248f77013863fec3e9ce4c10
+RWTTPlFarK9CxM/24cXt2alH38hanQ0lpGAreotGd9EfCe9d/eFuwRBIxflVO1zroP6xXWF0X3LvQKodhIiPnMZyKxkm5pq5MQg=
+SHA256 (Pkgfile) = 4ec88ae2aa19dd45e5dff0f97bca23a404802bed47b3d3b92729ed16606500ca
 SHA256 (.footprint) = ec2f24969ad72c3f91a95252ce54ba6636f296e6ac8f9aa1c2a40346a44b9385
 SHA256 (xournalpp-1.2.2.tar.gz) = b873ea4e2beadc3061fab87faef31c374ae7876c88dbda5565c491945cf7290f
diff --git a/xournalpp/Pkgfile b/xournalpp/Pkgfile
index 4b5ff88..615fdfc 100644
--- a/xournalpp/Pkgfile
+++ b/xournalpp/Pkgfile
@@ -1,7 +1,7 @@
 # Description: notetaking and PDF annotation software
 # URL: https://github.com/xournalpp/xournalpp
 # Maintainer: John McQuah, jmcquah at disroot dot org
-# Depends on: adwaita-icon-theme gtksourceview libsndfile libzip lua poppler-glib portaudio-cpp
+# Depends on: gtksourceview libsndfile libzip lua poppler portaudio-cpp
 # Optional: gpgme texlive
 
 name=xournalpp
@@ -10,6 +10,10 @@ release=1
 source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz)
 
 build() {
+    # fail the build if dependencies are not met
+    [ -e /usr/include/poppler/glib/poppler.h ] || \
+    { echo "Rebuild poppler with glib present; otherwise xournalpp will not work."; exit 1; }
+
     cmake -S $name-$version -B build -G Ninja \
           -DCMAKE_INSTALL_PREFIX="/usr" \
           -DCMAKE_C_FLAGS="$CFLAGS" \