Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Eric Sandall (b8bac5eaa40e4786fa9b13c6a2536c188a06a749)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Eric Sandall (b8bac5eaa40e4786fa9b13c6a2536c188a06a749)
  • Date: Sat, 12 Apr 2008 00:41:22 -0500

GIT changes to master games grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

games-emulators/zsnes/HISTORY | 4 +
games-emulators/zsnes/PRE_BUILD | 7 ++
games-emulators/zsnes/gcc43.patch | 124
++++++++++++++++++++++++++++++++++++++
3 files changed, 135 insertions(+)

New commits:
commit b8bac5eaa40e4786fa9b13c6a2536c188a06a749
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

zsnes: Fix for GCC 4.3.0. Blame dkowis for this expense of time

diff --git a/games-emulators/zsnes/HISTORY b/games-emulators/zsnes/HISTORY
index f4bdbdc..5210ec5 100644
--- a/games-emulators/zsnes/HISTORY
+++ b/games-emulators/zsnes/HISTORY
@@ -1,3 +1,7 @@
+2008-04-12 Eric Sandall <sandalle AT sourcemage.org>
+ * PRE_BUILD: Apply gcc43.patch
+ * gcc43.patch: Adhere to GCC 4.3.0 strictness
+
2007-09-29 Arwed v. Merkatz <v.merkatz AT gmx.net>
* PRE_BUILD: brought back the ./autogen.sh needed for the cvs version,
added sedits to install stuff in correct locations (/usr/games and
diff --git a/games-emulators/zsnes/PRE_BUILD b/games-emulators/zsnes/PRE_BUILD
index ed3a952..462a434 100755
--- a/games-emulators/zsnes/PRE_BUILD
+++ b/games-emulators/zsnes/PRE_BUILD
@@ -1,7 +1,14 @@
default_pre_build &&
cd $SOURCE_DIRECTORY/src &&
+
+#
+# GCC 4.3.0 fix
+#
+patch -p2 < $SCRIPT_DIRECTORY/gcc43.patch &&
+
sed -i "s:\$(DESTDIR)/@prefix@/bin:$INSTALL_ROOT/usr/games:" Makefile.in &&
sed -i "s:@prefix@/man:@prefix@/share/man:" Makefile.in &&
+
if [[ $ZSNES_CVS = y ]]; then
./autogen.sh
fi
diff --git a/games-emulators/zsnes/gcc43.patch
b/games-emulators/zsnes/gcc43.patch
new file mode 100644
index 0000000..095e68b
--- /dev/null
+++ b/games-emulators/zsnes/gcc43.patch
@@ -0,0 +1,124 @@
+diff -Naur zsnes_1_51.orig/src/parsegen.cpp zsnes_1_51/src/parsegen.cpp
+--- zsnes_1_51.orig/src/parsegen.cpp 2008-04-11 21:55:44.323422097 -0700
++++ zsnes_1_51/src/parsegen.cpp 2008-04-11 22:27:58.904100654 -0700
+@@ -26,6 +26,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <algorithm>
+ #include <sstream>
+@@ -1828,7 +1829,7 @@
+ }
+ }
+
+-int main(size_t argc, const char **argv)
++int main (int argc, const char **argv)
+ {
+ const char *cheader_file = 0;
+ bool compile = false;
+diff -Naur zsnes_1_51.orig/src/tools/depbuild.cpp
zsnes_1_51/src/tools/depbuild.cpp
+--- zsnes_1_51.orig/src/tools/depbuild.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/depbuild.cpp 2008-04-11 22:27:59.048100662 -0700
+@@ -24,6 +24,7 @@
+ #include <iostream>
+ #include <string>
+ #include <cstdio>
++#include <cstdlib>
+ using namespace std;
+
+ #include "fileutil.h"
+@@ -183,7 +184,7 @@
+ }
+ }
+
+-int main(size_t argc, const char *const *const argv)
++int main (int argc, const char *const *const argv)
+ {
+ if (argc < 5)
+ {
+diff -Naur zsnes_1_51.orig/src/tools/extraext.cpp
zsnes_1_51/src/tools/extraext.cpp
+--- zsnes_1_51.orig/src/tools/extraext.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/extraext.cpp 2008-04-11 22:27:59.142100811 -0700
+@@ -256,7 +256,7 @@
+ }
+ }
+
+-int main(size_t argc, char **argv)
++int main (int argc, char **argv)
+ {
+ for (char **i = argv+1; *i; i++)
+ {
+diff -Naur zsnes_1_51.orig/src/tools/macroll.cpp
zsnes_1_51/src/tools/macroll.cpp
+--- zsnes_1_51.orig/src/tools/macroll.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/macroll.cpp 2008-04-11 22:27:59.001101007 -0700
+@@ -207,7 +207,7 @@
+ }
+ }
+
+-int main(size_t argc, char **argv)
++int main (int argc, char **argv)
+ {
+ if (argc > 1)
+ {
+diff -Naur zsnes_1_51.orig/src/tools/minwhite.cpp
zsnes_1_51/src/tools/minwhite.cpp
+--- zsnes_1_51.orig/src/tools/minwhite.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/minwhite.cpp 2008-04-11 22:27:59.068100717 -0700
+@@ -102,7 +102,7 @@
+ }
+ }
+
+-int main(size_t argc, char **argv)
++int main (int argc, char **argv)
+ {
+ if (argc > 1)
+ {
+diff -Naur zsnes_1_51.orig/src/tools/nreplace.cpp
zsnes_1_51/src/tools/nreplace.cpp
+--- zsnes_1_51.orig/src/tools/nreplace.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/nreplace.cpp 2008-04-11 22:27:59.021101341 -0700
+@@ -95,7 +95,7 @@
+ }
+ }
+
+-int main(size_t argc, const char **argv)
++int main (int argc, const char **argv)
+ {
+ bool subdir_scan = false;
+ const char **argp = argv+1;
+diff -Naur zsnes_1_51.orig/src/tools/objprefx.cpp
zsnes_1_51/src/tools/objprefx.cpp
+--- zsnes_1_51.orig/src/tools/objprefx.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/objprefx.cpp 2008-04-11 22:27:59.091100977 -0700
+@@ -122,7 +122,7 @@
+ }
+ }
+
+-int main(size_t argc, char **argv)
++int main (int argc, char **argv)
+ {
+ if (argc == 3)
+ {
+diff -Naur zsnes_1_51.orig/src/tools/strutil.h zsnes_1_51/src/tools/strutil.h
+--- zsnes_1_51.orig/src/tools/strutil.h 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/strutil.h 2008-04-11 21:56:15.706420130 -0700
+@@ -23,6 +23,7 @@
+ #define STRUTIL_H
+
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <cctype>
+
+diff -Naur zsnes_1_51.orig/src/tools/varrep.cpp
zsnes_1_51/src/tools/varrep.cpp
+--- zsnes_1_51.orig/src/tools/varrep.cpp 2008-04-11 21:55:44.341424437
-0700
++++ zsnes_1_51/src/tools/varrep.cpp 2008-04-11 22:27:59.163101400 -0700
+@@ -145,7 +145,7 @@
+ return(false);
+ }
+
+-int main(size_t argc, const char *const *const argv)
++int main (int argc, const char *const *const argv)
+ {
+ if (argc >= 4)
+ {
+



  • [SM-Commit] GIT changes to master games grimoire by Eric Sandall (b8bac5eaa40e4786fa9b13c6a2536c188a06a749), Eric Sandall, 04/12/2008

Archive powered by MHonArc 2.6.24.

Top of Page