Author: glen Date: Sat Dec 3 15:35:45 2011 GMT Module: packages Tag: HEAD ---- Log message: - use system expat
---- Files affected: packages/chromium-browser: chromium-browser.spec (1.156 -> 1.157) , system-expat.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/chromium-browser/chromium-browser.spec diff -u packages/chromium-browser/chromium-browser.spec:1.156 packages/chromium-browser/chromium-browser.spec:1.157 --- packages/chromium-browser/chromium-browser.spec:1.156 Sat Dec 3 15:29:24 2011 +++ packages/chromium-browser/chromium-browser.spec Sat Dec 3 16:35:39 2011 @@ -73,6 +73,7 @@ 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 @@ -82,6 +83,7 @@ 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 @@ -209,6 +211,9 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +cd src +%patch9 -p1 +cd .. # drop bundled libs, from gentoo remove_bundled_lib() { @@ -222,6 +227,7 @@ } 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" @@ -406,6 +412,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.157 2011/12/03 15:35:39 glen +- use system expat + Revision 1.156 2011/12/03 14:29:24 glen - up to 16.0.912.59, r112386 ================================================================ Index: packages/chromium-browser/system-expat.patch diff -u /dev/null packages/chromium-browser/system-expat.patch:1.1 --- /dev/null Sat Dec 3 16:35:45 2011 +++ packages/chromium-browser/system-expat.patch Sat Dec 3 16:35:39 2011 @@ -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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/chromium-browser.spec?r1=1.156&r2=1.157&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
