Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28021
Modified Files:
wesnoth.info wesnoth.patch
Log Message:
New upstream version. Update by jessealama from the submissions tracker:
https://sourceforge.net/tracker/?func=detail&atid=414256&aid=2898249&group_id=17203
Index: wesnoth.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- wesnoth.patch 2 Jan 2009 05:06:32 -0000 1.10
+++ wesnoth.patch 16 Nov 2009 06:53:09 -0000 1.11
@@ -1,36 +1,24 @@
-diff -Naur --exclude='*~' wesnoth-1.4.6/configure wesnoth-1.4.6.fink/configure
---- wesnoth-1.4.6/configure 2008-11-02 12:20:54.000000000 -0800
-+++ wesnoth-1.4.6.fink/configure 2008-12-06 14:34:20.000000000 -0800
-@@ -13961,6 +13961,7 @@
- { $as_echo "$as_me:$LINENO: checking for PNG support in SDL_image" >&5
- $as_echo_n "checking for PNG support in SDL_image... " >&6; }
+diff -Naur --exclude='*~' wesnoth-1.6.5/src/tools/cutter.cpp
wesnoth-1.6.5.fink/src/tools/cutter.cpp
+--- wesnoth-1.6.5/src/tools/cutter.cpp 2009-01-01 10:27:41.000000000 +0000
++++ wesnoth-1.6.5.fink/src/tools/cutter.cpp 2009-11-15 23:20:37.000000000
+0000
+@@ -95,6 +95,8 @@
+ } catch(exploder_failure err) {
+ std::cerr << "Failed: " << err.message << "\n";
+ }
++
++ return 0;
+ }
-+if test "x$enable_sdltest" = "xyes" ; then
- OLD_CPPFLAGS=$CPPFLAGS
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
-@@ -14042,7 +14043,7 @@
- CPPFLAGS=$OLD_CPPFLAGS
- CFLAGS=$OLD_CFLAGS
- LIBS=$OLD_LIBS
--
-+fi
- #######################################################################
- # Check for OGG support in SDL_mixer #
-@@ -14059,6 +14060,7 @@
- { $as_echo "$as_me:$LINENO: checking for OGG support in SDL_mixer" >&5
- $as_echo_n "checking for OGG support in SDL_mixer... " >&6; }
+diff -Naur --exclude='*~' wesnoth-1.6.5/src/tools/exploder.cpp
wesnoth-1.6.5.fink/src/tools/exploder.cpp
+--- wesnoth-1.6.5/src/tools/exploder.cpp 2009-01-01 10:27:41.000000000
+0000
++++ wesnoth-1.6.5.fink/src/tools/exploder.cpp 2009-11-15 23:20:31.000000000
+0000
+@@ -69,6 +69,8 @@
+ } catch(exploder_failure err) {
+ std::cerr << "Failed: " << err.message << "\n";
+ }
++
++ return 0;
+ }
-+ if test "x$enable_sdltest" = "xyes" ; then
- OLD_CPPFLAGS=$CPPFLAGS
- OLD_CFLAGS=$CFLAGS
- OLD_LIBS=$LIBS
-@@ -14138,6 +14140,7 @@
- CPPFLAGS=$OLD_CPPFLAGS
- CFLAGS=$OLD_CFLAGS
- LIBS=$OLD_LIBS
-+ fi
- fi
- fi
Index: wesnoth.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/games/wesnoth.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- wesnoth.info 27 Jan 2009 07:41:14 -0000 1.14
+++ wesnoth.info 16 Nov 2009 06:53:08 -0000 1.15
@@ -1,12 +1,11 @@
Package: wesnoth
-Version: 1.4.6
+Version: 1.6.5
Revision: 1
Description: Fantasy turn-based strategy game
GCC: 4.0
-Source-MD5: 9e92234b29f062b3779750ba3cd0a71b
+Source-MD5: 493826bbd9ba355930765a7e8fe3749a
Source: mirror:sourceforge:wesnoth/wesnoth-%v.tar.bz2
BuildDepends: <<
- fink (>= 0.24.12),
sdl,
sdl-mixer,
sdl-image,
@@ -20,9 +19,10 @@
libiconv-dev,
libgettext3-dev,
gettext-tools,
- boost1.33
+ boost1.35.python25,
+ fink (>= 0.24.12)
<<
-Conflicts: wesnoth-devel, wesnoth-devel-campaign-server, wesnoth-devel-editor,
wesnoth-devel-server
+Conflicts: wesnoth-devel, wesnoth-devel-campaign-server, wesnoth-devel-editor,
wesnoth-devel-server, wesnoth-editor (<= 1.6.5)
Replaces: wesnoth-devel, wesnoth-devel-campaign-server, wesnoth-devel-editor,
wesnoth-devel-server
Depends: <<
sdl-mixer-shlibs,
@@ -36,7 +36,7 @@
freetype219-shlibs,
libiconv,
libgettext3-shlibs,
- boost1.33-shlibs
+ boost1.35.python25-shlibs
<<
DocFiles: <<
ABOUT-NLS
@@ -61,12 +61,13 @@
--with-server-uid=root \
--disable-python \
--disable-python-install \
- --with-boost=%p
+ --with-boost=%p \
+ --disable-strict-compilation
<<
PatchFile: %n.patch
-PatchFile-MD5: ffb25ea97c36dd00de8d5ed16eee1fb7
+PatchFile-MD5: 12ba1e8b79608f4c05d49ae6da56d96b
PatchScript: <<
- %{default_script}
+ %{default_script}
perl -pi -e 's/-L. -l(wesnoth-core)/lib\1.a/' src/Makefile.in
<<
CompileScript: <<
@@ -156,17 +157,6 @@
<<
SplitOff2: <<
- Package: wesnoth-editor
- Replaces: wesnoth-editor (>= 1.2.3)
- Conflicts: wesnoth-editor (>= 1.2.3)
- Description: Battle for Wesnoth map editor
- Files: <<
- bin/wesnoth_editor
- share/man/de/man6/wesnoth_editor.6
- share/man/man6/wesnoth_editor.6
-<<
-<<
-SplitOff3: <<
Package: wesnoth-campaign-server
Conflicts: wesnoth-campaign-server (>= 1.2.3)
Replaces: wesnoth-campaign-server (>= 1.2.3)
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
