From 2bed3481330aa3b59f1a016d332af9ae0795bed0 Mon Sep 17 00:00:00 2001
From: John McQuah <jquah@mx.sdf.org>
Date: Thu, 16 Feb 2023 11:30:50 -0500
Subject: [PATCH] xournalpp: fix dependencies, remove unused cmake variable

---
 REPO                 |  6 +++---
 xournalpp/.footprint |  4 ++++
 xournalpp/.signature |  8 ++++----
 xournalpp/Pkgfile    | 18 +++++++-----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/REPO b/REPO
index 713d6be..2d91774 100644
--- a/REPO
+++ b/REPO
@@ -93,9 +93,9 @@ f:25ab755226086d18a17cb559b05cf95b:python3-pytimeparse/.footprint
 f:5dfd8b6ecf48dd828832736ba201e405:python3-slugify/.signature
 f:0229bfc92b64c4d2b2dc9203b6629290:python3-slugify/Pkgfile
 f:def7da684fd9aff8165f99388839fe06:python3-slugify/.footprint
-f:5a984aa5603b9a174633a58cea4ec43e:xournalpp/.signature
-f:4ec8b05be8a281522931a7f84302bfb9:xournalpp/Pkgfile
-f:276fc4ac025642b34588418a6859271f:xournalpp/.footprint
+f:b51b824843c3306871f6e0c61c520880:xournalpp/.signature
+f:8c8ed7c6e205b18f84aaca47e33e4fdc:xournalpp/Pkgfile
+f:19d67e9e73085351403b8ccde6ce43f9:xournalpp/.footprint
 f:b4876d82493de47a71ef1562e613539d:texlive-base/README
 f:85d9a28badf0967c2b3a29aa5a320e4f:texlive-base/tabu.sty.diff
 f:7e9ff4f40b0bc62c09212445b7392bf4:texlive-base/.signature
diff --git a/xournalpp/.footprint b/xournalpp/.footprint
index e2bb764..4149e50 100644
--- a/xournalpp/.footprint
+++ b/xournalpp/.footprint
@@ -16,6 +16,10 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/mimetypes/application-x-xopt.svg
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopp.svg
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopt.svg
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/xournalpp-thumbnailer.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/xournalpp.1.gz
 drwxr-xr-x	root/root	usr/share/metainfo/
 -rw-r--r--	root/root	usr/share/metainfo/com.github.xournalpp.xournalpp.appdata.xml
 drwxr-xr-x	root/root	usr/share/mime/
diff --git a/xournalpp/.signature b/xournalpp/.signature
index 7a210d8..09e6c57 100644
--- a/xournalpp/.signature
+++ b/xournalpp/.signature
@@ -1,5 +1,5 @@
-untrusted comment: verify with /etc/ports/jmq.pub
-RWTTPlFarK9CxO65F+3rIkSRaClVXvkz7/IgNmWu2M00YTIdBVpaVzFshwBravXZKSIyj9ePzDpeQj/i4TAK1gxlED4HYjYMoAc=
-SHA256 (Pkgfile) = 04200f501389737781187063b0c34260eb62413b54f3d7d32a211175d16f542b
-SHA256 (.footprint) = 4fd5990fe3884fe2e3e851a4a5de7be6bd37ffce7ff3aa233748b043cdce6ba9
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF38D5b0VixedRBGEYfdY94rsTUo3cLB0rw0BmrD08UM9bCTjaDgrsmDdFKCEac+uxje5U322IJU5nLL1FVhdyKgw=
+SHA256 (Pkgfile) = b0f172681e64cbc2bbccc2d670a3580ae33abbd9f288bd89aa5e7db17b0c10f5
+SHA256 (.footprint) = 71f99cd223acbdd5052113ce3a15723e195661f165aae9fa878a6804e3f5be20
 SHA256 (xournalpp-1.1.3.tar.gz) = 5021c7a8f53687edb3a759e079c54d23d5918d83f8d1f5fcd08a1da2ce81bd8b
diff --git a/xournalpp/Pkgfile b/xournalpp/Pkgfile
index 9d9e175..be9b652 100644
--- a/xournalpp/Pkgfile
+++ b/xournalpp/Pkgfile
@@ -1,30 +1,26 @@
 # 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 cppunit libsndfile libzip lua53 poppler-glib portaudio
-# Nice to have: libungif texlive
+# Depends on: adwaita-icon-theme cppunit librsvg libsndfile libzip lua53 poppler-glib portaudio
+# Optional: libungif texlive
 
 name=xournalpp
 version=1.1.3
 release=1
-source=(https://github.com/$name/$name/archive/refs/tags/v${version}.tar.gz)
-renames=($name-$version.tar.gz)
+source=(https://github.com/$name/$name/archive/v$version/$name-$version.tar.gz)
 
 build() {
     cd $name-$version
+
     mkdir build && cd build
-    if [ -z "$XDG_CONFIG_HOME" ]; then
-            configdir=".config"
-    else
-            configdir="$(realpath --relative-to="$HOME" "$XDG_CONFIG_HOME")"
-    fi
     cmake -DCMAKE_INSTALL_PREFIX="/usr/" \
-          -DDEV_CONFIG_DIR="$configdir/xournalpp" \
           -DCMAKE_C_FLAGS="$CFLAGS" \
           -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
           -DENABLE_CPPUNIT=ON -DCMAKE_BUILD_TYPE=Release ..
+
     cmake --build .
     make DESTDIR=$PKG install
+
     rm -rf $PKG/usr/share/locale
-    find $PKG -name README.md -exec rm -f '{}' +
+    find $PKG -name README.md -delete
 }