From c80552b41838a5668458ebb1eb9b0f44ea6fe879 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sat, 18 Jun 2011 23:03:19 +0000
Subject: Sat Jun 18 23:03:19 UTC 2011

---
 community/dosbox/PKGBUILD    | 37 +++++++++++++++++++++++--------------
 community/dosbox/gcc46.patch | 12 ++++++++++++
 2 files changed, 35 insertions(+), 14 deletions(-)
 create mode 100644 community/dosbox/gcc46.patch

(limited to 'community/dosbox')

diff --git a/community/dosbox/PKGBUILD b/community/dosbox/PKGBUILD
index 4358f1a53..1f88ecec8 100644
--- a/community/dosbox/PKGBUILD
+++ b/community/dosbox/PKGBUILD
@@ -1,37 +1,46 @@
-# $Id: PKGBUILD 46953 2011-05-13 20:41:08Z andrea $
+# $Id: PKGBUILD 49481 2011-06-17 21:30:52Z jelle $
 # Maintainer :
+# Contribute : Jelle van der Waa <jelle@vdwaa.nl>
 # Contributor: James Rayner <james@archlinux.org>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=dosbox
 pkgver=0.74
-pkgrel=1
+pkgrel=2
 pkgdesc="An emulator with builtin DOS for running DOS Games"
 arch=('i686' 'x86_64')
 url="http://dosbox.sourceforge.net/"
 license=('GPL')
-depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
+depends=('sdl_net' 'zlib' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
 makedepends=('mesa')
 source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz"
-	'dosbox.png' 'dosbox.desktop')
-md5sums=('b9b240fa87104421962d14eee71351e8'
-         '2aac25fc06979e375953fcc36824dc5e'
-         '85169ca599028bee8e29e0b3b7b34dd8')
+	'dosbox.png' 'dosbox.desktop' 'gcc46.patch')
 
 build(){
   cd ${srcdir}/${pkgname}-${pkgver}
-  sed -i 's/png_check_sig/png_sig_cmp/' configure || return 1
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc/dosbox || return 1
-  make || return 1
+  patch -Np1 -i $srcdir/gcc46.patch
+  sed -i 's/png_check_sig/png_sig_cmp/' configure 
+  ./configure   --prefix=/usr \
+    --sysconfdir=/etc/dosbox  
+  make 
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
+  make DESTDIR=${pkgdir} install 
+
+
+  # install docs, make does not install them
+  install -d $pkgdir/usr/share/doc/$pkgname
+  install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
+  install -Dm644 $srcdir/$pkgname-$pkgver/docs/README.video $pkgdir/usr/share/doc/$pkgname/README.video
 
   install -Dm644 ${srcdir}/${pkgname}.png \
-    ${pkgdir}/usr/share/pixmaps/${pkgname}.png || return 1
+    ${pkgdir}/usr/share/pixmaps/${pkgname}.png 
   install -Dm644 ${srcdir}/${pkgname}.desktop \
-    ${pkgdir}/usr/share/applications/${pkgname}.desktop || return 1
+    ${pkgdir}/usr/share/applications/${pkgname}.desktop 
 }
+md5sums=('b9b240fa87104421962d14eee71351e8'
+         '2aac25fc06979e375953fcc36824dc5e'
+         '85169ca599028bee8e29e0b3b7b34dd8'
+         '3fba2e3c7c43290319b2928f40ed30e5')
diff --git a/community/dosbox/gcc46.patch b/community/dosbox/gcc46.patch
new file mode 100644
index 000000000..eae9ae63e
--- /dev/null
+++ b/community/dosbox/gcc46.patch
@@ -0,0 +1,12 @@
+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
-- 
cgit v1.2.3-54-g00ecf