packages (ICEDOVE_2_0): icedove/icedove.spec, icedove/icedove-libpng.patch ...

[arekm]

Author: arekm                        Date: Sat Jan 30 06:54:32 2010 GMT
Module: packages                      Tag: ICEDOVE_2_0
---- Log message:
- rel 6; libpng fix

---- Files affected:
packages/icedove:
   icedove.spec (1.31.2.1 -> 1.31.2.2) , icedove-libpng.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.31.2.1 packages/icedove/icedove.spec:1.31.2.2
--- packages/icedove/icedove.spec:1.31.2.1	Thu Jan 14 15:11:04 2010
+++ packages/icedove/icedove.spec	Sat Jan 30 07:54:27 2010
@@ -17,7 +17,7 @@
 Summary(pl.UTF-8):	Icedove - klient poczty
 Name:		icedove
 Version:	2.0.0.23
-Release:	5
+Release:	6
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		Applications/Networking
 Source0:	http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/%{version}/source/thunderbird-%{version}-source.tar.bz2
@@ -40,6 +40,7 @@
 Patch7:		%{name}-regionNames.patch
 Patch8:		%{name}-prefs.patch
 Patch9:		%{name}-gcc44.patch
+Patch10:	%{name}-libpng.patch
 URL:		http://www.pld-linux.org/Packages/Icedove
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	automake
@@ -136,6 +137,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 :> config/gcc_hidden.h
 
@@ -368,6 +370,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31.2.2  2010/01/30 06:54:27  arekm
+- rel 6; libpng fix
+
 Revision 1.31.2.1  2010/01/14 14:11:04  hawk
 - release 5
 

================================================================
Index: packages/icedove/icedove-libpng.patch
diff -u /dev/null packages/icedove/icedove-libpng.patch:1.1.2.1
--- /dev/null	Sat Jan 30 07:54:32 2010
+++ packages/icedove/icedove-libpng.patch	Sat Jan 30 07:54:27 2010
@@ -0,0 +1,15 @@
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp~	2006-05-20 19:20:49.000000000 +0200
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-30 07:52:00.347734738 +0100
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.31.2.1&r2=1.31.2.2&f=u