From b8df83d5dcf2484185671530123a953b369c4cc8 Mon Sep 17 00:00:00 2001
From: Christopher Aillon <caillon@fedoraproject.org>
Date: Sat, 27 Aug 2005 07:34:33 +0000
Subject: - Re-enable SVG, canvas, and system cairo. - Fix issue with typing in
 proxy preference panel

---
 firefox-mozconfig |  6 +++---
 firefox.spec      | 11 ++++++++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/firefox-mozconfig b/firefox-mozconfig
index bede3c1..b7e9f64 100755
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -14,9 +14,9 @@ ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --disable-xprint
 ac_add_options --disable-strip
 ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-#ac_add_options --enable-svg
-#ac_add_options --enable-canvas
+ac_add_options --enable-system-cairo
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
 
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
diff --git a/firefox.spec b/firefox.spec
index 3df548e..195ebe1 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -11,7 +11,7 @@ ExcludeArch:    ppc64
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.1
-Release:        0.2.7.deerpark.alpha2.1
+Release:        0.2.8.deerpark.alpha2
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -42,6 +42,7 @@ Patch2:         firefox-1.0-gcc4-compile.patch
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.1-dont-package-nspr-libs.patch
 Patch5:         firefox-1.1-visibility.patch
+Patch6:         firefox-1.1-canvas-system-cairo.patch
 
 # customization patches
 Patch20:        firefox-redhat-homepage.patch
@@ -65,6 +66,7 @@ Patch81:        firefox-nopangoxft.patch
 # patches from upstream (Patch100+)
 Patch100:       firefox-1.1-modal-filechooser.patch
 Patch101:       firefox-1.1-focus-on-navback.patch
+Patch102:       firefox-1.1-proxy-prefs.patch
 
 
 # ---------------------------------------------------
@@ -114,6 +116,8 @@ compliance, performance and portability.
 %patch5  -p0
 %endif
 
+%patch6  -p0
+
 %patch20 -p0
 %patch21 -p1
 %patch22 -p1
@@ -129,6 +133,7 @@ compliance, performance and portability.
 %patch81 -p1
 %patch100 -p0
 %patch101 -p0
+%patch102 -p0
 
 %{__rm} -f .mozconfig
 %{__cp} %{SOURCE10} .mozconfig
@@ -262,6 +267,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Aug 27 2005 Christopher Aillon <caillon@redhat.com> - 1.1-0.2.8.deerpark.alpha2
+- Re-enable SVG, canvas, and system cairo.
+- Fix issue with typing in proxy preference panel
+
 * Thu Aug 18 2005 Jeremy Katz <katzj@redhat.com> - 1.1-0.2.7.deerpark.alpha2.1
 - another fix to not use pango_xft
 
-- 
cgit