| 1 |
mr_bones_ 11/05/06 18:21:27 |
| 2 |
|
| 3 |
Added: criticalmass-1.0.2-system_curl.patch |
| 4 |
criticalmass-1.0.2-libpng14.patch |
| 5 |
criticalmass-1.0.2-gcc43.patch |
| 6 |
Log: |
| 7 |
version bump |
| 8 |
|
| 9 |
(Portage version: 2.1.9.42/cvs/Linux i686) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.1 games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch?rev=1.1&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch?rev=1.1&content-type=text/plain |
| 16 |
|
| 17 |
Index: criticalmass-1.0.2-system_curl.patch |
| 18 |
=================================================================== |
| 19 |
--- configure.in |
| 20 |
+++ configure.in |
| 21 |
@@ -115,8 +115,6 @@ fi |
| 22 |
AC_CHECK_LIB(m, sin,, |
| 23 |
AC_MSG_ERROR(libm is needed)) |
| 24 |
|
| 25 |
-AC_CONFIG_SUBDIRS(curl) |
| 26 |
- |
| 27 |
AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile) |
| 28 |
|
| 29 |
echo "Configuration: |
| 30 |
--- game/Makefile.am |
| 31 |
+++ game/Makefile.am |
| 32 |
@@ -41,7 +41,7 @@ critter_SOURCES = \ |
| 33 |
main.cpp |
| 34 |
|
| 35 |
LDADD = \ |
| 36 |
- ../curl/lib/libcurl.a \ |
| 37 |
+ -lcurl \ |
| 38 |
../utils/libutils.a \ |
| 39 |
../utilssdl/libutilssdl.a \ |
| 40 |
../utilsgl/libutilsgl.a \ |
| 41 |
--- Makefile.am |
| 42 |
+++ Makefile.am |
| 43 |
@@ -4,7 +4,7 @@ |
| 44 |
AUTOMAKE_OPTIONS = 1.4 |
| 45 |
|
| 46 |
## Any directories that you want built and installed should go here. |
| 47 |
-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game |
| 48 |
+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game |
| 49 |
|
| 50 |
## Any directories you want a part of the distribution should be listed |
| 51 |
## here, as well as have a Makefile generated at the end of configure.in |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: criticalmass-1.0.2-libpng14.patch |
| 61 |
=================================================================== |
| 62 |
--- configure.in |
| 63 |
+++ configure.in |
| 64 |
@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then |
| 65 |
else |
| 66 |
LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" |
| 67 |
CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" |
| 68 |
- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) |
| 69 |
+ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed)) |
| 70 |
AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) |
| 71 |
if test "x$TARGET" = xUNIX; then |
| 72 |
if test "x$enable_dyngl" = xoff; then |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
1.1 games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch |
| 77 |
|
| 78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch?rev=1.1&view=markup |
| 79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch?rev=1.1&content-type=text/plain |
| 80 |
|
| 81 |
Index: criticalmass-1.0.2-gcc43.patch |
| 82 |
=================================================================== |
| 83 |
--- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp 2003-03-03 03:34:58.000000000 +0100 |
| 84 |
+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp 2008-04-18 19:40:35.000000000 +0200 |
| 85 |
@@ -21,10 +21,12 @@ |
| 86 |
distribution. |
| 87 |
*/ |
| 88 |
|
| 89 |
#include "tinyxml.h" |
| 90 |
|
| 91 |
+#include <cstring> |
| 92 |
+ |
| 93 |
|
| 94 |
TiXmlNode::TiXmlNode( NodeType _type ) |
| 95 |
{ |
| 96 |
parent = 0; |
| 97 |
type = _type; |
| 98 |
--- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h 2003-03-03 03:34:58.000000000 +0100 |
| 99 |
+++ CriticalMass-1.0.0/tinyxml/tinyxml.h 2008-04-18 19:40:35.000000000 +0200 |
| 100 |
@@ -28,10 +28,11 @@ |
| 101 |
#ifdef _MSC_VER |
| 102 |
#pragma warning( disable : 4530 ) |
| 103 |
#pragma warning( disable : 4786 ) |
| 104 |
#endif |
| 105 |
|
| 106 |
+#include <cstdlib> |
| 107 |
#include <string> |
| 108 |
#include <stdio.h> |
| 109 |
#include <assert.h> |
| 110 |
|
| 111 |
class TiXmlDocument; |
| 112 |
--- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp 2003-03-03 03:34:58.000000000 +0100 |
| 113 |
+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp 2008-04-18 19:40:35.000000000 +0200 |
| 114 |
@@ -23,10 +23,12 @@ |
| 115 |
|
| 116 |
|
| 117 |
#include "tinyxml.h" |
| 118 |
#include <ctype.h> |
| 119 |
|
| 120 |
+#include <cstring> |
| 121 |
+ |
| 122 |
const char* TiXmlBase::SkipWhiteSpace( const char* p ) |
| 123 |
{ |
| 124 |
while ( p && *p && |
| 125 |
( isspace( *p ) || *p == '\n' || *p == '\r' ) ) |
| 126 |
p++; |
| 127 |
--- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp 2005-01-02 03:59:29.000000000 +0100 |
| 128 |
+++ CriticalMass-1.0.0/utils/ResourceManager.cpp 2008-04-18 19:40:35.000000000 +0200 |
| 129 |
@@ -20,10 +20,12 @@ |
| 130 |
#include <ResourceManager.hpp> |
| 131 |
#include <FindHash.hpp> |
| 132 |
#include <Endian.hpp> |
| 133 |
#include <WalkDirectory.hpp> |
| 134 |
|
| 135 |
+#include <cstring> |
| 136 |
+ |
| 137 |
#ifdef WIN32 |
| 138 |
const char PATH_SEPERATOR = '\\'; |
| 139 |
#else |
| 140 |
const char PATH_SEPERATOR = '/'; |
| 141 |
#endif |
| 142 |
--- CriticalMass-1.0.0.orig/utils/Value.hpp 2004-12-18 03:41:24.000000000 +0100 |
| 143 |
+++ CriticalMass-1.0.0/utils/Value.hpp 2008-04-18 19:40:35.000000000 +0200 |
| 144 |
@@ -13,10 +13,11 @@ |
| 145 |
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details |
| 146 |
// |
| 147 |
#ifndef _Value_hpp_ |
| 148 |
#define _Value_hpp_ |
| 149 |
|
| 150 |
+#include <cstdlib> |
| 151 |
#include <stdio.h> |
| 152 |
#include <string> |
| 153 |
|
| 154 |
#include <Trace.hpp> |
| 155 |
|
| 156 |
--- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp 2005-07-31 22:06:14.000000000 +0200 |
| 157 |
+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp 2008-04-18 19:40:35.000000000 +0200 |
| 158 |
@@ -10,10 +10,11 @@ |
| 159 |
// |
| 160 |
// This program is distributed in the hope that it will be useful, but WITHOUT |
| 161 |
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
| 162 |
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details |
| 163 |
// |
| 164 |
+#include <cstdlib> |
| 165 |
#include <Trace.hpp> |
| 166 |
#include <zStreamBufferImplZLib.hpp> |
| 167 |
|
| 168 |
bool ziStreamBufferImplZLib::init( void) |
| 169 |
{ |
| 170 |
--- CriticalMass-1.0.0.orig/utils/zStream.cpp 2005-07-31 22:06:14.000000000 +0200 |
| 171 |
+++ CriticalMass-1.0.0/utils/zStream.cpp 2008-04-18 19:40:35.000000000 +0200 |
| 172 |
@@ -10,10 +10,11 @@ |
| 173 |
// |
| 174 |
// This program is distributed in the hope that it will be useful, but WITHOUT |
| 175 |
// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
| 176 |
// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details |
| 177 |
// |
| 178 |
+#include <cstdlib> |
| 179 |
#include <Trace.hpp> |
| 180 |
#include <Endian.hpp> |
| 181 |
#include <zStream.hpp> |
| 182 |
#include <zStreamBufferImplLZMA.hpp> |
| 183 |
#include <zStreamBufferImplZLib.hpp> |
Archives