upstream fix: added support for libadwaita 1 alpha 3

2 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ffa3929ff8be..12e9faa2817c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = hydrapaper
 	pkgdesc = A Gtk utility to set different backgrounds for each monitor on GNOME
-	pkgver = 3.1.0
+	pkgver = 3.1.0+1+g290d4e2
 	pkgrel = 1
 	url = https://hydrapaper.gabmus.org
 	arch = any
 	license = GPL3
 	checkdepends = appstream
+	makedepends = git
 	makedepends = gobject-introspection
 	makedepends = meson
 	makedepends = pandoc
 	depends = gtk4
 	depends = libadwaita
-	depends = python-dbus
+	depends = dbus-python
 	depends = python-gobject
 	depends = python-pillow
-	source = https://gitlab.gnome.org/GabMus/HydraPaper/-/archive/3.1.0/HydraPaper-3.1.0.tar.gz
-	sha256sums = fc69f1fa934743f1ee1f823248d9bfaaa2ced4af65176f9852bc5278bcb5a469
+	source = git+https://gitlab.gnome.org/GabMus/HydraPaper.git#commit=290d4e2ff81afe6d7188643a9daf44fc91d5f316
+	sha256sums = SKIP
 
 pkgname = hydrapaper
diff --git a/PKGBUILD b/PKGBUILD
index ac96b43e1940..aca08d4d99ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,26 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=hydrapaper
-pkgver=3.1.0
+pkgver=3.1.0+1+g290d4e2
 pkgrel=1
 pkgdesc="A Gtk utility to set different backgrounds for each monitor on GNOME"
 arch=('any')
 url="https://hydrapaper.gabmus.org"
 license=('GPL3')
-depends=('gtk4' 'libadwaita' 'python-dbus' 'python-gobject' 'python-pillow' )
-makedepends=('gobject-introspection' 'meson' 'pandoc')
+depends=('gtk4' 'libadwaita' 'dbus-python' 'python-gobject' 'python-pillow')
+makedepends=('git' 'gobject-introspection' 'meson' 'pandoc')
 checkdepends=('appstream')
-source=("https://gitlab.gnome.org/GabMus/HydraPaper/-/archive/$pkgver/HydraPaper-$pkgver.tar.gz")
-sha256sums=('fc69f1fa934743f1ee1f823248d9bfaaa2ced4af65176f9852bc5278bcb5a469')
+_commit=290d4e2ff81afe6d7188643a9daf44fc91d5f316
+source=("git+https://gitlab.gnome.org/GabMus/HydraPaper.git#commit=$_commit")
+#source=("https://gitlab.gnome.org/GabMus/HydraPaper/-/archive/$pkgver/HydraPaper-$pkgver.tar.gz")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/HydraPaper"
+  git describe --tags | sed 's/-/+/g'
+}
 
 build() {
-  arch-meson HydraPaper-$pkgver build
+  arch-meson HydraPaper build
   meson compile -C build
 }