rpms/firefox/devel firefox-1.5-pango-about.patch, NONE, 1.1 firefox-1.5-pango-ua.patch, NONE, 1.1 firefox.sh.in, 1.10, 1.11 firefox.spec, 1.109, 1.110

Mon Mar 13 07:47:26 UTC 2006

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4857

Modified Files:
	firefox.sh.in firefox.spec 
Added Files:
	firefox-1.5-pango-about.patch firefox-1.5-pango-ua.patch 
Log Message:
* Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
- Add a notice to the about dialog denoting this is a pango enabled build.
- Tweak the user agent denoting this is a pango enabled build.


firefox-1.5-pango-about.patch:
 about.xhtml |    9 +++++++++
 1 files changed, 9 insertions(+)

--- NEW FILE firefox-1.5-pango-about.patch ---
Index: toolkit/content/about.xhtml
===================================================================
RCS file: /cvsroot/mozilla/toolkit/content/about.xhtml,v
retrieving revision 1.8.16.1
diff -d -u -p -r1.8.16.1 about.xhtml
--- toolkit/content/about.xhtml	10 Jan 2006 01:34:02 -0000	1.8.16.1
+++ toolkit/content/about.xhtml	13 Mar 2006 06:27:13 -0000
@@ -92,6 +92,15 @@ h1 {
 <hr />
 
 <ul>
+<li id="pango-notice">
+In order to better support certain scripts (such as Indic and some CJK scripts), Fedora builds its Firefox, with permission from the Mozilla Corporation, with 
+the Pango system as its text renderer.  This change is known to break rendering of MathML, and may negatively impact performance on some pages.  To disable the 
+use of Pango, set <tt>MOZ_DISABLE_PANGO=1</tt> in your environment before launching Firefox.
+</li>
+<script type="application/x-javascript">
+if (!navigator.userAgent.match("pango-text"))
+  document.getElementById("pango-notice").style.display="none";
+</script>
 <li>Copyright © 1998-2006 &license.part1; <a href="about:credits">&license.contrib;</a>
   &license.part2;
   <a href="about:license">Mozilla Public License &license.and; Netscape Public License</a>&license.part3;

firefox-1.5-pango-ua.patch:
 nsFontMetricsUtils.cpp |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

--- NEW FILE firefox-1.5-pango-ua.patch ---
Index: gfx/src/gtk/nsFontMetricsUtils.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/nsFontMetricsUtils.cpp,v
retrieving revision 1.6
diff -d -u -p -r1.6 nsFontMetricsUtils.cpp
--- gfx/src/gtk/nsFontMetricsUtils.cpp	28 Mar 2005 02:14:17 -0000	1.6
+++ gfx/src/gtk/nsFontMetricsUtils.cpp	12 Mar 2006 00:34:40 -0000
@@ -143,11 +143,24 @@ NS_IsXftEnabled(void)
 PRBool
 NS_IsPangoEnabled(void)
 {
-    char *val = PR_GetEnv("MOZ_DISABLE_PANGO");
-    if (val)
-        return FALSE;
+    static PRBool beenHere;
+    static PRBool pangoEnabled;
 
-    return TRUE;
+    if (!beenHere) {
+        beenHere = PR_TRUE;
+
+        char *val = PR_GetEnv("MOZ_DISABLE_PANGO");
+        pangoEnabled = !(val);
+
+        if (pangoEnabled) {
+            nsCOMPtr<nsIPref> prefService = do_GetService(NS_PREF_CONTRACTID);
+            if (prefService)
+                prefService->SetDefaultCharPref("general.useragent.extra.pango",
+                                                "pango-text");
+        }
+    }
+
+    return pangoEnabled;
 }
 
 #endif


Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- firefox.sh.in	10 Mar 2006 06:57:11 -0000	1.10
+++ firefox.sh.in	13 Mar 2006 07:47:23 -0000	1.11
@@ -83,22 +83,17 @@
 export FONTCONFIG_PATH
 
 ##
-## Set MOZ_ENABLE_PANGO=1  to force enabling pango
-## Set MOZ_DISABLE_PANGO=1 to force disabling of pango
+## In order to better support certain scripts (such as Indic and some CJK 
+## scripts), Fedora builds its Firefox, with permission from the Mozilla 
+## Corporation, with the Pango system as its text renderer.  This change 
+## is known to break rendering of MathML, and may negatively impact 
+## performance on some pages.  To disable the use of Pango, set 
+## MOZ_DISABLE_PANGO=1 in your environment before launching Firefox.
 ##
-#MOZ_DISABLE_PANGO=1
-#export MOZ_DISABLE_PANGO
-
-# For now, in order to ship with firefox trademarks, we need to default to
-# disable pango on non-indic locales.  Use MOZ_ENABLE_PANGO=1 to force pango.
-tmplang=${LC_CTYPE:-${LANG:-"en_US.UTF-8"}}
-if ! echo $tmplang | grep "^..[_-]IN" > /dev/null; then
-   if [ -z "$MOZ_ENABLE_PANGO" ]; then
-     MOZ_DISABLE_PANGO=1
-     export MOZ_DISABLE_PANGO
-   fi
-fi
-
+#
+# MOZ_DISABLE_PANGO=1
+# export MOZ_DISABLE_PANGO
+#
 
 function check_running() {
     $MOZ_CLIENT_PROGRAM $MOZ_CLIENT_PROGRAM_PARAM 'ping()' 2>/dev/null >/dev/null


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- firefox.spec	10 Mar 2006 06:57:11 -0000	1.109
+++ firefox.spec	13 Mar 2006 07:47:23 -0000	1.110
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5.0.1
-Release:        8
+Release:        9
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -57,6 +57,8 @@
 
 # patches from upstream (Patch100+)
 Patch100:       firefox-1.5-pango-typo.patch
+Patch101:       firefox-1.5-pango-ua.patch
+Patch102:       firefox-1.5-pango-about.patch
 
 # ---------------------------------------------------
 
@@ -119,7 +121,9 @@
 %patch42 -p0
 %patch81 -p1
 
-%patch100 -p0
+%patch100 -p0 -b .pango-typo
+%patch101 -p0 -b .pango-ua
+%patch102 -p0 -b .pango-about
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -265,9 +269,9 @@
 #---------------------------------------------------------------------
 
 %changelog
-* Fri Mar 10 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-8
-- Disable pango by default in non-indic locales per upstream request.
-  Users can export MOZ_ENABLE_PANGO=1 to force pango support.
+* Sat Mar 11 2006 Christopher Aillon <caillon at redhat.com> - 1.5.0.1-9
+- Add a notice to the about dialog denoting this is a pango enabled build.
+- Tweak the user agent denoting this is a pango enabled build.
 
 * Mon Mar  6 2006 Warren Togami <wtogami at redhat.com> - 1.5.0.1-7
 - make links point to the correct release


