diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
| commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
| tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /games-simulation/cannonsmash/files | |
| download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip | |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'games-simulation/cannonsmash/files')
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 000000000000..85612b929c59 --- /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 000000000000..0f3e511f09cc --- /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 000000000000..9237f95978ef --- /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 000000000000..99c1e2f944fa --- /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" + |