[patch] mozilla-firefox-3.0.11.ebuild.diff

mozilla-firefox-3.0.11.ebuild.diff (text/plain), 1.60 KB, created by Lars Wendler (Polynomial-C) (RETIRED) on 2009-06-15 06:05:21 UTC

--- mozilla-firefox-3.0.11.ebuild
+++ mozilla-firefox-3.0.11.ebuild
@@ -108,7 +108,9 @@
 	if use iceweasel; then
 		unpack iceweasel-icons-3.0.tar.bz2
 
-		cp -r iceweaselicons/browser mozilla/
+		cp -r iceweaselicons/browser/app/* mozilla/browser/branding/unofficial
+		cp iceweaselicons/browser/base/branding/icon48.png mozilla/browser/branding/unofficial/default48.png
+		cp -r iceweaselicons/browser/base/branding/* mozilla/browser/branding/unofficial/content
 	fi
 
 	linguas
@@ -131,8 +133,8 @@
 	epatch "${WORKDIR}"/patch
 
 	if use iceweasel; then
-		sed -i -e "s|Minefield|Iceweasel|" browser/locales/en-US/chrome/branding/brand.* \
-			browser/branding/nightly/configure.sh
+		sed -i -e "s|Gran Paradiso|Iceweasel|" browser/branding/unofficial/locales/en-US/brand.*
+		sed -i -e "s|GranParadiso|Iceweasel|" browser/branding/unofficial/configure.sh
 	fi
 
 	eautoreconf
@@ -181,9 +183,9 @@
 		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
 	fi
 
-	if ! use bindist && ! use iceweasel; then
+	if ! use bindist && ! use iceweasel ; then
 		mozconfig_annotate '' --enable-official-branding
-	elif use bindist && ! use iceweasel; then
+	elif use bindist || use iceweasel ; then
 		mozconfig_annotate 'bindist' --with-branding=browser/branding/unofficial
 	fi
 
@@ -243,7 +245,7 @@
 
 	# Install icon and .desktop for menu entry
 	if use iceweasel; then
-		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
+		newicon "${S}"/browser/branding/unofficial/default48.png iceweasel-icon.png
 		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
 			mozilla-firefox-3.0.desktop
 	elif ! use bindist; then