upgpkg: spacechem-hib 2:1016-1

upstream release

The library dependencies are now bundled with the package.
There is some missing dependency that causes it to crash after recording
a run but I can't figure out what it is.

4 files changed, 18 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 395e7124f1c5..42419a93a4f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,19 @@
 pkgbase = spacechem-hib
 	pkgdesc = A design-based puzzle game from Zachtronics Industries. Humble Bundle version.
-	pkgver = 1013
+	pkgver = 1016
 	pkgrel = 1
 	epoch = 2
 	url = http://www.zachtronics.com/spacechem/
 	arch = x86_64
 	license = custom
-	depends = sdl
-	depends = sdl_image
-	depends = sdl_mixer
-	depends = mono
-	depends = xclip
-	optdepends = lib32-glibc: Recording runs via rgb2theora
 	provides = spacechem
 	conflicts = spacechem
 	conflicts = gog-spacechem
 	options = !strip
-	source = SpaceChem_Linux_v1013_FIXED.zip::hib://SpaceChem_Linux_v1013_FIXED.zip
+	source = SpaceChem_Linux_v1016.zip::hib://SpaceChem_Linux_v1016.zip
 	source = spacechem-hib.desktop
-	source = spacechem-hib.patch
-	md5sums = c290e8631ae3380b7e70362501a5adb6
-	md5sums = 9a436b55222c47c0c03060de4043d8a1
-	md5sums = c8f74f821035d5daaff6c61ec643ae51
+	md5sums = c4500639c8c48f898e0a8060af31b075
+	md5sums = 86bf2f4d344da8883e85959a2cd42694
 
 pkgname = spacechem-hib
 
diff --git a/PKGBUILD b/PKGBUILD
index 69e6f7ca77e1..d386d27ddde0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,17 @@
 
 pkgname=spacechem-hib
 _installname=spacechem
-pkgver=1013
+pkgver=1016
 pkgrel=1
 epoch=2
 pkgdesc="A design-based puzzle game from Zachtronics Industries. Humble Bundle version."
 license=('custom')
 arch=('x86_64')
 url="http://www.zachtronics.com/spacechem/"
-depends=('sdl' 'sdl_image' 'sdl_mixer' 'mono' 'xclip')
-optdepends=('lib32-glibc: Recording runs via rgb2theora')
+depends=()
 provides=('spacechem')
 conflicts=('spacechem' 'gog-spacechem')
-_gamepkg="SpaceChem_Linux_v${pkgver}_FIXED.zip"
+_gamepkg="SpaceChem_Linux_v${pkgver}.zip"
 
 # You can download the Humble Indie Bundle file manually, or you can configure
 # DLAGENTS in makepkg.conf to auto-download.
@@ -25,31 +24,25 @@ _gamepkg="SpaceChem_Linux_v${pkgver}_FIXED.zip"
 # To auto-search through a directory containing Humble Bundle downloads, you
 # could set:
 # DLAGENTS=('hib::/usr/bin/find /path/to/downloads -name $(echo %u | cut -c 7-) -exec ln -s \{\} %o \; -quit')
-DLAGENTS+=('hib::/usr/bin/echo "Could not find %u. Download manually to \"$(pwd)\" or setup hib:// DLAGENT in /etc/makepkg.conf."; exit 1')
+DLAGENTS+=("hib::/usr/bin/echo \"Could not find %u. Download manually to '$(pwd)' or setup hib:// DLAGENT in /etc/makepkg.conf.\"")
 
 source=("${_gamepkg}"::"hib://${_gamepkg}"
-        "${pkgname}.desktop"
-        "${pkgname}.patch")
-md5sums=('c290e8631ae3380b7e70362501a5adb6'
-         '9a436b55222c47c0c03060de4043d8a1'
-         'c8f74f821035d5daaff6c61ec643ae51')
+        "${pkgname}.desktop")
+md5sums=('c4500639c8c48f898e0a8060af31b075'
+         '86bf2f4d344da8883e85959a2cd42694')
 options=(!strip)
 
-prepare() {
-	cd "SpaceChem"
-	patch --forward --strip=1 --input="${srcdir}/${pkgname}.patch"
-}
-
 package() {
 	cd "SpaceChem"
 	find . -type f -exec install -Dm644 "{}" "${pkgdir}/opt/${_installname}/{}" \;
-	chmod 755 "${pkgdir}/opt/${_installname}"/{rgb2theora,spacechem-launcher.sh}
+	chmod 755 "${pkgdir}/opt/${_installname}/"{rgb2theora,SpaceChem}
 
-	install -Dm644 icon.png "${pkgdir}/usr/share/pixmaps/${_installname}.png"
-	install -Dm644 -t "${pkgdir}/usr/share/licenses/${_installname}" readme/*
+	install -Dm644 images/icon.png "${pkgdir}/usr/share/pixmaps/${_installname}.png"
+	install -Dm644 -t "${pkgdir}/usr/share/licenses/${_installname}" LICENSE.txt
 
 	install -d "${pkgdir}/usr/bin"
-	ln -s "/opt/${_installname}/spacechem-launcher.sh" "${pkgdir}/usr/bin/${_installname}"
+	ln -s "/opt/${_installname}/SpaceChem" "${pkgdir}/usr/bin/${_installname}"
 
-	install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${_installname}.desktop"
+	install -Dm644 "${srcdir}/${pkgname}.desktop" \
+		"${pkgdir}/usr/share/applications/${_installname}.desktop"
 }
diff --git a/spacechem-hib.desktop b/spacechem-hib.desktop
index 463c6286a6a9..c256a34f5c63 100644
--- a/spacechem-hib.desktop
+++ b/spacechem-hib.desktop
@@ -5,6 +5,6 @@ Name=SpaceChem
 GenericName=Game
 Comment=Solve design-based challenges in this game from Zachtronics Industries
 Icon=spacechem
-Exec=/opt/spacechem/spacechem-launcher.sh
+Exec=/opt/spacechem/SpaceChem
 Terminal=false
 Categories=Game;
diff --git a/spacechem-hib.patch b/spacechem-hib.patch
deleted file mode 100644
index 1c2907cf2699..000000000000
--- a/spacechem-hib.patch
+++ /dev/null
@@ -1,7 +0,0 @@
-diff --unified --recursive --text SpaceChem/spacechem-launcher.sh SpaceChem.new/spacechem-launcher.sh
---- SpaceChem/spacechem-launcher.sh	2019-04-06 09:16:22.000000000 -0400
-+++ SpaceChem.new/spacechem-launcher.sh	2020-04-17 13:29:30.167850161 -0400
-@@ -1,2 +1,3 @@
- #!/bin/sh
-+cd /opt/spacechem || exit 1
- mono SpaceChem.exe