diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2005-04-26 09:14:50 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2005-04-26 09:14:50 +0000 |
| commit | 8684c7b13d0a16da0ba853044adf40c5c47a0d9d (patch) | |
| tree | e66d364a1529fe515a83830df60cc6f8bf31a43f /app-text/wv | |
| parent | Fix building with gcc4. Patch from Debian. (diff) | |
| download | gentoo-2-8684c7b13d0a16da0ba853044adf40c5c47a0d9d.tar.gz gentoo-2-8684c7b13d0a16da0ba853044adf40c5c47a0d9d.tar.bz2 gentoo-2-8684c7b13d0a16da0ba853044adf40c5c47a0d9d.zip | |
Fix building with gcc4 (namespace collide with libxml2).
(Portage version: 2.0.51.20-r4)
Diffstat (limited to 'app-text/wv')
| -rw-r--r-- | app-text/wv/ChangeLog | 6 | ||||
| -rw-r--r-- | app-text/wv/files/wv-1.0.3-gcc4.patch | 40 | ||||
| -rw-r--r-- | app-text/wv/wv-1.0.3.ebuild | 12 |
3 files changed, 56 insertions, 2 deletions
diff --git a/app-text/wv/ChangeLog b/app-text/wv/ChangeLog index 33539b4dfd33..4b032b922c1f 100644 --- a/app-text/wv/ChangeLog +++ b/app-text/wv/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-text/wv # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.24 2005/01/01 16:42:22 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/wv/ChangeLog,v 1.25 2005/04/26 09:14:49 azarah Exp $ + + 26 Apr 2005; Martin Schlemmer <azarah@gentoo.org> + +files/wv-1.0.3-gcc4.patch, wv-1.0.3.ebuild: + Fix building with gcc4 (namespace collide with libxml2). *wv-1.0.3 (01 Dec 2004) diff --git a/app-text/wv/files/wv-1.0.3-gcc4.patch b/app-text/wv/files/wv-1.0.3-gcc4.patch new file mode 100644 index 000000000000..829212f971fb --- /dev/null +++ b/app-text/wv/files/wv-1.0.3-gcc4.patch @@ -0,0 +1,40 @@ +--- wv-1.0.3/wvConfig.c ++++ wv-1.0.3.az/wvConfig.c 2005-04-26 08:59:26.000000000 +0000 +@@ -2130,7 +2130,7 @@ + } + + static void +-startElement (void *userData, const XML_Char *name, const XML_Char **atts) ++_startElement (void *userData, const XML_Char *name, const XML_Char **atts) + { + unsigned int nAtts = 0; + const XML_Char **p; +@@ -3094,7 +3094,7 @@ + } + + static void +-endElement (void *userData, const XML_Char *name) ++_endElement (void *userData, const XML_Char *name) + { + state_data *mydata = (state_data *) userData; + unsigned int token_type; +@@ -3470,8 +3470,8 @@ + memset(&hdl, 0, sizeof(hdl)); + + hdl.getEntity = _getEntity; +- hdl.startElement = startElement; +- hdl.endElement = endElement; ++ hdl.startElement = _startElement; ++ hdl.endElement = _endElement; + hdl.characters = charData; + + if (myhandle->fp) +@@ -3514,7 +3514,7 @@ + size_t len; + + XML_SetUserData (parser, myhandle); +- XML_SetElementHandler (parser, startElement, endElement); ++ XML_SetElementHandler (parser, _startElement, _endElement); + XML_SetCharacterDataHandler (parser, charData); + + if (myhandle->fp == NULL) diff --git a/app-text/wv/wv-1.0.3.ebuild b/app-text/wv/wv-1.0.3.ebuild index 011c87cfa47d..453722cae36d 100644 --- a/app-text/wv/wv-1.0.3.ebuild +++ b/app-text/wv/wv-1.0.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.3.ebuild,v 1.2 2005/01/01 16:42:22 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/wv/wv-1.0.3.ebuild,v 1.3 2005/04/26 09:14:49 azarah Exp $ inherit eutils @@ -22,6 +22,16 @@ RDEPEND="sys-libs/zlib DEPEND="${RDEPEND} dev-util/pkgconfig" +src_unpack() { + + unpack ${A} + + cd ${S} + # Fix building with gcc4 (namespace collide with libxml2) + epatch ${FILESDIR}/${P}-gcc4.patch + +} + src_compile() { econf \ |