OpenSSL 3.0 rebuild + upstream fixes

2 files changed, 18 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75408e61336d..90b3b1fb50d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = geopard
 	pkgdesc = Colorful, adaptive gemini browser
-	pkgver = 1.3.0
+	pkgver = 1.3.0+10+g8481743
 	pkgrel = 1
 	url = https://ranfdev.com/projects/Geopard
 	arch = x86_64
@@ -9,10 +9,12 @@ pkgbase = geopard
 	checkdepends = appstream-glib
 	makedepends = blueprint-compiler
 	makedepends = cargo
+	makedepends = git
 	makedepends = gobject-introspection
 	makedepends = meson
 	depends = libadwaita
-	source = geopard-1.3.0.tar.gz::https://github.com/ranfdev/Geopard/archive/refs/tags/v1.3.0.tar.gz
-	sha256sums = e23c77767d2579b72b2ce2f74c1782a0f0a0b9564f7d9b4aad15dd9190734cc2
+	depends = python-gobject
+	source = git+https://github.com/ranfdev/Geopard.git#commit=848174316d39bee3aec2fb156757bf49a0de6499
+	sha256sums = SKIP
 
 pkgname = geopard
diff --git a/PKGBUILD b/PKGBUILD
index b2c821898168..1417b2adab80 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,32 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=geopard
-pkgver=1.3.0
+pkgver=1.3.0+10+g8481743
 pkgrel=1
 pkgdesc="Colorful, adaptive gemini browser"
 arch=('x86_64' 'aarch64')
 url="https://ranfdev.com/projects/Geopard"
 license=('GPL3')
-depends=('libadwaita')
-makedepends=('blueprint-compiler' 'cargo' 'gobject-introspection' 'meson')
+depends=('libadwaita' 'python-gobject')
+makedepends=('blueprint-compiler' 'cargo' 'git' 'gobject-introspection' 'meson')
 checkdepends=('appstream-glib')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/ranfdev/Geopard/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('e23c77767d2579b72b2ce2f74c1782a0f0a0b9564f7d9b4aad15dd9190734cc2')
+_commit=848174316d39bee3aec2fb156757bf49a0de6499
+source=("git+https://github.com/ranfdev/Geopard.git#commit=$_commit")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd "$srcdir/Geopard"
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
 
 prepare() {
-  cd "Geopard-$pkgver"
+  cd "$srcdir/Geopard"
   export RUSTUP_TOOLCHAIN=stable
   cargo fetch --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
   export RUSTUP_TOOLCHAIN=stable
-  arch-meson "Geopard-$pkgver" build
+  arch-meson Geopard build
   meson compile -C build
 }