diff options
| author |   Bernard Cafarelli <voyageur@gentoo.org> | 2012-12-28 23:52:42 +0000 |
|---|---|---|
| committer | Bernard Cafarelli <voyageur@gentoo.org> | 2012-12-28 23:52:42 +0000 |
| commit | 3192b8868713d9663cadc5e0da1f446e967d1386 (patch) | |
| tree | 1231139a0717d5c440c61261f1d3a4703b36f5bf /gnustep-base | |
| parent | 0.9.12 version bump. (diff) | |
| download | historical-3192b8868713d9663cadc5e0da1f446e967d1386.tar.gz historical-3192b8868713d9663cadc5e0da1f446e967d1386.tar.bz2 historical-3192b8868713d9663cadc5e0da1f446e967d1386.zip | |
Fix compilation with dev-libs/libxml2-2.9.0, thanks Harris Landgarten <harrisl@lhjonline.com> in bug #448234
Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2
Diffstat (limited to 'gnustep-base')
4 files changed, 33 insertions, 8 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/Manifest b/gnustep-base/gnustep-base/Manifest index 1c1b9c003c72..d8208aac744f 100644 --- a/gnustep-base/gnustep-base/Manifest +++ b/gnustep-base/gnustep-base/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX gnustep-base-1.24.0-libxml2-2.9_support.patch 464 SHA256 486632073cd60bf53c44cc5873fcfefe7e9b19bc562aab21646f0843fa00dc6e SHA512 e5fe60bbb34dbdbe68550d70fea2099e37fcfdb08bb59770ba69e1b1b1573a00ee19c86590ac3c2c155ee2189abc5c7aa54855274653318aa1b78a78c504b5a0 WHIRLPOOL fc613cd49752790c4909fc766b7ae628a089fec8a301316767cffc7700d6a78234f8848df9fd1e93a2016a9af1ab69f072764b580d6243b720d93553b86f6f16 DIST gnustep-base-1.24.0.tar.gz 2947759 SHA256 e07040e85a6bf3e89a9d66424a40dc8d3be749fbe7c0c98942cff5e4f35a6b11 SHA512 9232fed3439ee5e514e9c9194ef61ca8f1fbef294dc292e0b8ea0dd782e0e73ffda263f1a9e951e04d5dd379efae609f1f1a6ad4c9a606905a45b5daaa389049 WHIRLPOOL 9ed2f604829573efa91a212a9fe7bd7fa54f25cd8328e2d96ca86a57bbbcacd5bf1f6846ccf8aacc16190699cc43b58e5d2cc1c7dcafdf3e99ecaaae1f11b057 -EBUILD gnustep-base-1.24.0-r1.ebuild 2249 SHA256 c95302ccee42888a935a0565c06e0636a5436cf1b155f7c795379af1a1284780 SHA512 f81ba32f88dbaaac7339e2a9f30063474095b77f15c7a902b354193e2760b8bcf1b37f5b2f3c719ece4d2b4aff6429beecb6a7d8a065ee233994899ff849fc84 WHIRLPOOL 403515f8b1dfe2763d54d8053396dfac284974b7d835cdd5fb275f4f5978f76c806c376f44f45a3e20794476aee9ffc9626f146ff11f5f3acff8157374fe52d5 -MISC ChangeLog 23261 SHA256 0fdd8bc9e67758fccbfb0b2e3cd79deaad4c706ab63263bbf2e3ef9c38b9f2fa SHA512 d4eba1c4f5e3a0ffbf6abaf868d608778a09fd08be639007aafb6b68bf8511282f202b470c2733242cc8bdb807ec5277dd75e42fffc2250c83f56aa9e102da06 WHIRLPOOL fa830ca4ef9109e2ebeee91626ec6e560d278587402b3bb5eb854a1de2930aee1e588611e51f31640f82eea33f17e90bd578f92a9c5f05f6c0f1b54aa433402b +EBUILD gnustep-base-1.24.0-r1.ebuild 2333 SHA256 8d00d7ee3b25eb563f3182fa4b0c174efc251d90bd9737e7df6db5f9659b307a SHA512 393a99ec046f0960cbae452af4c548cc77c18e7d7978882b39bb4ac62371388716e40fe62bffd1d4e900d8a18920c08ffa01266bffe8d5d32989992fa26dd33b WHIRLPOOL 8cf4afd0d1a936b1645c7001eb585f3f9eb0367556d43705fa99df20b31b94ff15fb1d4aa43ec56349b9f291f4538654dfe98bcfeb00b3582b3348db61c72bc4 +MISC ChangeLog 23519 SHA256 14cfc4e3b28f6ab58eb842d0695a3deb5962b51a9f7b632a525b2d59dfd36902 SHA512 552eef07499cd7220ce8f82dd0d1e555142e47b84d0d21b34faa0c1582aef2f22adf4a99db529c69cb06a6b696bdf0d340de160a4da0998154c340928ffb8517 WHIRLPOOL 3e7f9961933e9a041cf8b7b712d25b4bd836a18c5a699554b1117f9feaded63eed5dde883bdb03a2d1b74e75a2beecc5e0d591671b899f395a1a5fa8f713bba7 MISC metadata.xml 670 SHA256 e08343661cc7ecb6d963be62092a270a45f8af0201c9523d1feeddfa09a417fa SHA512 3901cb8078a5b3c4921f045c013b00598da50e083ee85e86d63de5f9fae9ac2ca7aec1887d706f5bd8a7787a39c08cfe2d255124d08cc3421b39c6b546fdc4f0 WHIRLPOOL c6f815e693ca9088cd0b216c459581a8241e3a3f027aac3fb8f8c94bd0e3fafc631df7ad79da33e9ac3e1fe6d00be0fcdcd57b122d0b679e922d6cc650e76d61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlDTKb0ACgkQFYEBGcdFJfI8SQD+Ik23Q+MK6HSxF67Bdd5s1nag -okiwJFRJq0Ob/aY2k6AA/0Vx0MOAsylwb+BNeDChB3878UsGNNaEgKONCvDR1+Kc -=2MFL +iF0EAREIAAYFAlDeMMEACgkQFYEBGcdFJfJ86QD+I6kiFDe2uCK4w53iKq+NBaF1 +oqb/Dg1+PuJH9CD17TIA+MDJaCie2p3335NZ5rpBBWyTmAcGgl0+ihVDaajkqrs= +=xHZp -----END PGP SIGNATURE----- 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 |