rpms/firefox/F-7 firefox-2.0-pango-ligatures.patch, 1.2, 1.3 firefox.spec, 1.192, 1.193 sources, 1.42, 1.43 firefox-2.0.0.10-canvas-load.patch, 1.1, NONE

[Christopher Aillon (caillon)]

Author: caillon

Update of /cvs/extras/rpms/firefox/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6032

Modified Files:
	firefox-2.0-pango-ligatures.patch firefox.spec sources 
Removed Files:
	firefox-2.0.0.10-canvas-load.patch 
Log Message:
* Fri Feb  8 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.12-1
- Update to 2.0.0.12


firefox-2.0-pango-ligatures.patch:

Index: firefox-2.0-pango-ligatures.patch
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-7/firefox-2.0-pango-ligatures.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-2.0-pango-ligatures.patch	27 Nov 2007 01:47:55 -0000	1.2
+++ firefox-2.0-pango-ligatures.patch	8 Feb 2008 15:15:28 -0000	1.3
@@ -118,7 +118,7 @@
  
  nsFontMetricsPango::nsFontMetricsPango()
  {
-@@ -169,14 +228,20 @@ nsFontMetricsPango::Init(const nsFont& a
+@@ -169,15 +228,21 @@ nsFontMetricsPango::Init(const nsFont& a
      mLangGroup = aLangGroup;
  
      // Hang on to the device context
@@ -135,6 +135,7 @@
      // don't make the X server blow up.
      nscoord screenPixels = gdk_screen_height();
      mPointSize = PR_MIN((screenPixels - 1) * FONT_MAX_FONT_SCALE, mPointSize);
+     mPointSize = PR_MIN(2000, mPointSize);
 +#endif
  
      // enumerate over the font names passed in


Index: firefox.spec
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-7/firefox.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- firefox.spec	28 Nov 2007 15:08:54 -0000	1.192
+++ firefox.spec	8 Feb 2008 15:15:28 -0000	1.193
@@ -11,8 +11,8 @@
 
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
-Version:        2.0.0.10
-Release:        2%{?dist}
+Version:        2.0.0.12
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -22,7 +22,7 @@
 %define tarball firefox-2.0rc3-source.tar.bz2
 %endif
 Source0:        %{tarball}
-Source2:        firefox-langpacks-%{version}-20071123.tar.bz2
+Source2:        firefox-langpacks-%{version}-20080208.tar.bz2
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
 Source12:       firefox-redhat-default-prefs.js
@@ -81,8 +81,6 @@
 
 %endif
 
-Patch200:       firefox-2.0.0.10-canvas-load.patch
-
 
 # ---------------------------------------------------
 
@@ -174,8 +172,6 @@
 %patch102 -p0 -b .theme-change
 %patch104 -p1 -b .ppc64
 
-%patch200 -p0 -b .canvas-load
-
 # For branding specific patches.
 
 %if %{official_branding}
@@ -202,9 +198,9 @@
 
 %build
 
-# Build with -Os as it helps the browser; also, don't override mozilla's warning
-# level; they use -Wall but disable a few warnings that show up _everywhere_
-MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-O2/-Os/' -e 's/-Wall//')
+# Don't override mozilla's warning level; they use -Wall
+# but disable a few warnings that show up _everywhere_
+MOZ_OPT_FLAGS=$(echo $RPM_OPT_FLAGS | %{__sed} -e 's/-Wall//')
 
 export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
 export PREFIX='%{_prefix}'
@@ -432,6 +428,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Feb  8 2008 Christopher Aillon <caillon at redhat.com> 2.0.0.12-1
+- Update to 2.0.0.12
+
 * Wed Nov 28 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.10-2
 - Make Canvas.drawImage work again
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/firefox/F-7/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	27 Nov 2007 01:47:55 -0000	1.42
+++ sources	8 Feb 2008 15:15:28 -0000	1.43
@@ -1,2 +1,2 @@
-5c2f13d6a27f462ec6b862dafca22e7b  firefox-2.0.0.10-source.tar.bz2
-368295c3958e2f8f7e7d404b9876f43f  firefox-langpacks-2.0.0.10-20071123.tar.bz2
+361eadc4f2132287f5812762978f43ee  firefox-2.0.0.12-source.tar.bz2
+b7d506ab57a5e43b26ae032b4f6b34b2  firefox-langpacks-2.0.0.12-20080208.tar.bz2


--- firefox-2.0.0.10-canvas-load.patch DELETED ---