drive by fixes and improvements...good grief

4 files changed, 26 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b25c930c0e59..8d24ea93447f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = tlpui
 	pkgdesc = A GTK user interface for TLP written in Python
 	pkgver = 1.6.0
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/d4nj1/TLPUI
 	arch = any
 	license = GPL2
+	makedepends = python-build
+	makedepends = python-installer
 	makedepends = python-setuptools
+	makedepends = python-wheel
 	depends = tlp
 	depends = python-gobject
-	source = tlpui-1.6.0.zip::https://github.com/d4nj1/TLPUI/archive/tlpui-1.6.0.zip
-	source = tlpui.desktop
-	sha256sums = ba4dcaf655d01477169c32005b92c68776b00b65ac045d1e163d8c21929bf421
-	sha256sums = fbf9e4b92bff5c92f5ced1ee1b155110b32cd128e5f066260d8dc6cea163c4af
+	source = https://github.com/d4nj1/TLPUI/archive/refs/tags/tlpui-1.6.0.tar.gz
+	sha256sums = f1b2cd69cb25f59ce973ee8411e51ded45032d289ec8f6f62ccbb45919d16b86
 
 pkgname = tlpui
diff --git a/.gitignore b/.gitignore
index 63f5c67588b5..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,3 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
-!tlpui.desktop
diff --git a/PKGBUILD b/PKGBUILD
index c50203771493..006e18017c01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,36 @@
-# Maintainer: HelloImWar <helloimwar at proton dot me>
-# Original Maintainer : Yamada Hayao <hayao@fascode.net>
-# Contributor: Mark Wagie <mark dot wagie at tutanota dot com>
+# Maintainer: 
+# Contributer: HelloImWar <helloimwar at proton dot me>
+# Contributer: Yamada Hayao <hayao@fascode.net>
+# Contributor: Mark Wagie <mark dot wagie at proton dot me>
 # Contributor: slact
 
-# BEGIN AUTOMATICALLY UPDATED SECTION
-_tlpui_ver=1.6.0
-_pkgrel=1
-_sha256=ba4dcaf655d01477169c32005b92c68776b00b65ac045d1e163d8c21929bf421
-# END AUTOMATICALLY UPDATED SECTION
-
 pkgname=tlpui
-pkgver="$(tr "-" "." <<< "${_tlpui_ver}")"
-pkgrel=${_pkgrel}
+pkgver=1.6.0
+pkgrel=2
 epoch=1
 pkgdesc="A GTK user interface for TLP written in Python"
 arch=('any')
 url="https://github.com/d4nj1/TLPUI"
 license=('GPL2')
 depends=('tlp' 'python-gobject')
-makedepends=('python-setuptools')
-source=(
-    "tlpui-${_tlpui_ver}.zip::https://github.com/d4nj1/TLPUI/archive/tlpui-${_tlpui_ver}.zip"
-    "${pkgname}.desktop"
-)
-sha256sums=(${_sha256}
-            'fbf9e4b92bff5c92f5ced1ee1b155110b32cd128e5f066260d8dc6cea163c4af')
+makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel')
+source=("https://github.com/d4nj1/TLPUI/archive/refs/tags/$pkgname-$pkgver.tar.gz")
+sha256sums=('f1b2cd69cb25f59ce973ee8411e51ded45032d289ec8f6f62ccbb45919d16b86')
 
 build() {
-    cd "${srcdir}/TLPUI-tlpui-${_tlpui_ver}"
-    python ./setup.py build
+  cd "TLPUI-$pkgname-$pkgver"
+  python -m build --wheel --no-isolation
 }
 
 package() {
-    cd "${srcdir}/TLPUI-tlpui-${_tlpui_ver}"
-    export PYTHONHASHSEED=0
-    python setup.py install --root="${pkgdir}/" --optimize=1 --skip-build
+  cd "TLPUI-$pkgname-$pkgver"
+  python -m installer --destdir="$pkgdir" dist/*.whl
+
+  for i in 16 32 48 64 128 96 128 256; do
+    install -Dm644 "$pkgname/icons/themeable/hicolor/${i}x${i}/apps/$pkgname.png" -t \
+      "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/"
+  done
 
-    install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+  install -Dm644 "$pkgname/icons/themeable/hicolor/scalable/apps/$pkgname.svg" -t \
+    "$pkgdir/usr/share/icons/hicolor/scalable/apps/"
 }
diff --git a/tlpui.desktop b/tlpui.desktop
deleted file mode 100644
index 26b5f86e97bd..000000000000
--- a/tlpui.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=TLP UI
-Name[de_DE]=TLP UI
-Name[ja_JP]=TLP UI
-Name[pt_BR]=TLP UI
-Name[zh_CN]=TLP 设置
-Exec=/usr/bin/tlpui
-Terminal=false
-Type=Application
-Icon=preferences-system-power-management
-Comment=Tlp UI with gtk
-Comment[de_DE]=Tlp UI mit Gtk
-Comment[ja_JP]=GtkによるTlp UI
-Comment[pt_BR]=Tlp UI com gtk
-Comment[zh_CN]=TLP 的 Gtk 设置界面
-Categories=Settings;HardwareSettings;GTK;