diff -r 0fea78eee35a -r 5477a696d8f6 firefox-branded-icons.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/firefox-branded-icons.patch Wed Mar 30 16:38:38 2011 +0200 @@ -0,0 +1,77 @@ +# HG changeset patch +# Parent 33dfbc62844ac4883fbedb77d782a1b9ef5596c4 +diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in +--- a/browser/app/Makefile.in ++++ b/browser/app/Makefile.in +@@ -281,16 +281,21 @@ endif + + ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + libs:: + $(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons + $(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png $(DIST)/bin/chrome/icons/default + $(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png $(DIST)/bin/chrome/icons/default ++ifdef MOZ_OFFICIAL_BRANDING ++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png $(DIST)/bin/chrome/icons/default ++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png $(DIST)/bin/chrome/icons/default ++ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png $(DIST)/bin/chrome/icons/default ++endif + endif + + ifdef MOZ_SPLASHSCREEN + ifeq ($(MOZ_WIDGET_TOOLKIT),windows) + libs:: + $(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin + endif + endif +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 +@@ -423,18 +423,21 @@ + #if MOZ_UPDATE_CHANNEL == beta + @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi + #endif + @BINPATH@/chrome/toolkit@JAREXT@ + @BINPATH@/chrome/toolkit.manifest + #ifdef XP_UNIX + #ifndef XP_MACOSX + @BINPATH@/chrome/icons/default/default16.png ++@BINPATH@/chrome/icons/default/default22.png ++@BINPATH@/chrome/icons/default/default24.png + @BINPATH@/chrome/icons/default/default32.png + @BINPATH@/chrome/icons/default/default48.png ++@BINPATH@/chrome/icons/default/default256.png + #endif + #endif + + + ; shell icons + #ifdef XP_UNIX + #ifndef XP_MACOSX + @BINPATH@/icons/*.xpm +diff --git a/other-licenses/branding/firefox/Makefile.in b/other-licenses/branding/firefox/Makefile.in +--- a/other-licenses/branding/firefox/Makefile.in ++++ b/other-licenses/branding/firefox/Makefile.in +@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \ + firefox.icns \ + disk.icns \ + document.icns \ + dsstore \ + $(NULL) + + LINUX_BRANDING_FILES = \ + default16.png \ ++ default22.png \ ++ default24.png \ + default32.png \ + default48.png \ ++ default256.png \ + document.png \ + mozicon128.png \ + $(NULL) + + OS2_BRANDING_FILES = \ + firefox-os2.ico \ + document-os2.ico \ + $(NULL)