# HG changeset patch # User Wolfgang Rosenauer # Date 1321598206 -3600 # Node ID 30a00f382aed223085c4100377837d6082f0af39 # Parent 91b462c0fd72975a759e4d5cf46483e38d1e90c1 version 9.0b2 diff -r 91b462c0fd72 -r 30a00f382aed MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Sat Nov 12 16:22:36 2011 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Fri Nov 18 07:36:46 2011 +0100 @@ -19,7 +19,7 @@ # norootforbuild %define major 8 -%define mainver %major.0 +%define mainver %major.99 Name: MozillaFirefox BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel unzip update-desktop-files yasm zip @@ -29,13 +29,13 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.8.8 -BuildRequires: mozilla-nss-devel >= 3.12.10 +BuildRequires: mozilla-nspr-devel >= 4.8.9 +BuildRequires: mozilla-nss-devel >= 3.13.1 BuildRequires: nss-shared-helper-devel License: MPLv1.1 or GPLv2+ or LGPLv2+ Version: %{mainver} Release: 1 -%define releasedate 2011110500 +%define releasedate 2011111700 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -268,7 +268,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=default +ac_add_options --enable-update-channel=beta EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -308,6 +308,9 @@ # install kde.js %if %suse_version >= 1110 install -m 644 %{SOURCE6} $RPM_BUILD_ROOT%{progdir}/defaults/pref/kde.js +# make sure that instantApply is true by default +# (TODO: mozilla-kde.patch needs to be improved to really not load kde.js in non-KDE envs) +echo 'pref("browser.preferences.instantApply", true);' > $RPM_BUILD_ROOT%{progdir}/defaults/pref/firefox.js %endif # install add-plugins.sh sed "s:%%PROGDIR:%{progdir}:g" \ @@ -350,7 +353,10 @@ -name "*.jsm" -o \ -name "*.rdf" -o \ -name "*.properties" -o \ - -name "*.dtd" | xargs chmod a-x + -name "*.dtd" -o \ + -name "*.txt" -o \ + -name "*.xml" -o \ + -name "*.css" | xargs chmod a-x # overwrite the mozilla start-script and link it to /usr/bin mkdir --parents $RPM_BUILD_ROOT/usr/bin sed "s:%%PREFIX:%{_prefix}:g diff -r 91b462c0fd72 -r 30a00f382aed MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Sat Nov 12 16:22:36 2011 +0100 +++ b/MozillaFirefox/create-tar.sh Fri Nov 18 07:36:46 2011 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="release" +CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_8_0_RELEASE" -VERSION="8.0" +RELEASE_TAG="FIREFOX_9_0b2_RELEASE" +VERSION="8.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla diff -r 91b462c0fd72 -r 30a00f382aed firefox-kde.patch --- a/firefox-kde.patch Sat Nov 12 16:22:36 2011 +0100 +++ b/firefox-kde.patch Fri Nov 18 07:36:46 2011 +0100 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1055 @@ +@@ -0,0 +1,1054 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -237,7 +237,6 @@ + noautohide="true" + titlebar="normal" + close="true" -+ onpopuphiding="InspectorUI.closeInspectorUI();" + label="&inspectPanelTitle.label;"> + + @@ -962,7 +961,7 @@ + contentcontextmenu="contentAreaContextMenu" + autocompletepopup="PopupAutoComplete" + onclick="return contentAreaClick(event, false);"/> -+ ++ + + @@ -1075,11 +1074,11 @@ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/content.js (content/content.js) * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) - * content/browser/inspector.html (content/inspector.html) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) + * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1100,9 +1099,9 @@ #if !defined(XP_OS2) #include "nsOperaProfileMigrator.h" #endif - #include "nsSeamonkeyProfileMigrator.h" #if defined(XP_WIN) && !defined(__MINGW32__) -@@ -72,18 +72,16 @@ using namespace mozilla::browser; + #include "nsIEProfileMigrator.h" +@@ -71,18 +71,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1119,10 +1118,10 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) #endif NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator) #if defined(XP_WIN) && !defined(__MINGW32__) -@@ -117,17 +115,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA - NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID); + NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) +@@ -114,17 +112,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA + #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); static const mozilla::Module::CIDEntry kBrowserCIDs[] = { @@ -1582,7 +1581,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -434,16 +434,17 @@ +@@ -424,16 +424,17 @@ #endif #endif diff -r 91b462c0fd72 -r 30a00f382aed mozilla-kde.patch --- a/mozilla-kde.patch Sat Nov 12 16:22:36 2011 +0100 +++ b/mozilla-kde.patch Fri Nov 18 07:36:46 2011 +0100 @@ -709,7 +709,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1371 @@ +@@ -0,0 +1,1373 @@ + + + + // This "command" event handler tracks changes made to preferences by + // the user in this window. ++ if (event.sourceEvent) ++ event = event.sourceEvent; + this.userChangedValue(event.target); + + @@ -2192,12 +2194,12 @@ +EXPORTS += nsKDEUtils.h else ifeq ($(MOZ_WIDGET_TOOLKIT),qt) + MOCSRCS += moc_nsNativeAppSupportQt.cpp + $(NULL) + CPPSRCS += $(MOCSRCS) CPPSRCS += nsNativeAppSupportQt.cpp CPPSRCS += nsQAppInstance.cpp EXPORTS += nsQAppInstance.h - else - CPPSRCS += nsNativeAppSupportDefault.cpp - endif diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp new file mode 100644 --- /dev/null @@ -3615,7 +3617,7 @@ info.dwMinorVersion); } + desktop = NS_LITERAL_STRING("win"); - #elif defined(XP_MACOSX) + #elif defined(MOZ_WIDGET_COCOA) SInt32 majorVersion, minorVersion; if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) && (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) { diff -r 91b462c0fd72 -r 30a00f382aed mozilla-pkgconfig.patch --- a/mozilla-pkgconfig.patch Sat Nov 12 16:22:36 2011 +0100 +++ b/mozilla-pkgconfig.patch Fri Nov 18 07:36:46 2011 +0100 @@ -14,17 +14,17 @@ # Add pkg-config files to the install:: target +# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-8 ++apilibdir = $(dir $(installdir))xulrunner-9 + pkg_config_files = \ libxul.pc \ libxul-embedding.pc \ mozilla-js.pc \ mozilla-plugin.pc \ - mozilla-gtkmozembed.pc \ - mozilla-gtkmozembed-embedding.pc \ $(NULL) -@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc + + ifdef MOZ_NATIVE_NSPR +@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) @@ -73,32 +73,6 @@ Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% -diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in -+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in -@@ -1,8 +1,9 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz - Description: Static version-independent Mozilla Embedding Widget for Gtk+ - Version: %MOZILLA_VERSION% - Requires: libxul-embedding = %MOZILLA_VERSION% -diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- a/xulrunner/installer/mozilla-gtkmozembed.pc.in -+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in -@@ -1,8 +1,9 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz - Description: Mozilla Embedding Widget for Gtk+ - Version: %MOZILLA_VERSION% - Requires: libxul = %MOZILLA_VERSION% diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in --- a/xulrunner/installer/mozilla-js.pc.in +++ b/xulrunner/installer/mozilla-js.pc.in diff -r 91b462c0fd72 -r 30a00f382aed mozilla-ppc64.patch --- a/mozilla-ppc64.patch Sat Nov 12 16:22:36 2011 +0100 +++ b/mozilla-ppc64.patch Fri Nov 18 07:36:46 2011 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 87e43d08cce58b76e1910946c36c6465bb4c74e6 +# Parent 928a29c4a79c9041d6b9f68e24de8f5aab15cc5d From: upstream Subject: Fix PPC64 build https://bugzilla.mozilla.org/show_bug.cgi?id=670719 @@ -8,7 +8,7 @@ diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h --- a/ipc/chromium/src/build/build_config.h +++ b/ipc/chromium/src/build/build_config.h -@@ -52,16 +52,19 @@ +@@ -54,16 +54,19 @@ #define ARCH_CPU_X86_FAMILY 1 #define ARCH_CPU_X86 1 #define ARCH_CPU_32_BITS 1 @@ -23,53 +23,8 @@ #elif defined(__ppc__) || defined(__powerpc__) #define ARCH_CPU_PPC 1 #define ARCH_CPU_32_BITS 1 + #elif defined(__sparc64__) + #define ARCH_CPU_SPARC 1 + #define ARCH_CPU_64_BITS 1 #else #error Please add support for your architecture in build/build_config.h - #endif - - // Type detection for wchar_t. -diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -433,16 +433,18 @@ CPPSRCS += \ - YarrPattern.cpp \ - YarrSyntaxChecker.cpp \ - $(NULL) - else - - ############################################### - # BEGIN include sources for the Nitro assembler - # -+ENABLE_YARR_JIT = 1 -+ - VPATH += $(srcdir)/assembler \ - $(srcdir)/assembler/wtf \ - $(srcdir)/assembler/jit \ - $(srcdir)/assembler/assembler \ - $(srcdir)/methodjit \ - $(srcdir)/yarr \ - $(NONE) - -@@ -1076,17 +1078,21 @@ endif - - ############################################### - # BEGIN kludges for the Nitro assembler - # - - # Needed to "configure" it correctly. Unfortunately these - # flags wind up being applied to all code in js/src, not just - # the code in js/src/assembler. --CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -+ -+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT)) -+CXXFLAGS += -DENABLE_JIT=1 -+endif - - INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr - - ifdef ENABLE_METHODJIT - # Build a standalone test program that exercises the assembler - # sources a bit. - TESTMAIN_OBJS = \ - Assertions.$(OBJ_SUFFIX) \ diff -r 91b462c0fd72 -r 30a00f382aed mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Sat Nov 12 16:22:36 2011 +0100 +++ b/mozilla-shared-nss-db.patch Fri Nov 18 07:36:46 2011 +0100 @@ -7,14 +7,14 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -577,16 +577,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS +@@ -571,16 +571,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS + MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ + + MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ - LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ - LIBIDL_LIBS = @LIBIDL_LIBS@ - STATIC_LIBIDL = @STATIC_LIBIDL@ +MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ +NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8680,16 +8680,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8016,16 +8016,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ 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 -@@ -114,12 +114,14 @@ CSRCS += md4.c +@@ -113,12 +113,14 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) @@ -109,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1748,18 +1755,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1727,18 +1734,34 @@ nsNSSComponent::InitializeNSS(PRBool sho ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,7 +149,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -139,17 +139,17 @@ ifdef MOZ_DEBUG +@@ -138,17 +138,17 @@ ifdef MOZ_DEBUG EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif diff -r 91b462c0fd72 -r 30a00f382aed xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Sat Nov 12 16:22:36 2011 +0100 +++ b/xulrunner/create-tar.sh Fri Nov 18 07:36:46 2011 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="release" +CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_8_0_RELEASE" -VERSION="8.0" +RELEASE_TAG="FIREFOX_9_0b2_RELEASE" +VERSION="8.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla diff -r 91b462c0fd72 -r 30a00f382aed xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Sat Nov 12 16:22:36 2011 +0100 +++ b/xulrunner/xulrunner.spec Fri Nov 18 07:36:46 2011 +0100 @@ -27,15 +27,15 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.8.8 -BuildRequires: mozilla-nss-devel >= 3.12.10 +BuildRequires: mozilla-nspr-devel >= 4.8.9 +BuildRequires: mozilla-nss-devel >= 3.13.1 License: MPLv1.1 or GPLv2+ or LGPLv2+ -Version: 8.0 +Version: 8.99 Release: 1 -%define releasedate 2011110500 -%define version_internal 8.0 -%define apiversion 8 -%define uaweight 800000 +%define releasedate 2011111700 +%define version_internal 9.0 +%define apiversion 9 +%define uaweight 900000 Summary: Mozilla Runtime Environment Url: http://www.mozilla.org/ Group: Productivity/Other