diff -r 4b419fce88dc -r 8220ea23b47d firefox-branded-icons.patch --- a/firefox-branded-icons.patch Fri Feb 09 13:28:07 2018 +0100 +++ b/firefox-branded-icons.patch Fri Feb 09 16:30:49 2018 +0100 @@ -1,39 +1,30 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent 75308bbaaf73d672c88cb283591d4aefc7db9804 +# Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild --- a/browser/branding/branding-common.mozbuild +++ b/browser/branding/branding-common.mozbuild -@@ -38,18 +38,24 @@ def FirefoxBranding(): - 'disk.icns', - 'document.icns', - 'dsstore', - 'firefox.icns', +@@ -17,12 +17,15 @@ def FirefoxBranding(): + FINAL_TARGET_FILES.VisualElements += [ + 'VisualElements_150.png', + 'VisualElements_70.png', ] elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: - BRANDING_FILES += [ + FINAL_TARGET_FILES.chrome.icons.default += [ + 'default128.png', 'default16.png', -+ 'default22.png', -+ 'default24.png', -+ 'default256.png', ++ 'default22.png', ++ 'default24.png', ++ 'default256.png', 'default32.png', 'default48.png', - 'mozicon128.png', - ] - FINAL_TARGET_FILES.icons += ['mozicon128.png'] - FINAL_TARGET_FILES.chrome.icons.default += [ - 'default16.png', -+ 'default22.png', -+ 'default24.png', -+ 'default256.png', - 'default32.png', - 'default48.png', + 'default64.png', ] 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 -@@ -618,18 +618,21 @@ +@@ -601,20 +601,23 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ @@ -46,6 +37,8 @@ +@RESPATH@/browser/chrome/icons/default/default24.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 +@RESPATH@/browser/chrome/icons/default/default256.png #endif @RESPATH@/browser/features/*