From a973131882cad8b1f5baba5d32512d1973f07bd4 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Wed, 16 May 2018 08:05:07 +0200 Subject: updated to 60.0 branding --- .../iceweasel-branding/Allowed-dupes_for_Iceweasel.patch | 2 +- .../Determine-which-phishing-shavar-to-use-depending-on-.patch | 2 +- .../Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch | 3 ++- .../Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch | 10 +++++----- .../iceweasel-branding/enable-object-directory-paths.patch | 2 +- .../remove-default-and-shell-icons-in-packaging-manifest.patch | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch index 7873732..b376add 100644 --- a/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch +++ b/src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch @@ -10,7 +10,7 @@ diff --git a/browser/installer/allowed-dupes.mn b/browser/installer/allowed-dupe index c5ab86b65..c402ab76f 100644 --- a/browser/installer/allowed-dupes.mn +++ b/browser/installer/allowed-dupes.mn -@@ -132,9 +132,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png +@@ -128,9 +128,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png components/FxAccountsPush.js crashreporter.app/Contents/Resources/English.lproj/MainMenu.nib/classes.nib crashreporter.app/Contents/Resources/English.lproj/MainMenuRTL.nib/classes.nib diff --git a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch index 145f998..d675f43 100644 --- a/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch +++ b/src/patches/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch @@ -12,7 +12,7 @@ diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 11bfba3..ed817aa 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -5395,9 +5395,7 @@ pref("dom.mapped_arraybuffer.enabled", t +@@ -5508,9 +5508,7 @@ pref("dom.mapped_arraybuffer.enabled", t // The tables used for Safebrowsing phishing and malware checks pref("urlclassifier.malwareTable", "goog-malware-proto,goog-unwanted-proto,test-harmful-simple,test-malware-simple,test-unwanted-simple"); diff --git a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch index 022cde7..6e2427c 100644 --- a/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch +++ b/src/patches/iceweasel-branding/Use-MOZ_APP_DISPLAYNAME-to-fill-appstrings.propertie.patch @@ -50,7 +50,7 @@ index 05cf816..5301b0b 100644 contentEncodingError=The page you are trying to view cannot be shown because it uses an invalid or unsupported form of compression. unsafeContentType=The page you are trying to view cannot be shown because it is contained in a file type that may not be safe to open. Please contact the website owners to inform them of this problem. externalProtocolTitle=External Protocol Request -@@ -36,7 +36,7 @@ unwantedBlocked=The site at %S has been +@@ -36,8 +36,8 @@ unwantedBlocked=The site at %S has been deceptiveBlocked=This web page at %S has been reported as a deceptive site and has been blocked based on your security preferences. cspBlocked=This page has a content security policy that prevents it from being loaded in this way. corruptedContentErrorv2=The site at %S has experienced a network protocol violation that cannot be repaired. @@ -60,3 +60,4 @@ index 05cf816..5301b0b 100644 -sslv3Used=Firefox cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. +#expand sslv3Used=__MOZ_APP_DISPLAYNAME__ cannot guarantee the safety of your data on %S because it uses SSLv3, a broken security protocol. inadequateSecurityError=The website tried to negotiate an inadequate level of security. + blockedByPolicy=Your organization has blocked access to this page or website. diff --git a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch index 20d2949..7464e28 100644 --- a/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch +++ b/src/patches/iceweasel-branding/Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch @@ -11,20 +11,20 @@ diff --git a/toolkit/modules/ResetProfile.jsm b/toolkit/modules/ResetProfile.jsm index 52c35c7..af2c0cf 100644 --- a/toolkit/modules/ResetProfile.jsm +++ b/toolkit/modules/ResetProfile.jsm -@@ -11,7 +11,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; - Cu.import("resource://gre/modules/Services.jsm"); - Cu.import("resource://gre/modules/AppConstants.jsm"); +@@ -9,7 +9,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; + ChromeUtils.import("resource://gre/modules/Services.jsm"); + ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); -const MOZ_APP_NAME = AppConstants.MOZ_APP_NAME; +const MOZ_APP_NAME = "firefox"; const MOZ_BUILD_APP = AppConstants.MOZ_BUILD_APP; - this.ResetProfile = { + var ResetProfile = { diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index fe63faa..66ca008 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -4479,7 +4479,7 @@ XREMain::XRE_mainRun() +@@ -4602,7 +4602,7 @@ XREMain::XRE_mainRun() if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. diff --git a/src/patches/iceweasel-branding/enable-object-directory-paths.patch b/src/patches/iceweasel-branding/enable-object-directory-paths.patch index 4c7b035..2fe5d6f 100644 --- a/src/patches/iceweasel-branding/enable-object-directory-paths.patch +++ b/src/patches/iceweasel-branding/enable-object-directory-paths.patch @@ -2,7 +2,7 @@ diff --git a/python/mozbuild/mozbuild/frontend/context.py b/python/mozbuild/mozb index 41ae8ae..dcc3263 100644 --- a/python/mozbuild/mozbuild/frontend/context.py +++ b/python/mozbuild/mozbuild/frontend/context.py -@@ -617,8 +617,6 @@ class Path(ContextDerivedValue, unicode): +@@ -651,8 +651,6 @@ class Path(ContextDerivedValue, unicode): class SourcePath(Path): """Like Path, but limited to paths in the source directory.""" def __init__(self, context, value): diff --git a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch index 9c01f05..fbbbf7a 100644 --- a/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch +++ b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch @@ -2,7 +2,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m index cffcff1..85d28cc 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -604,13 +604,6 @@ +@@ -601,13 +601,6 @@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest @RESPATH@/chrome/recording/* @@ -16,7 +16,7 @@ index cffcff1..85d28cc 100644 @RESPATH@/browser/features/* ; [Webide Files] -@@ -629,15 +622,10 @@ +@@ -612,15 +605,10 @@ @RESPATH@/browser/@PREF_DIR@/devtools.js @RESPATH@/browser/@PREF_DIR@/debugger.js -- cgit v1.2.2