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.
adopt patches to new base
authorWolfgang Rosenauer <wr@rosenauer.org>
Wed, 30 Mar 2011 11:21:12 +0200
changeset 251 4c9ebbedd59c
parent 250 51fbca12da9a
child 253 5cbec268563a
adopt patches to new base
firefox-kde.patch file | annotate | diff | comparison | revisions
firefox-multilocale-chrome.patch file | annotate | diff | comparison | revisions
firefox-no-sync-l10n.patch file | annotate | diff | comparison | revisions
mozilla-gcc46.patch file | annotate | diff | comparison | revisions
mozilla-kde.patch file | annotate | diff | comparison | revisions
mozilla-language.patch file | annotate | diff | comparison | revisions
mozilla-xulrunner22/mozilla-gcc46.patch file | annotate | diff | comparison | revisions
mozilla-xulrunner22/mozilla-xulrunner22.spec file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions
toolkit-download-folder.patch file | annotate | diff | comparison | revisions 
--- a/firefox-kde.patch	Wed Mar 30 08:53:19 2011 +0200
+++ b/firefox-kde.patch	Wed Mar 30 11:21:12 2011 +0200
@@ -1142,10 +1142,10 @@
  #ifndef WINCE
  
  #include "nsProfileMigrator.h"
- #if !defined(XP_BEOS)
  #include "nsDogbertProfileMigrator.h"
- #endif
-@@ -84,18 +84,16 @@ using namespace mozilla::browser;
+ #if !defined(XP_OS2)
+ #include "nsOperaProfileMigrator.h"
+@@ -82,18 +82,16 @@ using namespace mozilla::browser;
  
  /////////////////////////////////////////////////////////////////////////////
  
@@ -1160,11 +1160,11 @@
  
  #ifndef WINCE
  
- #if !defined(XP_BEOS)
  NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
+ #if !defined(XP_OS2)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator)
  #endif
- #if !defined(XP_OS2)
-@@ -151,17 +149,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM
+@@ -145,17 +143,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM
  #endif /* WINCE */
  NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID);
  
@@ -1625,7 +1625,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
-@@ -442,16 +442,17 @@
+@@ -441,16 +441,17 @@
  #endif
  #endif
  
--- a/firefox-multilocale-chrome.patch	Wed Mar 30 08:53:19 2011 +0200
+++ b/firefox-multilocale-chrome.patch	Wed Mar 30 11:21:12 2011 +0200
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent e3da64303bf904a8da2410754026b7a00480a589
+# Parent ec1efb28a1fea666f22730689d811fc67720f2db
 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
-@@ -321,16 +321,20 @@ pref("browser.download.manager.scanWhenD
+@@ -327,16 +327,20 @@ pref("browser.download.manager.scanWhenD
  pref("browser.download.manager.resumeOnWakeDelay", 10000);
  
  // search engines URL
@@ -30,16 +30,16 @@
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -169,31 +169,44 @@ libs:: $(addprefix $(LOCALE_SRCDIR)/prof
+@@ -167,31 +167,43 @@ libs:: $(call MERGE_FILES,$(addprefix pr
  install:: $(DESTDIR)$(mozappdir)/defaults/profile/bookmarks.html ;
  
  install:: $(addprefix generic/profile/,$(PROFILE_FILES))
  	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
  
- install:: $(addprefix $(LOCALE_SRCDIR)/profile/chrome/,$(PROFILE_CHROME))
+ install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
  	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
  
--SEARCH_PLUGINS = $(shell cat $(LOCALE_SRCDIR)/searchplugins/list.txt)
+-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 ) )
@@ -59,12 +59,11 @@
 +	  -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-%:
  	$(NSINSTALL) -D $(DIST)/install
  	@$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1
@@ -77,8 +76,8 @@
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
  
  
- repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
- repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
+ repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+ repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
  	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
--- a/firefox-no-sync-l10n.patch	Wed Mar 30 08:53:19 2011 +0200
+++ b/firefox-no-sync-l10n.patch	Wed Mar 30 11:21:12 2011 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent e386d64898cac5a2e10bc4fbce606ffeefe1f210
+# Parent 0266a8a602473a4fa13393628be0b2fd50d0efc6
 
 diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
 --- a/browser/locales/Makefile.in
 +++ b/browser/locales/Makefile.in
-@@ -181,17 +181,19 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
+@@ -179,17 +179,19 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS
  
  install:: $(addsuffix .xml,$(SEARCH_PLUGINS))
  	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins
@@ -21,6 +21,6 @@
  	@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1
  
  
- repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
- repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES)
+ repackage-win32-installer: WIN32_INSTALLER_OUT=$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe
+ repackage-win32-installer: $(call ESCAPE_SPACE,$(WIN32_INSTALLER_IN)) $(SUBMAKEFILES) libs-$(AB_CD)
  	@echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)."
--- a/mozilla-gcc46.patch	Wed Mar 30 08:53:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-See the following bug reports;
-
-https://bugzilla.mozilla.org/show_bug.cgi?id=623116
-https://bugzilla.mozilla.org/show_bug.cgi?id=623123
-https://bugzilla.mozilla.org/show_bug.cgi?id=623126
-https://bugzilla.mozilla.org/show_bug.cgi?id=628371
-
-diff --git a/xpcom/base/nsDebugImpl.h b/xpcom/base/nsDebugImpl.h
---- a/xpcom/base/nsDebugImpl.h
-+++ b/xpcom/base/nsDebugImpl.h
-@@ -40,6 +40,7 @@
- class nsDebugImpl : public nsIDebug2
- {
- public:
-+    nsDebugImpl() {}
-     NS_DECL_ISUPPORTS
-     NS_DECL_NSIDEBUG
-     NS_DECL_NSIDEBUG2
-diff --git a/xpcom/base/nsTraceRefcntImpl.h b/xpcom/base/nsTraceRefcntImpl.h
---- a/xpcom/base/nsTraceRefcntImpl.h
-+++ b/xpcom/base/nsTraceRefcntImpl.h
-@@ -44,6 +44,7 @@
- class nsTraceRefcntImpl : public nsITraceRefcnt
- {
- public:
-+  nsTraceRefcntImpl() {}
-   NS_DECL_ISUPPORTS
-   NS_DECL_NSITRACEREFCNT
- 
-diff --git a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp
---- a/xpcom/glue/nsEnumeratorUtils.cpp
-+++ b/xpcom/glue/nsEnumeratorUtils.cpp
-@@ -52,6 +52,7 @@ class EmptyEnumeratorImpl : public nsISi
-                             public nsIStringEnumerator
- {
- public:
-+    EmptyEnumeratorImpl() {}
-     // nsISupports interface
-     NS_DECL_ISUPPORTS_INHERITED  // not really inherited, but no mRefCnt
- 
-diff --git a/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h
---- a/xpcom/io/nsUnicharInputStream.h
-+++ b/xpcom/io/nsUnicharInputStream.h
-@@ -51,6 +51,7 @@ class nsSimpleUnicharStreamFactory :
-   private nsISimpleUnicharStreamFactory
- {
- public:
-+  nsSimpleUnicharStreamFactory() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIFACTORY
-   NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
-diff --git a/intl/unicharutil/util/nsUnicharUtils.h b/intl/unicharutil/util/nsUnicharUtils.h
---- a/intl/unicharutil/util/nsUnicharUtils.h
-+++ b/intl/unicharutil/util/nsUnicharUtils.h
-@@ -103,6 +103,7 @@ public:
- class nsASCIICaseInsensitiveStringComparator : public nsStringComparator
- {
- public:
-+  nsASCIICaseInsensitiveStringComparator() {}
-   virtual int operator() (const PRUnichar*,
-                           const PRUnichar*,
-                           PRUint32,
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -616,6 +616,7 @@ class nsXULAppInfo : public nsIXULAppInf
- 
- {
- public:
-+  nsXULAppInfo() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIXULAPPINFO
-   NS_DECL_NSIXULRUNTIME
-diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp b/embedding/browser/gtk/src/EmbedPrivate.cpp
-index 57fd9b1..0052ca7 100644
---- a/embedding/browser/gtk/src/EmbedPrivate.cpp
-+++ b/embedding/browser/gtk/src/EmbedPrivate.cpp
-@@ -99,6 +99,7 @@ nsIDirectoryServiceProvider *EmbedPrivate::sAppFileLocProvider = nsnull;
- class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2
- {
- public:
-+  GTKEmbedDirectoryProvider() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIDIRECTORYSERVICEPROVIDER
-   NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
--- a/mozilla-kde.patch	Wed Mar 30 08:53:19 2011 +0200
+++ b/mozilla-kde.patch	Wed Mar 30 11:21:12 2011 +0200
@@ -126,22 +126,23 @@
    rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
    NS_ENSURE_SUCCESS(rv, rv);
  
-diff --git a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in
---- a/toolkit/components/downloads/src/Makefile.in
-+++ b/toolkit/components/downloads/src/Makefile.in
-@@ -71,8 +71,9 @@ EXTRA_COMPONENTS = \
-   nsDownloadManagerUI.manifest \
-   $(NULL)
+diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in
+--- a/toolkit/components/downloads/Makefile.in
++++ b/toolkit/components/downloads/Makefile.in
+@@ -79,8 +79,10 @@ endif
+ 
+ ifdef ENABLE_TESTS
+ DIRS += test
  endif
  
  include $(topsrcdir)/config/rules.mk
  
  EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS)
- 
++
 +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
-diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
---- a/toolkit/components/downloads/src/nsDownloadManager.cpp
-+++ b/toolkit/components/downloads/src/nsDownloadManager.cpp
+diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
+--- a/toolkit/components/downloads/nsDownloadManager.cpp
++++ b/toolkit/components/downloads/nsDownloadManager.cpp
 @@ -71,16 +71,20 @@
  
  #if defined(XP_WIN) && !defined(WINCE)
@@ -2134,14 +2135,14 @@
 diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
 --- a/toolkit/xre/Makefile.in
 +++ b/toolkit/xre/Makefile.in
-@@ -97,17 +97,18 @@ CMMSRCS = nsNativeAppSupportCocoa.mm
+@@ -94,17 +94,18 @@ EXPORTS = nsWindowsDllInterceptor.h
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+ CMMSRCS = nsNativeAppSupportCocoa.mm
  else
  ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
  CPPSRCS += nsNativeAppSupportOS2.cpp
  else
- ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
- CPPSRCS += nsNativeAppSupportBeOS.cpp
- else
  ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 -CPPSRCS += nsNativeAppSupportUnix.cpp
 +CPPSRCS += nsNativeAppSupportUnix.cpp nsKDEUtils.cpp
@@ -2572,7 +2573,7 @@
 diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
 --- a/uriloader/exthandler/Makefile.in
 +++ b/uriloader/exthandler/Makefile.in
-@@ -94,18 +94,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
+@@ -90,18 +90,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas
              -I$(topsrcdir)/dom/ipc \
              -I$(topsrcdir)/content/base/src \
              -I$(topsrcdir)/content/events/src \
@@ -3663,7 +3664,7 @@
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -93,16 +93,17 @@
+@@ -88,16 +88,17 @@
  #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
@@ -3681,11 +3682,11 @@
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1822,44 +1823,50 @@ nsLocalFile::Launch()
+@@ -1730,44 +1731,50 @@ nsLocalFile::SetPersistentDescriptor(con
+     return InitWithNativePath(aPersistentDescriptor);
+ #endif
+ }
  
-     return NS_OK;
- }
- #else
  NS_IMETHODIMP
  nsLocalFile::Reveal()
  {
@@ -3746,7 +3747,7 @@
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1885,16 +1892,23 @@ nsLocalFile::Launch()
+@@ -1793,16 +1800,23 @@ nsLocalFile::Launch()
  
      if (nsnull == connection)
        return NS_ERROR_FAILURE;
--- a/mozilla-language.patch	Wed Mar 30 08:53:19 2011 +0200
+++ b/mozilla-language.patch	Wed Mar 30 11:21:12 2011 +0200
@@ -1,6 +1,6 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 05766406681babf9a5a433649b5ba2b9741b9962
+# Parent db620d83124746201970dcf50c661957df979eca
 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
 
 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
@@ -11,7 +11,7 @@
  
  
  #ifdef MOZ_WIDGET_QT
-         const char* lang = QLocale::languageToString(QLocale::system().language()).toAscii();
+         const char* lang = QLocale::system().name().toAscii();
  #else
          // Get system configuration
          const char* lang = getenv("LANG");
@@ -45,4 +45,4 @@
          mApplicationLocale = do_QueryInterface(resultLocale);
      }  // if ( NS_SUCCEEDED )...
         
- #endif // XP_UNIX || XP_BEOS
+ #endif // XP_UNIX
--- a/mozilla-xulrunner22/mozilla-gcc46.patch	Wed Mar 30 08:53:19 2011 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-gcc46.patch
\ No newline at end of file
--- a/mozilla-xulrunner22/mozilla-xulrunner22.spec	Wed Mar 30 08:53:19 2011 +0200
+++ b/mozilla-xulrunner22/mozilla-xulrunner22.spec	Wed Mar 30 11:21:12 2011 +0200
@@ -76,7 +76,6 @@
 Patch15:        mozilla-cairo-return.patch
 Patch16:        mozilla-ntlm-full-path.patch
 Patch17:        mozilla-gecko-version.patch
-Patch18:        mozilla-gcc46.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       mozilla-js22 = %{version}
 Requires(post):  update-alternatives coreutils
@@ -222,7 +221,6 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p1
 
 %build
 kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
--- a/series	Wed Mar 30 08:53:19 2011 +0200
+++ b/series	Wed Mar 30 11:21:12 2011 +0200
@@ -15,7 +15,6 @@
 mozilla-gio.patch
 mozilla-cairo-return.patch
 mozilla-ntlm-full-path.patch
-mozilla-gcc46.patch
 
 # Firefox patches
 firefox-linkorder.patch
--- a/toolkit-download-folder.patch	Wed Mar 30 08:53:19 2011 +0200
+++ b/toolkit-download-folder.patch	Wed Mar 30 11:21:12 2011 +0200
@@ -15,9 +15,9 @@
        iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));
      } else {
        // 'Desktop'
-diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp
---- a/toolkit/components/downloads/src/nsDownloadManager.cpp
-+++ b/toolkit/components/downloads/src/nsDownloadManager.cpp
+diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
+--- a/toolkit/components/downloads/nsDownloadManager.cpp
++++ b/toolkit/components/downloads/nsDownloadManager.cpp
 @@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi
    // XDG user dir spec, with a fallback to Home/Downloads
mozilla