Date: Monday, January 30, 2012 @ 13:52:21 Author: ibiru Revision: 148366
db-move: moved xulrunner from [staging] to [testing] (i686) Added: xulrunner/repos/testing-i686/ xulrunner/repos/testing-i686/5007_fix_libpr0n_nsPNGDecoder.patch (from rev 148047, xulrunner/repos/staging-i686/5007_fix_libpr0n_nsPNGDecoder.patch) xulrunner/repos/testing-i686/PKGBUILD (from rev 148047, xulrunner/repos/staging-i686/PKGBUILD) xulrunner/repos/testing-i686/mozconfig (from rev 148047, xulrunner/repos/staging-i686/mozconfig) xulrunner/repos/testing-i686/mozilla-pkgconfig.patch (from rev 148047, xulrunner/repos/staging-i686/mozilla-pkgconfig.patch) Deleted: xulrunner/repos/staging-i686/ -------------------------------------+ 5007_fix_libpr0n_nsPNGDecoder.patch | 81 ++++++++++++++++++++++++++++++++++ PKGBUILD | 56 +++++++++++++++++++++++ mozconfig | 38 +++++++++++++++ mozilla-pkgconfig.patch | 40 ++++++++++++++++ 4 files changed, 215 insertions(+) Copied: xulrunner/repos/testing-i686/5007_fix_libpr0n_nsPNGDecoder.patch (from rev 148047, xulrunner/repos/staging-i686/5007_fix_libpr0n_nsPNGDecoder.patch) =================================================================== --- testing-i686/5007_fix_libpr0n_nsPNGDecoder.patch (rev 0) +++ testing-i686/5007_fix_libpr0n_nsPNGDecoder.patch 2012-01-30 18:52:21 UTC (rev 148366) @@ -0,0 +1,81 @@ +# HG changeset patch +# User Glenn Randers-Pehrson <glennrp+...@gmail.com> +# 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; + + Copied: xulrunner/repos/testing-i686/PKGBUILD (from rev 148047, xulrunner/repos/staging-i686/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-01-30 18:52:21 UTC (rev 148366) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Alexander Baldeck <alexan...@archlinux.org> +pkgname=xulrunner +pkgver=9.0.1 +pkgrel=2 +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 + mozconfig + mozilla-pkgconfig.patch + 5007_fix_libpr0n_nsPNGDecoder.patch) +options=('!emptydirs') +replaces=('xulrunner-oss') +md5sums=('7cf2bd379792a9b232267c6a79680566' + '8dfb78c5bd0581c8cf4753813132bf0b' + '27271ce647a83906ef7a24605e840d61' + '6f3be4f4ac0217d0782b1a0770d80f28') + +build() { + cd "$srcdir/mozilla-release" + cp "$srcdir/mozconfig" .mozconfig + + #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" + + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" +} + +package() { + cd "$srcdir/mozilla-release" + make -j1 -f client.mk DESTDIR="$pkgdir" install + + rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation} + ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries" + ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation" + + # add xulrunner library path to ld.so.conf + install -d $pkgdir/etc/ld.so.conf.d + echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf + + chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py" + sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py" +} Copied: xulrunner/repos/testing-i686/mozconfig (from rev 148047, xulrunner/repos/staging-i686/mozconfig) =================================================================== --- testing-i686/mozconfig (rev 0) +++ testing-i686/mozconfig 2012-01-30 18:52:21 UTC (rev 148366) @@ -0,0 +1,38 @@ +. $topsrcdir/xulrunner/config/mozconfig + +ac_add_options --prefix=/usr +ac_add_options --libdir=/usr/lib + +# System libraries +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-jpeg +ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 +ac_add_options --with-system-png +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx +ac_add_options --enable-system-hunspell +ac_add_options --enable-system-sqlite +ac_add_options --enable-system-ffi +ac_add_options --enable-system-cairo +ac_add_options --enable-system-pixman +ac_add_options --with-pthreads + +# Features +ac_add_options --enable-safe-browsing +ac_add_options --enable-startup-notification +ac_add_options --enable-gio + +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter +ac_add_options --disable-updater +ac_add_options --disable-tests +ac_add_options --disable-mochitest +ac_add_options --disable-installer + +# Optimization +ac_add_options --enable-optimize + +export MOZILLA_OFFICIAL=1 +mk_add_options MOZILLA_OFFICIAL=1 Copied: xulrunner/repos/testing-i686/mozilla-pkgconfig.patch (from rev 148047, xulrunner/repos/staging-i686/mozilla-pkgconfig.patch) =================================================================== --- testing-i686/mozilla-pkgconfig.patch (rev 0) +++ testing-i686/mozilla-pkgconfig.patch 2012-01-30 18:52:21 UTC (rev 148366) @@ -0,0 +1,40 @@ +diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000 ++++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000 +@@ -6,5 +6,6 @@ + Name: libxul-embedding + Description: Static library for version-independent embedding of the Mozilla runtime + Version: %MOZILLA_VERSION% ++Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib -lxpcomglue -ldl + Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% +diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in +--- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000 +@@ -1,5 +1,6 @@ + prefix=%prefix% + sdkdir=%sdkdir% ++libdir=%libdir% + includedir=%includedir% + idldir=%idldir% + +diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in +--- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000 +@@ -108,6 +108,7 @@ + -e "s|%includedir%|$(includedir)|" \ + -e "s|%idldir%|$(idldir)|" \ + -e "s|%sdkdir%|$(sdkdir)|" \ ++ -e "s|%libdir%|$(installdir)|" \ + -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ + -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ + -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ +diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in +--- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000 ++++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000 +@@ -7,4 +7,4 @@ + Version: %MOZILLA_VERSION% + Requires: %NSPR_NAME% >= %NSPR_VERSION% + Libs: -L${sdkdir}/lib %MOZ_JS_LINK% +-Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE ++Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE