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 828 59013b3a51f5
parent 766 e0b23b7851e9
child 868 284da266ec46 
--- a/firefox-branded-icons.patch	Sun Jan 25 11:12:18 2015 +0100
+++ b/firefox-branded-icons.patch	Wed Jan 28 13:45:46 2015 +0100
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent 8f03aa18c51f9c014f32aba7750f6b7927f9256e
+# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
 
 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
 --- a/browser/app/Makefile.in
 +++ b/browser/app/Makefile.in
-@@ -75,16 +75,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
+@@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
  endif
  
  ifdef MOZ_WIDGET_GTK
@@ -20,12 +20,12 @@
 +endif
  endif
  
- libs:: $(srcdir)/profile/prefs.js
- 	$(INSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile
- 
  ifndef LIBXUL_SDK
  # 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)
+ endif
 diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
 --- a/browser/branding/official/Makefile.in
 +++ b/browser/branding/official/Makefile.in
@@ -54,25 +54,25 @@
 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
-@@ -623,18 +623,21 @@
- @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
- @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
- @BINPATH@/chrome/toolkit@JAREXT@
- @BINPATH@/chrome/toolkit.manifest
- @BINPATH@/chrome/recording.manifest
- @BINPATH@/chrome/recording/*
+@@ -654,18 +654,21 @@
+ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+ @RESPATH@/chrome/toolkit@JAREXT@
+ @RESPATH@/chrome/toolkit.manifest
+ @RESPATH@/chrome/recording.manifest
+ @RESPATH@/chrome/recording/*
  #ifdef MOZ_GTK
- @BINPATH@/browser/chrome/icons/default/default16.png
-+@BINPATH@/browser/chrome/icons/default/default22.png
-+@BINPATH@/browser/chrome/icons/default/default24.png
- @BINPATH@/browser/chrome/icons/default/default32.png
- @BINPATH@/browser/chrome/icons/default/default48.png
-+@BINPATH@/browser/chrome/icons/default/default256.png
+ @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
  #endif
  
  ; [Webide Files]
- @BINPATH@/browser/chrome/webide@JAREXT@
- @BINPATH@/browser/chrome/webide.manifest
- @BINPATH@/browser/@PREF_DIR@/webide-prefs.js
+ @RESPATH@/browser/chrome/webide@JAREXT@
+ @RESPATH@/browser/chrome/webide.manifest
+ @RESPATH@/browser/@PREF_DIR@/webide-prefs.js
  
  ; shell icons
mozilla