diff options
| author |   Paweł Hajdan <phajdan.jr@gentoo.org> | 2012-06-03 18:01:06 +0000 |
|---|---|---|
| committer | Paweł Hajdan <phajdan.jr@gentoo.org> | 2012-06-03 18:01:06 +0000 |
| commit | 9e8706b50a9e396caac025549b660d35cd96e1b5 (patch) | |
| tree | ce30beaf24968356e5256010ee52d0b6b8dda426 /www-client | |
| parent | Cleanup (diff) | |
| download | gentoo-2-9e8706b50a9e396caac025549b660d35cd96e1b5.tar.gz gentoo-2-9e8706b50a9e396caac025549b660d35cd96e1b5.tar.bz2 gentoo-2-9e8706b50a9e396caac025549b660d35cd96e1b5.zip | |
Remove bundled copy of expat, bug #384773 by Julien Sanchez.
(Portage version: 2.1.10.49/cvs/Linux i686)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/chromium/chromium-21.0.1155.2.ebuild | 7 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-expat-r0.patch | 10 |
3 files changed, 20 insertions, 3 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index 925cb46eff71..d634ecbba4d8 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/chromium # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.650 2012/05/31 00:45:51 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.651 2012/06/03 18:01:06 phajdan.jr Exp $ + + 03 Jun 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> + +files/chromium-expat-r0.patch, chromium-21.0.1155.2.ebuild: + Remove bundled copy of expat, bug #384773 by Julien Sanchez. *chromium-20.0.1132.21 (31 May 2012) diff --git a/www-client/chromium/chromium-21.0.1155.2.ebuild b/www-client/chromium/chromium-21.0.1155.2.ebuild index 3c7a1defba77..6bd7e9afc916 100644 --- a/www-client/chromium/chromium-21.0.1155.2.ebuild +++ b/www-client/chromium/chromium-21.0.1155.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.1 2012/05/30 09:56:48 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-21.0.1155.2.ebuild,v 1.2 2012/06/03 18:01:06 phajdan.jr Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -29,6 +29,7 @@ RDEPEND="app-arch/bzip2 >=dev-lang/v8-3.10.2.1 dev-libs/dbus-glib dev-libs/elfutils + dev-libs/expat >=dev-libs/icu-49.1.1-r1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] @@ -109,6 +110,9 @@ src_prepare() { sed -i '1i#define OF(x) x' \ third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.h || die + # Unbundle expat, bug #384773. + epatch "${FILESDIR}/${PN}-expat-r0.patch" + epatch_user # Remove most bundled libraries. Some are still needed. @@ -117,7 +121,6 @@ src_prepare() { \! -path 'third_party/angle/*' \ \! -path 'third_party/cacheinvalidation/*' \ \! -path 'third_party/cld/*' \ - \! -path 'third_party/expat/*' \ \! -path 'third_party/ffmpeg/*' \ \! -path 'third_party/flac/flac.h' \ \! -path 'third_party/gpsd/*' \ diff --git a/www-client/chromium/files/chromium-expat-r0.patch b/www-client/chromium/files/chromium-expat-r0.patch new file mode 100644 index 000000000000..16f0fd69e032 --- /dev/null +++ b/www-client/chromium/files/chromium-expat-r0.patch @@ -0,0 +1,10 @@ +--- chrome/browser/autofill/autofill_xml_parser.h.orig 2012-06-03 16:45:24.000000000 +0200 ++++ chrome/browser/autofill/autofill_xml_parser.h 2012-06-03 16:45:33.000000000 +0200 +@@ -13,7 +13,6 @@ + #include "base/compiler_specific.h" + #include "chrome/browser/autofill/field_types.h" + #include "chrome/browser/autofill/form_structure.h" +-#include "third_party/expat/files/lib/expat.h" + #include "third_party/libjingle/source/talk/xmllite/xmlparser.h" + + // The base class that contains common functionality between |