From 2ad8533d2c108de6a09c05ba73ee8df6b090e5e7 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Wed, 14 Mar 2018 20:33:54 +0100 Subject: updated to 59.0 branding --- src/patches/iceweasel-branding/Allowed-dupes_for_Iceweasel.patch | 2 +- .../Determine-which-phishing-shavar-to-use-depending-on-.patch | 2 +- .../Use-firefox-instead-of-MOZ_APP_NAME-for-profile-rese.patch | 2 +- .../remove-default-and-shell-icons-in-packaging-manifest.patch | 8 ++++---- 4 files changed, 7 insertions(+), 7 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 fd16aa2..7873732 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 -@@ -147,9 +147,9 @@ chrome/toolkit/skin/classic/mozapps/update/downloadButtons.png +@@ -132,9 +132,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 0a2b25f..145f998 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 -@@ -5377,9 +5377,7 @@ pref("dom.mapped_arraybuffer.enabled", t +@@ -5395,9 +5395,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-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 13cd7e0..20d2949 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 @@ -24,7 +24,7 @@ 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 -@@ -4460,7 +4460,7 @@ XREMain::XRE_mainRun() +@@ -4479,7 +4479,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/remove-default-and-shell-icons-in-packaging-manifest.patch b/src/patches/iceweasel-branding/remove-default-and-shell-icons-in-packaging-manifest.patch index 266b7e5..9c01f05 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 -@@ -612,11 +612,6 @@ +@@ -604,13 +604,6 @@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest @RESPATH@/chrome/recording/* @@ -10,19 +10,19 @@ index cffcff1..85d28cc 100644 -@RESPATH@/browser/chrome/icons/default/default16.png -@RESPATH@/browser/chrome/icons/default/default32.png -@RESPATH@/browser/chrome/icons/default/default48.png +-@RESPATH@/browser/chrome/icons/default/default64.png +-@RESPATH@/browser/chrome/icons/default/default128.png -#endif @RESPATH@/browser/features/* ; [Webide Files] -@@ -635,17 +630,10 @@ +@@ -629,15 +622,10 @@ @RESPATH@/browser/@PREF_DIR@/devtools.js @RESPATH@/browser/@PREF_DIR@/debugger.js -; shell icons -#ifdef XP_UNIX -#ifndef XP_MACOSX --; shell icons --@RESPATH@/browser/icons/*.png #ifdef MOZ_UPDATER ; updater icon @RESPATH@/icons/updater.png -- cgit v1.2.2