[cvs] experimental/fangism/finkinfo wesnoth.info, 1.4, 1.5 wesnoth.patch, 1.1, 1.2

[fangism <fa...@us...>]

Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv1838

Modified Files:
	wesnoth.info wesnoth.patch 
Log Message:
upstream update 1.8.5, had to patch out an SDL test in configure.ac this time


Index: wesnoth.patch
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/wesnoth.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wesnoth.patch	18 Aug 2010 22:53:14 -0000	1.1
+++ wesnoth.patch	22 Oct 2010 22:32:43 -0000	1.2
@@ -1,24 +1,25 @@
-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;
- }
+--- wesnoth-1.8.5-orig/configure.ac	2010-09-24 10:37:41.000000000 -0700
++++ wesnoth-1.8.5/configure.ac	2010-10-22 15:08:14.000000000 -0700
+@@ -755,6 +755,7 @@
  
+ AC_LANG([C])
+ AC_MSG_CHECKING([for PNG support in SDL_image])
++if test "x$enable_sdltest" = "xyes" ; then
  
-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;
- }
+ OLD_CPPFLAGS=$CPPFLAGS
+ OLD_CFLAGS=$CFLAGS
+@@ -789,11 +790,14 @@
+ 	[AC_MSG_ERROR([*** Either your test image has vanished, or SDL_image has no PNG support!])],
+ 	[AC_MSG_RESULT([not tested in cross-compiling])])
+ 
+ CPPFLAGS=$OLD_CPPFLAGS
+ CFLAGS=$OLD_CFLAGS
+ LIBS=$OLD_LIBS
++else
++	AC_MSG_RESULT([test disabled])
++fi
  
  
+ #######################################################################
+ # Check for OGG support in SDL_mixer                                  #
+ #######################################################################

Index: wesnoth.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/wesnoth.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- wesnoth.info	25 Aug 2010 02:16:15 -0000	1.4
+++ wesnoth.info	22 Oct 2010 22:32:43 -0000	1.5
@@ -1,9 +1,9 @@
 Package: wesnoth
-Version: 1.8.4
+Version: 1.8.5
 Revision: 1
 Description: Fantasy turn-based strategy game
 GCC: 4.0
-Source-MD5: 2dce83f835ecce1d505ea60e46b7356f
+Source-MD5: a800285d1406690755dd0ea22b98b6df
 Source: mirror:sourceforge:wesnoth/wesnoth-%v.tar.bz2
 BuildDepends: <<
   autoconf (>= 2.60),
@@ -74,11 +74,11 @@
   PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH" \
   FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
 <<
-# PatchFile: %n.patch
-# PatchFile-MD5: 12ba1e8b79608f4c05d49ae6da56d96b
+PatchFile: %n.patch
+PatchFile-MD5: 69d07a787a28ab3d0865abc433528b04
 PatchScript: <<
   #!/bin/sh -ev
-#  %{default_script}
+  %{default_script}
   perl -pi -e 's/-L. -l(wesnoth-core)/lib\1.a/' src/Makefile.am
   # darwin10: msgmerge is screwy, disabling backup avoids permissions issues
   file=po/Makefile.in.in