Fix Build on CURRENT and catchup with latest xmame version

PR:		50041, 48643
Submitted by:	maintainer

5 files changed, 132 insertions, 0 deletions

diff --git a/emulators/kmamerun/files/patch-kmamerun+gamelist.h b/emulators/kmamerun/files/patch-kmamerun+gamelist.h
new file mode 100644
index 000000000000..04f891a189e1
--- /dev/null
+++ b/emulators/kmamerun/files/patch-kmamerun+gamelist.h
@@ -0,0 +1,19 @@
+*** kmamerun/gamelist.h.orig	Tue Aug  6 09:15:28 2002
+--- kmamerun/gamelist.h	Mon Feb 24 11:07:07 2003
+***************
+*** 54,60 ****
+  		int size;
+  		bool valid;
+      };
+!     typedef std::map<string, struct elem, greater<string> > GameListMap;
+      
+      GameListMap gamelist;
+      bool modified;
+--- 54,60 ----
+  		int size;
+  		bool valid;
+      };
+!     typedef std::map<std::string, struct elem, std::greater<std::string> > GameListMap;
+      
+      GameListMap gamelist;
+      bool modified;
diff --git a/emulators/kmamerun/files/patch-kmamerun+preferences.cpp b/emulators/kmamerun/files/patch-kmamerun+preferences.cpp
new file mode 100644
index 000000000000..ff00d275b5c9
--- /dev/null
+++ b/emulators/kmamerun/files/patch-kmamerun+preferences.cpp
@@ -0,0 +1,23 @@
+--- kmamerun/preferences.cpp.orig	Wed Feb 26 21:04:52 2003
++++ kmamerun/preferences.cpp	Wed Feb 26 21:05:35 2003
+@@ -256,7 +256,7 @@
+         prefGeneral.logdir = "/tmp";
+     mamecmd = prefGeneral.mamecmd;
+     logdir = prefGeneral.logdir;
+-    prefGeneral.spooldir = "";
++    prefGeneral.hiscoredir = "";
+     prefGeneral.cheat = 0;
+     prefGeneral.version = 37;
+     prefGeneral.check_romsets = false;
+@@ -368,9 +368,9 @@
+             sscanf(line.data(),"%*s%s",buf);
+             prefGeneral.rompath = buf;
+             prefGeneral.version = 34;
+-        } else if (str == "spooldir") {
++        } else if (str == "hiscoredir") {
+             sscanf(line.data(),"%*s%s",buf);
+-            prefGeneral.spooldir = buf;
++            prefGeneral.hiscoredir = buf;
+         } else if (str == "screenshotdir") {
+             sscanf(line.data(),"%*s%s",buf);
+             prefGeneral.screenshotdir = buf;
diff --git a/emulators/kmamerun/files/patch-kmamerun+prefgeneral.cpp b/emulators/kmamerun/files/patch-kmamerun+prefgeneral.cpp
new file mode 100644
index 000000000000..cb097d76bb71
--- /dev/null
+++ b/emulators/kmamerun/files/patch-kmamerun+prefgeneral.cpp
@@ -0,0 +1,44 @@
+--- kmamerun/prefgeneral.cpp.orig	Wed Feb 26 21:05:03 2003
++++ kmamerun/prefgeneral.cpp	Wed Feb 26 21:05:35 2003
+@@ -35,7 +35,7 @@
+ {
+     checkCheat->setChecked(prefs->cheat);
+     inputMamedir->setText(prefs->rompath);
+-    inputSpooldir->setText(prefs->spooldir);
++    inputHiscoredir->setText(prefs->hiscoredir);
+     inputMamecmd->setText(prefs->mamecmd);
+     inputLogdir->setText(prefs->logdir);
+     inputImagedir->setText(prefs->screenshotdir);
+@@ -57,7 +57,7 @@
+     str = inputMamedir->text();
+     if (!str.isEmpty())
+         config.writeEntry("rompath",inputMamedir->text());
+-    config.writeEntry("spooldir",inputSpooldir->text());
++    config.writeEntry("hiscoredir",inputHiscoredir->text());
+     QString
+         cmd = inputMamecmd->text();
+     if (!cmd.isEmpty() && cmd.find("@@Game") < 0) {
+@@ -98,8 +98,8 @@
+         if (!str.isEmpty())
+             prefs->rompath = str;
+     }
+-    if (config.hasKey("spooldir"))
+-        prefs->spooldir = config.readEntry("spooldir");
++    if (config.hasKey("hiscoredir"))
++        prefs->hiscoredir = config.readEntry("hiscoredir");
+     if (config.hasKey("mamecmd"))
+         prefs->mamecmd = config.readEntry("mamecmd");
+     if (config.hasKey("logdir"))
+@@ -129,9 +129,9 @@
+ 	    opt += prefs->rompath;
+ 	}
+     }
+-    if (defpref->spooldir != prefs->spooldir) {
+-	if (!prefs->spooldir.isEmpty())
+-            opt += " -spooldir " + prefs->spooldir;
++    if (defpref->hiscoredir != prefs->hiscoredir) {
++	if (!prefs->hiscoredir.isEmpty())
++            opt += " -hiscore_directory " + prefs->hiscoredir;
+     }
+     if (defpref->screenshotdir != prefs->screenshotdir) {
+ 	if (!prefs->screenshotdir.isEmpty())
diff --git a/emulators/kmamerun/files/patch-kmamerun+prefgeneral.h b/emulators/kmamerun/files/patch-kmamerun+prefgeneral.h
new file mode 100644
index 000000000000..d3b26615619d
--- /dev/null
+++ b/emulators/kmamerun/files/patch-kmamerun+prefgeneral.h
@@ -0,0 +1,22 @@
+--- kmamerun/prefgeneral.h.orig	Wed Feb 26 21:05:12 2003
++++ kmamerun/prefgeneral.h	Wed Feb 26 21:05:37 2003
+@@ -29,7 +29,7 @@
+ 
+ struct general_prefs {
+     QString rompath;
+-    QString spooldir;
++    QString hiscoredir;
+     int cheat;
+     // local data
+     QString mamecmd;
+@@ -58,8 +58,8 @@
+ 	//Generated area. DO NOT EDIT!!!(begin)
+ 	QLabel *labelMamedir;
+ 	QLineEdit *inputMamedir;
+-	QLabel *labelSpooldir;
+-	QLineEdit *inputSpooldir;
++	QLabel *labelHiscoredir;
++	QLineEdit *inputHiscoredir;
+ 	QLabel *labelMamecmd;
+ 	QLineEdit *inputMamecmd;
+ 	QLabel *labelLogdir;
diff --git a/emulators/kmamerun/files/patch-kmamerun+prefgeneraldata.cpp b/emulators/kmamerun/files/patch-kmamerun+prefgeneraldata.cpp
new file mode 100644
index 000000000000..8e4f159bbb65
--- /dev/null
+++ b/emulators/kmamerun/files/patch-kmamerun+prefgeneraldata.cpp
@@ -0,0 +1,24 @@
+--- kmamerun/prefgeneraldata.cpp.orig	Wed Feb 26 21:05:23 2003
++++ kmamerun/prefgeneraldata.cpp	Wed Feb 26 21:05:35 2003
+@@ -21,14 +21,14 @@
+   inputMamedir->setGeometry(120,10,300,30);
+   inputMamedir->setMinimumSize(0,0);
+ 
+-  labelSpooldir= new QLabel(this,"NoName");
+-  labelSpooldir->setGeometry(10,40,110,30);
+-  labelSpooldir->setMinimumSize(0,0);
+-  labelSpooldir->setText(i18n("Hiscore directory:"));
++  labelHiscoredir= new QLabel(this,"NoName");
++  labelHiscoredir->setGeometry(10,40,110,30);
++  labelHiscoredir->setMinimumSize(0,0);
++  labelHiscoredir->setText(i18n("Hiscore directory:"));
+ 
+-  inputSpooldir= new QLineEdit(this,"NoName");
+-  inputSpooldir->setGeometry(120,40,300,30);
+-  inputSpooldir->setMinimumSize(0,0);
++  inputHiscoredir= new QLineEdit(this,"NoName");
++  inputHiscoredir->setGeometry(120,40,300,30);
++  inputHiscoredir->setMinimumSize(0,0);
+ 
+   labelMamecmd= new QLabel(this,"NoName");
+   labelMamecmd->setGeometry(10,70,110,30);