Author: qboosh Date: Tue Jan 17 20:22:35 2012 GMT Module: packages Tag: HEAD ---- Log message: - added libpng patch to fix build with libpng 1.5.x
---- Files affected: packages/xulrunner: xulrunner.spec (1.204 -> 1.205) , xulrunner-libpng.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/xulrunner/xulrunner.spec diff -u packages/xulrunner/xulrunner.spec:1.204 packages/xulrunner/xulrunner.spec:1.205 --- packages/xulrunner/xulrunner.spec:1.204 Thu Dec 22 12:30:54 2011 +++ packages/xulrunner/xulrunner.spec Tue Jan 17 21:22:29 2012 @@ -43,6 +43,7 @@ # http://pkgs.fedoraproject.org/gitweb/?p=xulrunner.git;a=tree Patch9: %{name}-gtkmozembed.patch Patch10: %{name}-linux3.patch +Patch11: %{name}-libpng.patch URL: https://developer.mozilla.org/en/XULRunner %{!?with_qt:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: alsa-lib-devel @@ -188,6 +189,7 @@ %patch8 -p1 %patch9 -p2 %patch10 -p1 +%patch11 -p2 # config/rules.mk is patched by us and js/src/config/rules.mk # is supposed to be exact copy @@ -422,6 +424,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.205 2012/01/17 20:22:29 qboosh +- added libpng patch to fix build with libpng 1.5.x + Revision 1.204 2011/12/22 11:30:54 arekm - up to 9.0.1; BR: older xulrunner-devel (building with system one installed produces hanging xulrunner or doesn't build at all ================================================================ Index: packages/xulrunner/xulrunner-libpng.patch diff -u /dev/null packages/xulrunner/xulrunner-libpng.patch:1.3 --- /dev/null Tue Jan 17 21:22:35 2012 +++ packages/xulrunner/xulrunner-libpng.patch Tue Jan 17 21:22:29 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/xulrunner/xulrunner.spec?r1=1.204&r2=1.205&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-libpng.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
