Updates

2 files changed, 20 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28e1bb9bde20..26fe55546554 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
 pkgbase = avvie-git
 	pkgdesc = A utility for quickly cropping images
-	pkgver = 2.0.r0.g6326118
-	pkgrel = 2
+	pkgver = 2.0.r17.gdcf94d9
+	pkgrel = 1
 	url = https://github.com/Taiko2k/avvie
 	arch = any
 	license = GPL3
+	checkdepends = appstream-glib
 	makedepends = git
+	makedepends = meson
 	depends = libadwaita
 	depends = libnotify
 	depends = python-cairo
@@ -15,8 +17,6 @@ pkgbase = avvie-git
 	provides = avvie
 	conflicts = avvie
 	source = git+https://github.com/Taiko2k/avvie.git
-	source = avvie.sh
 	b2sums = SKIP
-	b2sums = 0b9462efa971eb7d5ffba08cca71bf7f2c522fdf5ccc6bcb4ca66f6aaea7eb1c84d2d2ee8e9be96a58a1f5cfdad407cf39aa0b4842d31587b1aeeff494debbe8
 
 pkgname = avvie-git
diff --git a/PKGBUILD b/PKGBUILD
index 03568c3f363d..97ec9b704bd8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,36 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 
 pkgname=avvie-git
-_app_id=com.github.taiko2k.avvie
-pkgver=2.0.r0.g6326118
-pkgrel=2
+pkgver=2.0.r17.gdcf94d9
+pkgrel=1
 pkgdesc="A utility for quickly cropping images"
 arch=('any')
 url="https://github.com/Taiko2k/avvie"
 license=('GPL3')
 depends=('libadwaita' 'libnotify' 'python-cairo' 'python-gobject' 'python-piexif' 'python-pillow')
-makedepends=('git')
+makedepends=('git' 'meson')
+checkdepends=('appstream-glib')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/Taiko2k/avvie.git'
-        "${pkgname%-git}.sh")
-b2sums=('SKIP'
-        '0b9462efa971eb7d5ffba08cca71bf7f2c522fdf5ccc6bcb4ca66f6aaea7eb1c84d2d2ee8e9be96a58a1f5cfdad407cf39aa0b4842d31587b1aeeff494debbe8')
+source=(git+$url.git)
+b2sums=('SKIP')
+
 
 pkgver() {
   cd "$srcdir/${pkgname%-git}"
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-  cd "$srcdir/${pkgname%-git}"
-  sed -i "s/main.py/${pkgname%-git}/g" "$_app_id.desktop"
+build() {
+  arch-meson "${pkgname%-git}" build
+  meson compile -C build
 }
 
-package() {
-  cd "$srcdir/${pkgname%-git}"
-  install -Dm755 main.py -t "$pkgdir/opt/${pkgname%-git}"
-  install -Dm644 pinku.css -t "$pkgdir/opt/${pkgname%-git}"
-  install -Dm644 "$_app_id.appdata.xml" -t "$pkgdir/usr/share/metainfo"
-  install -Dm644 "$_app_id.desktop" -t "$pkgdir/usr/share/applications"
-  install -Dm644 "$_app_id.svg" -t "$pkgdir/usr/share/icons/hicolor/scalable/apps"
-  install -Dm644 "$_app_id-symbolic.svg" -t "$pkgdir/usr/share/icons/hicolor/symbolic/apps"
-  install -Dm644 icon128.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/$_app_id.png"
-  install -Dm644 icon256.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/$_app_id.png"
-  install -Dm644 image-crop.svg -t "$pkgdir/usr/share/icons/hicolor/scalable/actions"
+check() {
+  meson test -C build
+}
 
-  install -Dm755 "$srcdir/${pkgname%-git}.sh" "$pkgdir/usr/bin/${pkgname%-git}"
+package() {
+  meson install -C build --destdir "$pkgdir"
 }
+