fix download url; do minor refactor

2 files changed, 15 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1514f2219d89..c0c3c30d1b9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,14 @@
 pkgbase = wlr-randr
 	pkgdesc = Utility to manage outputs of a Wayland compositor
 	pkgver = 0.3.1
-	pkgrel = 1
-	url = https://sr.ht/~emersion/wlr-randr/
+	pkgrel = 2
+	url = https://sr.ht/~emersion/wlr-randr
 	arch = x86_64
 	license = MIT
 	makedepends = meson
 	depends = wayland
-	source = https://git.sr.ht/~emersion/wlr-randr/refs/download/v0.3.1/wlr-randr-0.3.1.tar.gz
-	source = https://git.sr.ht/~emersion/wlr-randr/refs/download/v0.3.1/wlr-randr-0.3.1.tar.gz.sig
+	source = wlr-randr-0.3.1.tar.gz::https://git.sr.ht/~emersion/wlr-randr/archive/v0.3.1.tar.gz
 	validpgpkeys = 34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48
-	sha256sums = 37ef025da9653d327bc7bb46c34294171d64749f5e12a3d08d124a2e81b4a089
-	sha256sums = SKIP
+	sha256sums = 918420f134fc094da0cd9cc5112b65f623abd773964bff5fa57e221204506ab2
 
 pkgname = wlr-randr
diff --git a/PKGBUILD b/PKGBUILD
index c05ed129173b..57f00ac52c40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,24 +5,28 @@
 
 pkgname=wlr-randr
 pkgver=0.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Utility to manage outputs of a Wayland compositor'
 arch=('x86_64')
-url='https://sr.ht/~emersion/wlr-randr/'
+url='https://sr.ht/~emersion/wlr-randr'
+_url='https://git.sr.ht/~emersion/wlr-randr'
 license=('MIT')
 depends=('wayland')
 makedepends=('meson')
-source=("https://git.sr.ht/~emersion/wlr-randr/refs/download/v$pkgver/wlr-randr-$pkgver.tar.gz"{,.sig})
-sha256sums=('37ef025da9653d327bc7bb46c34294171d64749f5e12a3d08d124a2e81b4a089'
-            'SKIP')
+source=("$pkgname-$pkgver.tar.gz::${_url}/archive/v$pkgver.tar.gz")
+sha256sums=('918420f134fc094da0cd9cc5112b65f623abd773964bff5fa57e221204506ab2')
 validpgpkeys=('34FF9526CFEF0E97A340E2E40FDE7BE0E88F5E48')
 
 build() {
-  arch-meson "$pkgname-$pkgver" build
+  cd "$pkgname-v$pkgver"
+
+  arch-meson build
   meson compile -C build
 }
 
 package() {
+  cd "$pkgname-v$pkgver"
+
   meson install -C build --destdir "$pkgdir"
-  install -Dm644 "$pkgname-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }