Update to meson

2 files changed, 7 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bebde76232d8..b21d543e4ba2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = tubefeeder-git
 	pkgdesc = A Youtube, Lbry and Peertube client made for the Pinephone
-	pkgver = 1.8.3.r1.a9926c2
+	pkgver = 1.8.5.r2.9a0f55a
 	pkgrel = 1
 	url = https://www.tubefeeder.de
 	arch = x86_64
@@ -8,6 +8,7 @@ pkgbase = tubefeeder-git
 	license = GPL
 	makedepends = git
 	makedepends = cargo
+	makedepends = meson
 	depends = libadwaita
 	optdepends = mpv: Play the videos,
 	optdepends = youtube-dl: Play and download the videos
diff --git a/PKGBUILD b/PKGBUILD
index e13a033b4793..ad663e9abd22 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Julian Schmidhuber <aur at schmiddi dot anonaddy dot com>
 pkgname=tubefeeder-git
-pkgver=1.8.3.r1.a9926c2
+pkgver=1.8.5.r2.9a0f55a
 pkgrel=1
 pkgdesc="A Youtube, Lbry and Peertube client made for the Pinephone"
 arch=('x86_64' 'aarch64')
@@ -9,7 +9,7 @@ license=('GPL')
 groups=()
 depends=('libadwaita')
 optdepends=('mpv: Play the videos', 'youtube-dl: Play and download the videos')
-makedepends=('git' 'cargo')
+makedepends=('git' 'cargo' 'meson')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 replaces=()
@@ -25,30 +25,11 @@ pkgver() {
 	printf "%s" "$(git describe --long --tags | sed 's/^v//;s/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
-prepare() {
-	cd "$srcdir/${pkgname}"
-        cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-}
-
 build() {
-	cd "$srcdir/${pkgname}"
-        export RUSTUP_TOOLCHAIN=stable
-        export CARGO_TARGET_DIR=target
-        cargo build --frozen --release --all-features
+        arch-meson $pkgname build
+        meson compile -C build
 }
 
 package() {
-	cd "$srcdir/${pkgname}"
-        # Binary
-        install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/tubefeeder"
-        # Desktop-file
-        sed -i 's_/app/bin/tubefeeder_/usr/bin/tubefeeder_' packaging/de.schmidhuberj.tubefeeder.desktop
-        install -D packaging/de.schmidhuberj.tubefeeder.desktop $pkgdir/usr/share/applications/de.schmidhuberj.tubefeeder.desktop
-        # Icon
-        install -D packaging/de.schmidhuberj.tubefeeder.512.png $pkgdir/usr/share/icons/hicolor/512x512/apps/de.schmidhuberj.tubefeeder.png
-        install -D packaging/de.schmidhuberj.tubefeeder.svg $pkgdir/usr/share/icons/hicolor/scalable/apps/de.schmidhuberj.tubefeeder.png
-        install -D packaging/de.schmidhuberj.tubefeeder.symbolic.svg $pkgdir/usr/share/icons/hicolor/symbolic/apps/de.schmidhuberj.tubefeeder-symbolic.png
-
-        # Localization
-        ls -ld po/locale/*/ | sed 's|.*po/locale/||' | xargs -I % install -D "po/locale/%LC_MESSAGES/de.schmidhuberj.tubefeeder.mo" "$pkgdir/usr/share/locale/%LC_MESSAGES/de.schmidhuberj.tubefeeder.mo"
+        meson install -C build --destdir "$pkgdir"
 }