Mercurial Mercurial > hg > mozilla / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
clean up general.useragent.locale settings
authorWolfgang Rosenauer <wr@rosenauer.org>
Mon, 08 Nov 2010 14:30:30 +0100
changeset 192 bb4213ee70c8
parent 191 14282ac75832
child 193 c6b8ff4f191a
clean up general.useragent.locale settings
MozillaFirefox/MozillaFirefox.spec file | annotate | diff | comparison | revisions
MozillaFirefox/firefox-no-default-ualocale.patch file | annotate | diff | comparison | revisions
firefox-no-default-ualocale.patch file | annotate | diff | comparison | revisions
series file | annotate | diff | comparison | revisions 
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Nov 08 09:35:44 2010 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Nov 08 14:30:30 2010 +0100
@@ -61,6 +61,7 @@
 Patch10:        firefox-ui-lockdown.patch
 Patch11:        firefox-no-sync-l10n.patch
 Patch12:        firefox-libxulsdk-locales.patch
+Patch13:        firefox-no-default-ualocale.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -162,6 +163,7 @@
 #%patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
@@ -234,6 +236,8 @@
   	make -C browser/locales langpack-$locale
 	cp -r dist/xpi-stage/locale-$locale \
 	      $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org
+	# remove prefs and profile defaults from langpack
+	rm -rf $RPM_BUILD_ROOT%{progdir}/extensions/langpack-$locale@firefox.mozilla.org/defaults
 	# check against the fixed common list and sort into the right filelist
 	_matched=0
 	for _match in ar ca cs da de en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/firefox-no-default-ualocale.patch	Mon Nov 08 14:30:30 2010 +0100
@@ -0,0 +1,1 @@
+../firefox-no-default-ualocale.patch
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/firefox-no-default-ualocale.patch	Mon Nov 08 14:30:30 2010 +0100
@@ -0,0 +1,27 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent 9041ab32e51a397a39de4f95c718a5adf5c21f2f
+Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
+
+diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
+--- a/browser/app/profile/firefox.js
++++ b/browser/app/profile/firefox.js
+@@ -215,17 +215,17 @@ pref("xpinstall.whitelist.add.36", "getp
+ 
+ pref("lightweightThemes.update.enabled", true);
+ 
+ pref("keyword.enabled", true);
+ // Override the default keyword.URL. Empty value means
+ // "use the search service's default engine"
+ pref("keyword.URL", "");
+ 
+-pref("general.useragent.locale", "@AB_CD@");
++pref("general.useragent.locale", "chrome://global/locale/intl.properties");
+ pref("general.skins.selectedSkin", "classic/1.0");
+ 
+ pref("general.smoothScroll", false);
+ #ifdef UNIX_BUT_NOT_MAC
+ pref("general.autoScroll", false);
+ #else
+ pref("general.autoScroll", true);
+ #endif
--- a/series	Mon Nov 08 09:35:44 2010 +0100
+++ b/series	Mon Nov 08 14:30:30 2010 +0100
@@ -23,3 +23,4 @@
 #firefox-ui-lockdown.patch
 firefox-no-sync-l10n.patch
 firefox-libxulsdk-locales.patch
+firefox-no-default-ualocale.patch
mozilla