# HG changeset patch # User Wolfgang Rosenauer # Date 1286305110 -7200 # Node ID f91727efd8451e5d7869eae7e6b6f0d8e9725733 # Parent 78d410fd888a617addc7c28ccb9850abe3bf5059 rebased for 20101004; removed upstream firefox-sync-system-nss.patch diff -r 78d410fd888a -r f91727efd845 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Tue Oct 05 11:41:04 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Tue Oct 05 20:58:30 2010 +0200 @@ -36,7 +36,7 @@ Provides: firefox Version: 4.0b Release: 1 -%define releasedate 2010100300 +%define releasedate 2010100400 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -60,7 +60,6 @@ Patch9: firefox-kde.patch Patch10: firefox-ui-lockdown.patch Patch11: firefox-no-sync-l10n.patch -Patch12: firefox-sync-system-nss.patch Patch13: firefox-sync-build.patch Patch14: firefox-libxulsdk-locales.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -163,7 +162,6 @@ %endif #%patch10 -p1 %patch11 -p1 -%patch12 -p1 %patch13 -p1 %patch14 -p1 diff -r 78d410fd888a -r f91727efd845 MozillaFirefox/firefox-sync-system-nss.patch --- a/MozillaFirefox/firefox-sync-system-nss.patch Tue Oct 05 11:41:04 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-sync-system-nss.patch \ No newline at end of file diff -r 78d410fd888a -r f91727efd845 firefox-sync-build.patch --- a/firefox-sync-build.patch Tue Oct 05 11:41:04 2010 +0200 +++ b/firefox-sync-build.patch Tue Oct 05 20:58:30 2010 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent d7f423a91ae943643510a03fd2cb0360423e014f +# Parent 686f29d9e7e6ef165400bec2eea04aa861b83ec5 Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk diff --git a/browser/build.mk b/browser/build.mk @@ -27,32 +27,10 @@ @$(MAKE) -C browser/installer installer package: -diff --git a/services/sync/Weave.js b/services/sync/Weave.js ---- a/services/sync/Weave.js -+++ b/services/sync/Weave.js -@@ -76,17 +76,17 @@ WeaveService.prototype = { - .getService(Ci.nsIIOService); - let resProt = ioService.getProtocolHandler("resource") - .QueryInterface(Ci.nsIResProtocolHandler); - - // Only create alias if resource://services-sync doesn't already exist. - if (resProt.hasSubstitution("services-sync")) - return; - -- let uri = ioService.newURI("resource://gre/modules/services-sync/", -+ let uri = ioService.newURI("resource:///modules/services-sync/", - null, null); - resProt.setSubstitution("services-sync", uri); - } - }; - - function AboutWeaveLog() {} - AboutWeaveLog.prototype = { - classID: Components.ID("{d28f8a0b-95da-48f4-b712-caf37097be41}"), diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk --- a/toolkit/toolkit-tiers.mk +++ b/toolkit/toolkit-tiers.mk -@@ -270,20 +270,15 @@ endif +@@ -281,20 +281,15 @@ endif ifdef MOZ_LEAKY tier_platform_dirs += tools/leaky endif diff -r 78d410fd888a -r f91727efd845 firefox-sync-system-nss.patch --- a/firefox-sync-system-nss.patch Tue Oct 05 11:41:04 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -# HG changeset patch -# Parent 1e4f0a7028202f758195452878b0299a587a4b4e -Bug 583209 - Weave fails to load if system libnss3.so is in use (OpenSolaris, Linux dists) -https://bugzilla.mozilla.org/show_bug.cgi?id=583209 - -diff --git a/services/crypto/WeaveCrypto.js b/services/crypto/WeaveCrypto.js ---- a/services/crypto/WeaveCrypto.js -+++ b/services/crypto/WeaveCrypto.js -@@ -102,44 +102,23 @@ WeaveCrypto.prototype = { - initNSS : function() { - // We use NSS for the crypto ops, which needs to be initialized before - // use. By convention, PSM is required to be the module that - // initializes NSS. So, make sure PSM is initialized in order to - // implicitly initialize NSS. - Cc["@mozilla.org/psm;1"].getService(Ci.nsISupports); - - // Open the NSS library. -- let nssfile = Services.dirsvc.get("GreD", Ci.nsILocalFile); - let os = Services.appinfo.OS; -- switch (os) { -- case "WINNT": -- case "WINMO": -- case "WINCE": -- nssfile.append("nss3.dll"); -- break; -- case "Darwin": -- nssfile.append("libnss3.dylib"); -- break; -- case "Linux": -- case "SunOS": -- case "WebOS": // Palm Pre -- nssfile.append("libnss3.so"); -- break; -- case "Android": -- // Android uses a $GREDIR/lib/ subdir. -- nssfile.append("lib"); -- nssfile.append("libnss3.so"); -- break; -- default: -- throw Components.Exception("unsupported platform: " + os, Cr.NS_ERROR_UNEXPECTED); -- } -- this.log("Using NSS library " + nssfile.path); -+ let path = ctypes.libraryName("nss3"); -+ -+ this.log("Using NSS library " + path); - - // XXX really want to be able to pass specific dlopen flags here. -- let nsslib = ctypes.open(nssfile.path); -+ let nsslib = ctypes.open(path); - - this.log("Initializing NSS types and function declarations..."); - - this.nss = {}; - this.nss_t = {}; - - // nsprpub/pr/include/prtypes.h#435 - // typedef PRIntn PRBool; --> int diff -r 78d410fd888a -r f91727efd845 mozilla-xulrunner20/mozilla-xulrunner20.spec --- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Tue Oct 05 11:41:04 2010 +0200 +++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Tue Oct 05 20:58:30 2010 +0200 @@ -32,7 +32,7 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 2.0b Release: 1 -%define releasedate 2010100300 +%define releasedate 2010100400 %define version_internal 2.0b7pre %define apiversion 2.0 %define uaweight 199900 diff -r 78d410fd888a -r f91727efd845 series --- a/series Tue Oct 05 11:41:04 2010 +0200 +++ b/series Tue Oct 05 20:58:30 2010 +0200 @@ -22,6 +22,5 @@ firefox-kde.patch #firefox-ui-lockdown.patch firefox-no-sync-l10n.patch -firefox-sync-system-nss.patch firefox-sync-build.patch firefox-libxulsdk-locales.patch