Mercurial Mercurial > hg > mozilla / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
firefox-branded-icons.patch
changeset 923 3cc9f17ca9bb
parent 909 c6717354928b
child 952 8094e6bba260 
--- a/firefox-branded-icons.patch	Sat Jul 30 10:49:37 2016 +0200
+++ b/firefox-branded-icons.patch	Mon Aug 01 14:45:11 2016 +0200
@@ -1,42 +1,17 @@
 # HG changeset patch
 # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
-# Parent  a5764b0a088418fdbf4b774a8ff2745cc99f6706
+# Parent  2bffb52e07b587a6c755d67c6fc971fed6509783
 
-diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
- endif
- 
- ifdef MOZ_WIDGET_GTK
- libs::
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(FINAL_TARGET)/icons
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(FINAL_TARGET)/chrome/icons/default
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png  $(FINAL_TARGET)/chrome/icons/default
- 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(FINAL_TARGET)/chrome/icons/default
-+ifdef MOZ_OFFICIAL_BRANDING
-+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png  $(FINAL_TARGET)/chrome/icons/default
-+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png  $(FINAL_TARGET)/chrome/icons/default
-+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png  $(FINAL_TARGET)/chrome/icons/default
-+endif
- endif
- 
- # channel-prefs.js is handled separate from other prefs due to bug 756325
- libs:: $(srcdir)/profile/channel-prefs.js
- 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
- 	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
- 
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 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
-@@ -34,12 +34,15 @@ def FirefoxBranding():
+@@ -34,18 +34,24 @@ def FirefoxBranding():
              'disk.icns',
              'document.icns',
              'dsstore',
              'firefox.icns',
          ]
-     elif CONFIG['MOZ_WIDGET_GTK']:
+     elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
          BRANDING_FILES += [
              'default16.png',
 +            'default22.png',
@@ -46,10 +21,19 @@
              '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',
+         ]
 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
-@@ -664,18 +664,21 @@
+@@ -650,18 +650,21 @@
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
  @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
  @RESPATH@/chrome/toolkit@JAREXT@
mozilla