- dosbox-c++.patch: needed for gcc4 ("extra qualification" error).

Changed files:
    dosbox-c++.patch -> 1.1
    dosbox.spec -> 1.24

diff --git a/dosbox-c++.patch b/dosbox-c++.patch
new file mode 100644 (file)
index 0000000..fcbd9eb
--- /dev/null
+++ b/dosbox-c++.patch
@@ -0,0 +1,11 @@
+--- dosbox-0.63/include/programs.h~    2004-08-04 11:12:51.000000000 +0200
++++ dosbox-0.63/include/programs.h     2005-12-12 17:37:59.000000000 +0100
+@@ -40,7 +40,7 @@
+       CommandLine * cmd;
+       DOS_PSP * psp;
+       virtual void Run(void)=0;
+-      bool Program::GetEnvStr(const char * entry,std::string & result);
++      bool GetEnvStr(const char * entry,std::string & result);
+       bool GetEnvNum(Bitu num,std::string & result);
+       Bitu GetEnvCount(void);
+       bool SetEnv(const char * entry,const char * new_string);

diff --git a/dosbox.spec b/dosbox.spec
index 0c7043931fa291f9d7bb0192ac764b005d3b3aa3..d2629cf1d48c5f71ac85d3b61c6e64d9f55fcefb 100644 (file)
--- a/dosbox.spec
+++ b/dosbox.spec
@@ -17,6 +17,7 @@ Source3:      %{name}.conf
 Patch0:                %{name}-hq2x.patch
 # http://home.amis.net/lkslavi/dosbox.html
 Patch1:                %{name}_coreswitch.patch
+Patch2:                %{name}-c++.patch
 URL:           http://dosbox.sourceforge.net/
 BuildRequires: SDL_net-devel
 BuildRequires: SDL_sound-devel
@@ -54,6 +55,7 @@ komputerach.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 # kill AM_PATH_SDL and AM_PATH_ALSA, leave only AH_{TOP,BOTTOM}