From 9780d07c31b22125ad7ecba4e281ff41194f95be Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Wed, 4 May 2011 12:58:32 +0000
Subject: Wed May  4 12:58:31 UTC 2011

---
 community/xulrunner-oss/PKGBUILD                | 16 +++++++++-------
 community/xulrunner-oss/xulrunner-omnijar.patch |  6 +++---
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'community/xulrunner-oss')

diff --git a/community/xulrunner-oss/PKGBUILD b/community/xulrunner-oss/PKGBUILD
index b36ba73e9..924c875c9 100644
--- a/community/xulrunner-oss/PKGBUILD
+++ b/community/xulrunner-oss/PKGBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=xulrunner-oss
-pkgver=2.0
-_ffoxver=4.0
-pkgrel=2
+pkgver=2.0.1
+_ffoxver=4.0.1
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment compiled with OSS support"
 arch=('i686' 'x86_64')
 license=('MPL' 'GPL' 'LGPL')
@@ -21,13 +21,14 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}
 options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${pkgver}")
-md5sums=('3468a2c463b4fc2788ba621e4b511c30'
+md5sums=('9abda7d23151e97913c8555a64c13f34'
          '2358a2ddd35bcdd62ff42442dfe548d9'
          '639ea80e823543dd415b90c0ee804186'
          'a0236f6c3e55f60b7888d8cf137ff209'
-         'dea8c2a57a588bf5f6198ce7b4155655'
+         '0bf82bc6677e3ce57fd20a147fe8d7b1'
          '42f83468b296452fb754a81a4317ca64'
-	 '81032ce49c2a5ac15d62155bcc42d3ed')
+         '81032ce49c2a5ac15d62155bcc42d3ed')
+
 build() {
   cd "${srcdir}/mozilla-2.0"
   cp "${srcdir}/mozconfig" .mozconfig
@@ -39,7 +40,7 @@ build() {
   patch -Np1 -i "${srcdir}/xulrunner-version.patch"
 
   patch -Np1 -i "${srcdir}/xulrunner-omnijar.patch"
-  
+
   patch -Np1 -i "${srcdir}/port_gnomevfs_to_gio.patch"
 
   patch -Np0 -i "${srcdir}/oss.patch"
@@ -49,6 +50,7 @@ build() {
 
   unset CFLAGS
   unset CXXFLAGS
+  export CXXFLAGS="-fpermissive"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
diff --git a/community/xulrunner-oss/xulrunner-omnijar.patch b/community/xulrunner-oss/xulrunner-omnijar.patch
index 05b665afd..66ec5206c 100644
--- a/community/xulrunner-oss/xulrunner-omnijar.patch
+++ b/community/xulrunner-oss/xulrunner-omnijar.patch
@@ -468,11 +468,11 @@ diff --git a/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/js/src/xpconnect
 diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
 --- a/modules/libjar/nsJAR.cpp
 +++ b/modules/libjar/nsJAR.cpp
-@@ -170,26 +170,23 @@ nsJAR::Open(nsIFile* zipFile)
-   NS_ENSURE_ARG_POINTER(zipFile);
+@@ -171,26 +171,23 @@ nsJAR::Open(nsIFile* zipFile)
    if (mLock) return NS_ERROR_FAILURE; // Already open!
  
    mZipFile = zipFile;
+   mOuterZipEntry.Truncate();
  
    mLock = PR_NewLock();
    NS_ENSURE_TRUE(mLock, NS_ERROR_OUT_OF_MEMORY);
@@ -499,13 +499,13 @@ diff --git a/modules/libjar/nsJAR.cpp b/modules/libjar/nsJAR.cpp
    NS_ENSURE_ARG_POINTER(aZipReader);
    NS_ENSURE_ARG_POINTER(aZipEntry);
 @@ -234,23 +231,22 @@ nsJAR::Close()
+     mLock = nsnull;
    }
  
    mParsedManifest = PR_FALSE;
    mManifestData.Reset();
    mGlobalStatus = JAR_MANIFEST_NOT_PARSED;
    mTotalItemsInManifest = 0;
-   mOuterZipEntry.Truncate(0);
  
 -#ifdef MOZ_OMNIJAR
 -  if (mZip == mozilla::OmnijarReader()) {
-- 
cgit v1.2.3-54-g00ecf