summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'games-simulation/cannonsmash/files')
-rw-r--r--games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch21
-rw-r--r--games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch22
-rw-r--r--games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch11
-rw-r--r--games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch18
4 files changed, 72 insertions, 0 deletions
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
new file mode 100644
index 00000000000..85612b929c5
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-flags.patch
@@ -0,0 +1,21 @@
+--- configure.old 2010-10-18 15:05:02.000000000 +0200
++++ configure 2010-10-18 15:05:31.000000000 +0200
+@@ -5516,12 +5516,12 @@
+
+
+ if test "x$x_includes" != "x"; then
+- CFLAGS="-I $x_includes"
+-else
+- CFLAGS=""
+-fi
+-LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+-CXXFLAGS="$CFLAGS -Wall"
++ CFLAGS="${CFLAGS} -I $x_includes"
++else
++ CFLAGS="${CFLAGS}"
++fi
++LDFLAGS="${LDFLAGS} -L/usr/local/lib -L$x_libraries -L$libdir"
++CXXFLAGS="${CXXFLAGS} -Wall"
+
+
+ echo "$as_me:$LINENO: checking for main in -lXmu" >&5
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
new file mode 100644
index 00000000000..0f3e511f09c
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-gcc41.patch
@@ -0,0 +1,22 @@
+--- BallView.h.old 2006-04-11 00:10:37.000000000 +0200
++++ BallView.h 2006-04-11 00:10:53.000000000 +0200
+@@ -32,7 +32,7 @@
+
+ static GLuint m_number[10];
+ private:
+- void BallView::DrawTargetCircle();
++ void DrawTargetCircle();
+ GLUquadricObj *m_quad;
+
+ void DrawBall();
+--- matrix.old 2006-04-11 00:13:18.000000000 +0200
++++ matrix 2006-04-11 00:19:34.000000000 +0200
+@@ -42,7 +42,7 @@
+
+ /* __BEGIN__BEGIN__ */
+ //__NAMESPACE_BEGIN(ese);
+-#if (!defined __GNUG__) || (__GNUC__ == 3)
++#if (!defined __GNUG__) || (__GNUC__ >= 3)
+ template<typename T>
+ void swap(T& a, T& b)
+ {
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
new file mode 100644
index 00000000000..9237f95978e
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-sizeof-cast.patch
@@ -0,0 +1,11 @@
+Don't typecast otherwise C++ will fail to match on some arches.
+
+http://bugs.gentoo.org/84187
+
+--- loadparts.cpp
++++ loadparts.cpp
+@@ -247,3 +247,3 @@
+ // concat next line(s)
+- int bufsize = clamp(0U, sizeof(line)-l, sizeof(line)-1);
++ int bufsize = clamp((size_t)0, sizeof(line)-l, sizeof(line)-1);
+ fgets(&line[l-2], bufsize, fp);
diff --git a/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
new file mode 100644
index 00000000000..99c1e2f944f
--- /dev/null
+++ b/games-simulation/cannonsmash/files/cannonsmash-0.6.6-x-inc.patch
@@ -0,0 +1,18 @@
+Patch by Jason Bucata.
+http://bugs.gentoo.org/84187
+
+--- configure
++++ configure
+@@ -5515,7 +5515,11 @@
+ fi
+
+
+-CFLAGS="-I $x_includes"
++if test "x$x_includes" != "x"; then
++ CFLAGS="-I $x_includes"
++else
++ CFLAGS=""
++fi
+ LDFLAGS="-L/usr/local/lib -L$x_libraries -L$libdir"
+ CXXFLAGS="$CFLAGS -Wall"
+