fix package in KDE and other improvements

4 files changed, 30 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f1e5c9c2446..f01fcdf7cde7 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,9 +14,11 @@ pkgbase = toptracker
 	source = https://d101nvfmxunqnl.cloudfront.net/desktop/builds/redhat/toptracker_1.6.0-334_x86_64.rpm
 	source = toptracker.desktop
 	source = toptracker-LICENSE
+	source = toptracker-launcher
 	sha256sums = 212f82bc574c741b1c8837ae5d06b2999d15d6c431ef8d41cf096653d877b95c
-	sha256sums = 99730f7b360235a8f27a50fbc148b71dd0ef54526d2ccb563495f3ee1f75ac80
+	sha256sums = e65278708e76a1e3772ccdecb1710d59a492a88ee6c3fde87296cccaec79b9cd
 	sha256sums = 3a12e2c5bd4c992b24320e1e2552476f21d08229417ca298cb39a2512f36162e
+	sha256sums = daed1bd315d68a2755e6f13126482eef18c361306c62cb6219be6c39ee64af34
 
 pkgname = toptracker
 
diff --git a/PKGBUILD b/PKGBUILD
index 83e59bed2ee0..098d38f05765 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
 # Maintainer: Jaime Martínez Rincón <jaime@jamezrin.name> https://github.com/jamezrin
+# Maintainer: Fabio 'Lolix' Loli <lolix@disroot.org> -> https://github.com/FabioLolix
 
 pkgname=toptracker
 _pkgver=1.6.0-334
 pkgver=${_pkgver//-/.}
-pkgrel=2
+pkgrel=2.1
 pkgdesc="Time tracking software for remote teams and individuals"
 arch=(x86_64)
 url="https://www.toptal.com/tracker/"
@@ -12,17 +12,28 @@ license=(custom:toptracker)
 depends=(qt5-svg qt5-multimedia libxss gtk3 libappindicator-gtk2)
 source=("https://d101nvfmxunqnl.cloudfront.net/desktop/builds/redhat/${pkgname}_${_pkgver}_x86_64.rpm"
         'toptracker.desktop'
-        'toptracker-LICENSE')
+        'toptracker-LICENSE'
+        'toptracker-launcher')
 noextract=("${pkgname}_${_pkgver}_x86_64.rpm")
 sha256sums=('212f82bc574c741b1c8837ae5d06b2999d15d6c431ef8d41cf096653d877b95c'
-            '99730f7b360235a8f27a50fbc148b71dd0ef54526d2ccb563495f3ee1f75ac80'
-            '3a12e2c5bd4c992b24320e1e2552476f21d08229417ca298cb39a2512f36162e')
+            'e65278708e76a1e3772ccdecb1710d59a492a88ee6c3fde87296cccaec79b9cd'
+            '3a12e2c5bd4c992b24320e1e2552476f21d08229417ca298cb39a2512f36162e'
+            'daed1bd315d68a2755e6f13126482eef18c361306c62cb6219be6c39ee64af34')
 
 package() {
+  install -d "${pkgdir}/usr/bin"
+  install -d "${pkgdir}/opt/${pkgname}"
+  install -d "${pkgdir}/usr/share/applications"
+  install -d "${pkgdir}/usr/share/icons"
+
   bsdtar -xf ${srcdir}/${pkgname}_${_pkgver}_x86_64.rpm -C ${pkgdir}/
   rm -r ${pkgdir}/etc/yum.repos.d
   rm ${pkgdir}/etc/cron.daily/toptracker.cron
   rm ${pkgdir}/usr/share/applications/toptracker.desktop
+  unlink ${pkgdir}/usr/bin/toptracker
+
+  cp ${pkgdir}/opt/toptracker/icon.png ${pkgdir}/usr/share/icons/${pkgname}.png
+  install -Dm755 ${srcdir}/${pkgname}-launcher ${pkgdir}/usr/bin/toptracker
   install -Dm755 ${srcdir}/${pkgname}.desktop ${pkgdir}/usr/share/applications
   install -Dm644 ${srcdir}/${pkgname}-LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/toptracker-launcher b/toptracker-launcher
new file mode 100644
index 000000000000..b0b531f806fa
--- /dev/null
+++ b/toptracker-launcher
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Launch script for toptracker
+
+# necessary to avoid 'BadAccess (attempt to access private resource denied)'
+export XDG_CURRENT_DESKTOP=GNOME
+
+pushd "/opt/toptracker/bin" >/dev/null || exit 1
+./TopTracker
+popd >/dev/null || exit 1
diff --git a/toptracker.desktop b/toptracker.desktop
index c9c28ca6f981..ea75d70c9f6d 100755
--- a/toptracker.desktop
+++ b/toptracker.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Version=1.6.0-334
 Terminal=false
 Type=Application
 Categories=Qt;Utility;ProjectManagement;
@@ -7,5 +6,5 @@ Name=TopTracker
 GenericName=Time Tracking Application
 Comment=TopTracker is the first and only completely free tracking tool that helps remote teams track their time without being tied to a specific freelance marketplace
 Keywords=toptracker;time;track;work;freelance
-Exec=env XDG_CURRENT_DESKTOP=GNOME /usr/bin/toptracker
-Icon=/opt/toptracker/icon.png
+Exec=/usr/bin/toptracker
+Icon=toptracker