Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 274186
Collapse All | Expand All

(-)file_not_specified_in_diff (-7 / +9 lines)
Line  Link Here
0
-- mozilla-firefox-3.0.11.ebuild
0
++ mozilla-firefox-3.0.11.ebuild
Lines 108-114 Link Here
108
	if use iceweasel; then
108
	if use iceweasel; then
109
		unpack iceweasel-icons-3.0.tar.bz2
109
		unpack iceweasel-icons-3.0.tar.bz2
110
110
111
		cp -r iceweaselicons/browser mozilla/
111
		cp -r iceweaselicons/browser/app/* mozilla/browser/branding/unofficial
112
		cp iceweaselicons/browser/base/branding/icon48.png mozilla/browser/branding/unofficial/default48.png
113
		cp -r iceweaselicons/browser/base/branding/* mozilla/browser/branding/unofficial/content
112
	fi
114
	fi
113
115
114
	linguas
116
	linguas
Lines 131-138 Link Here
131
	epatch "${WORKDIR}"/patch
133
	epatch "${WORKDIR}"/patch
132
134
133
	if use iceweasel; then
135
	if use iceweasel; then
134
		sed -i -e "s|Minefield|Iceweasel|" browser/locales/en-US/chrome/branding/brand.* \
136
		sed -i -e "s|Gran Paradiso|Iceweasel|" browser/branding/unofficial/locales/en-US/brand.*
135
			browser/branding/nightly/configure.sh
137
		sed -i -e "s|GranParadiso|Iceweasel|" browser/branding/unofficial/configure.sh
136
	fi
138
	fi
137
139
138
	eautoreconf
140
	eautoreconf
Lines 181-189 Link Here
181
		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
183
		mozconfig_annotate '' --with-libxul-sdk=/usr/$(get_libdir)/xulrunner-1.9
182
	fi
184
	fi
183
185
184
	if ! use bindist && ! use iceweasel; then
186
	if ! use bindist && ! use iceweasel ; then
185
		mozconfig_annotate '' --enable-official-branding
187
		mozconfig_annotate '' --enable-official-branding
186
	elif use bindist && ! use iceweasel; then
188
	elif use bindist || use iceweasel ; then
187
		mozconfig_annotate 'bindist' --with-branding=browser/branding/unofficial
189
		mozconfig_annotate 'bindist' --with-branding=browser/branding/unofficial
188
	fi
190
	fi
189
191
Lines 243-249 Link Here
243
245
244
	# Install icon and .desktop for menu entry
246
	# Install icon and .desktop for menu entry
245
	if use iceweasel; then
247
	if use iceweasel; then
246
		newicon "${S}"/browser/base/branding/icon48.png iceweasel-icon.png
248
		newicon "${S}"/browser/branding/unofficial/default48.png iceweasel-icon.png
247
		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
249
		newmenu "${FILESDIR}"/icon/iceweasel.desktop \
248
			mozilla-firefox-3.0.desktop
250
			mozilla-firefox-3.0.desktop
249
	elif ! use bindist; then
251
	elif ! use bindist; then

Return to bug 274186