sameboy: upstream release 0.14.2-1 and fix for crash

sameboy did not find its data files and was crashing because of it

2 files changed, 10 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2280b9ab885e..92acf2c14bc0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = sameboy
 	pkgdesc = An accuracy-focused Game Boy/Game Boy Color emulator
-	pkgver = 0.14.1
+	pkgver = 0.14.2
 	pkgrel = 1
 	url = https://github.com/LIJI32/SameBoy
 	arch = x86_64
@@ -11,10 +11,8 @@ pkgbase = sameboy
 	depends = sdl2
 	depends = hicolor-icon-theme
 	conflicts = sameboy-git
-	source = sameboy-0.14.1.tar.gz::https://github.com/LIJI32/SameBoy/archive/v0.14.1.tar.gz
-	source = sameboy-d2ed1343-add-missing-mkdir.patch::https://github.com/LIJI32/SameBoy/commit/d2ed1343e5ef890f3ec9377941af25453cfe46b5.patch
-	md5sums = 6b61ba6b6b688a0ae2badee00ed45f70
-	md5sums = c71062c0994e1966ca86ab8178f405bd
+	source = sameboy-0.14.2.tar.gz::https://github.com/LIJI32/SameBoy/archive/v0.14.2.tar.gz
+	md5sums = 503b33778935748fea7d484fd2bca220
 
 pkgname = sameboy
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c49a5e8fd79..e096a133cc56 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=sameboy
 pkgdesc="An accuracy-focused Game Boy/Game Boy Color emulator"
-pkgver=0.14.1
+pkgver=0.14.2
 pkgrel=1
 arch=(x86_64)
 url="https://github.com/LIJI32/SameBoy"
@@ -12,15 +12,8 @@ depends=(sdl2 hicolor-icon-theme)
 conflicts=(sameboy-git)
 # Upstream suggests using clang, but gcc is supported on Linux: https://github.com/LIJI32/SameBoy/issues/164#issuecomment-486464194
 makedepends=(rgbds make git)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LIJI32/SameBoy/archive/v${pkgver}.tar.gz"
-	"sameboy-d2ed1343-add-missing-mkdir.patch::https://github.com/LIJI32/SameBoy/commit/d2ed1343e5ef890f3ec9377941af25453cfe46b5.patch")
-md5sums=('6b61ba6b6b688a0ae2badee00ed45f70'
-         'c71062c0994e1966ca86ab8178f405bd')
-
-prepare() {
-	cd "${srcdir}/SameBoy-${pkgver}"
-	patch -p1 < "${srcdir}/sameboy-d2ed1343-add-missing-mkdir.patch"
-}
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LIJI32/SameBoy/archive/v${pkgver}.tar.gz")
+md5sums=('503b33778935748fea7d484fd2bca220')
 
 build(){
 	cd "${srcdir}/SameBoy-${pkgver}"
@@ -34,6 +27,10 @@ package(){
 	install -D "${pkgdir}/usr/share/sameboy/LICENSE" "${pkgdir}/usr/share/licenses/sameboy/LICENSE"
 	rm "${pkgdir}/usr/share/sameboy/LICENSE"
 
+	# move data files to the correct location
+	mkdir -p ${pkgdir}/usr/share/games
+	mv ${pkgdir}/usr/share/{sameboy,games}
+
 	# mimetype icons don't belong here
 	# that could lead to file conflicts
 	find "${pkgdir}" -name 'x-gameboy*-rom.png' -delete