1.0.0

5 files changed, 60 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f93c1b2634f..a146cda250a4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = universal-android-debloater
 	pkgdesc = Cross-platform GUI written in Rust using ADB to debloat non-rooted Android devices
-	pkgver = 0.6.2
+	pkgver = 1.0.0
 	pkgrel = 1
 	url = https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation
 	arch = x86_64
@@ -10,18 +10,15 @@ pkgbase = universal-android-debloater
 	makedepends = cmake
 	makedepends = mold
 	depends = android-tools
-	depends = fontconfig
 	depends = gcc-libs
+	conflicts = universal-android-debloater-opengl
+	replaces = universal-android-debloater-opengl
 	options = !lto
-	source = universal-android-debloater-0.6.2.tar.gz::https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/archive/refs/tags/0.6.2.tar.gz
-	source = uad_gui.desktop
-	sha256sums = 8af51ed4f6c6038c97a9fd637bbd887a8666f12c90fe3ba8d1185ba74e7aab1f
-	sha256sums = e55f259fab5e09d6e91412dbfa74859f609615606422b0e3c937cc774eaedbf3
+	source = universal-android-debloater-1.0.0.tar.gz::https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation/archive/refs/tags/v1.0.0.tar.gz
+	source = uad-ng.desktop
+	source = version.patch
+	sha256sums = b2f5598ed0aa8b9296b7c23e3cfd1e19ba03a7328c33f19ec80aba2f3f7b99d8
+	sha256sums = 8d5d790fffd35101af340792d081f8f75b61b1579bc8f89acab818f03f1071ea
+	sha256sums = a98d580b058057b513178c90a71bf858b679e854d358b7376ca603cf25898c65
 
 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)
-	provides = universal-android-debloater
-	conflicts = universal-android-debloater
diff --git a/.gitignore b/.gitignore
index 3e5f927b10b7..c3cad637de48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!uad_gui.desktop
+!uad-ng.desktop
+!version.patch
diff --git a/PKGBUILD b/PKGBUILD
index 045ca8fa9818..ca701f117aa7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,55 +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.6.2
+pkgname=universal-android-debloater
+pkgver=1.0.0
 pkgrel=1
 pkgdesc="Cross-platform GUI written in Rust using ADB to debloat non-rooted Android devices"
 arch=('x86_64')
 url="https://github.com/Universal-Debloater-Alliance/universal-android-debloater-next-generation"
 license=('GPL-3.0-or-later')
-depends=('android-tools' 'fontconfig' 'gcc-libs')
+depends=('android-tools' 'gcc-libs')
 makedepends=('cargo' 'clang' 'cmake' 'mold')
-source=("$pkgbase-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-        'uad_gui.desktop')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
+        'uad-ng.desktop'
+        'version.patch')
+conflicts=('universal-android-debloater-opengl')
+replaces=('universal-android-debloater-opengl')
 options=('!lto')
-sha256sums=('8af51ed4f6c6038c97a9fd637bbd887a8666f12c90fe3ba8d1185ba74e7aab1f'
-            'e55f259fab5e09d6e91412dbfa74859f609615606422b0e3c937cc774eaedbf3')
+sha256sums=('b2f5598ed0aa8b9296b7c23e3cfd1e19ba03a7328c33f19ec80aba2f3f7b99d8'
+            '8d5d790fffd35101af340792d081f8f75b61b1579bc8f89acab818f03f1071ea'
+            'a98d580b058057b513178c90a71bf858b679e854d358b7376ca603cf25898c65')
 
 prepare() {
-  cd "$pkgbase-next-generation-$pkgver"
+  cd "$pkgname-next-generation-$pkgver"
   export CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=stable
-  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+  cargo fetch --target "$CARCH-unknown-linux-gnu"
+
+  # correct version
+  patch -Np1 -i ../version.patch
 }
 
 build() {
-  cd "$pkgbase-next-generation-$pkgver"
+  cd "$pkgname-next-generation-$pkgver"
   export CARGO_HOME="$srcdir/cargo-home"
   export RUSTUP_TOOLCHAIN=stable
   export CARGO_TARGET_DIR=target
-
-  # OpenGL
-  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 --frozen --release --no-default-features --features wgpu,no-self-update
+  cargo build --release --no-default-features --features wgpu,no-self-update
 }
 
-package_universal-android-debloater() {
-  pkgdesc+=" (Vulkan renderer)"
-
-  cd "$pkgbase-next-generation-$pkgver"
-  install -Dm755 target/release/uad_gui -t "$pkgdir/usr/bin/"
-  install -Dm644 "$srcdir/uad_gui.desktop" -t "$pkgdir/usr/share/applications/"
-}
-
-package_universal-android-debloater-opengl() {
-  pkgdesc+=" (OpenGL renderer)"
-  provides=("$pkgbase")
-  conflicts=("$pkgbase")
-
-  cd "$pkgbase-next-generation-$pkgver"
-  install -Dm755 target/release/uad_gui-opengl "$pkgdir/usr/bin/uad_gui"
-  install -Dm644 "$srcdir/uad_gui.desktop" -t "$pkgdir/usr/share/applications/"
+package() {
+  cd "$pkgname-next-generation-$pkgver"
+  install -Dm755 target/release/uad-ng -t "$pkgdir/usr/bin/"
+  install -Dm644 resources/assets/logo.png "$pkgdir/usr/share/pixmaps/uad-ng.png"
+  install -Dm644 "$srcdir/uad-ng.desktop" -t "$pkgdir/usr/share/applications/"
 }
diff --git a/uad_gui.desktop b/uad-ng.desktop
index b4d86bb5801c..e7cce3db67f3 100755
--- a/uad_gui.desktop
+++ b/uad-ng.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
-Icon=android-sdk
+Icon=uad-ng
 Name=Universal Android Debloater
-Exec=uad_gui
+Exec=uad-ng
 Terminal=false
 Hidden=false
 Categories=Development; Utility
diff --git a/version.patch b/version.patch
new file mode 100644
index 000000000000..f597685ce626
--- /dev/null
+++ b/version.patch
@@ -0,0 +1,24 @@
+diff --unified --recursive --text a/Cargo.lock b/Cargo.lock
+--- a/Cargo.lock	2024-02-06 15:53:49.000000000 -0700
++++ b/Cargo.lock	2024-02-10 15:55:36.627216650 -0700
+@@ -2708,7 +2708,7 @@
+ 
+ [[package]]
+ name = "uad-ng"
+-version = "0.6.2"
++version = "1.0.0"
+ dependencies = [
+  "chrono",
+  "dirs",
+diff --unified --recursive --text a/Cargo.toml b/Cargo.toml
+--- a/Cargo.toml	2024-02-06 15:53:49.000000000 -0700
++++ b/Cargo.toml	2024-02-10 15:55:14.530830096 -0700
+@@ -1,7 +1,7 @@
+ [package]
+ name = "uad-ng"
+ description = "A cross-platform GUI debloater for android devices"
+-version = "0.6.2"
++version = "1.0.0"
+ authors = ["Universal-Debloater-Alliance"]
+ license = "GPL-3.0"
+ homepage = "https://github.com/Universal-Debloater-Alliance/universal-android-debloater"