- use system expat

Changed files:
    chromium-browser.spec -> 1.157
    system-expat.patch -> 1.1

diff --git a/chromium-browser.spec b/chromium-browser.spec
index a7e3c9a7a1feea6672f4e95ce643fdbf3f6a5565..3b4e74f10727f53f990d9b47683a20248e189775 100644 (file)
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -72,6 +72,7 @@ Patch5:               options-support.patch
 Patch6:                get-webkit_revision.patch
 Patch7:                dlopen_sonamed_gl.patch
 Patch8:                chromium_useragent.patch.in
+Patch9:                system-expat.patch
 URL:           http://www.chromium.org/Home
 %{?with_gconf:BuildRequires:   GConf2-devel}
 BuildRequires: OpenGL-GLU-devel
@@ -81,6 +82,7 @@ BuildRequires:        bison
 BuildRequires: bzip2-devel
 %{?with_cups:BuildRequires:    cups-devel}
 BuildRequires: dbus-glib-devel
+BuildRequires: expat-devel
 %{?with_system_flac:BuildRequires:     flac-devel}
 BuildRequires: flex
 BuildRequires: fontconfig-devel
@@ -208,6 +210,9 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+cd src
+%patch9 -p1
+cd ..
 
 # drop bundled libs, from gentoo
 remove_bundled_lib() {
@@ -221,6 +226,7 @@ remove_bundled_lib() {
 }
 
 cd src
+rm -v third_party/expat/files/lib/expat.h
 remove_bundled_lib "third_party/bzip2"
 remove_bundled_lib "third_party/icu"
 remove_bundled_lib "third_party/libevent"

diff --git a/system-expat.patch b/system-expat.patch
new file mode 100644 (file)
index 0000000..c679202
--- /dev/null
+++ b/system-expat.patch
@@ -0,0 +1,12 @@
+diff -up chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h.system-expat chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h
+--- chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h.system-expat     2010-06-03 14:30:56.000000000 -0400
++++ chromium-6.0.425.0-20100603svn48849/chrome/browser/autofill/autofill_xml_parser.h  2010-06-03 16:58:16.607188633 -0400
+@@ -10,7 +10,7 @@
+ #include "base/basictypes.h"
+ #include "chrome/browser/autofill/field_types.h"
+ #include "chrome/browser/autofill/form_structure.h"
+-#include "third_party/expat/files/lib/expat.h"
++#include <expat.h>
+ #include "third_party/libjingle/source/talk/xmllite/xmlparser.h"
+ 
+ // The base class that contains common functionality between