sameboy: upstream release 0.14.1

2 files changed, 15 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 415fd24cd020..2280b9ab885e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,20 @@
 pkgbase = sameboy
 	pkgdesc = An accuracy-focused Game Boy/Game Boy Color emulator
-	pkgver = 0.14
-	pkgrel = 2
+	pkgver = 0.14.1
+	pkgrel = 1
 	url = https://github.com/LIJI32/SameBoy
 	arch = x86_64
 	license = MIT
 	makedepends = rgbds
 	makedepends = make
 	makedepends = git
-	makedepends = xdg-utils
 	depends = sdl2
 	depends = hicolor-icon-theme
 	conflicts = sameboy-git
-	source = sameboy-0.14.tar.gz::https://github.com/LIJI32/SameBoy/archive/v0.14.tar.gz
-	source = sameboy-0a4cb814-fix-destdir.patch::https://github.com/LIJI32/SameBoy/commit/0a4cb8148f6bcecd20486a6563a43eb9c074500c.patch
-	md5sums = c98eb4bd5a645ade48cd0dba1f496bd5
-	md5sums = dab79f4afa38cabf94a46634eb3e2d66
+	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
 
 pkgname = sameboy
 
diff --git a/PKGBUILD b/PKGBUILD
index 1fea279733b4..9c49a5e8fd79 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,37 +3,36 @@
 
 pkgname=sameboy
 pkgdesc="An accuracy-focused Game Boy/Game Boy Color emulator"
-pkgver=0.14
-pkgrel=2
+pkgver=0.14.1
+pkgrel=1
 arch=(x86_64)
 url="https://github.com/LIJI32/SameBoy"
 license=(MIT)
 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 xdg-utils)
+makedepends=(rgbds make git)
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LIJI32/SameBoy/archive/v${pkgver}.tar.gz"
-	"sameboy-0a4cb814-fix-destdir.patch::https://github.com/LIJI32/SameBoy/commit/0a4cb8148f6bcecd20486a6563a43eb9c074500c.patch")
-md5sums=('c98eb4bd5a645ade48cd0dba1f496bd5'
-         'dab79f4afa38cabf94a46634eb3e2d66')
+	"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-0a4cb814-fix-destdir.patch"
+	patch -p1 < "${srcdir}/sameboy-d2ed1343-add-missing-mkdir.patch"
 }
 
 build(){
 	cd "${srcdir}/SameBoy-${pkgver}"
-	make sdl CONF=release DATA_DIR=/usr/share/games/sameboy/ CC=gcc
+	make sdl CONF=release DATA_DIR=/usr/share/games/sameboy/ CC=gcc FREEDESKTOP=true
 }
 
 package(){
 	cd "${srcdir}/SameBoy-${pkgver}"
 
-	make install CONF=release PREFIX=/usr/ DESTDIR="${pkgdir}"
+	make install CONF=release PREFIX=/usr/ DATA_DIR=/usr/share/games/sameboy/ DESTDIR="${pkgdir}" FREEDESKTOP=true
 	install -D "${pkgdir}/usr/share/sameboy/LICENSE" "${pkgdir}/usr/share/licenses/sameboy/LICENSE"
 	rm "${pkgdir}/usr/share/sameboy/LICENSE"
-	install -Dm644 FreeDesktop/sameboy.desktop "${pkgdir}/usr/share/applications/sameboy.desktop"
 
 	# mimetype icons don't belong here
 	# that could lead to file conflicts