# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1317823634 -7200
# Node ID a90633075f60ab18ffd01d38b93b0042e562182b
# Parent  aabcc78956952e7a704df645c2ceba87e95d3e75# Parent  db8b891eeb1e31ec6cdbf34d2cc9faeb0fb31598
merge from firefox7

diff -r aabcc7895695 -r a90633075f60 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Wed Oct 05 16:01:57 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Oct 05 16:07:14 2011 +0200
@@ -3,6 +3,8 @@
 
 - update to minor release 7.0.1
   * fixed staged addon updates
+- set intl.locale.matchOS=true in the base package as it causes
+  too much confusion when it's only available with branding-openSUSE
 
 -------------------------------------------------------------------
 Fri Sep 23 11:22:22 UTC 2011 - wr@rosenauer.org
diff -r aabcc7895695 -r a90633075f60 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Oct 05 16:01:57 2011 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Oct 05 16:07:14 2011 +0200
@@ -66,12 +66,13 @@
 Patch3:         mozilla-prefer_plugin_pref.patch
 Patch4:         mozilla-shared-nss-db.patch
 Patch5:         mozilla-kde.patch
-Patch6:         mozilla-language.patch
-Patch7:         mozilla-ntlm-full-path.patch
-Patch8:         mozilla-repo.patch
-Patch9:         mozilla-dump_syms-static.patch
-Patch10:        mozilla-sle11.patch
-Patch11:        mozilla-linux3.patch
+Patch6:         mozilla-preferences.patch
+Patch7:         mozilla-language.patch
+Patch8:         mozilla-ntlm-full-path.patch
+Patch9:         mozilla-repo.patch
+Patch10:        mozilla-dump_syms-static.patch
+Patch11:        mozilla-sle11.patch
+Patch12:        mozilla-linux3.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -198,10 +199,11 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 %if %suse_version < 1120
-%patch10 -p1
+%patch11 -p1
 %endif
-%patch11 -p1
+%patch12 -p1
 #
 %patch31 -p1
 %patch32 -p1
diff -r aabcc7895695 -r a90633075f60 MozillaFirefox/mozilla-preferences.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-preferences.patch	Wed Oct 05 16:07:14 2011 +0200
@@ -0,0 +1,1 @@
+../mozilla-preferences.patch
\ No newline at end of file
diff -r aabcc7895695 -r a90633075f60 mozilla-preferences.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-preferences.patch	Wed Oct 05 16:07:14 2011 +0200
@@ -0,0 +1,30 @@
+From: Wolfgang Rosenauer <wr@rosenauer.org>
+Subject: use system locale if available
+This setting used to live in the branding-openSUSE package but this is causing too much
+confusion and therefore is currently the only setting we switch in the unbranded
+package unconditionally.
+
+# HG changeset patch
+# Parent 020571ebc3766a68f1e50780b910c51d1bb76087
+diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
+--- a/modules/libpref/src/init/all.js
++++ b/modules/libpref/src/init/all.js
+@@ -1085,17 +1085,17 @@ pref("intl.charsetmenu.browser.unicode",
+ pref("intl.charsetmenu.mailedit",           "chrome://global/locale/intl.properties");
+ pref("intl.charsetmenu.browser.cache",      "");
+ pref("intl.charsetmenu.mailview.cache",     "");
+ pref("intl.charsetmenu.composer.cache",     "");
+ pref("intl.charsetmenu.browser.cache.size", 5);
+ pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
+ pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
+ pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
+-pref("intl.locale.matchOS",                 false);
++pref("intl.locale.matchOS",                 true);
+ // fallback charset list for Unicode conversion (converting from Unicode)
+ // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+ // for ISO-8859-1
+ pref("intl.fallbackCharsetList.ISO-8859-1", "windows-1252");
+ pref("font.language.group",                 "chrome://global/locale/intl.properties");
+ 
+ // these locales have right-to-left UI
+ pref("intl.uidirection.ar", "rtl");
diff -r aabcc7895695 -r a90633075f60 series
--- a/series	Wed Oct 05 16:01:57 2011 +0200
+++ b/series	Wed Oct 05 16:07:14 2011 +0200
@@ -6,6 +6,7 @@
 mozilla-prefer_plugin_pref.patch
 mozilla-shared-nss-db.patch
 mozilla-kde.patch
+mozilla-preferences.patch
 #mozilla-gconf-backend.patch
 #gecko-lockdown.patch
 #toolkit-ui-lockdown.patch