Timecamp 2.1.1.0

5 files changed, 48 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 453bf92c1a0e..471e2cbbe935 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,20 @@
 # Generated by mksrcinfo v8
-# Mon Jul 30 23:29:20 UTC 2018
+# Wed Dec 19 23:28:15 UTC 2018
 pkgbase = timecamp
 	pkgdesc = Client application for TimeCamp software
-	pkgver = 1.4.3.3
+	pkgver = 2.1.1.0
 	pkgrel = 1
 	url = https://www.timecamp.com/
-	install = timecamp.install
-	arch = x86_64
-	license = custom
-	source = https://www.timecamp.com/downloadsoft/1.4.3.3/TimeCampSetup_LinAmd64-1.4.3.3.tar.gz
-	sha256sums = 51213dd2db59d8b4daa801682d5ec062d44341410a3fda4479d25b6dfc71264a
+	arch = any
+	license = GPL3
+	makedepends = cmake
+	depends = qt5-base
+	depends = qt5-webengine
+	depends = qt5-x11extras
+	source = timecamp-2.1.1.0.tar.gz::https://github.com/timecamp/timecamp-v2.1-desktop-app/archive/2.1.1.0.tar.gz
+	source = timecamp.desktop
+	sha256sums = 1ed3904dc3b99f4a84a637dbeb8d5d130e0d31859fdf7ce34229b374b24183c8
+	sha256sums = 632c47beefd1aae80eb3ea51832fd74e43f11ed6432f5dc7dded867c80d5df70
 
 pkgname = timecamp
 
diff --git a/.gitignore b/.gitignore
index 94cb21ba3bb3..b9103bd38e43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 /src/
 /pkg/
-/TimeCampSetup_*
+/timecamp-*.tar.gz
 /timecamp-*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 12f457e57406..5eb74b9850ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,34 @@
 # Maintainer: Chris Hobbs (RX14) <chris@rx14.co.uk>
 pkgname=timecamp
-pkgver=1.4.3.3
+pkgver=2.1.1.0
 pkgrel=1
 pkgdesc="Client application for TimeCamp software"
-arch=('x86_64')
+arch=('any')
 url="https://www.timecamp.com/"
-license=('custom')
-depends=('gtk2' 'libsm' 'libnotify' 'libxss' 'libappindicator-gtk2')
-install=${pkgname}.install
-source=("https://www.timecamp.com/downloadsoft/${pkgver}/TimeCampSetup_LinAmd64-${pkgver}.tar.gz")
-sha256sums=("51213dd2db59d8b4daa801682d5ec062d44341410a3fda4479d25b6dfc71264a")
+license=('GPL3')
+depends=('qt5-base' 'qt5-webengine' 'qt5-x11extras')
+makedepends=('cmake')
+source=("timecamp-${pkgver}.tar.gz::https://github.com/timecamp/timecamp-v2.1-desktop-app/archive/${pkgver}.tar.gz"
+        "timecamp.desktop")
+sha256sums=('1ed3904dc3b99f4a84a637dbeb8d5d130e0d31859fdf7ce34229b374b24183c8'
+            '632c47beefd1aae80eb3ea51832fd74e43f11ed6432f5dc7dded867c80d5df70')
+build() {
+  cd "$srcdir/timecamp-v2.1-desktop-app-${pkgver}"
 
-package(){
-	# Extract package data
-  ar x timecamp.deb
-	tar xzf data.tar.gz -C "${pkgdir}"
+  cp CMakeProjectConfig.cmake.example CMakeProjectConfig.cmake
 
-  mkdir -p "${pkgdir}/usr/bin"
-  ln -s /usr/share/timecamp/timecamp "${pkgdir}/usr/bin/timecamp"
+  mkdir build
+  cd build
+
+  cmake ..
+  make
+}
+
+package() {
+  cd "$srcdir/timecamp-v2.1-desktop-app-${pkgver}"
+
+  install -D -m755 build/TimeCampDesktop "$pkgdir/usr/bin/timecamp"
+  install -D -m644 res/AppIcon_48.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/timecamp.png"
+  install -D -m644 res/AppIcon_256.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/timecamp.png"
+  install -D -m644 "$srcdir/timecamp.desktop" "$pkgdir/usr/share/applications/timecamp.desktop"
 }
diff --git a/timecamp.desktop b/timecamp.desktop
new file mode 100644
index 000000000000..b4a008b2847a
--- /dev/null
+++ b/timecamp.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=TimeCamp Desktop
+Exec=/usr/bin/timecamp
+Icon=timecamp
+StartupNotify=false
+Terminal=false
+Categories=Office;ProjectManagement;
diff --git a/timecamp.install b/timecamp.install
deleted file mode 100644
index b50ffb36e4a2..000000000000
--- a/timecamp.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-	update-desktop-database -q
-}