Date: Tuesday, January 31, 2012 @ 14:00:12 Author: ibiru Revision: 148424
update to 10.0 Modified: xulrunner/trunk/PKGBUILD Deleted: xulrunner/trunk/5007_fix_libpr0n_nsPNGDecoder.patch -------------------------------------+ 5007_fix_libpr0n_nsPNGDecoder.patch | 81 ---------------------------------- PKGBUILD | 15 ++---- 2 files changed, 6 insertions(+), 90 deletions(-) Deleted: 5007_fix_libpr0n_nsPNGDecoder.patch =================================================================== --- 5007_fix_libpr0n_nsPNGDecoder.patch 2012-01-31 18:54:29 UTC (rev 148423) +++ 5007_fix_libpr0n_nsPNGDecoder.patch 2012-01-31 19:00:12 UTC (rev 148424) @@ -1,81 +0,0 @@ -# HG changeset patch -# User Glenn Randers-Pehrson <[email protected]> -# Date 1320490106 0 -# Node ID aff1bd412058cb6926a8feae1e8c0fc76b4c04a3 -# Parent 8248dbffd64534fb6c65ad3d757b795119e783c6 -Bug 682677 - Eliminated direct access to mInfo->pixel_depth, which is not allowed in libpng15. We access pixel_depth via png_get_IHDR() instead; r=joedrew - -diff --git a/modules/libpr0n/decoders/nsICODecoder.cpp b/modules/libpr0n/decoders/nsICODecoder.cpp ---- a/modules/libpr0n/decoders/nsICODecoder.cpp -+++ b/modules/libpr0n/decoders/nsICODecoder.cpp -@@ -381,18 +381,17 @@ nsICODecoder::WriteInternal(const char* - return; - } - mPos += aCount; - aBuffer += aCount; - aCount = 0; - - // Raymond Chen says that 32bpp only are valid PNG ICOs - // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() && -- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) { -+ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) { - PostDataError(); - } - return; - } - - // We've processed all of the icon dir entries and are within the - // bitmap info size - if (!mIsPNG && mCurrIcon == mNumIcons && mPos >= mImageOffset && -diff --git a/modules/libpr0n/decoders/nsPNGDecoder.h b/modules/libpr0n/decoders/nsPNGDecoder.h ---- a/modules/libpr0n/decoders/nsPNGDecoder.h -+++ b/modules/libpr0n/decoders/nsPNGDecoder.h -@@ -68,29 +68,35 @@ public: - - void CreateFrame(png_uint_32 x_offset, png_uint_32 y_offset, - PRInt32 width, PRInt32 height, - gfxASurface::gfxImageFormat format); - void SetAnimFrameInfo(); - - void EndImageFrame(); - -- // Checks if the info header contains valid information -- bool HasValidInfo() const -+ // Check if PNG is valid ICO (32bpp RGBA) -+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx -+ bool IsValidICO() const - { -- return mInfo && mInfo->valid; -- } -+ png_uint_32 -+ png_width, // Unused -+ png_height; // Unused - -- // Obtain the pixel depth if available or 0 otherwise -- PRInt32 GetPixelDepth() const -- { -- if (!mInfo) { -- return 0; -+ int png_bit_depth, -+ png_color_type; -+ -+ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth, -+ &png_color_type, NULL, NULL, NULL)) { -+ -+ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA && -+ png_bit_depth == 8); -+ } else { -+ return false; - } -- return mInfo->pixel_depth; - } - - public: - png_structp mPNG; - png_infop mInfo; - nsIntRect mFrameRect; - PRUint8 *mCMSLine; - PRUint8 *interlacebuf; - - Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-01-31 18:54:29 UTC (rev 148423) +++ PKGBUILD 2012-01-31 19:00:12 UTC (rev 148424) @@ -2,24 +2,22 @@ # Maintainer: Jan de Groot <[email protected]> # Contributor: Alexander Baldeck <[email protected]> pkgname=xulrunner -pkgver=9.0.1 -pkgrel=2 +pkgver=10.0 +pkgrel=1 pkgdesc="Mozilla Runtime Environment" arch=('i686' 'x86_64') license=('MPL' 'GPL' 'LGPL') depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2') makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa') url="http://wiki.mozilla.org/XUL:Xul_Runner"; -source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2 +source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/$pkgver/source/firefox-$pkgver.source.tar.bz2 mozconfig - mozilla-pkgconfig.patch - 5007_fix_libpr0n_nsPNGDecoder.patch) + mozilla-pkgconfig.patch) options=('!emptydirs') replaces=('xulrunner-oss') -md5sums=('7cf2bd379792a9b232267c6a79680566' +md5sums=('13c61203ccfa583e5a54b4dc22f41233' '8dfb78c5bd0581c8cf4753813132bf0b' - '27271ce647a83906ef7a24605e840d61' - '6f3be4f4ac0217d0782b1a0770d80f28') + '27271ce647a83906ef7a24605e840d61') build() { cd "$srcdir/mozilla-release" @@ -28,7 +26,6 @@ #fix libdir/sdkdir - fedora patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch" - patch -Np1 -i "$srcdir/5007_fix_libpr0n_nsPNGDecoder.patch" export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver" export PYTHON="/usr/bin/python2"
