diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-01 21:29:17 -0300 |
| commit | 5a1b7efd1dfd0d0a1f4a7a4b68ea7b69f06aa6d1 (patch) | |
| tree | f2d8419cf544c9c1980e49a5a94f19252e17d4e7 /extra/xulrunner | |
| parent | 02380099f9ca13810767a2d25742c6862e255852 (diff) | |
| parent | 40f0b1c7106cc1fed13f14e80f083ecd69c416f5 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/clementine/PKGBUILD
community/google-gadgets/PKGBUILD
community/redis/PKGBUILD
community/uzbl/PKGBUILD
extra/anjuta/PKGBUILD
extra/atkmm/PKGBUILD
extra/ekiga/PKGBUILD
extra/epiphany/PKGBUILD
extra/evolution-data-server/PKGBUILD
extra/gdl/PKGBUILD
extra/glade/PKGBUILD
extra/glibmm/PKGBUILD
extra/gnome-control-center/PKGBUILD
extra/gnome-desktop/PKGBUILD
extra/gnome-menus/PKGBUILD
extra/gnome-nettool/PKGBUILD
extra/gnome-panel/PKGBUILD
extra/gnome-sharp/PKGBUILD
extra/gtk2/PKGBUILD
extra/gtkmm/PKGBUILD
extra/libchamplain/PKGBUILD
extra/libgda/PKGBUILD
extra/libotr/PKGBUILD
extra/libvncserver/PKGBUILD
extra/libwebkit/PKGBUILD
extra/notification-daemon/PKGBUILD
extra/pangomm/PKGBUILD
extra/pidgin/PKGBUILD
extra/pygobject/PKGBUILD
extra/rasqal/PKGBUILD
extra/redland/PKGBUILD
extra/vte/PKGBUILD
extra/xarchiver/PKGBUILD
extra/yelp/PKGBUILD
testing/gnome-control-center/PKGBUILD
testing/mesa/PKGBUILD
testing/rasqal/PKGBUILD
testing/redland/PKGBUILD
Diffstat (limited to 'extra/xulrunner')
| -rw-r--r-- | extra/xulrunner/PKGBUILD | 12 | ||||
| -rw-r--r-- | extra/xulrunner/xulrunner-omnijar.patch | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/extra/xulrunner/PKGBUILD b/extra/xulrunner/PKGBUILD index 0fe853d23..3fb4ccab2 100644 --- a/extra/xulrunner/PKGBUILD +++ b/extra/xulrunner/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115811 2011-03-21 17:44:12Z ibiru $ +# $Id: PKGBUILD 121212 2011-04-29 14:12:33Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@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' 'mips64el') @@ -18,11 +18,11 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver} 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 @@ build() { unset CFLAGS unset CXXFLAGS + export CXXFLAGS="-fpermissive" + make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" } diff --git a/extra/xulrunner/xulrunner-omnijar.patch b/extra/xulrunner/xulrunner-omnijar.patch index 05b665afd..66ec5206c 100644 --- a/extra/xulrunner/xulrunner-omnijar.patch +++ b/extra/xulrunner/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()) { |