Make similar to -git version and implement suggestion of ItachiSan

2 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c48dbfb5a6b1..7976b26a5e39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,19 @@
 pkgbase = koi
 	pkgdesc = Switch between light and dark themes on KDE Plasma
 	pkgver = 0.2.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/baduhai/Koi
 	arch = x86_64
 	arch = aarch64
 	license = LGPL3
 	makedepends = qt5-base
-	depends = plasma-desktop
+	makedepends = extra-cmake-modules
 	depends = kconfig
 	depends = kcoreaddons
 	depends = kwidgetsaddons
+	depends = kpackage
+	depends = hicolor-icon-theme
+	optdepends = xsettingsd: Apply settings to GTK applications on the fly
 	source = https://github.com/baduhai/Koi/archive/0.2.3.tar.gz
 	sha256sums = 811f6bdaa8146f0da6103742816cc48f571d344d2cd8cd9ac2448ca518825e32
 
diff --git a/PKGBUILD b/PKGBUILD
index 75af04f0cf20..4c99644a4e38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@
 
 pkgname='koi'
 pkgver=0.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Switch between light and dark themes on KDE Plasma"
 arch=('x86_64' 'aarch64')
 url="https://github.com/baduhai/Koi"
 license=('LGPL3')
-depends=('plasma-desktop' 'kconfig' 'kcoreaddons' 'kwidgetsaddons')
-makedepends=('qt5-base')
+depends=('kconfig' 'kcoreaddons' 'kwidgetsaddons' 'kpackage' 'hicolor-icon-theme')
+makedepends=('qt5-base' 'extra-cmake-modules')
+optdepends=('xsettingsd: Apply settings to GTK applications on the fly')
 source=("https://github.com/baduhai/Koi/archive/$pkgver.tar.gz")
 sha256sums=('811f6bdaa8146f0da6103742816cc48f571d344d2cd8cd9ac2448ca518825e32')
 
@@ -26,9 +27,6 @@ build() {
 }
 
 package() {
-    cd "Koi-$pkgver"
-    install -D "src/build/bin/koi" "$pkgdir/usr/bin/koi"
-    install -Dm644 "src/koi.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-    install -Dm644 "src/resources/icons/koi.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
-    install -Dm644 "src/resources/icons/koi_tray.svg" "$pkgdir/usr/share/icons/hicolor/scalable/apps/${pkgname}_tray.svg"
+    cd "Koi-$pkgver/src/build"
+    make DESTDIR="$pkgdir" install
 }