[arch-commits] Commit in xulrunner/trunk (PKGBUILD xulrunner-omnijar.patch)

[Ionut Biru]

    Date: Friday, April 29, 2011 @ 10:12:33
  Author: ibiru
Revision: 121212

update to 2.0.1

Modified:
  xulrunner/trunk/PKGBUILD
  xulrunner/trunk/xulrunner-omnijar.patch

-------------------------+
 PKGBUILD                |   10 ++++++----
 xulrunner-omnijar.patch |    6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-29 14:10:42 UTC (rev 121211)
+++ PKGBUILD	2011-04-29 14:12:33 UTC (rev 121212)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 pkgname=xulrunner
-pkgver=2.0
-_ffoxver=4.0
+pkgver=2.0.1
+_ffoxver=4.0.1
 pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=('i686' 'x86_64')
@@ -18,11 +18,11 @@
         xulrunner-omnijar.patch
         port_gnomevfs_to_gio.patch)
 options=('!emptydirs')
-md5sums=('3468a2c463b4fc2788ba621e4b511c30'
+md5sums=('9abda7d23151e97913c8555a64c13f34'
          '2358a2ddd35bcdd62ff42442dfe548d9'
          '639ea80e823543dd415b90c0ee804186'
          'a0236f6c3e55f60b7888d8cf137ff209'
-         'dea8c2a57a588bf5f6198ce7b4155655'
+         '0bf82bc6677e3ce57fd20a147fe8d7b1'
          '42f83468b296452fb754a81a4317ca64')
 build() {
   cd "${srcdir}/mozilla-2.0"
@@ -43,6 +43,8 @@
   unset CFLAGS
   unset CXXFLAGS
 
+  export CXXFLAGS="-fpermissive"
+
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
 

Modified: xulrunner-omnijar.patch
===================================================================
--- xulrunner-omnijar.patch	2011-04-29 14:10:42 UTC (rev 121211)
+++ xulrunner-omnijar.patch	2011-04-29 14:12:33 UTC (rev 121212)
@@ -468,11 +468,11 @@
 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 @@
    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()) {