From: Jan Rękorajski Date: Wed, 19 Mar 2014 11:11:26 +0000 (+0100) Subject: - updated patches for 28.0 X-Git-Tag: auto/th/iceweasel-28.0-1~2 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=87e6bff271f6b3accc147d4f3c238462b9b5dfe6;p=packages%2Ficeweasel.git - updated patches for 28.0 --- diff --git a/iceweasel-branding.patch b/iceweasel-branding.patch index 63fa987..d158601 100644 --- a/iceweasel-branding.patch +++ b/iceweasel-branding.patch @@ -18,41 +18,41 @@ Subject: Determine which phishing shavar to use depending on MOZ_OFFICIAL_BRANDING --- - browser/app/Makefile.in | 4 ++++ - browser/app/profile/firefox.js | 4 ++++ + modules/libpref/src/Makefile.in | 4 ++++ + modules/libpref/src/init/all.js | 4 ++++ 2 files changed, 8 insertions(+) -diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in -index fdcee86..3c6cb9f 100644 ---- a/browser/app/Makefile.in -+++ b/browser/app/Makefile.in -@@ -141,6 +141,10 @@ libs:: - $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(FINAL_TARGET)/chrome/icons/default - endif +diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in +index 31333bc..e833ecd 100644 +--- a/modules/libpref/src/Makefile.in ++++ b/modules/libpref/src/Makefile.in +@@ -7,6 +7,10 @@ DEFINES += -DOS_ARCH=$(OS_ARCH) \ + -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ + $(NULL) +ifdef MOZ_OFFICIAL_BRANDING +DEFINES += -DMOZ_OFFICIAL_BRANDING +endif + - libs:: $(srcdir)/profile/prefs.js - $(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile + include $(topsrcdir)/config/rules.mk -diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js -index 02c8e3f..979e01a 100644 ---- a/browser/app/profile/firefox.js -+++ b/browser/app/profile/firefox.js -@@ -760,7 +760,11 @@ pref("urlclassifier.alternate_error_page", "blocked"); - pref("urlclassifier.gethashnoise", 4); + GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, \ +diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js +index 24f1574..9c98f3e 100644 +--- a/modules/libpref/src/init/all.js ++++ b/modules/libpref/src/init/all.js +@@ -4538,7 +4538,11 @@ pref("dom.inter-app-communication-api.enabled", false); - // The list of tables that use the gethash request to confirm partial results. + // The tables used for Safebrowsing phishing and malware checks. + pref("urlclassifier.malware_table", "goog-malware-shavar"); +#ifdef MOZ_OFFICIAL_BRANDING - pref("urlclassifier.gethashtables", "goog-phish-shavar,goog-malware-shavar"); + pref("urlclassifier.phish_table", "goog-phish-shavar"); +#else -+pref("urlclassifier.gethashtables", "googpub-phish-shavar,goog-malware-shavar"); ++pref("urlclassifier.phish_table", "googpub-phish-shavar"); +#endif + pref("urlclassifier.download_block_table", ""); + pref("urlclassifier.download_allow_table", ""); - // If an urlclassifier table has not been updated in this number of seconds, - // a gethash request will be forced to check that the result is still in From: Mike Hommey Date: Sat, 19 Feb 2011 11:04:53 +0100 Subject: Modify search plugins depending on MOZ_APP_NAME @@ -64,10 +64,10 @@ Subject: Modify search plugins depending on MOZ_APP_NAME 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in -index 07a105e..fa8ea25 100644 +index 9b6fdee..e254d99 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -83,6 +83,8 @@ SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins +@@ -79,6 +79,8 @@ SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) PP_TARGETS += SEARCHPLUGINS @@ -89,7 +89,7 @@ index f131ea6..357d42e 100644 http://www.answers.com/ diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml -index 10ba30b..f23b99e 100644 +index 668643f..cd56936 100644 --- a/browser/locales/en-US/searchplugins/google.xml +++ b/browser/locales/en-US/searchplugins/google.xml @@ -2,6 +2,7 @@ @@ -117,7 +117,7 @@ index 10ba30b..f23b99e 100644 +#endif - + From: Mike Hommey Date: Sat, 19 Feb 2011 11:02:30 +0100 Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties @@ -128,10 +128,10 @@ Subject: Use MOZ_APP_DISPLAYNAME to fill appstrings.properties 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in -index cfaa3db..07a105e 100644 +index 570485b..9b6fdee 100644 --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -37,6 +37,8 @@ SUBMAKEFILES += \ +@@ -29,6 +29,8 @@ SUBMAKEFILES += \ $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales/Makefile \ $(NULL) diff --git a/iceweasel-packaging.patch b/iceweasel-packaging.patch index 136810a..89ee232 100644 --- a/iceweasel-packaging.patch +++ b/iceweasel-packaging.patch @@ -27,7 +27,7 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea +#ifndef LIBXUL_SDK @BINPATH@/dependentlibs.list +#endif - #ifdef XP_WIN32 + #ifdef GKMEDIAS_SHARED_LIBRARY @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@ #endif +#ifndef LIBXUL_SDK @@ -191,9 +191,9 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/browser/components/FeedConverter.js @BINPATH@/browser/components/FeedWriter.js @@ -354,6 +394,7 @@ - @BINPATH@/browser/components/DownloadsStartup.js - @BINPATH@/browser/components/DownloadsUI.js @BINPATH@/browser/components/BrowserPlaces.manifest + @BINPATH@/browser/components/devtools-clhandler.manifest + @BINPATH@/browser/components/devtools-clhandler.js +#ifndef LIBXUL_SDK @BINPATH@/components/Downloads.manifest @BINPATH@/components/DownloadLegacy.js @@ -294,12 +294,15 @@ diff -ur iceweasel-24.0.org/mozilla/browser/installer/package-manifest.in icewea @BINPATH@/components/servicesComponents.manifest @BINPATH@/components/cryptoComponents.manifest @BINPATH@/components/TelemetryPing.js -@@ -581,7 +581,9 @@ +@@ -581,10 +581,12 @@ @BINPATH@/components/PeerConnection.js @BINPATH@/components/PeerConnection.manifest #endif +#endif + @BINPATH@/components/HttpDataUsage.manifest + @BINPATH@/components/HttpDataUsage.js + +#ifndef LIBXUL_SDK @BINPATH@/chrome/marionette@JAREXT@ @BINPATH@/chrome/marionette.manifest diff --git a/system-virtualenv.patch b/system-virtualenv.patch index a2d150f..3650d56 100644 --- a/system-virtualenv.patch +++ b/system-virtualenv.patch @@ -1,5 +1,5 @@ ---- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200 -+++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py 2013-05-14 22:51:32.136719267 +0200 +--- xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py~ 2013-05-11 21:19:23.000000000 +0200 ++++ xulrunner-27.0/mozilla/python/mozbuild/mozbuild/virtualenv.py 2013-05-14 22:51:32.136719267 +0200 @@ -37,8 +37,7 @@ @property def virtualenv_script_path(self):