New version & optimized packaging

1 files changed, 14 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 6e6dfbb076fe..7c87eb8dbe58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 HIDE_TRAY_ICON=0
 
 pkgname=kwin-bismuth-bin
-pkgver=2.1.0
-pkgrel=2
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="Addon for KDE Plasma to arrange your windows automatically and switch between them using keyboard shortcuts, like tiling window managers."
 arch=('x86_64')
 url="https://github.com/Bismuth-Forge/bismuth"
@@ -13,26 +13,30 @@ provides=('kwin-bismuth')
 conflicts=('kwin-bismuth')
 options=('!emptydirs')
 
+_archive="bismuth-bin-${pkgver}.tar.gz"
+
 source=(
-    "bismuth-bin-${pkgver}.tar.gz::${url}/releases/download/v${pkgver}/binary-release.tar.gz"
+    "${_archive}::${url}/releases/download/v${pkgver}/binary-release.tar.gz"
     'hide-tray-icon.patch'
 )
 
 sha512sums=(
-    '3cb3eab9a3109331e3f1b0ea94466e9250b26964c7136bb94470b55254a70e343961536830cb18522c558d3ba28513f3d52d1a697ce9e0faa6789b99ed027ed6'
-    'aab3cecfcb8dcfcb1a367a264fb2e95c446ceb9d2588eec51a98455936dde4fe62daa483952a437c7cb903105a3371ebb137d6e1c512ea9dc11b9c7baced101c'
+    'fef20373254918943466f15576b5ee350f00b3e1a64bab970c9f8303eb7fdd01af1303e5b1ebdfe740ec0f407ab4be007d6f83c49880c698ce018e4fa5c4470a'
+    'c89e7186cb0f07fc15e88974e2de6a3bb84221278d8582faf0faf6a90bafc19f021b6266a0c96769aa204a501cd4f90cbb987c8e892536636db27a88beeafba9'
 )
 
+noextract=("${_archive}")
+
 package() {
     cd "${srcdir}"
 
-    install -Dm644 -t "${pkgdir}/usr/lib/qt/plugins/kcms" "lib/x86_64-linux-gnu/plugins/kcms/kcm_bismuth.so"
+    install -dm755 "${pkgdir}/usr/lib/qt" &&
+        tar -C "$_" --strip-components=3 -xf "${_archive}" "./lib/x86_64-linux-gnu"
 
-    rm "share/icons/hicolor/icon-theme.cache"
+    tar -C "${pkgdir}/usr" --strip-components=1 --exclude="icon-theme.cache" -xf "${_archive}" "./share"
 
     if [ ${HIDE_TRAY_ICON} = 1 ]; then
-        patch -p0 -N -i "hide-tray-icon.patch"
+        cd "${pkgdir}/usr/share/kwin/scripts/bismuth/contents/ui"
+        patch -p0 -N -i "${srcdir}/hide-tray-icon.patch"
     fi
-
-    cp -rt "${pkgdir}/usr" "share"
 }