[patch] mozilla-firefox-linguas.patch

mozilla-firefox-linguas.patch (text/plain), 3.69 KB, created by Harald van Dijk (RETIRED) on 2007-06-15 21:22:14 UTC

--- mozilla-firefox-2.0.0.4.ebuild
+++ mozilla-firefox-2.0.0.4-r1.ebuild
@@ -7,13 +7,13 @@
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
 PATCH="${P}-patches-0.1"
-LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr fy-NL ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR pt-PT ro ru sk sl sv-SE tr zh-CN zh-TW"
+LANGS="af ar be bg ca cs da de el en-GB es-AR es-ES eu fi fr ga-IE gu-IN he hu it ja ka ko ku lt mk mn nb-NO nl nn-NO pa-IN pl pt-BR ro ru sk sl sv-SE tr zh-CN zh-TW"
 NOSHORTLANGS="en-GB es-AR pt-BR zh-TW"
 
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
 
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 SLOT="0"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="java mozdevelop bindist xforms restrict-javascript filepicker"
@@ -59,28 +59,6 @@
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 
-linguas() {
-	local LANG SLANG
-	for LANG in ${LINGUAS}; do
-		if has ${LANG} en en_US; then
-			has en ${linguas} || linguas="${linguas:+"${linguas} "}en"
-			continue
-		elif has ${LANG} ${LANGS//-/_}; then
-			has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}"
-			continue
-		elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then
-			for X in ${LANGS}; do
-				if [[ "${X}" == "${LANG}-"* ]] && \
-					[[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then
-					has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}"
-					continue 2
-				fi
-			done
-		fi
-		ewarn "Sorry, but mozilla-firefox does not support the ${LANG} LINGUA"
-	done
-}
-
 pkg_setup(){
 	if ! built_with_use x11-libs/cairo X; then
 		eerror "Cairo is not built with X useflag."
@@ -100,13 +78,9 @@
 src_unpack() {
 	unpack firefox-${PV}-source.tar.bz2  ${PATCH}.tar.bz2
 
-	linguas
-	for X in ${linguas}; do
+	for X in ${A}; do
-		[[ ${X} != "en" ]] && xpi_unpack "${P}-${X}.xpi"
+		[[ ${X} == *.xpi ]] && xpi_unpack ${X}
 	done
-	if [[ ${linguas} != "" ]]; then
-		einfo "Selected language packs (first will be default): ${linguas}"
-	fi
 
 	# Apply our patches
 	cd "${S}" || die "cd failed"
@@ -209,20 +183,10 @@
 	dodir "${MOZILLA_FIVE_HOME}"
 	cp -RL "${S}"/dist/bin/* "${D}"/"${MOZILLA_FIVE_HOME}"/ || die "cp failed"
 
-	linguas
-	for X in ${linguas}; do
+	for X in ${A}; do
-		[[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${P}-${X}"
+		[[ ${X} == *.xpi ]] && xpi_install "${WORKDIR}"/${X%.xpi}
 	done
 
-	local LANG=${linguas%% *}
-	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
-		elog "Setting default locale to ${LANG}"
-		dosed -e "s:general.useragent.locale\", \"en-US\":general.useragent.locale\", \"${LANG}\":" \
-			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox.js \
-			"${MOZILLA_FIVE_HOME}"/defaults/pref/firefox-l10n.js || \
-			die "sed failed to change locale"
-	fi
-
 	# Create /usr/bin/firefox
 	install_mozilla_launcher_stub firefox "${MOZILLA_FIVE_HOME}"
 
@@ -256,9 +220,9 @@
 	doins "${S}"/build/unix/*.pc
 
 	insinto "${MOZILLA_FIVE_HOME}"/greprefs
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js all-gentoo.js
 	insinto "${MOZILLA_FIVE_HOME}"/defaults/pref
-	newins "${FILESDIR}"/gentoo-default-prefs.js all-gentoo.js
+	newins "${FILESDIR}"/gentoo-default-prefs-r1.js all-gentoo.js
 }
 
 pkg_postinst() {
--- files/gentoo-default-prefs.js
+++ files/gentoo-default-prefs-r1.js
@@ -9,3 +9,4 @@
 pref("browser.urlbar.hideGoButton",        true);
 pref("accessibility.typeaheadfind",        true);
 pref("browser.startup.homepage",           "http://www.gentoo.org/");
+pref("intl.locale.matchOS",                true);