[arch-commits] Commit in dosbox/repos (3 files)

[Eric Belanger]

    Date: Wednesday, June 25, 2008 @ 17:44:34
  Author: eric
Revision: 3588

Merged revisions 3570-3587 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/dosbox/trunk

........
  r3586 | eric | 2008-06-25 17:44:01 -0400 (Wed, 25 Jun 2008) | 2 lines
  
  upgpkg: dosbox 0.72-4
      added missing patch, cleaned up depends
........

Added:
  dosbox/repos/extra-i686/dosbox-0.72+gcc-4.3.patch
    (from rev 3586, dosbox/trunk/dosbox-0.72+gcc-4.3.patch)
Modified:
  dosbox/repos/extra-i686/	(properties)
  dosbox/repos/extra-i686/PKGBUILD

---------------------------+
 PKGBUILD                  |    5 +---
 dosbox-0.72+gcc-4.3.patch |   45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)


Property changes on: dosbox/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /dosbox/trunk:1-3569
   + /dosbox/trunk:1-3587

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-25 21:44:15 UTC (rev 3587)
+++ extra-i686/PKGBUILD	2008-06-25 21:44:34 UTC (rev 3588)
@@ -9,9 +9,10 @@
 arch=(i686 x86_64)
 url="http://dosbox.sourceforge.net/"
 license=('GPL')
-depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'libgl')
+depends=('sdl_net' 'sdl_sound' 'libgl' 'libpng' 'alsa-lib' 'gcc-libs')
 source=(http://heanet.dl.sourceforge.net/sourceforge/dosbox/$pkgname-$pkgver.tar.gz \
 dosbox-0.72+gcc-4.3.patch )
+md5sums=('262939cc28966c1f9b07c2bc472b699f' 'd0cf64f78ba1a4a85981c421ee04fd22')
 
 build()
 {
@@ -24,5 +25,3 @@
   make prefix=$startdir/pkg/usr install
 }
 # vim: ts=2 sw=2 et ft=sh
-md5sums=('262939cc28966c1f9b07c2bc472b699f'
-         'd0cf64f78ba1a4a85981c421ee04fd22')

Copied: dosbox/repos/extra-i686/dosbox-0.72+gcc-4.3.patch (from rev 3586, dosbox/trunk/dosbox-0.72+gcc-4.3.patch)
===================================================================
--- extra-i686/dosbox-0.72+gcc-4.3.patch	                        (rev 0)
+++ extra-i686/dosbox-0.72+gcc-4.3.patch	2008-06-25 21:44:34 UTC (rev 3588)
@@ -0,0 +1,45 @@
+diff -ur /tmp/dosbox-0.72/src/dos/cdrom_image.cpp dosbox-0.72/src/dos/cdrom_image.cpp
+--- /tmp/dosbox-0.72/src/dos/cdrom_image.cpp	2007-08-22 13:54:35.000000000 +0200
++++ dosbox-0.72/src/dos/cdrom_image.cpp	2008-03-06 21:30:00.000000000 +0100
+@@ -23,7 +23,7 @@
+ #include <cstdio>
+ #include <fstream>
+ #include <iostream>
+-#include <limits.h>
++#include <limits>
+ #include <sstream>
+ #include <vector>
+ #include <sys/stat.h>
+diff -ur /tmp/dosbox-0.72/src/hardware/gameblaster.cpp dosbox-0.72/src/hardware/gameblaster.cpp
+--- /tmp/dosbox-0.72/src/hardware/gameblaster.cpp	2007-01-10 11:17:37.000000000 +0100
++++ dosbox-0.72/src/hardware/gameblaster.cpp	2008-03-06 21:31:32.000000000 +0100
+@@ -24,6 +24,7 @@
+ #include "hardware.h"
+ #include "setup.h"
+ #include "pic.h"
++#include <cstring>
+ 
+ #define LEFT	0x00
+ #define RIGHT	0x01
+diff -ur /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp dosbox-0.72/src/hardware/tandy_sound.cpp
+--- /tmp/dosbox-0.72/src/hardware/tandy_sound.cpp	2007-06-29 20:21:12.000000000 +0200
++++ dosbox-0.72/src/hardware/tandy_sound.cpp	2008-03-06 21:32:02.000000000 +0100
+@@ -28,6 +28,7 @@
+ #include "setup.h"
+ #include "pic.h"
+ #include "dma.h"
++#include <cstring>
+ 
+ #define DAC_CLOCK 3570000
+ #define MAX_OUTPUT 0x7fff
+diff -ur /tmp/dosbox-0.72/src/shell/shell_cmds.cpp dosbox-0.72/src/shell/shell_cmds.cpp
+--- /tmp/dosbox-0.72/src/shell/shell_cmds.cpp	2007-08-17 19:58:46.000000000 +0200
++++ dosbox-0.72/src/shell/shell_cmds.cpp	2008-03-06 21:32:47.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include "regs.h"
+ #include "../dos/drives.h"
+ #include "support.h"
++#include <cstdlib>
+ 
+ static SHELL_Cmd cmd_list[]={
+ {	"CHDIR",	1,			&DOS_Shell::CMD_CHDIR,		"SHELL_CMD_CHDIR_HELP"},