Complete overhaul of the PKGBUILD Dependecies, Build and Install sections + Updated to the latest upstream version to 0.2.4 - GIT

2 files changed, 52 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6d98f7a944d..c4cc57a04166 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,33 @@
 pkgbase = koi-git
-	pkgdesc = Switch between light and dark themes on KDE Plasma
-	pkgver = 0.2.3.r6.g386c0fe
+	pkgdesc = Scheduled LIGHT/DARK Theme Switching for the KDE Plasma Desktop
+	pkgver = r163.eae87d1
 	pkgrel = 1
 	url = https://github.com/baduhai/Koi
 	arch = x86_64
 	arch = aarch64
 	license = LGPL3
-	makedepends = qt5-base
 	makedepends = git
+	makedepends = glibc
+	makedepends = qt5-base
+	makedepends = qt5-tools
+	makedepends = qt5-svg
+	makedepends = cmake
 	makedepends = extra-cmake-modules
-	depends = kconfig
-	depends = kcoreaddons
-	depends = kwidgetsaddons
-	depends = kpackage
+	depends = plasma-desktop
+	depends = plasma-integration
+	depends = plasma-framework5
+	depends = kcoreaddons5
+	depends = kconfig5
+	depends = kwidgetsaddons5
+	depends = kwindowsystem5
+	depends = kconfigwidgets5
+	depends = kxmlgui5
+	depends = kpackage5
 	depends = hicolor-icon-theme
 	optdepends = xsettingsd: Apply settings to GTK applications on the fly
-	provides = koi
 	conflicts = koi
-	source = koi-git::git+https://github.com/baduhai/Koi.git
-	md5sums = SKIP
+	options = !strip
+	source = Koi::git+https://github.com/baduhai/Koi.git
+	sha256sums = SKIP
 
 pkgname = koi-git
diff --git a/PKGBUILD b/PKGBUILD
index 6af9ccb7bd9b..23dda3f493a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,51 @@
-# Maintainer: Gabriel Guldner <gabriel at guldner dot eu>
-
-# Contributor: William Franco Abdul Hai <williamhai at hotmail dot com>
+# Author: William Franco Abdul Hai <williamhai@hotmail.com>
+# Contributor: Martin Stibor <martin.von.reichenberg@protonmail.com>
+# Maintainer: Martin Stibor <martin.von.reichenberg@protonmail.com>
 
 pkgname='koi-git'
 _pkgname='koi'
-pkgver=0.2.3.r6.g386c0fe
+__pkgname='Koi'
+pkgver=r163.eae87d1
 pkgrel=1
-pkgdesc="Switch between light and dark themes on KDE Plasma"
+pkgdesc="Scheduled LIGHT/DARK Theme Switching for the KDE Plasma Desktop"
 arch=('x86_64' 'aarch64')
 url="https://github.com/baduhai/Koi"
 license=('LGPL3')
-depends=('kconfig' 'kcoreaddons' 'kwidgetsaddons' 'kpackage' 'hicolor-icon-theme')
-makedepends=('qt5-base' 'git' 'extra-cmake-modules')
+depends=('plasma-desktop' 'plasma-integration' 'plasma-framework5' 'kcoreaddons5' 'kconfig5'
+         'kwidgetsaddons5' 'kwindowsystem5' 'kconfigwidgets5' 'kxmlgui5' 'kpackage5' 'hicolor-icon-theme')
+makedepends=('git' 'glibc' 'qt5-base' 'qt5-tools' 'qt5-svg' 'cmake' 'extra-cmake-modules')
 optdepends=('xsettingsd: Apply settings to GTK applications on the fly')
-provides=($_pkgname)
-conflicts=($_pkgname)
-source=("$pkgname::git+https://github.com/baduhai/Koi.git")
-md5sums=('SKIP')
+conflicts=('koi')
+source=("${__pkgname}::git+https://github.com/baduhai/Koi.git")
+sha256sums=('SKIP')
+options=('!strip')
+
 
 pkgver() {
-    cd "$srcdir/$pkgname"
-    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd "${srcdir}/${__pkgname}"
+  ( set -o pipefail
+    git describe --long --abbrev=7 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//g' ||
+
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short=7 HEAD)"
+  )
 }
 
 build() {
-	cd "$srcdir/$pkgname/src"
-    mkdir -p build && cd build
+    mkdir -p "${srcdir}/${__pkgname}/src/build/"
 
-    cmake \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    ..
+    cmake -S "${srcdir}/${__pkgname}/src/" \
+          -B "${srcdir}/${__pkgname}/src/build/" \
+          -DCMAKE_INSTALL_PREFIX=/usr/
 
-    make
+    cd "${srcdir}/${__pkgname}/src/build/"
+
+    make all
 }
 
 package() {
-    cd "$srcdir/$pkgname/src/build"
-    make DESTDIR="$pkgdir" install
+    cd "${srcdir}/${__pkgname}/src/build/"
+
+    make DESTDIR="${pkgdir}" install all
+
+    install -Dm644 "${srcdir}/${__pkgname}/src/koi.desktop" -t "${pkgdir}/usr/share/applications/"
 }