diff options
18 files changed, 100 insertions, 729 deletions
diff --git a/abs/core-testing/sqlite3/PKGBUILD b/abs/core-testing/sqlite3/PKGBUILD index b40c3ee..31f6a30 100644 --- a/abs/core-testing/sqlite3/PKGBUILD +++ b/abs/core-testing/sqlite3/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=sqlite3 -pkgver=3.6.7 -pkgrel=2 +pkgver=3.6.10 +pkgrel=3 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64') license=('custom') @@ -15,9 +15,9 @@ conflicts=('sqlite') replaces=('sqlite') source=(http://www.sqlite.org/sqlite-$pkgver.tar.gz license.txt) -options=(!libtool) -md5sums=('5223d1f459b608ed8c2c54f8847f8e1a' +md5sums=('a03bdc86df4025b6881d58557e4b5bd3' 'c1cdbc5544034d9012e421e75a5e4890') +options=(!libtool) build() { cd ${srcdir}/sqlite-${pkgver} diff --git a/abs/extra-testing/community/firefox/PKGBUILD b/abs/extra-testing/community/firefox/PKGBUILD index c72e419..1d2ea63 100644 --- a/abs/extra-testing/community/firefox/PKGBUILD +++ b/abs/extra-testing/community/firefox/PKGBUILD @@ -1,14 +1,15 @@ -# $Id: PKGBUILD 36426 2009-04-22 11:55:02Z pierre $ +# $Id: PKGBUILD 46468 2009-07-18 13:24:45Z jgc $ # Contributor: Jakub Schmidtke <sjakub@gmail.com> pkgname=firefox -pkgver=3.0.9 -pkgrel=2 +pkgver=3.5.1 +pkgrel=1 +_xulver=1.9.1.1 pkgdesc="Standalone web browser from mozilla.org" arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') -depends=('xulrunner=1.9.0.9' 'desktop-file-utils') -makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python' 'xorg-server') +depends=("xulrunner>=${_xulver}" 'desktop-file-utils' "nspr>=4.8") +makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1' 'python') replaces=('firefox3') install=firefox.install url="http://www.mozilla.org/projects/firefox" @@ -17,47 +18,42 @@ source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${pkgver}/s firefox.desktop firefox-safe.desktop mozilla-firefox-1.0-lang.patch - mozbug421977.patch - firefox-appversion.patch) -md5sums=('f80b085699db8201e5db6b30fc63c60d' - '8b6e5f7d0a9e3f64747a024cf8f12069' + browser-defaulturls.patch + firefox-version.patch + browser-app-makefile.patch) +md5sums=('18169e189785d680827d4fce94524449' + '3c928b11918d22377eba01de34debc19' '68cf02788491c6e846729b2f2913bf79' '5e68cabfcf3c021806b326f664ac505e' 'bd5db57c23c72a02a489592644f18995' - '7976e3ff52e01af3388dfc3a479c4955' - 'c6f27fca2e6bd2a570b271ec3ce35782') + '346d74ec560e7bbf453c02ff21f4b868' + '1dd9a10df0b9e4cf332eadc326d78e07' + '165c43a5b03a0bf7ad2e7210b0d8c82c') build() { - cd ${srcdir}/mozilla - - patch -Np1 -i ${srcdir}/mozilla-firefox-1.0-lang.patch || return 1 - - # FS#10836: fixes backgroundcolor parsing with gnome - patch -Np0 -i ${srcdir}/mozbug421977.patch || return 1 - - patch -Np1 -i ${srcdir}/firefox-appversion.patch || return 1 - - cp ${srcdir}/mozconfig .mozconfig + cd "${srcdir}/mozilla-1.9.1" + patch -Np1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch" || return 1 + patch -Np0 -i "${srcdir}/browser-defaulturls.patch" || return 1 + patch -Np1 -i "${srcdir}/firefox-version.patch" || return 1 + cp "${srcdir}/mozconfig" .mozconfig unset CFLAGS unset CXXFLAGS - export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.0" - - LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX :99 & - XPID=$! - export DISPLAY=:99 - - LD_PRELOAD="" make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 - kill $XPID + export LDFLAGS="-Wl,-rpath,/usr/lib/firefox-3.5" - make -j1 DESTDIR=${pkgdir} -C ff-opt-obj install || return 1 + make -j1 -f client.mk configure MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 + cd browser/app + patch -p2 < "${srcdir}/browser-app-makefile.patch" || return 1 + cd ../.. + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || return 1 + make -j1 DESTDIR="${pkgdir}" install || return 1 - rm -f ${pkgdir}/usr/lib/firefox-3.0/libjemalloc.so + rm -f ${pkgdir}/usr/lib/firefox-3.5/libjemalloc.so install -m755 -d ${pkgdir}/usr/share/applications install -m755 -d ${pkgdir}/usr/share/pixmaps - install -m644 ${srcdir}/mozilla/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1 + install -m644 ${srcdir}/mozilla-1.9.1/browser/branding/unofficial/default48.png ${pkgdir}/usr/share/pixmaps/firefox.png || return 1 install -m644 ${srcdir}/firefox.desktop ${pkgdir}/usr/share/applications/ || return 1 install -m644 ${srcdir}/firefox-safe.desktop ${pkgdir}/usr/share/applications/ || return 1 } diff --git a/abs/extra-testing/community/firefox/browser-app-makefile.patch b/abs/extra-testing/community/firefox/browser-app-makefile.patch new file mode 100644 index 0000000..9a02c40 --- /dev/null +++ b/abs/extra-testing/community/firefox/browser-app-makefile.patch @@ -0,0 +1,11 @@ +--- browser/app/Makefile 2009-07-27 22:41:13.000000000 +0930 ++++ browser-new/app/Makefile 2009-07-27 22:42:51.000000000 +0930 +@@ -279,7 +279,7 @@ + + ifneq (,$(filter-out OS2 WINNT WINCE,$(OS_ARCH))) + +-$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS) ++$(MOZ_APP_NAME): $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS) + cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \ + -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@ + chmod +x $@ diff --git a/abs/extra-testing/community/firefox/browser-defaulturls.patch b/abs/extra-testing/community/firefox/browser-defaulturls.patch new file mode 100644 index 0000000..42a2e1d --- /dev/null +++ b/abs/extra-testing/community/firefox/browser-defaulturls.patch @@ -0,0 +1,26 @@ +--- browser/branding/unofficial/locales/browserconfig.properties~ 2009-06-13 17:04:42.000000000 +0200 ++++ browser/branding/unofficial/locales/browserconfig.properties 2009-06-13 17:05:28.000000000 +0200 +@@ -1,3 +1,3 @@ + # Do NOT localize or otherwise change these values +-browser.startup.homepage=http://www.mozilla.org/projects/shiretoko/ ++browser.startup.homepage=http://www.google.com/firefox + +--- browser/branding/unofficial/pref/firefox-branding.js~ 2009-06-13 16:57:53.000000000 +0200 ++++ browser/branding/unofficial/pref/firefox-branding.js 2009-06-13 16:59:17.000000000 +0200 +@@ -1,5 +1,5 @@ +-pref("startup.homepage_override_url","http://www.mozilla.org/projects/%APP%/%VERSION%/whatsnew/"); +-pref("startup.homepage_welcome_url","http://www.mozilla.org/projects/%APP%/%VERSION%/firstrun/"); ++pref("startup.homepage_override_url","http://www.mozilla.com/%APP%/%VERSION%/whatsnew/"); ++pref("startup.homepage_welcome_url","http://www.mozilla.com/%APP%/%VERSION%/firstrun/"); + // The time interval between checks for a new version (in seconds) + // nightly=8 hours, official=24 hours + pref("app.update.interval", 28800); +@@ -11,7 +11,7 @@ + pref("app.update.url.details", "http://www.mozilla.org/projects/%APP%/"); + + // Release notes URL +-pref("app.releaseNotesURL", "http://www.mozilla.org/projects/%APP%/%VERSION%/releasenotes/"); ++pref("app.releaseNotesURL", "http://www.mozilla.com/%APP%/%VERSION%/releasenotes/"); + + // Search codes belong only in builds with official branding + pref("browser.search.param.yahoo-fr", ""); diff --git a/abs/extra-testing/community/firefox/firefox-appversion.patch b/abs/extra-testing/community/firefox/firefox-appversion.patch deleted file mode 100644 index 458904e..0000000 --- a/abs/extra-testing/community/firefox/firefox-appversion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mozilla/browser/installer/Makefile.in.orig 2008-11-19 22:49:15.000000000 +0100 -+++ mozilla/browser/installer/Makefile.in 2008-11-19 22:49:32.000000000 +0100 -@@ -43,6 +43,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION=3.0 -+ - NO_PKG_FILES = \ - $(MOZ_APP_NAME)-config \ - $(MOZ_APP_NAME)-bin.elf \ diff --git a/abs/extra-testing/community/firefox/firefox-version.patch b/abs/extra-testing/community/firefox/firefox-version.patch new file mode 100644 index 0000000..b0a4552 --- /dev/null +++ b/abs/extra-testing/community/firefox/firefox-version.patch @@ -0,0 +1,11 @@ +--- mozilla-1.9.1/browser/installer/Makefile.in.ver 2009-07-18 13:32:35.000000000 +0200 ++++ mozilla-1.9.1/browser/installer/Makefile.in 2009-07-18 13:33:12.000000000 +0200 +@@ -43,6 +43,8 @@ + + include $(DEPTH)/config/autoconf.mk + ++MOZ_APP_VERSION="3.5" ++ + NO_PKG_FILES = \ + $(MOZ_APP_NAME)-config \ + $(MOZ_APP_NAME)-bin.elf \ diff --git a/abs/extra-testing/community/firefox/mozbug421977.patch b/abs/extra-testing/community/firefox/mozbug421977.patch deleted file mode 100644 index df8371a..0000000 --- a/abs/extra-testing/community/firefox/mozbug421977.patch +++ /dev/null @@ -1,158 +0,0 @@ -Index: browser/components/shell/src/nsGNOMEShellService.cpp -=================================================================== -RCS file: /cvsroot/mozilla/browser/components/shell/src/nsGNOMEShellService.cpp,v -retrieving revision 1.21 -diff -d -u -p -U 8 -r1.21 nsGNOMEShellService.cpp ---- browser/components/shell/src/nsGNOMEShellService.cpp 1 Oct 2007 18:25:26 -0000 1.21 -+++ browser/components/shell/src/nsGNOMEShellService.cpp 15 Mar 2008 07:08:47 -0000 -@@ -58,16 +58,17 @@ - #include "nsIImage.h" - #include "prprf.h" - #ifdef MOZ_WIDGET_GTK2 - #include "nsIImageToPixbuf.h" - #endif - - #include <glib.h> - #include <glib-object.h> -+#include <gdk/gdk.h> - #include <gdk-pixbuf/gdk-pixbuf.h> - #include <limits.h> - #include <stdlib.h> - - struct ProtocolAssociation - { - const char *name; - PRBool essential; -@@ -442,117 +443,56 @@ nsGNOMEShellService::SetDesktopBackgroun - EmptyCString()); - - gconf->SetString(NS_LITERAL_CSTRING(kDesktopImageKey), filePath); - gconf->SetBool(NS_LITERAL_CSTRING(kDesktopDrawBGKey), PR_TRUE); - - return rv; - } - --// In: pointer to two characters CC --// Out: parsed color number --static PRUint8 --HexToNum(char ch) --{ -- if ('0' <= ch && '9' >= ch) -- return ch - '0'; -- -- if ('A' <= ch && 'F' >= ch) -- return ch - 'A'; -- -- if ('a' <= ch && 'f' >= ch) -- return ch - 'a'; -- -- return 0; --} -- -- --// In: 3 or 6-character RRGGBB hex string --// Out: component colors --static PRBool --HexToRGB(const nsCString& aColorSpec, -- PRUint8 &aRed, -- PRUint8 &aGreen, -- PRUint8 &aBlue) --{ -- const char *buf = aColorSpec.get(); -- -- if (aColorSpec.Length() == 6) { -- aRed = HexToNum(buf[0]) >> 4 | -- HexToNum(buf[1]); -- aGreen = HexToNum(buf[2]) >> 4 | -- HexToNum(buf[3]); -- aBlue = HexToNum(buf[4]) >> 4 | -- HexToNum(buf[5]); -- return PR_TRUE; -- } -- -- if (aColorSpec.Length() == 3) { -- aRed = HexToNum(buf[0]); -- aGreen = HexToNum(buf[1]); -- aBlue = HexToNum(buf[2]); -- -- aRed |= aRed >> 4; -- aGreen |= aGreen >> 4; -- aBlue |= aBlue >> 4; -- -- return PR_TRUE; -- } -- -- return PR_FALSE; --} -+#define COLOR_16_TO_8_BIT(_c) ((_c) >> 8) -+#define COLOR_8_TO_16_BIT(_c) ((_c) << 8) - - NS_IMETHODIMP - nsGNOMEShellService::GetDesktopBackgroundColor(PRUint32 *aColor) - { - nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - - nsCAutoString background; - gconf->GetString(NS_LITERAL_CSTRING(kDesktopColorKey), background); - - if (background.IsEmpty()) { - *aColor = 0; - return NS_OK; - } - -- // Chop off the leading '#' character -- background.Cut(0, 1); -+ GdkColor color; -+ gboolean success = gdk_color_parse(background.get(), &color); - -- PRUint8 red, green, blue; -- if (!HexToRGB(background, red, green, blue)) -- return NS_ERROR_FAILURE; -+ NS_ENSURE_TRUE(success, NS_ERROR_FAILURE); - -- // The result must be in RGB order with the high 8 bits zero. -- *aColor = (red << 16 | green << 8 | blue); -+ *aColor = COLOR_16_TO_8_BIT(color.red) << 16 | -+ COLOR_16_TO_8_BIT(color.green) << 8 | -+ COLOR_16_TO_8_BIT(color.blue); - return NS_OK; - } - --static void --ColorToHex(PRUint32 aColor, nsCString& aResult) --{ -- char *buf = aResult.BeginWriting(7); -- if (!buf) -- return; -- -- PRUint8 red = (aColor >> 16); -- PRUint8 green = (aColor >> 8) & 0xff; -- PRUint8 blue = aColor & 0xff; -- -- PR_snprintf(buf, 8, "#%02x%02x%02x", red, green, blue); --} -- - NS_IMETHODIMP - nsGNOMEShellService::SetDesktopBackgroundColor(PRUint32 aColor) - { - nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID); - -- nsCString colorString; -- ColorToHex(aColor, colorString); -+ GdkColor color; -+ color.red = COLOR_8_TO_16_BIT(aColor >> 16); -+ color.green = COLOR_8_TO_16_BIT((aColor >> 8) & 0xff); -+ color.blue = COLOR_8_TO_16_BIT(aColor & 0xff); - -- gconf->SetString(NS_LITERAL_CSTRING(kDesktopColorKey), colorString); -+ gchar *colorString = gdk_color_to_string(&color); -+ gconf->SetString(NS_LITERAL_CSTRING(kDesktopColorKey), nsDependentCString(colorString)); -+ g_free (colorString); - - return NS_OK; - } - - NS_IMETHODIMP - nsGNOMEShellService::OpenApplication(PRInt32 aApplication) - { - nsCAutoString scheme; diff --git a/abs/extra-testing/community/firefox/mozconfig b/abs/extra-testing/community/firefox/mozconfig index b40ce01..030317d 100644 --- a/abs/extra-testing/community/firefox/mozconfig +++ b/abs/extra-testing/community/firefox/mozconfig @@ -23,11 +23,9 @@ ac_add_options --enable-canvas ac_add_options --enable-startup-notification ac_add_options --enable-libxul ac_add_options --disable-crashreporter -ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9 +ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.1.1 ac_add_options --enable-safe-browsing ac_add_options --with-branding=browser/branding/unofficial -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/ff-opt-obj -mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py' export BUILD_OFFICIAL=1 export MOZILLA_OFFICIAL=1 diff --git a/abs/extra-testing/community/firefox/mozilla-firstrun.patch b/abs/extra-testing/community/firefox/mozilla-firstrun.patch deleted file mode 100644 index 3a75328..0000000 --- a/abs/extra-testing/community/firefox/mozilla-firstrun.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up mozilla/browser/base/jar.mn.firstrun mozilla/browser/base/jar.mn ---- mozilla/browser/base/jar.mn.firstrun 2008-06-15 12:39:28.000000000 -0700 -+++ mozilla/browser/base/jar.mn 2008-06-15 12:39:34.000000000 -0700 -@@ -21,9 +21,6 @@ browser.jar: - * content/browser/browser.js (content/browser.js) - * content/browser/browser.xul (content/browser.xul) - * content/browser/credits.xhtml (content/credits.xhtml) --* content/browser/EULA.js (content/EULA.js) --* content/browser/EULA.xhtml (content/EULA.xhtml) --* content/browser/EULA.xul (content/EULA.xul) - * content/browser/metaData.js (content/metaData.js) - * content/browser/metaData.xul (content/metaData.xul) - * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) ---- mozilla/browser/components/nsBrowserGlue.js 2008-09-16 19:07:25.000000000 +0000 -+++ mozilla/browser/components/nsBrowserGlue.js.new 2008-10-03 14:54:50.955760018 +0000 -@@ -175,33 +175,6 @@ - // profile startup handler (contains profile initialization routines) - _onProfileStartup: function() - { -- // Check to see if the EULA must be shown on startup -- -- var prefBranch = Cc["@mozilla.org/preferences-service;1"]. -- getService(Ci.nsIPrefBranch); -- var mustDisplayEULA = false; -- try { -- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override"); -- } catch (e) { -- // Pref might not exist -- } -- -- // Make sure it hasn't already been accepted -- if (mustDisplayEULA) { -- try { -- var EULAVersion = prefBranch.getIntPref("browser.EULA.version"); -- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted"); -- } catch(ex) { -- } -- } -- -- if (mustDisplayEULA) { -- var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"]. -- getService(Ci.nsIWindowWatcher); -- ww2.openWindow(null, "chrome://browser/content/EULA.xul", -- "_blank", "chrome,centerscreen,modal,resizable=yes", null); -- } -- - this.Sanitizer.onStartup(); - // check if we're in safe mode - var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo). diff --git a/abs/extra-testing/nspr/PKGBUILD b/abs/extra-testing/nspr/PKGBUILD index 57d9d3c..453b515 100644 --- a/abs/extra-testing/nspr/PKGBUILD +++ b/abs/extra-testing/nspr/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=nspr -pkgver=4.7.3 -pkgrel=1 +pkgver=4.8 +pkgrel=2 pkgdesc="Netscape Portable Runtime" arch=(i686 x86_64) url="http://www.mozilla.org/projects/nspr/" @@ -13,7 +13,7 @@ makedepends=('zip') options=(!emptydirs) source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz nspr.pc.in) -md5sums=('3496d6656f3e02dddc7e29f1b122b744' +md5sums=('e0916a72bcc6c427551ea262183fdb26' 'bce1611f3117b53fc904cab549c09967') build() { diff --git a/abs/extra-testing/nss/PKGBUILD b/abs/extra-testing/nss/PKGBUILD index c3e5869..8e7d434 100644 --- a/abs/extra-testing/nss/PKGBUILD +++ b/abs/extra-testing/nss/PKGBUILD @@ -2,27 +2,28 @@ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=nss -pkgver=3.12.2 -_nssver=3.12.2.0 -pkgrel=1 +pkgver=3.12.3 +_pkgver=3_12_3 +_nssver=3.12.3.0 +pkgrel=2 pkgdesc="Mozilla Network Security Services" arch=(i686 x86_64) url="http://www.mozilla.org/projects/security/pki/nss/" license=('MPL' 'GPL') -_nsprver=4.7.3 +_nsprver=4.8 depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.7') replaces=('nss-nspr') -source=(ftp://ftp.archlinux.org/other/nss/${pkgname}-${pkgver}.tar.gz +source=(https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${_pkgver}_RTM/src/nss-${pkgver}.tar.bz2 nss-nolocalsql.patch nss.pc.in nss-config.in) -md5sums=('30ee9cf4a2b415435b16b71bae367060' +md5sums=('ecb7079ba4ebcf29b7716775384f1f18' '1837781eed35bfb6f826cfb3efcd6409' 'c547b030c57fe1ed8b77c73bf52b3ded' '46bee81908f1e5b26d6a7a2e14c64d9f') build() { - cd "${srcdir}" + cd ${srcdir}/nss-${pkgver} patch -Np0 -i "${srcdir}/nss-nolocalsql.patch" || return 1 unset CFLAGS unset CXXFLAGS diff --git a/abs/extra-testing/xulrunner/100-system-hunspell-corrections.patch b/abs/extra-testing/xulrunner/100-system-hunspell-corrections.patch deleted file mode 100644 index 5533e10..0000000 --- a/abs/extra-testing/xulrunner/100-system-hunspell-corrections.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- ./extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig 2008-02-15 19:21:21.000000000 +0000 -+++ ./extensions/spellcheck/hunspell/src/mozHunspell.cpp 2008-02-15 19:23:20.000000000 +0000 -@@ -63,6 +63,9 @@ - #include "nsISimpleEnumerator.h" - #include "nsIDirectoryEnumerator.h" - #include "nsIFile.h" -+#ifdef MOZ_NATIVE_HUNSPELL -+#include "nsILocalFile.h" -+#endif - #include "nsDirectoryServiceUtils.h" - #include "nsDirectoryServiceDefs.h" - #include "mozISpellI18NManager.h" -@@ -307,7 +310,16 @@ - return; - - nsCOMPtr<nsIFile> dictDir; -- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, -+ #ifdef MOZ_NATIVE_HUNSPELL -+ nsCOMPtr<nsILocalFile> localFile; -+ rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile)); -+ if (localFile && NS_SUCCEEDED(rv)) { -+ localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); -+ LoadDictionariesFromDir(dictDir); -+ } -+ else { -+ #endif -+ rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, - NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); - if (NS_SUCCEEDED(rv)) { - LoadDictionariesFromDir(dictDir); -@@ -332,6 +344,9 @@ - LoadDictionariesFromDir(appDir); - } - } -+#ifdef MOZ_NATIVE_HUNSPELL -+ } -+#endif - - nsCOMPtr<nsISimpleEnumerator> dictDirs; - rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, ---- ./extensions/spellcheck/src/Makefile.in.orig 2008-02-15 19:25:58.000000000 +0000 -+++ ./extensions/spellcheck/src/Makefile.in 2008-02-15 19:28:36.000000000 +0000 -@@ -63,9 +63,16 @@ - txtsvc \ - uconv \ - unicharutil \ -+ xulapp \ - $(NULL) - --CPPSRCS = \ -+ifdef MOZ_NATIVE_HUNSPELL -+CPPSRCS += mozHunspell.cpp -+ifdef MOZ_XUL_APP -+CPPSRCS += mozHunspellDirProvider.cpp -+endif -+endif -+CPPSRCS += \ - mozSpellCheckerFactory.cpp \ - mozSpellChecker.cpp \ - mozPersonalDictionary.cpp \ -@@ -80,8 +87,14 @@ - SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX) - LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src - else -+ifndef MOZ_NATIVE_HUNSPELL - SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) - LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src -+else -+LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \ -+ -DMOZ_NATIVE_HUNSPELL \ -+ $(NULL) -+endif - endif - - EXTRA_DSO_LDOPTS = \ -@@ -96,3 +112,18 @@ - LOCAL_INCLUDES += \ - -I$(topsrcdir)/xpcom/io \ - $(NULL) -+ -+ifdef MOZ_NATIVE_HUNSPELL -+export:: $(srcdir)/../hunspell/src/mozHunspell.cpp -+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* . -+GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp -+clean:: -+ rm -f mozHunspell.* -+ifdef MOZ_XUL_APP -+export:: $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp -+ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspellDirProvider.* . -+GARBAGE += mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp -+clean:: -+ rm -f mozHunspellDirProvider.* -+endif -+endif ---- ./extensions/spellcheck/Makefile.in.orig 2008-02-15 19:23:39.000000000 +0000 -+++ ./extensions/spellcheck/Makefile.in 2008-02-15 19:24:34.000000000 +0000 -@@ -42,13 +42,19 @@ - include $(DEPTH)/config/autoconf.mk - - MODULE = spellchecker --DIRS = idl locales -+ifndef MOZ_NATIVE_HUNSPELL -+DIRS = idl locales -+else -+DIRS = idl -+endif - - ifeq (camino,$(MOZ_BUILD_APP)) - DIRS += osxspell - else -+ifndef MOZ_NATIVE_HUNSPELL - DIRS += hunspell - endif -+endif - - DIRS += src diff --git a/abs/extra-testing/xulrunner/PKGBUILD b/abs/extra-testing/xulrunner/PKGBUILD index 3f3f757..84d6734 100644 --- a/abs/extra-testing/xulrunner/PKGBUILD +++ b/abs/extra-testing/xulrunner/PKGBUILD @@ -2,56 +2,27 @@ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xulrunner -pkgver=1.9.0.9 -_ffoxver=3.0.9 +pkgver=1.9.1.1 +_ffoxver=3.5.1 pkgrel=2 pkgdesc="Mozilla Runtime Environment" arch=(i686 x86_64) license=('MPL' 'GPL' 'LGPL') -depends=('gtk2>=2.16.0' 'gcc-libs>=4.3.3' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.2' 'libxt' 'lcms' 'hunspell>=1.2.8' 'startup-notification>=0.9') +depends=('gtk2>=2.16.0' 'gcc-libs>=4.3.3' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'libxt' 'lcms' + 'hunspell>=1.2.8' 'startup-notification>=0.9') makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.24.1') provides=(gecko-sdk) replaces=(gecko-sdk) url="http://wiki.mozilla.org/XUL:Xul_Runner" source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${_ffoxver}/source/firefox-${_ffoxver}-source.tar.bz2 - mozconfig - 100-system-hunspell-corrections.patch - bzXXX_pc_honour_system_nspr_nss.patch - mozilla-pkgconfig.patch - fix-mozilla-launcher.patch - mozilla-ps-pdf-simplify-operators.patch - nsThreadUtils.patch) -md5sums=('f80b085699db8201e5db6b30fc63c60d' - '6509d12e6b17bfc51c09e1dc35259035' - '5efd6772ed0ecf8eddec5d5650191d3c' - '7a5151f90cb360bc1ea911e5cf7208e9' - 'dfbfb4e35912112668ac66dae0783686' - '63eee2d1da3b43c9d604f2253f242f40' - '13dca58c04e62a8916691c63c5c492a0' - 'ccc3a0672c783c043434f256fbd38c86') + mozconfig) +md5sums=('18169e189785d680827d4fce94524449' + '6509d12e6b17bfc51c09e1dc35259035') build() { - cd ${startdir}/src/mozilla + cd ${startdir}/src/mozilla-1.9.1 cp ${startdir}/src/mozconfig .mozconfig - #Upstream patch. Still not applied to 1.9.0.1 - patch -Np1 -i ${srcdir}/mozilla-ps-pdf-simplify-operators.patch || return 1 - - #fix build with system hunspell - gentoo - patch -Np0 -i ${srcdir}/100-system-hunspell-corrections.patch || return 1 - - #fix pkgconfig files when building with system nss/nspr - ubuntu - patch -Np1 -i ${srcdir}/bzXXX_pc_honour_system_nspr_nss.patch || return 1 - - #fix libdir/sdkdir - fedora - with local modifications - patch -Np1 -i ${srcdir}/mozilla-pkgconfig.patch || return 1 - - #Fix stub launcher - archlinux - patch -Np0 -i ${srcdir}/fix-mozilla-launcher.patch || return 1 - - #Fix epiphany crashes - requires epiphany rebuild - patch -Np1 -i ${srcdir}/nsThreadUtils.patch || return 1 - unset CFLAGS unset CXXFLAGS export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-1.9" diff --git a/abs/extra-testing/xulrunner/bzXXX_pc_honour_system_nspr_nss.patch b/abs/extra-testing/xulrunner/bzXXX_pc_honour_system_nspr_nss.patch deleted file mode 100644 index be2e872..0000000 --- a/abs/extra-testing/xulrunner/bzXXX_pc_honour_system_nspr_nss.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- - xulrunner/installer/Makefile.in | 17 ++++++++++++++--- - xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +- - xulrunner/installer/libxul-embedding.pc.in | 2 +- - xulrunner/installer/mozilla-nss.pc.in | 6 +++--- - 4 files changed, 19 insertions(+), 8 deletions(-) - -Index: mozilla/xulrunner/installer/Makefile.in -=================================================================== ---- mozilla.orig/xulrunner/installer/Makefile.in -+++ mozilla/xulrunner/installer/Makefile.in -@@ -90,40 +90,51 @@ - mozilla-plugin.pc \ - mozilla-gtkmozembed.pc \ - mozilla-gtkmozembed-embedding.pc \ - $(NULL) - - ifdef MOZ_NATIVE_NSPR - NSPR_NAME=nspr - NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) -+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags) -+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs) - else --pkg_config_files += mozilla-nspr.pc - NSPR_NAME=mozilla-nspr - FULL_NSPR_CFLAGS=-I\$${includedir}/stable - FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) - NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) - endif -+pkg_config_files += mozilla-nspr.pc - - $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS)) - --ifndef MOZ_NATIVE_NSS --pkg_config_files += mozilla-nss.pc -+ifdef MOZ_NATIVE_NSS -+NSS_VERSION=$(shell $(NSS_CONFIG) --version) -+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags) -+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs) -+else -+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version) -+FULL_NSS_CFLAGS=-I\$${includedir}/stable -+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs)) - endif -+pkg_config_files += mozilla-nss.pc - - %.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk - cat $< | sed \ - -e "s|%prefix%|$(prefix)|" \ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ - -e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \ -+ -e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \ -+ -e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \ - -e "s|%NSPR_NAME%|$(NSPR_NAME)|" \ - -e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@ - chmod 644 $@ - - install:: $(pkg_config_files) - @echo pkg_config_file: $(pkg_config_files) - $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig - -Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in -+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in -@@ -3,9 +3,9 @@ - includedir=%includedir% - idldir=%idldir% - includetype=unstable - - Name: libxul-embedding-unstable - Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) - Version: %MOZILLA_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue --Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar -+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS% -Index: mozilla/xulrunner/installer/libxul-embedding.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in -+++ mozilla/xulrunner/installer/libxul-embedding.pc.in -@@ -7,9 +7,9 @@ - # Note: the default pkg-config cflags will only list include directories - # that contain stable (frozen or safe for linking) header files. To include - # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable - - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue --Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar -+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS% -Index: mozilla/xulrunner/installer/mozilla-nss.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in -+++ mozilla/xulrunner/installer/mozilla-nss.pc.in -@@ -1,10 +1,10 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - - Name: NSS - Description: Mozilla Network Security Services --Version: %MOZILLA_VERSION% -+Version: %NSS_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3 --Cflags: -I${includedir}/stable -+Libs: %FULL_NSS_LIBS% -+Cflags: %FULL_NSS_CFLAGS% diff --git a/abs/extra-testing/xulrunner/fix-mozilla-launcher.patch b/abs/extra-testing/xulrunner/fix-mozilla-launcher.patch deleted file mode 100644 index de64e4c..0000000 --- a/abs/extra-testing/xulrunner/fix-mozilla-launcher.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- xulrunner/stub/nsXULStub.cpp 2008-07-17 21:43:11.000000000 +0200 -+++ xulrunner/stub/nsXULStub.cpp 2008-07-17 21:47:04.000000000 +0200 -@@ -208,8 +208,10 @@ - // 3) give up - - struct stat fileStat; -+ char *testp; - -- if (!realpath(argv[0], iniPath) || stat(iniPath, &fileStat)) { -+ testp = realpath(argv[0], iniPath); -+ if (!(testp != NULL && stat(iniPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode) && fileStat.st_mode & S_IXUSR) || (testp != NULL && stat(iniPath, &fileStat))) { - const char *path = getenv("PATH"); - if (!path) - return 1; -@@ -222,7 +224,7 @@ - char *token = strtok(pathdup, ":"); - while (token) { - sprintf(tmpPath, "%s/%s", token, argv[0]); -- if (realpath(tmpPath, iniPath) && stat(iniPath, &fileStat) == 0) { -+ if (realpath(tmpPath, iniPath) && stat(iniPath, &fileStat) == 0 && S_ISREG(fileStat.st_mode) && fileStat.st_mode & S_IXUSR) { - found = PR_TRUE; - break; - } diff --git a/abs/extra-testing/xulrunner/mozilla-pkgconfig.patch b/abs/extra-testing/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index 1ce40fd..0000000 --- a/abs/extra-testing/xulrunner/mozilla-pkgconfig.patch +++ /dev/null @@ -1,88 +0,0 @@ -diff -ruN mozilla/xulrunner/installer/libxul-embedding.pc.in mozilla/xulrunner/installer/libxul-embedding.pc.in ---- mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-07-16 20:27:31.000000000 +0200 -+++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2008-07-16 21:43:47.000000000 +0200 -@@ -1,7 +1,7 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/stable - includetype=stable - - # Note: the default pkg-config cflags will only list include directories -diff -ruN mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in ---- mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-07-16 20:27:31.000000000 +0200 -+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in 2008-07-16 21:44:06.000000000 +0200 -@@ -1,7 +1,7 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/unstable - includetype=unstable - - Name: libxul-embedding-unstable -diff -ruN mozilla/xulrunner/installer/libxul.pc.in mozilla/xulrunner/installer/libxul.pc.in ---- mozilla/xulrunner/installer/libxul.pc.in 2007-08-03 16:46:28.000000000 +0200 -+++ mozilla/xulrunner/installer/libxul.pc.in 2008-07-16 21:44:33.000000000 +0200 -@@ -1,7 +1,8 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/stable - includetype=stable - - # Note: the default pkg-config includes will only list include directories -@@ -13,4 +14,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom --Cflags: -I${includedir}/${includetype} -fshort-wchar -\ No newline at end of file -+Cflags: -I${includedir}/${includetype} -fshort-wchar -diff -ruN mozilla/xulrunner/installer/libxul-unstable.pc.in mozilla/xulrunner/installer/libxul-unstable.pc.in ---- mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-01-05 07:50:34.000000000 +0100 -+++ mozilla/xulrunner/installer/libxul-unstable.pc.in 2008-07-16 21:45:11.000000000 +0200 -@@ -1,7 +1,8 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% --idldir=%idldir% -+idldir=%idldir%/unstable - includetype=unstable - - Name: libxul -diff -ruN mozilla/xulrunner/installer/Makefile.in mozilla/xulrunner/installer/Makefile.in ---- mozilla/xulrunner/installer/Makefile.in 2008-07-16 20:27:31.000000000 +0200 -+++ mozilla/xulrunner/installer/Makefile.in 2008-07-16 21:45:51.000000000 +0200 -@@ -125,6 +125,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|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \ -diff -ruN mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-01-10 10:17:49.000000000 +0100 -+++ mozilla/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2008-07-16 21:46:14.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -ruN mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-01-10 10:17:49.000000000 +0100 -+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in 2008-07-16 21:46:28.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz diff --git a/abs/extra-testing/xulrunner/mozilla-ps-pdf-simplify-operators.patch b/abs/extra-testing/xulrunner/mozilla-ps-pdf-simplify-operators.patch deleted file mode 100644 index cab1341..0000000 --- a/abs/extra-testing/xulrunner/mozilla-ps-pdf-simplify-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=435313 - -Index: mozilla/gfx/thebes/public/gfxPDFSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPDFSurface.h ---- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr<nsIOutputStream> mStream; -Index: mozilla/gfx/thebes/public/gfxPSSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPSSurface.h ---- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr<nsIOutputStream> mStream; diff --git a/abs/extra-testing/xulrunner/nsThreadUtils.patch b/abs/extra-testing/xulrunner/nsThreadUtils.patch deleted file mode 100644 index 69609c0..0000000 --- a/abs/extra-testing/xulrunner/nsThreadUtils.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- xulrunner-1.9.0.4.orig/xpcom/glue/nsThreadUtils.cpp -+++ xulrunner-1.9.0.4/xpcom/glue/nsThreadUtils.cpp -@@ -187,24 +187,27 @@ - } - #endif // XPCOM_GLUE_AVOID_NSPR - -+inline PRBool -+hasPendingEvents(nsIThread *thread) -+{ -+ PRBool val; -+ return NS_SUCCEEDED(thread->HasPendingEvents(&val)) && val; -+} -+ - PRBool - NS_HasPendingEvents(nsIThread *thread) - { --#ifdef MOZILLA_INTERNAL_API - if (!thread) { -+#ifndef MOZILLA_INTERNAL_API -+ nsCOMPtr<nsIThread> current; -+ NS_GetCurrentThread(getter_AddRefs(current)); -+ return hasPendingEvents(current); -+#else - thread = NS_GetCurrentThread(); - NS_ENSURE_TRUE(thread, PR_FALSE); -- } --#else -- nsCOMPtr<nsIThread> current; -- if (!thread) { -- NS_GetCurrentThread(getter_AddRefs(current)); -- NS_ENSURE_TRUE(current, PR_FALSE); -- thread = current.get(); -- } - #endif -- PRBool val; -- return NS_SUCCEEDED(thread->HasPendingEvents(&val)) && val; -+ } -+ return hasPendingEvents(thread); - } - - PRBool - |