Better PKGBUILD…

- drop gendesk with .desktop-file
- use a template for opsu and opsu-git
- inlude missing dependency `hicolor-icon-theme`
- remove pkgver() (why is it even in there?)
- keep gradle inside the `${srcdir}`

3 files changed, 44 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2ad1e10d7c8..67559daea699 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jul  3 11:40:53 UTC 2017
 pkgbase = opsu
 	pkgdesc = An open source osu!-client written in Java.
 	pkgver = 0.16.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://itdelatrisu.github.io/opsu/
 	install = opsu.install
 	changelog = .CHANGELOG
@@ -12,18 +10,19 @@ pkgbase = opsu
 	makedepends = java-environment
 	makedepends = java-web-start
 	makedepends = gradle
-	makedepends = gendesk
 	makedepends = git
 	depends = java-runtime
 	depends = bash
+	depends = hicolor-icon-theme
 	depends = xorg-xrandr
 	optdepends = ffmpeg: Background video playback
-	provides = opsu-git
 	conflicts = opsu-git
 	source = opsu::git://github.com/itdelatrisu/opsu.git#tag=0.16.0
 	source = opsu.sh
+	source = opsu.desktop
 	sha512sums = SKIP
 	sha512sums = 4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d
+	sha512sums = 94f6f2f2a7f5f104e1002869099daf2bc033764373c8f51b204152d6821070e4be25a0001bfdb8b5b2ef25046b0be214f640de5ff994eda9126a48495104e745
 
 pkgname = opsu
 
diff --git a/PKGBUILD b/PKGBUILD
index 68c7a9a8d9cd..9e2161511bb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,49 @@
-# Maintainer: Lucki <Lucki at holarse-linuxgaming dot de>
+# Maintainer: Lucki <https://aur.archlinux.org/account/Lucki>
 # Contributor in comments: Misc <https://aur.archlinux.org/account/misc/>
 # Contributor in comments: SajeOne <https://aur.archlinux.org/account/SajeOne/>
 # Contributor in email: tpenguinltg <https://aur.archlinux.org/account/tpenguinltg/>
 
 pkgname=opsu
 pkgver=0.16.0
-pkgrel=1
+pkgrel=2
+install=${pkgname}.install
+changelog=.CHANGELOG
+conflicts=("${pkgname}-git")
+source=("${pkgname}::git://github.com/itdelatrisu/opsu.git#tag=${pkgver}"
+        "${pkgname}.sh"
+        "${pkgname}.desktop")
+sha512sums=('SKIP'
+            '4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d'
+            '94f6f2f2a7f5f104e1002869099daf2bc033764373c8f51b204152d6821070e4be25a0001bfdb8b5b2ef25046b0be214f640de5ff994eda9126a48495104e745')
+
+_pkgname=${pkgname}
+# template start; name=opsu; version=0.2;
 pkgdesc="An open source osu!-client written in Java."
 arch=('any')
 url="https://itdelatrisu.github.io/opsu/"
 license=('GPL3')
-changelog=.CHANGELOG
-install=opsu.install
-depends=('java-runtime' 'bash' 'xorg-xrandr')
+depends=('java-runtime' 'bash' 'hicolor-icon-theme'
+		 'xorg-xrandr' # is a dependency for LWJGL. Had to search around for the fix after the application was throwing an unhandled exception because it couldn't detect monitors. Any chance this could be added to the dep list? - https://aur.archlinux.org/account/SajeOne
+		 )
 optdepends=('ffmpeg: Background video playback')
-makedepends=('java-environment' 'java-web-start' 'gradle' 'gendesk' 'git')
-provides=('opsu-git')
-conflicts=('opsu-git')
-source=( ${pkgname}::git://github.com/itdelatrisu/opsu.git#tag=${pkgver}
-         opsu.sh )
-sha512sums=('SKIP'
-            '4b065052fef55e1860a51dfa5af080930b1001e4c82cd8b3b0383bd68b239d382d788408235a7cb4fb4a1d04123a6049188a2e2c2d0e5fd08a3deb69da25fc2d')
-
-pkgver()
-{
-	cd "${srcdir}/${pkgname}"
-	git describe --tags | sed 's/-.*//'
-}
-
-prepare()
-{
-	# generate .desktop-file
-	gendesk -n -f --pkgname "${pkgname}" --pkgdesc "$pkgdesc" --name "opsu!" --exec "${pkgname}" --categories "Game"
-}
+makedepends=('java-environment' 'java-web-start' 'gradle' 'git')
 
 build()
 {
-	cd "${srcdir}/${pkgname}"
-	gradle jar -PXDG=true -PexcludeFFmpeg
+	cd "${srcdir}/${_pkgname}"
+	
+	# keep dependencies outside users home by setting GRADLE_USER_HOME
+	GRADLE_USER_HOME=. gradle jar -PXDG=true -PexcludeFFmpeg
 }
 
 package()
 {
-	install -Dm644 "${srcdir}/${pkgname}/build/libs/${pkgname}-${pkgver}.jar" "${pkgdir}/usr/share/java/${pkgname}/${pkgname}.jar"
-	install -Dm644 "${srcdir}/${pkgname}/res/logo.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-	install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-	install -Dm755 "${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+	# cut pkgver
+	_pkgver=$(git -C "${srcdir}/${_pkgname}" describe --tags | sed 's/-.*//')
+
+	install -Dm644 "${srcdir}/${_pkgname}/build/libs/${_pkgname}-${_pkgver}.jar" "${pkgdir}/usr/share/java/${_pkgname}/${_pkgname}.jar"
+	install -Dm644 "${srcdir}/${_pkgname}/res/logo.png" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.png"
+	install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+	install -Dm755 "${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
 }
+# template end;
diff --git a/opsu.desktop b/opsu.desktop
new file mode 100644
index 000000000000..f7ccc409a6e2
--- /dev/null
+++ b/opsu.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Opsu!
+Comment=An open source osu!-client written in Java.
+Exec=opsu
+Icon=opsu
+Terminal=false
+StartupNotify=false
+Categories=Game;ActionGame;