Clean up PKGBUILD

4 files changed, 57 insertions, 92 deletions

diff --git a/.CHANGELOG b/.CHANGELOG
deleted file mode 100644
index 1ef7b91d7a68..000000000000
--- a/.CHANGELOG
+++ /dev/null
@@ -1,68 +0,0 @@
-* commit 9f99d65bfe566e1ea9edae6805060036f5ef9fd3
-| Author: Lucki <Lucki@holarse-linuxgaming.de>
-| Date:   Fri Sep 22 17:09:04 2017 +0200
-| 
-|     Add logo
-|     
-|     fix #223
-|     
-|     File is an identical-looking, filesize-reduced version of the SVG in
-|     Lucki's pull request. Many thanks!
-| 
-* commit 5d215d85639dfc167efa29af6a697066776e5b1b
-| Author: geoo89 <geoo89@gmail.com>
-| Date:   Wed Sep 20 23:08:47 2017 +0200
-| 
-|     new and updated multiplayer levels by geoo
-| 
-* commit 5060ea4245bb7b39929dfd8affc23b9f130a7656
-| Author: Simon Naarmann <s.naarmann@gmail.com>
-| Date:   Tue Sep 19 16:43:47 2017 +0200
-| 
-|     0.8.7, fix too common skill-empty beeps
-|     
-|     Have 2 miners in the skillset. Have a walking lix. Assign miner. Click
-|     again. This second click will not assign miner, but beep as if we were
-|     out of skills. It shouldn't beep. This is fixed now.
-| 
-* commit 986ee1192c07ab8ea3a513f9a9477829ac198253
-| Author: SimonN <eiderdaus@gmail.com>
-| Date:   Sun Sep 10 16:44:46 2017 +0200
-| 
-|     0.8.6
-| 
-* commit 5e0ff5217d91aba253f5b72d1006f1bbafa8d232
-| Author: SimonN <eiderdaus@gmail.com>
-| Date:   Sat Sep 9 17:54:19 2017 +0200
-| 
-|     Rubix's race maps, Eater Island, Diagonal 8p
-| 
-* commit b8a823fc851dcfc04b136f17bbd1099df067b2ff
-| Author: Simon Naarmann <s.naarmann@gmail.com>
-| Date:   Tue Sep 19 11:00:53 2017 +0200
-| 
-|     fix #228: edge-scroll only when mouse in window
-| 
-* commit 8bf44788cbafe2a1c73a1a31e9aa33bb99656973
-| Author: Simon Naarmann <s.naarmann@gmail.com>
-| Date:   Tue Sep 19 10:42:39 2017 +0200
-| 
-|     fix #227: lobby player list buttons bled over
-| 
-* commit ddf70cd3b06d598f27e5cbd1d39f05eeca71fc80
-| Author: Simon Naarmann <s.naarmann@gmail.com>
-| Date:   Mon Sep 18 01:12:46 2017 +0200
-| 
-|     fix #229: hotkey of empty skill deselects skill
-| 
-* commit 2174f8576e1524e39cfdaf2ddafba8c0ed8185b7
-| Author: SimonN <eiderdaus@gmail.com>
-| Date:   Sat Sep 16 04:05:50 2017 +0200
-| 
-|     ballpark-guessing VRAM, often undershoots
-| 
-* commit 26e44df2f2d9c46243ee5c23296fd477f277cd04
-| Author: SimonN <eiderdaus@gmail.com>
-| Date:   Thu Sep 14 03:44:47 2017 +0200
-| 
-|     show phyus next to fps
diff --git a/.SRCINFO b/.SRCINFO
index b7d2d7b6b374..80d57a4702c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,12 @@
-# Generated by mksrcinfo v8
-# Thu Dec 14 11:48:26 UTC 2017
 pkgbase = lix-git
 	pkgdesc = An action-puzzle game inspired by Lemmings
-	pkgver = r1054.560ec520
+	pkgver = r1115.fce75cef
 	pkgrel = 1
 	url = http://www.lixgame.com/
-	changelog = .CHANGELOG
 	arch = i686
 	arch = x86_64
 	license = custom:CC0
 	makedepends = git
-	makedepends = gendesk
 	makedepends = dmd
 	makedepends = dub
 	depends = allegro
@@ -19,8 +15,10 @@ pkgbase = lix-git
 	conflicts = lix
 	source = lix::git+https://github.com/SimonN/lix-unstable.git
 	source = lix-music-1.zip::http://www.lixgame.com/dow/lix-music.zip
+	source = lix.desktop
 	sha512sums = SKIP
 	sha512sums = 37349c98b739ea43c25137dd03865f1c9c41eec91e5edc109afd9d50ce3871bd0c7f63c3f3599a47bb4ef52f5bfd14e034010de0ac2aec5a9c0c83eaf0b89425
+	sha512sums = 52d49562cd9be4eec76b464153af1cce2211fdbd6113a6a60df042f7e8f7e6a8f1942df883dfaaa6c1bbfea004c4154d884dfa767e25fa3fadf9c58be1103fe6
 
 pkgname = lix-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 4ebcbfd93b1c..075d29aa4b39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,17 @@
-# Maintainer: Lucki <Lucki at holarse-linuxgaming dot de>
+# Maintainer: Lucki <https://aur.archlinux.org/account/Lucki>
 # Contributor: Carl Reinke <mindless2112 gmail com>
 
 pkgname=lix-git
-pkgver=r1054.560ec520
+pkgver=r1115.fce75cef
 pkgrel=1
 provides=("${pkgname%-git}")
 conflicts=("${pkgname%-git}")
 source=("${pkgname%-git}::git+https://github.com/SimonN/lix-unstable.git"
-		"${pkgname%-git}-music-1.zip::http://www.lixgame.com/dow/lix-music.zip")
+		"${pkgname%-git}-music-1.zip::http://www.lixgame.com/dow/lix-music.zip"
+		"${pkgname%-git}.desktop")
 sha512sums=('SKIP'
-            '37349c98b739ea43c25137dd03865f1c9c41eec91e5edc109afd9d50ce3871bd0c7f63c3f3599a47bb4ef52f5bfd14e034010de0ac2aec5a9c0c83eaf0b89425')
+            '37349c98b739ea43c25137dd03865f1c9c41eec91e5edc109afd9d50ce3871bd0c7f63c3f3599a47bb4ef52f5bfd14e034010de0ac2aec5a9c0c83eaf0b89425'
+            '52d49562cd9be4eec76b464153af1cce2211fdbd6113a6a60df042f7e8f7e6a8f1942df883dfaaa6c1bbfea004c4154d884dfa767e25fa3fadf9c58be1103fe6')
 
 pkgver()
 {
@@ -22,30 +24,19 @@ pkgver()
 	)
 }
 
-prepare()
-{
-	cd "${srcdir}"
-	
-	# generate .desktop-file
-	gendesk -n -f --categories "Game"
-
-	# update .CHANGELOG
-	git -C "${srcdir}/${pkgname%-git}" log --graph -10 > "${startdir}/.CHANGELOG"	
-}
-
 _pkgname=${pkgname%-git}
-# template start; name=lix; version=0.3;
+# template start; name=lix; version=0.5;
 pkgdesc="An action-puzzle game inspired by Lemmings"
 arch=('i686' 'x86_64')
 url="http://www.lixgame.com/"
 license=('custom:CC0')
-changelog=.CHANGELOG
 depends=('allegro' 'enet')
-makedepends=('git' 'gendesk' 'dmd' 'dub')
+makedepends=('git' 'dmd' 'dub')
 
 build()
 {
 	cd "${srcdir}/${_pkgname}"
+	_r=0
 	
 	# force an upgrade of the dependencies to the local folder, without --cache=local they get added to the users home directory
 	dub upgrade --cache=local
@@ -57,7 +48,7 @@ build()
 	dub add-local enumap-*/enumap
 	
 	# force FHS compatibility with '-b releaseXDG'
-	dub build -f -b releaseXDG --cache=local
+	dub build -f -b releaseXDG --cache=local || _r=$?
 	
 	# remove local dependencies from search path so dub don't find them later again
 	dub remove-local allegro-*/allegro
@@ -65,6 +56,40 @@ build()
 	dub remove-local derelict-util-*/derelict-util
 	dub remove-local enumap-*/enumap
 	dub clean-caches
+	
+	if [[ "$_r" != 0 ]] ; then
+		# dub failed so we also fail after we removed the local dependencies
+		return "$_r";
+	fi
+}
+
+check()
+{
+	cd "${srcdir}/${_pkgname}"
+	_r=0
+	
+	# force an upgrade of the dependencies to the local folder, without --cache=local they get added to the users home directory
+	dub upgrade --cache=local
+	
+	# add local dependencies to search path
+	dub add-local allegro-*/allegro
+	dub add-local derelict-enet-*/derelict-enet
+	dub add-local derelict-util-*/derelict-util
+	dub add-local enumap-*/enumap
+	
+	dub test --cache=local || _r=$?
+	
+	# remove local dependencies from search path so dub don't find them later again
+	dub remove-local allegro-*/allegro
+	dub remove-local derelict-enet-*/derelict-enet
+	dub remove-local derelict-util-*/derelict-util
+	dub remove-local enumap-*/enumap
+	dub clean-caches
+	
+	if [[ "$_r" != 0 ]] ; then
+		# dub failed so we also fail after we removed the local dependencies
+		return "$_r"
+	fi
 }
 
 package()
diff --git a/lix.desktop b/lix.desktop
new file mode 100644
index 000000000000..575f5ce7e73c
--- /dev/null
+++ b/lix.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Lix
+Comment=An action-puzzle game inspired by Lemmings
+Exec=lix
+Icon=lix
+Terminal=false
+StartupNotify=false
+Categories=Game;ActionGame;