Update to version 0.74.3

3 files changed, 30 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 46051838be51..e346da59f05a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,12 @@
-# Generated by mksrcinfo v8
-# Thu Jan 26 01:36:58 UTC 2017
 pkgbase = dosbox-debug
 	pkgdesc = Emulator with builtin DOS for running DOS games (includes debugger for DOS apps)
-	pkgver = 0.74
-	pkgrel = 3
+	pkgver = 0.74.3
+	pkgrel = 1
 	url = http://dosbox.sourceforge.net/
 	arch = x86_64
-	arch = i686
 	license = GPL
-	makedepends = libgl
-	makedepends = gendesk>=0.5.3
+	makedepends = mesa-libgl
+	makedepends = gendesk
 	depends = sdl_net
 	depends = zlib
 	depends = sdl_sound
@@ -20,12 +17,10 @@ pkgbase = dosbox-debug
 	depends = glu
 	provides = dosbox
 	conflicts = dosbox
-	source = http://downloads.sourceforge.net/dosbox/dosbox-0.74.tar.gz
+	options = !buildflags
+	source = http://downloads.sourceforge.net/dosbox/dosbox-0.74-3.tar.gz
 	source = dosbox.png
-	source = gcc46.patch
-	md5sums = b9b240fa87104421962d14eee71351e8
-	md5sums = 2aac25fc06979e375953fcc36824dc5e
-	md5sums = 3fba2e3c7c43290319b2928f40ed30e5
+	sha256sums = c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a
+	sha256sums = 491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b
 
 pkgname = dosbox-debug
-
diff --git a/PKGBUILD b/PKGBUILD
index 85156cea1784..4ca1b444ecc3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,23 +6,25 @@
 
 pkgname=dosbox-debug
 srcname=dosbox
-pkgver=0.74
-pkgrel=3
+pkgver=0.74.3
+# Upstream version number
+usver=0.74-3
+pkgrel=1
 pkgdesc='Emulator with builtin DOS for running DOS games (includes debugger for DOS apps)'
-arch=('x86_64' 'i686')
+arch=('x86_64')
 url='http://dosbox.sourceforge.net/'
 license=('GPL')
 depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs' 'glu')
-# libgl can be provided by mesa-libgl or the nVidia closed-source driver
-makedepends=('libgl' 'gendesk>=0.5.3')
+makedepends=('mesa-libgl' 'gendesk')
 provides=('dosbox')
 conflicts=('dosbox')
-source=("http://downloads.sourceforge.net/$srcname/$srcname-$pkgver.tar.gz"
-        'dosbox.png'
-        'gcc46.patch')
-md5sums=('b9b240fa87104421962d14eee71351e8'
-         '2aac25fc06979e375953fcc36824dc5e'
-         '3fba2e3c7c43290319b2928f40ed30e5')
+source=("http://downloads.sourceforge.net/$srcname/$srcname-$usver.tar.gz"
+        'dosbox.png')
+sha256sums=('c0d13dd7ed2ed363b68de615475781e891cd582e8162b5c3669137502222260a'
+            '491c42d16fc5ef7ee2eca1b736f7801249d4ca8c0b236a001aec0d3e24504f3b')
+
+# Can't use -Werror=format-security or the debug version fails to compile
+options=(!buildflags)
 
 prepare() {
   cd "$srcdir"
@@ -32,29 +34,28 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/$srcname-$pkgver"
-
-  patch -Np1 -i "$srcdir/gcc46.patch"
-  sed -i 's/png_check_sig/png_sig_cmp/' configure
+  cd "$srcdir/$srcname-$usver"
 
   # Compile alternate version with built-in debugger enabled
-  ./configure   --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --enable-debug \
     --sysconfdir=/etc/dosbox
-  make
+  make ${MAKEFLAGS}
   mv src/dosbox src/dosbox-debug
 
   # Compile original version without DOS debugger
-  ./configure   --prefix=/usr \
+  ./configure \
+    --prefix=/usr \
     --sysconfdir=/etc/dosbox
-  make
+  make ${MAKEFLAGS}
 }
 
 package() {
-  cd "$srcdir/$srcname-$pkgver"
+  cd "$srcdir/$srcname-$usver"
 
   # Install everything including the non-debug binary
-  make DESTDIR="$pkgdir" install 
+  make DESTDIR="$pkgdir" install
 
   # Install the debug binary
   install -Dm755 "src/$pkgname" "$pkgdir/usr/bin/$pkgname"
diff --git a/gcc46.patch b/gcc46.patch
deleted file mode 100644
index eae9ae63e611..000000000000
--- a/gcc46.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur dosbox-0.74/include/dos_inc.h dosbox-0.74.new//include/dos_inc.h
---- dosbox-0.74/include/dos_inc.h	2010-05-10 17:43:54.000000000 +0000
-+++ dosbox-0.74.new//include/dos_inc.h	2011-06-17 20:42:43.982548979 +0000
-@@ -28,6 +28,8 @@
- #include "mem.h"
- #endif
- 
-+#include <stddef.h> //for offsetof
-+
- #ifdef _MSC_VER
- #pragma pack (1)
- #endif