diff -r fbfe323c62cd -r 526f445635f3 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Fri Jun 08 22:31:03 2018 +0200 +++ b/firefox-branded-icons.patch Fri Jun 08 22:48:29 2018 +0200 @@ -1,11 +1,11 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa +# Parent 8a401a01454e9f5e8a357262d774e0ff348d9bc1 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 -@@ -17,12 +17,15 @@ def FirefoxBranding(): +@@ -22,12 +22,15 @@ def FirefoxBranding(): FINAL_TARGET_FILES.VisualElements += [ 'VisualElements_150.png', 'VisualElements_70.png', @@ -24,9 +24,9 @@ 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 -@@ -601,20 +601,23 @@ - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +@@ -404,20 +404,23 @@ + @RESPATH@/browser/chrome/pdfjs.manifest + @RESPATH@/browser/chrome/pdfjs/* @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest @@ -46,5 +46,5 @@ ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ @RESPATH@/browser/chrome/webide.manifest - @RESPATH@/browser/@PREF_DIR@/webide-prefs.js + @RESPATH@/browser/@PREF_DIR@/webide.js