0.6.1

2 files changed, 22 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2929fcc1772..cd63ccad89c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,25 @@
 pkgbase = universal-android-debloater
 	pkgdesc = Cross-platform GUI written in Rust using ADB to debloat non-rooted Android devices
-	pkgver = 0.5.1
+	pkgver = 0.6.1
 	pkgrel = 1
-	url = https://github.com/0x192/universal-android-debloater
+	url = https://github.com/Universal-Debloater-Alliance/universal-android-debloater
 	arch = x86_64
 	license = GPL3
-	makedepends = cargo-nightly
-	makedepends = libxkbcommon
-	makedepends = lld
+	makedepends = cargo
+	makedepends = clang
+	makedepends = cmake
+	makedepends = mold
 	depends = android-tools
+	depends = fontconfig
 	depends = gcc-libs
 	options = !lto
-	source = universal-android-debloater-0.5.1.tar.gz::https://github.com/0x192/universal-android-debloater/archive/refs/tags/0.5.1.tar.gz
+	source = universal-android-debloater-0.6.1.tar.gz::https://github.com/Universal-Debloater-Alliance/universal-android-debloater/archive/refs/tags/0.6.1.tar.gz
 	source = uad_gui.desktop
-	sha256sums = 372418918913cd068fe3caabefce4f9a378e9705e86afee6eb112d71518633f1
+	sha256sums = 19d29d684c87050c652beed4055e71577cd60325cebd23294c94877d9e999bd7
 	sha256sums = e55f259fab5e09d6e91412dbfa74859f609615606422b0e3c937cc774eaedbf3
 
 pkgname = universal-android-debloater
+	pkgdesc = Cross-platform GUI written in Rust using ADB to debloat non-rooted Android devices (Vulkan renderer)
 
 pkgname = universal-android-debloater-opengl
 	pkgdesc = Cross-platform GUI written in Rust using ADB to debloat non-rooted Android devices (OpenGL renderer)
diff --git a/PKGBUILD b/PKGBUILD
index 7f5106087e21..eb61cd4625df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,44 @@
 # Maintainer: Mark Wagie <mark dot wagie at proton dot me>
 pkgname=('universal-android-debloater' 'universal-android-debloater-opengl')
 pkgbase=universal-android-debloater
-pkgver=0.5.1
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="Cross-platform GUI written in Rust using ADB to debloat non-rooted Android devices"
 arch=('x86_64')
-url="https://github.com/0x192/universal-android-debloater"
+url="https://github.com/Universal-Debloater-Alliance/universal-android-debloater"
 license=('GPL3')
-depends=('android-tools' 'gcc-libs')
-makedepends=('cargo-nightly' 'libxkbcommon' 'lld')
+depends=('android-tools' 'fontconfig' 'gcc-libs')
+makedepends=('cargo' 'clang' 'cmake' 'mold')
 source=("$pkgbase-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
         'uad_gui.desktop')
 options=('!lto')
-sha256sums=('372418918913cd068fe3caabefce4f9a378e9705e86afee6eb112d71518633f1'
+sha256sums=('19d29d684c87050c652beed4055e71577cd60325cebd23294c94877d9e999bd7'
             'e55f259fab5e09d6e91412dbfa74859f609615606422b0e3c937cc774eaedbf3')
 
 prepare() {
   cd "$pkgbase-$pkgver"
   export CARGO_HOME="$srcdir/cargo-home"
-  export RUSTUP_TOOLCHAIN=nightly
-  cargo fetch --target "$CARCH-unknown-linux-gnu"
+  export RUSTUP_TOOLCHAIN=stable
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
 }
 
 build() {
   cd "$pkgbase-$pkgver"
   export CARGO_HOME="$srcdir/cargo-home"
-  export RUSTUP_TOOLCHAIN=nightly
+  export RUSTUP_TOOLCHAIN=stable
   export CARGO_TARGET_DIR=target
-  export RUSTFLAGS="-C link-arg=-fuse-ld=lld"
 
   # OpenGL
-  cargo build --release --no-default-features --features glow,no-self-update
+  cargo build --frozen --release --no-default-features --features glow,no-self-update
   mv target/release/uad_gui target/release/uad_gui-opengl
 
   # Vulkan
-  cargo build --release --no-default-features --features wgpu,no-self-update
+  cargo build --frozen --release --no-default-features --features wgpu,no-self-update
 }
 
 package_universal-android-debloater() {
+  pkgdesc+=" (Vulkan renderer)"
+
   cd "$pkgbase-$pkgver"
   install -Dm755 target/release/uad_gui -t "$pkgdir/usr/bin/"
   install -Dm644 "$srcdir/uad_gui.desktop" -t "$pkgdir/usr/share/applications/"