diff -r b2202fea7983 -r f118b88b7d7f firefox-branded-icons.patch --- a/firefox-branded-icons.patch Sat May 03 10:14:44 2014 +0200 +++ b/firefox-branded-icons.patch Wed May 28 22:17:03 2014 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0 +# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -29,13 +29,13 @@ 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 -@@ -36,18 +36,21 @@ BRANDING_FILES := \ +@@ -35,18 +35,21 @@ BRANDING_FILES := \ document.icns \ dsstore \ $(NULL) endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) + ifdef MOZ_WIDGET_GTK BRANDING_FILES := \ default16.png \ + default22.png \ @@ -54,7 +54,7 @@ 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 -@@ -611,18 +611,21 @@ +@@ -613,18 +613,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@