Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to 12.0dev
authorWolfgang Rosenauer <wr@rosenauer.org>
Thu, 15 Mar 2012 10:33:22 +0100
changeset 409 ff30593d2daa
parent 408 475395d00191
child 410 0af1b0003b9f
switch to 12.0dev
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/create-tar.sh file | annotate | diff | comparison | revisions
firefox-branded-icons.patch file | annotate | diff | comparison | revisions
firefox-browser-css.patch file | annotate | diff | comparison | revisions
firefox-kde.patch file | annotate | diff | comparison | revisions
firefox-multilocale-chrome.patch file | annotate | diff | comparison | revisions
firefox-no-default-ualocale.patch file | annotate | diff | comparison | revisions
mozilla-kde.patch file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Mar 13 08:06:57 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Mar 15 10:33:22 2012 +0100
@@ -18,7 +18,8 @@
 
 
 %define major 11
-%define mainver %major.0
+%define mainver %major.99
+%define update_channel beta
 
 Name:           MozillaFirefox
 BuildRequires:  Mesa-devel
@@ -48,7 +49,7 @@
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012031200
+%define         releasedate 2012031400
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
@@ -282,7 +283,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=release
+ac_add_options --enable-update-channel=%{update_channel}
 EOF
 %if %suse_version > 1130
 cat << EOF >> $MOZCONFIG
--- a/MozillaFirefox/create-tar.sh	Tue Mar 13 08:06:57 2012 +0100
+++ b/MozillaFirefox/create-tar.sh	Thu Mar 15 10:33:22 2012 +0100
@@ -1,11 +1,12 @@
 #!/bin/bash
 
-CHANNEL="release"
+CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_11_0_RELEASE"
-VERSION="11.0"
+RELEASE_TAG="FIREFOX_12_0b1_RELEASE"
+VERSION="11.99"
 
 # mozilla
+echo "cloning $BRANCH..."
 hg clone http://hg.mozilla.org/$BRANCH mozilla
 pushd mozilla
 [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG
@@ -15,23 +16,28 @@
 echo -n "REPO=" >> ../source-stamp.txt
 hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt
 popd
+echo "creating archive..."
 tar cjf firefox-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla
 
 # l10n
+echo "fetching locales..."
 test ! -d l10n && mkdir l10n
 for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
   case $locale in
     ja-JP-mac|en-US)
       ;;
     *)
+      echo "fetching $locale ..."
       hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale
       [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
       ;;
   esac
 done
+echo "creating l10n archive..."
 tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
 
 # compare-locales
+echo "creating compare-locales"
 hg clone http://hg.mozilla.org/build/compare-locales
 tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales
 
--- a/firefox-branded-icons.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-branded-icons.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent efffa19fa0b2530d2aca1ebd5b885a6fc68e51de
+# Parent d6bb5c163142d233d00e739e21aa9df16077873e
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -169,16 +169,21 @@ endif # LIBXUL_SDK
+@@ -164,16 +164,21 @@ endif # LIBXUL_SDK
  DEFINES += -DFIREFOX_ICO=\"$(DIST)/branding/firefox.ico\" -DDOCUMENT_ICO=\"$(DIST)/branding/document.ico\"
  
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@@ -54,14 +54,14 @@
 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
-@@ -424,18 +424,21 @@
+@@ -432,18 +432,21 @@
+ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
  #ifdef SHIP_FEEDBACK
  @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
  #endif
  @BINPATH@/chrome/toolkit@JAREXT@
  @BINPATH@/chrome/toolkit.manifest
- #ifdef XP_UNIX
- #ifndef XP_MACOSX
+ #ifdef MOZ_GTK2
  @BINPATH@/chrome/icons/default/default16.png
 +@BINPATH@/chrome/icons/default/default22.png
 +@BINPATH@/chrome/icons/default/default24.png
@@ -69,10 +69,10 @@
  @BINPATH@/chrome/icons/default/default48.png
 +@BINPATH@/chrome/icons/default/default256.png
  #endif
- #endif
- 
  
  ; shell icons
  #ifdef XP_UNIX
  #ifndef XP_MACOSX
  @BINPATH@/icons/*.xpm
+ @BINPATH@/icons/*.png
+ #endif
--- a/firefox-browser-css.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-browser-css.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -9,7 +9,7 @@
 diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
 --- a/browser/themes/gnomestripe/browser.css
 +++ b/browser/themes/gnomestripe/browser.css
-@@ -1018,16 +1018,30 @@ toolbar[iconsize="small"] #feed-button {
+@@ -1016,16 +1016,30 @@ toolbar[iconsize="small"] #feed-button {
  }
  
  #urlbar-display {
@@ -36,7 +36,7 @@
  #page-proxy-favicon {
    width: 16px;
    height: 16px;
+   margin: 2px 4px;
  }
  
- #page-proxy-stack {
-   width: 24px;
+ #page-proxy-favicon:not([src]) {
--- a/firefox-kde.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-kde.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1145,11 +1145,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/newtab/newTab.xul             (content/newtab/newTab.xul)
+ *       content/browser/newtab/newTab.js              (content/newtab/newTab.js)
+         content/browser/newtab/newTab.css             (content/newtab/newTab.css)
  *       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
@@ -1166,13 +1166,13 @@
 +#include "nsUnixShellService.h"
  #endif
  
- #include "nsProfileMigrator.h"
  #if defined(XP_WIN) && !defined(__MINGW32__)
  #include "nsIEProfileMigrator.h"
  #elif defined(XP_MACOSX)
  #include "nsSafariProfileMigrator.h"
  #endif
-@@ -68,18 +68,16 @@ using namespace mozilla::browser;
+ 
+@@ -67,18 +67,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1185,13 +1185,13 @@
 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init)
  #endif
  
- NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator)
  #if defined(XP_WIN) && !defined(__MINGW32__)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator)
  #elif defined(XP_MACOSX)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator)
  #endif
-@@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
+ 
+@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR
  #endif
  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
  
@@ -1205,15 +1205,15 @@
  #endif
      { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor },
      { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create },
-     { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor },
  #if defined(XP_WIN) && !defined(__MINGW32__)
      { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor },
  #elif defined(XP_MACOSX)
      { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor },
+     { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor },
 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
 --- a/browser/components/preferences/advanced.js
 +++ b/browser/components/preferences/advanced.js
-@@ -697,24 +697,42 @@ var gAdvancedPane = {
+@@ -716,24 +716,42 @@ var gAdvancedPane = {
      var brandBundle = document.getElementById("bundleBrand");
      var shellBundle = document.getElementById("bundleShell");
      var brandShortName = brandBundle.getString("brandShortName");
@@ -1716,7 +1716,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
-@@ -440,16 +440,17 @@
+@@ -449,16 +449,17 @@
  #endif
  #endif
  
--- a/firefox-multilocale-chrome.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-multilocale-chrome.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 8b1b35442fee96324a141ab5d7710c3a88769df5
+# Parent cc2dd10c3b24c5fceeaf318e00cc1264f99edba2
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -323,16 +323,20 @@ pref("browser.download.manager.scanWhenD
+@@ -341,16 +341,20 @@ pref("browser.download.manager.scanWhenD
  pref("browser.download.manager.resumeOnWakeDelay", 10000);
  
  // search engines URL
@@ -30,7 +30,7 @@
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -167,29 +167,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr
+@@ -153,17 +153,41 @@ libs:: $(call MERGE_FILES,$(addprefix pr
  install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
  
  install:: $(addprefix generic/profile/,$(PROFILE_FILES))
@@ -41,29 +41,43 @@
  
 -SEARCH_PLUGINS = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt))
 +SEARCH_PLUGINS = $(shell cat \
-+  $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
-+       @srcdir@/en-US/searchplugins/list.txt ) )
- 
--libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
--	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins
++	$(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \
++	@srcdir@/en-US/searchplugins/list.txt ) )
++
 +tmp-search.jar.mn::
 +	printf "$(AB_CD).jar:" > $@
 +	printf "$(foreach plugin,$(SEARCH_PLUGINS),$(subst __PLUGIN_SUBST__,$(plugin), \n locale/browser/searchplugins/__PLUGIN_SUBST__.xml (__PLUGIN_SUBST__.xml)))" >>  $@
 +	@echo   >> $@
- 
--install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
--	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
-+searchplugins: tmp-search.jar.mn
++
++searchplugins:: $(addsuffix .xml,$(SEARCH_PLUGINS))
++	for SEARCH_PLUGIN in $^; do \
++	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
++	    $$SEARCH_PLUGIN > $$SEARCH_PLUGIN ; \
++	done
++
++searchplugins:: tmp-search.jar.mn
 +	$(PYTHON) $(MOZILLA_DIR)/config/JarMaker.py \
 +	  $(QUIET) -j $(FINAL_TARGET)/chrome \
 +	  -s $(topsrcdir)/$(relativesrcdir)/en-US/searchplugins \
 +	  -s $(LOCALE_SRCDIR)/searchplugins \
 +	  $(MAKE_JARS_FLAGS) tmp-search.jar.mn
- 
++
 +export:: searchplugins
 +
 +GARBAGE += tmp-search.jar.mn
  
+ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS))
+ 	$(NSINSTALL) -D $(FINAL_TARGET)/searchplugins
+ 	for SEARCH_PLUGIN in $^; do\
+ 	  SEARCH_PLUGIN_BASE=`basename $$SEARCH_PLUGIN`;\
+ 	  $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) \
+ 	    $$SEARCH_PLUGIN > $(FINAL_TARGET)/searchplugins/$$SEARCH_PLUGIN_BASE; \
+ 	done
+@@ -176,16 +200,17 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG
+ 	    $$SEARCH_PLUGIN > $(DESTDIR)$(mozappdir)/searchplugins/$$SEARCH_PLUGIN_BASE; \
+ 	done
+ 
+ 
  libs-%:
  	$(NSINSTALL) -D $(DIST)/install
  	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
@@ -80,7 +94,7 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -84,11 +84,12 @@
+@@ -97,11 +97,12 @@
      locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
  # the following files are browser-specific overrides
  *   locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
--- a/firefox-no-default-ualocale.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/firefox-no-default-ualocale.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f
+# Parent 4de3b724d8c78c38713aee20a01c702e132c2c4c
 Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp
+@@ -230,17 +230,17 @@ pref("xpinstall.whitelist.add.36", "getp
  
  pref("lightweightThemes.update.enabled", true);
  
@@ -19,7 +19,7 @@
 +pref("general.useragent.locale", "chrome://global/locale/intl.properties");
  pref("general.skins.selectedSkin", "classic/1.0");
  
- pref("general.smoothScroll", false);
+ pref("general.smoothScroll", true);
  #ifdef UNIX_BUT_NOT_MAC
  pref("general.autoScroll", false);
  #else
--- a/mozilla-kde.patch	Tue Mar 13 08:06:57 2012 +0100
+++ b/mozilla-kde.patch	Thu Mar 15 10:33:22 2012 +0100
@@ -3247,9 +3247,9 @@
  #endif
  
    // Now look up our extensions
-diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in
---- a/widget/src/gtk2/Makefile.in
-+++ b/widget/src/gtk2/Makefile.in
+diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
+--- a/widget/gtk2/Makefile.in
++++ b/widget/gtk2/Makefile.in
 @@ -135,11 +135,14 @@ DEFINES		+= -DCAIRO_GFX
  
  INCLUDES	+= \
@@ -3265,9 +3265,9 @@
  ifdef MOZ_X11
  INCLUDES   	+= -I$(srcdir)/../shared/x11
  endif
-diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp
---- a/widget/src/gtk2/nsFilePicker.cpp
-+++ b/widget/src/gtk2/nsFilePicker.cpp
+diff --git a/widget/gtk2/nsFilePicker.cpp b/widget/gtk2/nsFilePicker.cpp
+--- a/widget/gtk2/nsFilePicker.cpp
++++ b/widget/gtk2/nsFilePicker.cpp
 @@ -33,16 +33,17 @@
   * the provisions above, a recipient may use your version of this file under
   * the terms of any one of the MPL, the GPL or the LGPL.
@@ -3580,9 +3580,9 @@
 +        }
 +    return NS_OK;
 +    }
-diff --git a/widget/src/gtk2/nsFilePicker.h b/widget/src/gtk2/nsFilePicker.h
---- a/widget/src/gtk2/nsFilePicker.h
-+++ b/widget/src/gtk2/nsFilePicker.h
+diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
+--- a/widget/gtk2/nsFilePicker.h
++++ b/widget/gtk2/nsFilePicker.h
 @@ -89,11 +89,17 @@ protected:
    nsString  mDefault;
    nsString  mDefaultExtension;
mozilla