From 1cb4ac3e2ba1a33df50148f40403f45a3759468b Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Thu, 23 May 2019 21:05:57 +0200 Subject: updated to 65.0 branding --- .../Determine-which-phishing-shavar-to-use-depending-on-.patch | 4 ++-- .../Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch | 8 ++++---- .../remove-default-and-shell-icons-in-packaging-manifest.patch | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') 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 5be6fe9..174a425 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 -@@ -5540,9 +5540,7 @@ pref("dom.mapped_arraybuffer.enabled", t +@@ -5537,9 +5537,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"); @@ -27,7 +27,7 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build index 1c2c13e..7783e9d 100644 --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build -@@ -51,3 +51,6 @@ DEFINES['MOZ_WIDGET_TOOLKIT'] = CONFIG['MOZ_WIDGET_TOOLKIT'] +@@ -52,3 +52,6 @@ if CONFIG['NIGHTLY_BUILD']: FINAL_TARGET_PP_FILES += [ 'greprefs.js', ] 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 3f4a9fd..c1f9c19 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,7 +11,7 @@ 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 -@@ -9,7 +9,7 @@ const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components; +@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["ResetProfile"]; ChromeUtils.import("resource://gre/modules/Services.jsm"); ChromeUtils.import("resource://gre/modules/AppConstants.jsm"); @@ -24,12 +24,12 @@ 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 -@@ -4389,7 +4389,7 @@ XREMain::XRE_mainRun() +@@ -4163,7 +4163,7 @@ nsresult XREMain::XRE_mainRun() { if (gDoProfileReset) { // Automatically migrate from the current application if we just // reset the profile. - aKey = MOZ_APP_NAME; + aKey = "firefox"; + gResetOldProfile->GetName(aName); } - pm->Migrate(&mDirProvider, aKey, gResetOldProfileName); - } + pm->Migrate(&mDirProvider, aKey, aName); 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 6b93b51..6dd41f2 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 -@@ -405,13 +405,6 @@ +@@ -406,13 +406,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] -@@ -430,15 +423,10 @@ +@@ -431,15 +424,10 @@ @RESPATH@/browser/@PREF_DIR@/devtools-client.js @RESPATH@/browser/@PREF_DIR@/debugger.js -- cgit v1.2.2