rpms/firefox/devel firefox-1.0-pango-rounding.patch, NONE, 1.1 firefox.spec, 1.54, 1.55 mozconfig-firefox, 1.5, 1.6

[fedora-cvs-commits at redhat.com]

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

Modified Files:
	firefox.spec mozconfig-firefox 
Added Files:
	firefox-1.0-pango-rounding.patch 
Log Message:
* Tue Mar 22 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-6
- Add patch to fix italic rendering errors with certain fonts (e.g. Tahoma)
- Re-enable jsd since there is now a venkman version that works with Firefox.


firefox-1.0-pango-rounding.patch:
 nsFontMetricsPango.cpp |   28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

--- NEW FILE firefox-1.0-pango-rounding.patch ---
--- mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.foo	2005-03-21 17:09:14.000000000 -0500
+++ mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2005-03-21 17:16:53.000000000 -0500
@@ -501,13 +501,11 @@
 
     pango_layout_get_size(layout, &width, &height);
 
-    width /= PANGO_SCALE;
-
     g_object_unref(layout);
 
     float f;
     f = mDeviceContext->DevUnitsToAppUnits();
-    aWidth = NSToCoordRound(width * f);
+    aWidth = NSToCoordRound(width * f / PANGO_SCALE);
 
     //    printf("GetWidth (char *) %d\n", aWidth);
 
@@ -541,11 +539,9 @@
     FixupSpaceWidths(layout, text);
     pango_layout_get_size(layout, &width, &height);
 
-    width /= PANGO_SCALE;
-
     float f;
     f = mDeviceContext->DevUnitsToAppUnits();
-    aWidth = NSToCoordRound(width * f);
+    aWidth = NSToCoordRound(width * f / PANGO_SCALE);
 
     //    printf("GetWidth %d\n", aWidth);
 
@@ -601,9 +597,9 @@
     float P2T;
     P2T = mDeviceContext->DevUnitsToAppUnits();
 
-    aDimensions.width = NSToCoordRound(rect.width / PANGO_SCALE * P2T);
-    aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) / PANGO_SCALE * P2T);
-    aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) / PANGO_SCALE * P2T);
+    aDimensions.width = NSToCoordRound(rect.width * P2T / PANGO_SCALE);
+    aDimensions.ascent = NSToCoordRound(PANGO_ASCENT(rect) * P2T / PANGO_SCALE);
+    aDimensions.descent = NSToCoordRound(PANGO_DESCENT(rect) * P2T / PANGO_SCALE);
 
     //    printf("GetTextDimensions %d %d %d\n", aDimensions.width,
     //aDimensions.ascent, aDimensions.descent);
@@ -880,12 +876,12 @@
     P2T = mDeviceContext->DevUnitsToAppUnits();
 
     aBoundingMetrics.leftBearing =
-        NSToCoordRound(rect.x / PANGO_SCALE * P2T);
+        NSToCoordRound(rect.x * P2T / PANGO_SCALE);
     aBoundingMetrics.rightBearing =
-        NSToCoordRound(rect.width / PANGO_SCALE * P2T);
-    aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) / PANGO_SCALE * P2T);
-    aBoundingMetrics.ascent = NSToCoordRound(rect.y / PANGO_SCALE * P2T);
-    aBoundingMetrics.descent = NSToCoordRound(rect.height / PANGO_SCALE * P2T);
+        NSToCoordRound(rect.width * P2T / PANGO_SCALE);
+    aBoundingMetrics.width = NSToCoordRound((rect.x + rect.width) * P2T / PANGO_SCALE);
+    aBoundingMetrics.ascent = NSToCoordRound(rect.y * P2T / PANGO_SCALE);
+    aBoundingMetrics.descent = NSToCoordRound(rect.height * P2T / PANGO_SCALE);
 
  loser:
     g_free(text);
@@ -1118,11 +1114,11 @@
 
     // Convert the width into app units
     for (int i = 0; i < n_ranges; i++) {
-        aWidth += (ranges[(i * 2) + 1] - ranges[(i * 2)]) / PANGO_SCALE;
+        aWidth += (ranges[(i * 2) + 1] - ranges[(i * 2)]);
     }
 
     f = mDeviceContext-> DevUnitsToAppUnits();
-    aWidth = nscoord(aWidth * f);
+    aWidth = nscoord(aWidth * f / PANGO_SCALE);
 
  loser:
     if (ranges)


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- firefox.spec	8 Mar 2005 23:03:36 -0000	1.54
+++ firefox.spec	22 Mar 2005 07:09:14 -0000	1.55
@@ -10,7 +10,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.0.1
-Release:        5
+Release:        6
 Epoch:          0
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
@@ -50,11 +50,12 @@
 Patch30:        mozilla-1.7.3-pango-render.patch
 Patch31:        firefox-1.0-pango-selection.patch
 Patch32:        firefox-1.0-pango-space-width.patch
-Patch33:        firefox-1.0-download-to-desktop.patch
+Patch33:        firefox-1.0-pango-rounding.patch
 
 # local bugfixes
 Patch40:        firefox-PR1-gnome-vfs-default-app.patch
 Patch41:        firefox-PR1-stack-direction.patch
+Patch42:        firefox-1.0-download-to-desktop.patch
 
 # backported patches
 Patch90:        firefox-PR1-gtk-file-chooser-morefixes.patch
@@ -129,6 +130,7 @@
 %patch33 -p0
 %patch40 -p1
 %patch41 -p0
+%patch42 -p0
 %patch90 -p0
 %patch101 -p0
 %patch102 -p0
@@ -326,6 +328,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Mar 22 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-6
+- Add patch to fix italic rendering errors with certain fonts (e.g. Tahoma)
+- Re-enable jsd since there is now a venkman version that works with Firefox.
+
 * Tue Mar  8 2005 Christopher Aillon <caillon at redhat.com> 0:1.0.1-5
 - Add patch to compile against new fortified glibc macros
 


Index: mozconfig-firefox
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/mozconfig-firefox,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mozconfig-firefox	18 Oct 2004 15:15:48 -0000	1.5
+++ mozconfig-firefox	22 Mar 2005 07:09:14 -0000	1.6
@@ -11,7 +11,6 @@
 ac_add_options --with-pthreads
 ac_add_options --disable-tests
 ac_add_options --disable-debug
-ac_add_options --disable-jsd
 ac_add_options --disable-installer
 ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
 ac_add_options --enable-xft