diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-12-28 23:52:25 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-12-28 23:52:25 +0000 |
| commit | 960d2695097a6dfc718fafee615198e87f197dcf (patch) | |
| tree | 41352ea7dd2c959d9bc1f22ba0989e00794752df | |
| parent | 0.9.12 version bump. (diff) | |
| download | gentoo-2-960d2695097a6dfc718fafee615198e87f197dcf.tar.gz gentoo-2-960d2695097a6dfc718fafee615198e87f197dcf.tar.bz2 gentoo-2-960d2695097a6dfc718fafee615198e87f197dcf.zip | |
Fix compilation with dev-libs/libxml2-2.9.0, thanks Harris Landgarten <harrisl@lhjonline.com> in bug #448234
(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C74525F2)
3 files changed, 27 insertions, 3 deletions
diff --git a/gnustep-base/gnustep-base/ChangeLog b/gnustep-base/gnustep-base/ChangeLog index a86787b94c4c..7ed7810b1e96 100644 --- a/gnustep-base/gnustep-base/ChangeLog +++ b/gnustep-base/gnustep-base/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnustep-base/gnustep-base # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.115 2012/12/20 15:07:36 voyageur Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/ChangeLog,v 1.116 2012/12/28 23:52:25 voyageur Exp $ + + 28 Dec 2012; Bernard Cafarelli <voyageur@gentoo.org> + gnustep-base-1.24.0-r1.ebuild, + +files/gnustep-base-1.24.0-libxml2-2.9_support.patch: + Fix compilation with dev-libs/libxml2-2.9.0, thanks Harris Landgarten + <harrisl@lhjonline.com> in bug #448234 20 Dec 2012; Bernard Cafarelli <voyageur@gentoo.org> -files/50-gnustep-revdep, -gnustep-base-1.20.1.ebuild: diff --git a/gnustep-base/gnustep-base/files/gnustep-base-1.24.0-libxml2-2.9_support.patch b/gnustep-base/gnustep-base/files/gnustep-base-1.24.0-libxml2-2.9_support.patch new file mode 100644 index 000000000000..76865abce50e --- /dev/null +++ b/gnustep-base/gnustep-base/files/gnustep-base-1.24.0-libxml2-2.9_support.patch @@ -0,0 +1,14 @@ +--- libs/base/trunk/Source/Additions/GSXML.m 2012/10/21 05:25:31 35729 ++++ libs/base/trunk/Source/Additions/GSXML.m 2012/10/22 04:22:25 35730 +@@ -983,7 +983,11 @@ + 1, + "utf-8"); + xmlOutputBufferFlush(buf); ++#if LIBXML_VERSION < 20900 + string = UTF8StrLen(buf->buffer->content, buf->buffer->use); ++#else ++ string = UTF8StrLen(xmlBufContent(buf->buffer), xmlBufUse(buf->buffer)); ++#endif + xmlOutputBufferClose(buf); + } + return string; diff --git a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild index e539cbd8b0d3..489b4827d470 100644 --- a/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild +++ b/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.6 2012/12/20 13:07:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-base/gnustep-base-1.24.0-r1.ebuild,v 1.7 2012/12/28 23:52:25 voyageur Exp $ EAPI=4 -inherit gnustep-base +inherit eutils gnustep-base DESCRIPTION="A library of general-purpose, non-graphical Objective C objects." HOMEPAGE="http://www.gnustep.org" @@ -30,6 +30,10 @@ RDEPEND="${GNUSTEP_CORE_DEPEND} DEPEND="${RDEPEND} virtual/pkgconfig" +src_prepare() { + epatch "${FILESDIR}"/${P}-libxml2-2.9_support.patch +} + src_configure() { egnustep_env |