firefox-branded-icons.patch
author Dinar Valeev
Tue, 07 Feb 2012 19:07:59 +0100
changeset 378 dfb824794771
parent 340 aabcc7895695
child 382 67f876aafae8
permissions -rw-r--r--
import upstream patches to fix PPC64
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
252
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
340
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
     2
# Parent 87462739809ad0f41fd335f9a68203fd70f9883c
259
31beb466ca79 snapshot 20110411
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 252
diff changeset
     3
252
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
--- a/browser/app/Makefile.in
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
+++ b/browser/app/Makefile.in
340
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
     7
@@ -194,16 +194,21 @@ DEFINES += -DMOZILLA_OFFICIAL
294
5330447b83a3 update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
     8
 endif
252
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
 
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
 libs::
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
 	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
+ifdef MOZ_OFFICIAL_BRANDING
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+	$(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png  $(DIST)/bin/chrome/icons/default
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
+endif
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
 endif
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
 
340
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    23
 libs:: $(srcdir)/profile/prefs.js
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    24
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    25
 
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    26
 libs:: $(srcdir)/blocklist.xml
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    27
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    28
 
289
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    29
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    30
--- a/browser/branding/official/Makefile.in
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    31
+++ b/browser/branding/official/Makefile.in
340
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    32
@@ -65,18 +65,21 @@ OSX_BRANDING_FILES = \
252
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
 	firefox.icns \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
 	disk.icns \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
 	document.icns \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
 	dsstore \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 	$(NULL)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
 LINUX_BRANDING_FILES = \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
 	default16.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
+	default22.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
+	default24.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
 	default32.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    44
 	default48.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
+	default256.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
 	mozicon128.png \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 	$(NULL)
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
 
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
 OS2_BRANDING_FILES = \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    50
 	firefox-os2.ico \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    51
 	document-os2.ico \
5477a696d8f6 install all icons
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    52
 	$(NULL)
294
5330447b83a3 update to aurora (6.99 / 20110721)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 289
diff changeset
    53
 
289
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    54
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    55
--- a/browser/installer/package-manifest.in
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    56
+++ b/browser/installer/package-manifest.in
340
aabcc7895695 update to version 8.0b1 (just merged stuff; build might still fail)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 294
diff changeset
    57
@@ -415,18 +415,21 @@
289
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    58
 #ifdef SHIP_FEEDBACK
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    59
 @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    60
 #endif
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    61
 @BINPATH@/chrome/toolkit@JAREXT@
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    62
 @BINPATH@/chrome/toolkit.manifest
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    63
 #ifdef XP_UNIX
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    64
 #ifndef XP_MACOSX
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    65
 @BINPATH@/chrome/icons/default/default16.png
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    66
+@BINPATH@/chrome/icons/default/default22.png
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    67
+@BINPATH@/chrome/icons/default/default24.png
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    68
 @BINPATH@/chrome/icons/default/default32.png
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    69
 @BINPATH@/chrome/icons/default/default48.png
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    70
+@BINPATH@/chrome/icons/default/default256.png
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    71
 #endif
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    72
 #endif
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    73
 
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    74
 
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    75
 ; shell icons
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    76
 #ifdef XP_UNIX
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    77
 #ifndef XP_MACOSX
3c0dff7ca9c4 Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 259
diff changeset
    78
 @BINPATH@/icons/*.xpm