1 |
commit: ac4ee3fa01c26af03295d6a19582a4538e341ca3 |
2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 11 17:29:01 2022 +0000 |
4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 11 18:44:06 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4ee3fa |
7 |
|
8 |
games-arcade/criticalmass: EAPI6->8, misc changes |
9 |
|
10 |
* use https for homepage |
11 |
* depend on libsdl[opengl,sound,video] (doesn't launch without opengl) |
12 |
* depend on zlib |
13 |
* make dependency for music unconditional (generally feel audio/music |
14 |
being a broken-if-missing optfeature is questionable for games, there |
15 |
is an option to disable correctly in-game) |
16 |
* tidy patches and add some bugrefs |
17 |
* fix direct AR call (combined with -flags.patch) |
18 |
|
19 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
20 |
|
21 |
.../criticalmass/criticalmass-1.0.2-r1.ebuild | 62 -------------- |
22 |
.../criticalmass/criticalmass-1.0.2-r2.ebuild | 53 ++++++++++++ |
23 |
.../files/criticalmass-1.0.2-cflags.patch | 27 ------ |
24 |
.../files/criticalmass-1.0.2-flags.patch | 24 ++++++ |
25 |
.../files/criticalmass-1.0.2-gcc43.patch | 99 +++++----------------- |
26 |
.../files/criticalmass-1.0.2-libpng.patch | 28 ++++++ |
27 |
.../files/criticalmass-1.0.2-libpng14.patch | 11 --- |
28 |
.../files/criticalmass-1.0.2-libpng15.patch | 31 ------- |
29 |
....patch => criticalmass-1.0.2-system-curl.patch} | 30 ++----- |
30 |
9 files changed, 136 insertions(+), 229 deletions(-) |
31 |
|
32 |
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild |
33 |
deleted file mode 100644 |
34 |
index 5191beb0107f..000000000000 |
35 |
--- a/games-arcade/criticalmass/criticalmass-1.0.2-r1.ebuild |
36 |
+++ /dev/null |
37 |
@@ -1,62 +0,0 @@ |
38 |
-# Copyright 1999-2018 Gentoo Foundation |
39 |
-# Distributed under the terms of the GNU General Public License v2 |
40 |
- |
41 |
-EAPI=6 |
42 |
-inherit autotools desktop flag-o-matic |
43 |
- |
44 |
-DESCRIPTION="SDL/OpenGL space shoot'em up game" |
45 |
-HOMEPAGE="http://criticalmass.sourceforge.net/" |
46 |
-SRC_URI="mirror://sourceforge/criticalmass/CriticalMass-${PV}.tar.bz2" |
47 |
- |
48 |
-LICENSE="GPL-2" |
49 |
-SLOT="0" |
50 |
-KEYWORDS="~amd64 ~x86" |
51 |
-IUSE="" |
52 |
- |
53 |
-RDEPEND=" |
54 |
- media-libs/sdl-mixer |
55 |
- media-libs/sdl-image[png] |
56 |
- media-libs/libpng:0= |
57 |
- virtual/opengl |
58 |
- net-misc/curl |
59 |
-" |
60 |
-DEPEND="${RDEPEND}" |
61 |
- |
62 |
-S="${WORKDIR}/CriticalMass-${PV}" |
63 |
- |
64 |
-src_prepare() { |
65 |
- default |
66 |
- |
67 |
- eapply "${FILESDIR}"/${P}-gcc43.patch \ |
68 |
- "${FILESDIR}"/${P}-system_curl.patch \ |
69 |
- "${FILESDIR}"/${P}-libpng14.patch \ |
70 |
- "${FILESDIR}"/${P}-cflags.patch \ |
71 |
- "${FILESDIR}"/${P}-libpng15.patch |
72 |
- |
73 |
- rm -rf curl |
74 |
- |
75 |
- mv configure.in configure.ac || die |
76 |
- eautoreconf |
77 |
-} |
78 |
- |
79 |
-src_configure() { |
80 |
- append-cxxflags -std=gnu++98 # Bug 612758 |
81 |
- default |
82 |
-} |
83 |
- |
84 |
-src_install() { |
85 |
- HTML_DOCS="Readme.html" |
86 |
- default |
87 |
- rm -f "${ED}/usr/bin/Packer" |
88 |
- newicon critter.png ${PN}.png |
89 |
- make_desktop_entry critter "Critical Mass" |
90 |
-} |
91 |
- |
92 |
-pkg_postinst() { |
93 |
- if ! has_version "media-libs/sdl-mixer[mod]" ; then |
94 |
- ewarn |
95 |
- ewarn "To hear music, you will have to rebuild media-libs/sdl-mixer" |
96 |
- ewarn "with the \"mod\" USE flag turned on." |
97 |
- ewarn |
98 |
- fi |
99 |
-} |
100 |
|
101 |
diff --git a/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild |
102 |
new file mode 100644 |
103 |
index 000000000000..550a1493e02e |
104 |
--- /dev/null |
105 |
+++ b/games-arcade/criticalmass/criticalmass-1.0.2-r2.ebuild |
106 |
@@ -0,0 +1,53 @@ |
107 |
+# Copyright 1999-2022 Gentoo Authors |
108 |
+# Distributed under the terms of the GNU General Public License v2 |
109 |
+ |
110 |
+EAPI=8 |
111 |
+ |
112 |
+inherit autotools desktop flag-o-matic |
113 |
+ |
114 |
+MY_P="CriticalMass-${PV}" |
115 |
+ |
116 |
+DESCRIPTION="SDL/OpenGL space shoot'em up game" |
117 |
+HOMEPAGE="https://criticalmass.sourceforge.io/" |
118 |
+SRC_URI="mirror://sourceforge/criticalmass/${MY_P}.tar.bz2" |
119 |
+S="${WORKDIR}/${MY_P}" |
120 |
+ |
121 |
+LICENSE="GPL-2+ ZLIB" |
122 |
+SLOT="0" |
123 |
+KEYWORDS="~amd64 ~x86" |
124 |
+ |
125 |
+RDEPEND=" |
126 |
+ media-libs/libglvnd[X] |
127 |
+ media-libs/libpng:= |
128 |
+ media-libs/libsdl[opengl,sound,video] |
129 |
+ media-libs/sdl-image[png] |
130 |
+ media-libs/sdl-mixer[mod] |
131 |
+ net-misc/curl |
132 |
+ sys-libs/zlib:=" |
133 |
+DEPEND="${RDEPEND}" |
134 |
+ |
135 |
+PATCHES=( |
136 |
+ "${FILESDIR}"/${P}-gcc43.patch |
137 |
+ "${FILESDIR}"/${P}-system-curl.patch |
138 |
+ "${FILESDIR}"/${P}-libpng.patch |
139 |
+ "${FILESDIR}"/${P}-flags.patch |
140 |
+) |
141 |
+ |
142 |
+src_prepare() { |
143 |
+ default |
144 |
+ |
145 |
+ rm -r curl || die |
146 |
+ eautoreconf |
147 |
+ |
148 |
+ append-cxxflags -std=gnu++98 #612758 |
149 |
+} |
150 |
+ |
151 |
+src_install() { |
152 |
+ local HTML_DOCS="Readme.html" |
153 |
+ default |
154 |
+ |
155 |
+ rm "${ED}"/usr/bin/Packer || die #247449 |
156 |
+ |
157 |
+ newicon critter.png ${PN}.png |
158 |
+ make_desktop_entry critter "Critical Mass" |
159 |
+} |
160 |
|
161 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch |
162 |
deleted file mode 100644 |
163 |
index 0d9063c37538..000000000000 |
164 |
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-cflags.patch |
165 |
+++ /dev/null |
166 |
@@ -1,27 +0,0 @@ |
167 |
---- a/configure.in.orig 2011-07-20 11:23:19.849122541 -0400 |
168 |
-+++ b/configure.in 2011-07-20 11:24:28.169713094 -0400 |
169 |
-@@ -35,9 +35,6 @@ |
170 |
- AM_CONDITIONAL(APPLE,test "x$TARGET" = xAPPLE) |
171 |
- AM_CONDITIONAL(WIN32,test "x$TARGET" = xWIN32) |
172 |
- |
173 |
--CFLAGS="" |
174 |
--CXXFLAGS="" |
175 |
-- |
176 |
- if test "x$GCC" = xyes; then |
177 |
- CFLAGS="$CFLAGS -W -Wall" |
178 |
- CXXFLAGS="$CXXFLAGS -W -Wall -fno-exceptions" |
179 |
-@@ -51,14 +48,6 @@ |
180 |
- CXXFLAGS="$CXXFLAGS -g" |
181 |
- fi |
182 |
- |
183 |
--AC_ARG_ENABLE(optimize, |
184 |
--[ --enable-optimize=level Enable optimization [default=2]], |
185 |
-- enable_optmize=$enableval, enable_optimize=2) |
186 |
--if test "x$enable_optimize" != "xno" ; then |
187 |
-- CFLAGS="$CFLAGS -O$enable_optimize" |
188 |
-- CXXFLAGS="$CXXFLAGS -O$enable_optimize" |
189 |
--fi |
190 |
-- |
191 |
- AC_ARG_ENABLE(dyngl, |
192 |
- [ --enable-dyngl Load GL library dynamically [default=off]], |
193 |
- enable_dyngl=$enableval, enable_dyngl=off) |
194 |
|
195 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch |
196 |
new file mode 100644 |
197 |
index 000000000000..5677211c78a2 |
198 |
--- /dev/null |
199 |
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-flags.patch |
200 |
@@ -0,0 +1,24 @@ |
201 |
+https://bugs.gentoo.org/375739 |
202 |
+--- a/configure.in |
203 |
++++ b/configure.in |
204 |
+@@ -24,2 +24,3 @@ |
205 |
+ AC_PROG_RANLIB |
206 |
++AM_PROG_AR |
207 |
+ |
208 |
+@@ -37,5 +38,2 @@ |
209 |
+ |
210 |
+-CFLAGS="" |
211 |
+-CXXFLAGS="" |
212 |
+- |
213 |
+ if test "x$GCC" = xyes; then |
214 |
+@@ -52,10 +50,2 @@ |
215 |
+ fi |
216 |
+- |
217 |
+-AC_ARG_ENABLE(optimize, |
218 |
+-[ --enable-optimize=level Enable optimization [default=2]], |
219 |
+- enable_optmize=$enableval, enable_optimize=2) |
220 |
+-if test "x$enable_optimize" != "xno" ; then |
221 |
+- CFLAGS="$CFLAGS -O$enable_optimize" |
222 |
+- CXXFLAGS="$CXXFLAGS -O$enable_optimize" |
223 |
+-fi |
224 |
+ |
225 |
|
226 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch |
227 |
index e57c11f5af28..82207f52aec0 100644 |
228 |
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch |
229 |
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-gcc43.patch |
230 |
@@ -1,101 +1,46 @@ |
231 |
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.cpp 2003-03-03 03:34:58.000000000 +0100 |
232 |
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.cpp 2008-04-18 19:40:35.000000000 +0200 |
233 |
-@@ -21,10 +21,12 @@ |
234 |
- distribution. |
235 |
- */ |
236 |
- |
237 |
- #include "tinyxml.h" |
238 |
+https://bugs.gentoo.org/218299 |
239 |
+--- a/tinyxml/tinyxml.cpp |
240 |
++++ b/tinyxml/tinyxml.cpp |
241 |
+@@ -25,2 +25,4 @@ |
242 |
|
243 |
+#include <cstring> |
244 |
+ |
245 |
|
246 |
- TiXmlNode::TiXmlNode( NodeType _type ) |
247 |
- { |
248 |
- parent = 0; |
249 |
- type = _type; |
250 |
---- CriticalMass-1.0.0.orig/tinyxml/tinyxml.h 2003-03-03 03:34:58.000000000 +0100 |
251 |
-+++ CriticalMass-1.0.0/tinyxml/tinyxml.h 2008-04-18 19:40:35.000000000 +0200 |
252 |
-@@ -28,10 +28,11 @@ |
253 |
- #ifdef _MSC_VER |
254 |
- #pragma warning( disable : 4530 ) |
255 |
- #pragma warning( disable : 4786 ) |
256 |
- #endif |
257 |
+--- a/tinyxml/tinyxml.h |
258 |
++++ b/tinyxml/tinyxml.h |
259 |
+@@ -32,2 +32,3 @@ |
260 |
|
261 |
+#include <cstdlib> |
262 |
#include <string> |
263 |
- #include <stdio.h> |
264 |
- #include <assert.h> |
265 |
- |
266 |
- class TiXmlDocument; |
267 |
---- CriticalMass-1.0.0.orig/tinyxml/tinyxmlparser.cpp 2003-03-03 03:34:58.000000000 +0100 |
268 |
-+++ CriticalMass-1.0.0/tinyxml/tinyxmlparser.cpp 2008-04-18 19:40:35.000000000 +0200 |
269 |
-@@ -23,10 +23,12 @@ |
270 |
- |
271 |
- |
272 |
- #include "tinyxml.h" |
273 |
- #include <ctype.h> |
274 |
+--- a/tinyxml/tinyxmlparser.cpp |
275 |
++++ b/tinyxml/tinyxmlparser.cpp |
276 |
+@@ -27,2 +27,4 @@ |
277 |
|
278 |
+#include <cstring> |
279 |
+ |
280 |
const char* TiXmlBase::SkipWhiteSpace( const char* p ) |
281 |
- { |
282 |
- while ( p && *p && |
283 |
- ( isspace( *p ) || *p == '\n' || *p == '\r' ) ) |
284 |
- p++; |
285 |
---- CriticalMass-1.0.0.orig/utils/ResourceManager.cpp 2005-01-02 03:59:29.000000000 +0100 |
286 |
-+++ CriticalMass-1.0.0/utils/ResourceManager.cpp 2008-04-18 19:40:35.000000000 +0200 |
287 |
-@@ -20,10 +20,12 @@ |
288 |
- #include <ResourceManager.hpp> |
289 |
- #include <FindHash.hpp> |
290 |
- #include <Endian.hpp> |
291 |
- #include <WalkDirectory.hpp> |
292 |
+--- a/utils/ResourceManager.cpp |
293 |
++++ b/utils/ResourceManager.cpp |
294 |
+@@ -24,2 +24,4 @@ |
295 |
|
296 |
+#include <cstring> |
297 |
+ |
298 |
#ifdef WIN32 |
299 |
- const char PATH_SEPERATOR = '\\'; |
300 |
- #else |
301 |
- const char PATH_SEPERATOR = '/'; |
302 |
- #endif |
303 |
---- CriticalMass-1.0.0.orig/utils/Value.hpp 2004-12-18 03:41:24.000000000 +0100 |
304 |
-+++ CriticalMass-1.0.0/utils/Value.hpp 2008-04-18 19:40:35.000000000 +0200 |
305 |
-@@ -13,10 +13,11 @@ |
306 |
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details |
307 |
- // |
308 |
- #ifndef _Value_hpp_ |
309 |
- #define _Value_hpp_ |
310 |
+--- a/utils/Value.hpp |
311 |
++++ b/utils/Value.hpp |
312 |
+@@ -17,2 +17,3 @@ |
313 |
|
314 |
+#include <cstdlib> |
315 |
#include <stdio.h> |
316 |
- #include <string> |
317 |
- |
318 |
- #include <Trace.hpp> |
319 |
- |
320 |
---- CriticalMass-1.0.0.orig/utils/zStreamBufferImplZLib.cpp 2005-07-31 22:06:14.000000000 +0200 |
321 |
-+++ CriticalMass-1.0.0/utils/zStreamBufferImplZLib.cpp 2008-04-18 19:40:35.000000000 +0200 |
322 |
-@@ -10,10 +10,11 @@ |
323 |
- // |
324 |
- // This program is distributed in the hope that it will be useful, but WITHOUT |
325 |
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
326 |
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details |
327 |
+--- a/utils/zStream.cpp |
328 |
++++ b/utils/zStream.cpp |
329 |
+@@ -14,2 +14,3 @@ |
330 |
// |
331 |
+#include <cstdlib> |
332 |
#include <Trace.hpp> |
333 |
- #include <zStreamBufferImplZLib.hpp> |
334 |
- |
335 |
- bool ziStreamBufferImplZLib::init( void) |
336 |
- { |
337 |
---- CriticalMass-1.0.0.orig/utils/zStream.cpp 2005-07-31 22:06:14.000000000 +0200 |
338 |
-+++ CriticalMass-1.0.0/utils/zStream.cpp 2008-04-18 19:40:35.000000000 +0200 |
339 |
-@@ -10,10 +10,11 @@ |
340 |
- // |
341 |
- // This program is distributed in the hope that it will be useful, but WITHOUT |
342 |
- // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS |
343 |
- // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details |
344 |
+--- a/utils/zStreamBufferImplZLib.cpp |
345 |
++++ b/utils/zStreamBufferImplZLib.cpp |
346 |
+@@ -14,2 +14,3 @@ |
347 |
// |
348 |
+#include <cstdlib> |
349 |
#include <Trace.hpp> |
350 |
- #include <Endian.hpp> |
351 |
- #include <zStream.hpp> |
352 |
- #include <zStreamBufferImplLZMA.hpp> |
353 |
- #include <zStreamBufferImplZLib.hpp> |
354 |
|
355 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch |
356 |
new file mode 100644 |
357 |
index 000000000000..c2ea21bb2d63 |
358 |
--- /dev/null |
359 |
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng.patch |
360 |
@@ -0,0 +1,28 @@ |
361 |
+https://bugs.gentoo.org/206258 |
362 |
+https://bugs.gentoo.org/383207 |
363 |
+--- a/configure.in |
364 |
++++ b/configure.in |
365 |
+@@ -101,3 +101,3 @@ |
366 |
+ CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" |
367 |
+- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) |
368 |
++ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed)) |
369 |
+ AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) |
370 |
+--- a/game/main.cpp |
371 |
++++ b/game/main.cpp |
372 |
+@@ -30,2 +30,4 @@ |
373 |
+ |
374 |
++#include <zlib.h> |
375 |
++ |
376 |
+ void migrateConfig( void) |
377 |
+--- a/utilssdl/PNG.cpp |
378 |
++++ b/utilssdl/PNG.cpp |
379 |
+@@ -47,3 +47,3 @@ |
380 |
+ |
381 |
+- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); |
382 |
++ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); |
383 |
+ if( check != length) |
384 |
+@@ -74,3 +74,3 @@ |
385 |
+ |
386 |
+- if( setjmp(_png->jmpbuf)) |
387 |
++ if( setjmp(png_jmpbuf(_png))) |
388 |
+ { |
389 |
|
390 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch |
391 |
deleted file mode 100644 |
392 |
index f8a0eec2ad57..000000000000 |
393 |
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng14.patch |
394 |
+++ /dev/null |
395 |
@@ -1,11 +0,0 @@ |
396 |
---- a/configure.in |
397 |
-+++ b/configure.in |
398 |
-@@ -99,7 +99,7 @@ if test "x$TARGET" = xWIN32; then |
399 |
- else |
400 |
- LIBS="-L/usr/local/lib -L/usr/X11R6/lib $LIBS" |
401 |
- CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include" |
402 |
-- AC_CHECK_LIB(png12, main,, AC_MSG_ERROR(libpng is needed)) |
403 |
-+ AC_CHECK_LIB(png, main,, AC_MSG_ERROR(libpng is needed)) |
404 |
- AC_CHECK_LIB(z, main,, AC_MSG_ERROR(libz is needed)) |
405 |
- if test "x$TARGET" = xUNIX; then |
406 |
- if test "x$enable_dyngl" = xoff; then |
407 |
|
408 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch |
409 |
deleted file mode 100644 |
410 |
index dbdfc9f32275..000000000000 |
411 |
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-libpng15.patch |
412 |
+++ /dev/null |
413 |
@@ -1,31 +0,0 @@ |
414 |
---- a/game/main.cpp |
415 |
-+++ b/game/main.cpp |
416 |
-@@ -28,6 +28,8 @@ |
417 |
- #include <sys/stat.h> |
418 |
- #include <sys/types.h> |
419 |
- |
420 |
-+#include <zlib.h> |
421 |
-+ |
422 |
- void migrateConfig( void) |
423 |
- { |
424 |
- //if onlineCheck is not set, default it to true |
425 |
---- a/utilssdl/PNG.cpp |
426 |
-+++ b/utilssdl/PNG.cpp |
427 |
-@@ -45,7 +45,7 @@ |
428 |
- { |
429 |
- png_size_t check; |
430 |
- |
431 |
-- check = fwrite( data, 1, length, (FILE *)(png->io_ptr)); |
432 |
-+ check = fwrite( data, 1, length, (FILE *)(png_get_io_ptr(png))); |
433 |
- if( check != length) |
434 |
- { |
435 |
- png_error( png, "Write Error"); |
436 |
-@@ -72,7 +72,7 @@ |
437 |
- return false; |
438 |
- } |
439 |
- |
440 |
-- if( setjmp(_png->jmpbuf)) |
441 |
-+ if( setjmp(png_jmpbuf(_png))) |
442 |
- { |
443 |
- fclose( fp); |
444 |
- png_destroy_write_struct(&_png, (png_infopp)NULL); |
445 |
|
446 |
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch |
447 |
similarity index 57% |
448 |
rename from games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch |
449 |
rename to games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch |
450 |
index 1ab1a2d5ce52..084efbc05cf2 100644 |
451 |
--- a/games-arcade/criticalmass/files/criticalmass-1.0.2-system_curl.patch |
452 |
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.2-system-curl.patch |
453 |
@@ -1,33 +1,21 @@ |
454 |
+--- a/Makefile.am |
455 |
++++ b/Makefile.am |
456 |
+@@ -6,3 +6,3 @@ |
457 |
+ ## Any directories that you want built and installed should go here. |
458 |
+-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game |
459 |
++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game |
460 |
+ |
461 |
--- a/configure.in |
462 |
+++ b/configure.in |
463 |
-@@ -115,8 +115,6 @@ fi |
464 |
- AC_CHECK_LIB(m, sin,, |
465 |
- AC_MSG_ERROR(libm is needed)) |
466 |
+@@ -121,4 +121,2 @@ |
467 |
|
468 |
-AC_CONFIG_SUBDIRS(curl) |
469 |
- |
470 |
AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile) |
471 |
- |
472 |
- echo "Configuration: |
473 |
--- a/game/Makefile.am |
474 |
+++ b/game/Makefile.am |
475 |
-@@ -41,7 +41,7 @@ critter_SOURCES = \ |
476 |
- main.cpp |
477 |
- |
478 |
+@@ -43,3 +43,3 @@ |
479 |
LDADD = \ |
480 |
- ../curl/lib/libcurl.a \ |
481 |
+ -lcurl \ |
482 |
../utils/libutils.a \ |
483 |
- ../utilssdl/libutilssdl.a \ |
484 |
- ../utilsgl/libutilsgl.a \ |
485 |
---- a/Makefile.am |
486 |
-+++ b/Makefile.am |
487 |
-@@ -4,7 +4,7 @@ |
488 |
- AUTOMAKE_OPTIONS = 1.4 |
489 |
- |
490 |
- ## Any directories that you want built and installed should go here. |
491 |
--SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game |
492 |
-+SUBDIRS = tinyxml utils utilssdl utilsgl tools data game |
493 |
- |
494 |
- ## Any directories you want a part of the distribution should be listed |
495 |
- ## here, as well as have a Makefile generated at the end of configure.in |