adjust for upstream desktop and icon

3 files changed, 8 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c26ab3bfad62..51e2f94b8533 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gammy-git
 	pkgdesc = Adaptive screen brightness/temperature tool.
-	pkgver = 0.9.62.r0.gc9fd421
+	pkgver = 0.9.64.r3.g6404ca3
 	pkgrel = 1
 	url = https://getgammy.com
 	arch = x86_64
@@ -14,9 +14,7 @@ pkgbase = gammy-git
 	provides = gammy
 	conflicts = gammy
 	source = git+https://github.com/Fushko/gammy.git
-	source = gammy.desktop
 	sha256sums = SKIP
-	sha256sums = 6c67db210bd45f51d80119d25ffcaff9861aea926427ccf186d4530cf35ecf5d
 
 pkgname = gammy-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 3a91820112c0..fbbc02f270a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 pkgname=gammy-git
-pkgver=0.9.62.r0.gc9fd421
+pkgver=0.9.64.r3.g6404ca3
 pkgrel=1
 pkgdesc="Adaptive screen brightness/temperature tool."
 arch=('x86_64')
@@ -12,10 +12,8 @@ optdepends=('plog: library for debug logging'
             'qt5ct: recommended on DE without Qt integration')
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
-source=('git+https://github.com/Fushko/gammy.git'
-        "${pkgname%-git}.desktop")
-sha256sums=('SKIP'
-            '6c67db210bd45f51d80119d25ffcaff9861aea926427ccf186d4530cf35ecf5d')
+source=('git+https://github.com/Fushko/gammy.git')
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "$srcdir/${pkgname%-git}"
@@ -24,25 +22,14 @@ pkgver() {
 
 build() {
 	cd "$srcdir/${pkgname%-git}"
-	qmake Gammy.pro PREFIX=/usr
+	qmake \
+		QMAKE_CFLAGS="$CFLAGS" \
+		QMAKE_CXXFLAGS="$CXXFLAGS" \
+		QMAKE_LFLAGS="$LDFLAGS"
 	make
 }
 
 package() {
 	cd "$srcdir/${pkgname%-git}"
 	make INSTALL_ROOT="$pkgdir" install
-
-	install -Dm644 "$srcdir/${pkgname%-git}.desktop" -t "$pkgdir/usr/share/applications"
-
-	for icon_size in 16 32 64 128; do
-		convert icons/${icon_size}x${icon_size}ball.ico \
-			"$srcdir"/${icon_size}x${icon_size}ball.png
-	done
-
-	for icon_size in 16 32 64 128; do
-		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
-		install -d "$pkgdir/$icons_dir"
-		install -m644 "$srcdir/${icon_size}x${icon_size}ball.png" \
-			"$pkgdir$icons_dir/${pkgname%-git}.png"
-	done
 }
diff --git a/gammy.desktop b/gammy.desktop
deleted file mode 100755
index 499032532c07..000000000000
--- a/gammy.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Gammy
-Exec=gammy
-Icon=gammy
-Type=Application
-Terminal=false
-Hidden=false
-Categories=Utility