Added ultraspeed patch and fixed build error with latest g++.

2 files changed, 20 insertions, 4 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 60c2b5b58dce..71da88baaa47 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=gbcflsh
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="GameBoy Cart Flasher"
 arch=('i686' 'x86_64')
 url="http://sourceforge.net/projects/gbcf"
@@ -11,21 +11,25 @@ groups=()
 depends=('qt4')
 provides=('gbcflsh')
 conflicts=('gbcflsh')
-install=("$pkgname.install")
+install="$pkgname.install"
 source=(http://downloads.sourceforge.net/gbcf/${pkgname}_${pkgver}_src.tar.gz
         gbcflsh.desktop
 		config.patch
-		ultraspeed.patch)
+		ultraspeed.patch
+		error_t.patch)
 md5sums=('a2c6c1e0a9e4c4ba64631e0f66989dfc'
          'd6c39e134228d827d26db6d72fd65e85'
 		 'f4674e2030d797d1ec8a9d5603a8e97c'
-		 '0fdff2428687a4e9f0eb774a6fbfde4f')
+		 '0fdff2428687a4e9f0eb774a6fbfde4f'
+		 '27fc93a9f40bbdb0d242c69f6c00aa23')
 
 build() {
 	# Patch to install config files in /usr/share/gbcf instead of ~/config
 	patch -p0 < config.patch
 	# Patch to fix build errors and add -ultraspeed (for 1.5 Mbps).
 	patch -p0 < ultraspeed.patch
+	# Patch to rename error_t already defined in errno.h
+	patch -p0 < error_t.patch
 	cd "$srcdir/gbcflsh_1.1_src"
 
 	qmake-qt4
diff --git a/error_t.patch b/error_t.patch
new file mode 100644
index 000000000000..36e2d9f5508b
--- /dev/null
+++ b/error_t.patch
@@ -0,0 +1,12 @@
+diff -ruN gbcflsh_1.1_src.orig/src/const.h gbcflsh_1.1_src/src/const.h
+--- gbcflsh_1.1_src.orig/src/const.h	2016-12-06 15:28:19.006226548 +0100
++++ gbcflsh_1.1_src/src/const.h	2016-12-06 15:28:34.782848109 +0100
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ /* return values and errors */
+-enum error_t
++enum _error
+ { TIMEOUT = -1, FILEERROR_O = -2, FILEERROR_W = -3, FILEERROR_R =
+     -4, SEND_ERROR = -5,
+   BAD_PACKET = -6, BAD_PARAMS = -7, PORT_ERROR = -8, WRONG_SIZE = -9