0.5.0.r56.gf6d9a5abeb

3 files changed, 5 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 268faab0226b..4b2971168f4d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = xemu-git
 	pkgdesc = Original Xbox emulator (fork of XQEMU)
-	pkgver = 0.5.0.r42.g8326870f77
+	pkgver = 0.5.0.r56.gf6d9a5abeb
 	pkgrel = 1
 	url = https://xemu.app/
 	arch = x86_64
@@ -14,9 +14,7 @@ pkgbase = xemu-git
 	provides = xemu
 	conflicts = xemu
 	source = xemu::git+https://github.com/mborgerson/xemu.git
-	source = fix-no-pie.diff
 	md5sums = SKIP
-	md5sums = 25fa6282b6c1a11eed44c9f1ab2c5ab7
 
 pkgname = xemu-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8361071587ae..0b4bfa773682 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # shellcheck shell=bash disable=SC2034,SC2164
 _pkgname=xemu
 pkgname=$_pkgname-git
-pkgver=0.5.0.r42.g8326870f77
+pkgver=0.5.0.r56.gf6d9a5abeb
 pkgrel=1
 pkgdesc="Original Xbox emulator (fork of XQEMU)"
 arch=('x86_64')
@@ -12,21 +12,14 @@ depends=('glu' 'gtk3' 'libsamplerate' 'sdl2')
 makedepends=('git' 'python')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("$_pkgname::git+https://github.com/mborgerson/xemu.git"
-        'fix-no-pie.diff')
-md5sums=('SKIP'
-         '25fa6282b6c1a11eed44c9f1ab2c5ab7')
+source=("$_pkgname::git+https://github.com/mborgerson/xemu.git")
+md5sums=('SKIP')
 
 pkgver() {
 	cd $_pkgname
 	git describe --long | sed 's/^xemu-v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-prepare() {
-	cd $_pkgname
-	patch -p1 < ../fix-no-pie.diff
-}
-
 build() {
 	cd $_pkgname
 	./build.sh
@@ -36,7 +29,7 @@ package() {
 	cd $_pkgname
 	# shellcheck disable=SC2154
 	install -Dm755 -t "$pkgdir"/usr/bin dist/xemu
-	install -Dm644 -t "$pkgdir"/usr/share/$_pkgname/data dist/data/*
+	install -Dm644 -t "$pkgdir"/usr/share/xemu/data dist/data/*
 	install -Dm644 -t "$pkgdir"/usr/share/applications ui/xemu.desktop
 	install -Dm644 -t "$pkgdir"/usr/share/icons/hicolor/scalable/apps ui/icons/xemu.svg
 }
diff --git a/fix-no-pie.diff b/fix-no-pie.diff
deleted file mode 100644
index 620b31643418..000000000000
--- a/fix-no-pie.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/configure	2021-02-14 15:53:55.731291720 +0100
-+++ b/configure	2021-02-14 15:52:34.968093261 +0100
-@@ -2192,7 +2192,6 @@
- # Check we support --no-pie first; we will need this for building ROMs.
- if compile_prog "-Werror -fno-pie" "-no-pie"; then
-   CFLAGS_NOPIE="-fno-pie"
--  LDFLAGS_NOPIE="-no-pie"
- fi
- 
- if test "$static" = "yes"; then
-@@ -2208,7 +2207,6 @@
-   fi
- elif test "$pie" = "no"; then
-   QEMU_CFLAGS="$CFLAGS_NOPIE $QEMU_CFLAGS"
--  QEMU_LDFLAGS="$LDFLAGS_NOPIE $QEMU_LDFLAGS"
- elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then
-   QEMU_CFLAGS="-fPIE -DPIE $QEMU_CFLAGS"
-   QEMU_LDFLAGS="-pie $QEMU_LDFLAGS"
-@@ -8081,7 +8079,6 @@
-   echo "QEMU_CFLAGS  += -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-non-pointer-null" >> $config_host_mak
- fi
- echo "QEMU_LDFLAGS=$QEMU_LDFLAGS" >> $config_host_mak
--echo "LDFLAGS_NOPIE=$LDFLAGS_NOPIE" >> $config_host_mak
- echo "LD_REL_FLAGS=$LD_REL_FLAGS" >> $config_host_mak
- echo "LD_I386_EMULATION=$ld_i386_emulation" >> $config_host_mak
- echo "LIBS+=$LIBS" >> $config_host_mak