2011-03-31 08:49:52 +02:00
|
|
|
# HG changeset patch
|
2015-02-23 21:32:13 +01:00
|
|
|
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
|
2016-04-27 09:09:13 +02:00
|
|
|
# Parent a5764b0a088418fdbf4b774a8ff2745cc99f6706
|
2011-06-01 08:05:09 +02:00
|
|
|
|
2011-03-31 08:49:52 +02:00
|
|
|
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
|
|
|
|
--- a/browser/app/Makefile.in
|
|
|
|
+++ b/browser/app/Makefile.in
|
2015-08-12 09:11:49 +02:00
|
|
|
@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
|
2013-04-02 21:00:31 +02:00
|
|
|
endif
|
2011-03-31 08:49:52 +02:00
|
|
|
|
2013-09-16 09:57:05 +02:00
|
|
|
ifdef MOZ_WIDGET_GTK
|
2011-03-31 08:49:52 +02:00
|
|
|
libs::
|
2013-01-07 21:49:28 +01:00
|
|
|
$(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
|
2011-03-31 08:49:52 +02:00
|
|
|
+ifdef MOZ_OFFICIAL_BRANDING
|
2013-01-07 21:49:28 +01:00
|
|
|
+ $(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
|
2011-03-31 08:49:52 +02:00
|
|
|
+endif
|
|
|
|
endif
|
|
|
|
|
2012-07-16 10:13:51 +02:00
|
|
|
# channel-prefs.js is handled separate from other prefs due to bug 756325
|
|
|
|
libs:: $(srcdir)/profile/channel-prefs.js
|
2015-02-23 21:32:13 +01:00
|
|
|
$(NSINSTALL) -D $(DIST)/bin/defaults/pref
|
|
|
|
$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
|
2016-01-26 23:39:03 +01:00
|
|
|
|
|
|
|
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
|
2015-08-12 09:11:49 +02:00
|
|
|
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
|
2016-04-27 09:09:13 +02:00
|
|
|
@@ -34,12 +34,15 @@ def FirefoxBranding():
|
|
|
|
'disk.icns',
|
|
|
|
'document.icns',
|
|
|
|
'dsstore',
|
|
|
|
'firefox.icns',
|
|
|
|
]
|
|
|
|
elif CONFIG['MOZ_WIDGET_GTK']:
|
|
|
|
BRANDING_FILES += [
|
|
|
|
'default16.png',
|
|
|
|
+ 'default22.png',
|
|
|
|
+ 'default24.png',
|
|
|
|
+ 'default256.png',
|
|
|
|
'default32.png',
|
|
|
|
'default48.png',
|
|
|
|
'mozicon128.png',
|
|
|
|
]
|
2011-03-31 08:49:52 +02:00
|
|
|
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
|
2016-04-27 09:09:13 +02:00
|
|
|
@@ -664,18 +664,21 @@
|
2015-02-23 21:32:13 +01:00
|
|
|
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
|
2015-08-12 09:11:49 +02:00
|
|
|
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
2015-02-23 21:32:13 +01:00
|
|
|
@RESPATH@/chrome/toolkit@JAREXT@
|
|
|
|
@RESPATH@/chrome/toolkit.manifest
|
|
|
|
@RESPATH@/chrome/recording.manifest
|
|
|
|
@RESPATH@/chrome/recording/*
|
2013-09-16 09:57:05 +02:00
|
|
|
#ifdef MOZ_GTK
|
2015-02-23 21:32:13 +01:00
|
|
|
@RESPATH@/browser/chrome/icons/default/default16.png
|
|
|
|
+@RESPATH@/browser/chrome/icons/default/default22.png
|
|
|
|
+@RESPATH@/browser/chrome/icons/default/default24.png
|
|
|
|
@RESPATH@/browser/chrome/icons/default/default32.png
|
|
|
|
@RESPATH@/browser/chrome/icons/default/default48.png
|
|
|
|
+@RESPATH@/browser/chrome/icons/default/default256.png
|
2011-03-31 08:49:52 +02:00
|
|
|
#endif
|
2016-03-07 17:25:29 +01:00
|
|
|
@RESPATH@/browser/features/*
|
2011-03-31 08:49:52 +02:00
|
|
|
|
2014-09-22 18:35:40 +02:00
|
|
|
; [Webide Files]
|
2015-02-23 21:32:13 +01:00
|
|
|
@RESPATH@/browser/chrome/webide@JAREXT@
|
|
|
|
@RESPATH@/browser/chrome/webide.manifest
|
|
|
|
@RESPATH@/browser/@PREF_DIR@/webide-prefs.js
|
2014-10-13 20:00:43 +02:00
|
|
|
|