packages (DEVEL): wesnoth/wesnoth-libpng.patch - merged from HEAD - updated...

lisu lisu at pld-linux.org
Thu Feb 11 16:06:19 CET 2010


Author: lisu                         Date: Thu Feb 11 15:06:20 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- merged from HEAD
- updated for 1.7.13

---- Files affected:
packages/wesnoth:
   wesnoth-libpng.patch (1.1 -> 1.1.2.1) 

---- Diffs:

================================================================
Index: packages/wesnoth/wesnoth-libpng.patch
diff -u packages/wesnoth/wesnoth-libpng.patch:1.1 packages/wesnoth/wesnoth-libpng.patch:1.1.2.1
--- packages/wesnoth/wesnoth-libpng.patch:1.1	Thu Feb 11 13:38:16 2010
+++ packages/wesnoth/wesnoth-libpng.patch	Thu Feb 11 16:06:12 2010
@@ -1,11 +1,10 @@
-diff -urN wesnoth-1.6.5/src/tools/exploder_utils.cpp wesnoth-1.6.5.new/src/tools/exploder_utils.cpp
---- wesnoth-1.6.5/src/tools/exploder_utils.cpp	2009-01-01 11:27:41.000000000 +0100
-+++ wesnoth-1.6.5.new/src/tools/exploder_utils.cpp	2010-02-11 13:21:55.718521128 +0100
+--- wesnoth-1.7.13/src/tools/exploder_utils.cpp~	2010-01-01 14:16:49.000000000 +0100
++++ wesnoth-1.7.13/src/tools/exploder_utils.cpp	2010-02-11 15:38:16.226041276 +0100
 @@ -174,8 +174,8 @@
  	//TODO: review whether providing NULL error handlers is something
  	//sensible
  	png_struct* png_ptr = png_create_write_struct
--		(PNG_LIBPNG_VER_STRING, (png_voidp)png_voidp_NULL,
+-		(PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL),
 -		 png_error_ptr_NULL, png_error_ptr_NULL);
 +		(PNG_LIBPNG_VER_STRING, NULL,
 +		 NULL, NULL);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wesnoth/wesnoth-libpng.patch?r1=1.1&r2=1.1.2.1&f=u



More information about the pld-cvs-commit mailing list