packages: icedove/icedove.spec, icedove/icedove-libpng.patch - added libpng...

[qboosh]

Author: qboosh                       Date: Sat Jan 21 18:07:16 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added libpng patch to fix build with libpng 1.5.x

---- Files affected:
packages/icedove:
   icedove.spec (1.137 -> 1.138) , icedove-libpng.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.137 packages/icedove/icedove.spec:1.138
--- packages/icedove/icedove.spec:1.137	Wed Jan 11 09:26:58 2012
+++ packages/icedove/icedove.spec	Sat Jan 21 19:07:11 2012
@@ -30,7 +30,7 @@
 %define		nspr_ver	4.8.8
 %define		nss_ver		3.12.10
 
-# convert firefox release number to platform version: 7.0.x -> 7.0.x
+# convert firefox release number to platform version: 9.0.x -> 9.0.x
 %define		xulrunner_main	9.0
 %define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#9.0})
 
@@ -64,6 +64,7 @@
 Patch6:		%{name}-prefs.patch
 Patch7:		system-mozldap.patch
 Patch8:		%{name}-makefile.patch
+Patch9:		%{name}-libpng.patch
 Patch10:	%{name}-extensiondir.patch
 Patch11:	crashreporter.patch
 Patch12:	no-subshell.patch
@@ -203,6 +204,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p2
+%patch9 -p1
 %patch10 -p2
 %patch11 -p2
 %patch12 -p1
@@ -566,6 +568,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.138  2012/01/21 18:07:11  qboosh
+- added libpng patch to fix build with libpng 1.5.x
+
 Revision 1.137  2012/01/11 08:26:58  lisu
 - up to 9.0.1
 

================================================================
Index: packages/icedove/icedove-libpng.patch
diff -u /dev/null packages/icedove/icedove-libpng.patch:1.6
--- /dev/null	Sat Jan 21 19:07:16 2012
+++ packages/icedove/icedove-libpng.patch	Sat Jan 21 19:07:11 2012
@@ -0,0 +1,21 @@
+--- xulrunner-9.0.1/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h.orig	2011-12-21 00:28:33.000000000 +0100
++++ xulrunner-9.0.1/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h	2012-01-16 18:43:35.830209631 +0100
+@@ -76,7 +76,7 @@
+   // Checks if the info header contains valid information
+   bool HasValidInfo() const 
+   {
+-    return mInfo && mInfo->valid;
++    return mInfo && png_get_valid(mPNG, mInfo, 0xFFFFFFFFU);
+   }
+ 
+   // Obtain the pixel depth if available or 0 otherwise
+@@ -85,7 +85,8 @@
+     if (!mInfo) {
+       return 0;
+     }
+-    return mInfo->pixel_depth;
++    // XXX: shouldn't png_get_pixel_depth() be available?
++    return png_get_bit_depth(mPNG, mInfo) * png_get_channels(mPNG, mInfo);
+   }
+ 
+ public:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove.spec?r1=1.137&r2=1.138&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedove/icedove-libpng.patch?r1=1.5&r2=1.6&f=u