Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
install all icons mozilla-2.0
authorWolfgang Rosenauer <wr@rosenauer.org>
Wed, 30 Mar 2011 16:38:38 +0200
branchmozilla-2.0
changeset 252 5477a696d8f6
parent 248 0fea78eee35a
child 253 5cbec268563a
child 266 0c52b02bd7c2
install all icons
MozillaFirefox/MozillaFirefox.changes file | annotate | diff | comparison | revisions
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/firefox-branded-icons.patch file | annotate | diff | comparison | revisions
firefox-branded-icons.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Mar 30 08:12:05 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Mar 30 16:38:38 2011 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 30 11:24:36 UTC 2011 - wr@rosenauer.org
+
+- add all available icon sizes
+
 -------------------------------------------------------------------
 Tue Mar 29 11:55:53 UTC 2011 - cfarrell@novell.com
 
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Mar 30 08:12:05 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Mar 30 16:38:38 2011 +0200
@@ -68,6 +68,7 @@
 Patch10:        firefox-no-default-ualocale.patch
 Patch11:        firefox-multilocale-chrome.patch
 Patch12:        firefox-shellservice.patch
+Patch13:        firefox-branded-icons.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -190,6 +191,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
@@ -313,7 +315,7 @@
 ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
 ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
 %if %branding
-for size in 16 32 48; do
+for size in 16 22 24 32 48 256; do
   mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/
   ln -sf %{progdir}/chrome/icons/default/default$size.png \
          $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/firefox-branded-icons.patch	Wed Mar 30 16:38:38 2011 +0200
@@ -0,0 +1,1 @@
+../firefox-branded-icons.patch
\ No newline at end of file
--- /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)
--- a/series	Wed Mar 30 08:12:05 2011 +0200
+++ b/series	Wed Mar 30 16:38:38 2011 +0200
@@ -30,3 +30,4 @@
 firefox-no-default-ualocale.patch
 firefox-multilocale-chrome.patch
 firefox-shellservice.patch
+firefox-branded-icons.patch
mozilla