# HG changeset patch # User Wolfgang Rosenauer # Date 1289205344 -3600 # Node ID 14282ac758326d21421ac73e8d2a9a3706910219 # Parent 36e368eff6f7ac6b054c6ee43da73c570fdc13d0 update to FIREFOX_4_0b7_BUILD1 diff -r 36e368eff6f7 -r 14282ac75832 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Fri Oct 29 07:19:55 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Mon Nov 08 09:35:44 2010 +0100 @@ -36,7 +36,7 @@ Provides: firefox Version: 4.0b Release: 1 -%define releasedate 2010101200 +%define releasedate 2010110500 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -60,9 +60,7 @@ 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 +Patch12: firefox-libxulsdk-locales.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -164,8 +162,6 @@ #%patch10 -p1 %patch11 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 %build export MOZ_BUILD_DATE=%{releasedate} diff -r 36e368eff6f7 -r 14282ac75832 MozillaFirefox/firefox-sync-build.patch --- a/MozillaFirefox/firefox-sync-build.patch Fri Oct 29 07:19:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-sync-build.patch \ No newline at end of file diff -r 36e368eff6f7 -r 14282ac75832 MozillaFirefox/firefox-sync-system-nss.patch --- a/MozillaFirefox/firefox-sync-system-nss.patch Fri Oct 29 07:19:55 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 36e368eff6f7 -r 14282ac75832 firefox-sync-build.patch --- a/firefox-sync-build.patch Fri Oct 29 07:19:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -# HG changeset patch -# Parent 20a161dabb40729976748bf5b13d14f27b76b130 -Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk - -diff --git a/browser/build.mk b/browser/build.mk ---- a/browser/build.mk -+++ b/browser/build.mk -@@ -40,16 +40,21 @@ include $(topsrcdir)/toolkit/toolkit-tie - endif - - TIERS += app - - ifdef MOZ_EXTENSIONS - tier_app_dirs += extensions - endif - -+ifdef MOZ_SERVICES_SYNC -+tier_app_dirs += services/crypto -+tier_app_dirs += services/sync -+endif -+ - tier_app_dirs += $(MOZ_BRANDING_DIRECTORY) - - tier_app_dirs += toolkit/components/console/hudservice - - tier_app_dirs += browser - - installer: - @$(MAKE) -C browser/installer installer -diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk ---- a/toolkit/toolkit-tiers.mk -+++ b/toolkit/toolkit-tiers.mk -@@ -281,20 +281,15 @@ endif - ifdef MOZ_LEAKY - tier_platform_dirs += tools/leaky - endif - - ifdef MOZ_MAPINFO - tier_platform_dirs += tools/codesighs - endif - --ifdef MOZ_SERVICES_SYNC --tier_platform_dirs += services/crypto --tier_platform_dirs += services/sync --endif -- - ifdef ENABLE_TESTS - tier_platform_dirs += testing/mochitest - tier_platform_dirs += testing/xpcshell - tier_platform_dirs += testing/mozmill - tier_platform_dirs += testing/tools/screenshot - endif - diff -r 36e368eff6f7 -r 14282ac75832 firefox-sync-system-nss.patch --- a/firefox-sync-system-nss.patch Fri Oct 29 07:19:55 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 36e368eff6f7 -r 14282ac75832 mozilla-kde.patch --- a/mozilla-kde.patch Fri Oct 29 07:19:55 2010 +0200 +++ b/mozilla-kde.patch Mon Nov 08 09:35:44 2010 +0100 @@ -39,7 +39,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -783,30 +784,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -760,30 +761,48 @@ pref_LoadPrefsInDir(nsIFile* aDir, char } static nsresult pref_LoadPrefsInDirList(const char *listId) @@ -89,7 +89,7 @@ } //---------------------------------------------------------------------------------------- -@@ -837,28 +856,40 @@ static nsresult pref_InitDefaults() +@@ -814,28 +833,40 @@ static nsresult pref_InitDefaults() /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MAC) || defined(XP_MACOSX) @@ -167,7 +167,7 @@ #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" -@@ -2188,16 +2192,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2192,16 +2196,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -193,7 +193,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2223,16 +2236,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2227,16 +2240,17 @@ nsDownload::SetState(DownloadState aStat // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. alerts->ShowAlertNotification( @@ -3647,7 +3647,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -191,17 +191,17 @@ include $(topsrcdir)/config/rules.mk +@@ -192,17 +192,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) @@ -3656,8 +3656,8 @@ endif endif --LOCAL_INCLUDES = -I.. -+LOCAL_INCLUDES = -I.. -I$(topsrcdir)/toolkit/xre +-LOCAL_INCLUDES += -I.. ++LOCAL_INCLUDES += -I.. -I$(topsrcdir)/toolkit/xre ifeq ($(MOZ_PLATFORM_MAEMO),5) CFLAGS += $(MOZ_DBUS_CFLAGS) diff -r 36e368eff6f7 -r 14282ac75832 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Fri Oct 29 07:19:55 2010 +0200 +++ b/mozilla-shared-nss-db.patch Mon Nov 08 09:35:44 2010 +0100 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -564,16 +564,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -571,16 +571,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8550,16 +8550,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8610,16 +8610,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -43,7 +43,7 @@ +dnl Check for nss-shared-helper +dnl ======================================================== + -+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, ++ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, + [MOZ_ENABLE_NSSHELPER=1], + [MOZ_ENABLE_NSSHELPER=]) + @@ -55,18 +55,18 @@ +AC_SUBST(NSSHELPER_LIBS) + +dnl ======================================================== + dnl OTS + dnl ======================================================== + MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)' + AC_SUBST(MOZ_OTS_LIBS) + + dnl ======================================================== dnl disable xul dnl ======================================================== - MOZ_ARG_DISABLE_BOOL(xul, - [ --disable-xul Disable XUL], - MOZ_XUL= ) - if test "$MOZ_XUL"; then - AC_DEFINE(MOZ_XUL) - else diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -112,19 +112,20 @@ CSRCS += md4.c +@@ -117,19 +117,20 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) @@ -115,7 +115,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1647,18 +1654,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1658,18 +1665,34 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs diff -r 36e368eff6f7 -r 14282ac75832 mozilla-xulrunner20/create-tar.sh --- a/mozilla-xulrunner20/create-tar.sh Fri Oct 29 07:19:55 2010 +0200 +++ b/mozilla-xulrunner20/create-tar.sh Mon Nov 08 09:35:44 2010 +0100 @@ -1,7 +1,7 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="GECKO20b7pre_20101006_RELBRANCH" +RELEASE_TAG="FIREFOX_4_0b7_RELEASE" VERSION="2.0b" # mozilla diff -r 36e368eff6f7 -r 14282ac75832 mozilla-xulrunner20/mozilla-xulrunner20.spec --- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Fri Oct 29 07:19:55 2010 +0200 +++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Mon Nov 08 09:35:44 2010 +0100 @@ -32,8 +32,8 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 2.0b Release: 1 -%define releasedate 2010101200 -%define version_internal 2.0b7pre +%define releasedate 2010110500 +%define version_internal 2.0b7 %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 diff -r 36e368eff6f7 -r 14282ac75832 series --- a/series Fri Oct 29 07:19:55 2010 +0200 +++ b/series Mon Nov 08 09:35:44 2010 +0100 @@ -22,6 +22,4 @@ 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