fix bug 391737

Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

4 files changed, 61 insertions, 11 deletions

diff --git a/media-libs/raptor/ChangeLog b/media-libs/raptor/ChangeLog
index 740418e1e27a..dedad2b258e5 100644
--- a/media-libs/raptor/ChangeLog
+++ b/media-libs/raptor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/raptor
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.113 2011/11/16 18:32:49 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/ChangeLog,v 1.114 2011/11/26 17:43:36 ssuominen Exp $
+
+  26 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> raptor-2.0.5.ebuild,
+  +files/raptor-2.0.5-expat.patch:
+  Fix building with upstream expat patch (USE="-xml" to disable libxml2 usage)
+  wrt #391737 (Thanks to Hans for reporting)
 
   16 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> raptor-1.4.21-r1.ebuild:
   Reduce installed files to minimum in the obsolete raptor1 branch.
diff --git a/media-libs/raptor/Manifest b/media-libs/raptor/Manifest
index f04b84cfd21e..30514b821b71 100644
--- a/media-libs/raptor/Manifest
+++ b/media-libs/raptor/Manifest
@@ -3,22 +3,23 @@ Hash: SHA1
 
 AUX raptor-2.0.3-curl-headers.patch 358 RMD160 7c92c938cf15dd126782aeeff93bce9aed8a5bdf SHA1 2e87d3881395a8541a5aa2d0b62b879b33b5080b SHA256 5018c8568f4a69465bc91584af00c896c02df57510b2f31d73c8e3758f77cb82
 AUX raptor-2.0.4-fix_math_test.patch 807 RMD160 2f6e675fc27e69975c28a95ee444e1aa6f84d7e1 SHA1 9dad69c6c07485be315e4b5ce79748439a14d38c SHA256 0dcf1d3263cf5c3e0af45d7e736b8af3bd20b54d17c7491ef55069d7c7f05ce9
+AUX raptor-2.0.5-expat.patch 1662 RMD160 a76f52c219e9d674e675d8c55df0d789738243b1 SHA1 fe7176f885a0b60fdc4c5fbccd13b565c11f556c SHA256 d750971b5f443e58f53712fcbd7cebed96ea8c0861c6c14248bd470c1ce0babd
 DIST raptor-1.4.21.tar.gz 1651843 RMD160 f2ee591e3e9e008b496d6b7bf78f1293173bf7ed SHA1 f8a82c6e9a342d0cc9772a02562c5e29c2c9b737 SHA256 db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca
 DIST raptor2-2.0.4.tar.gz 1660320 RMD160 643ea2a36c4dd07a5b15a25df926d795c0243d4a SHA1 79e1289f480cb0fe75f49ec29d9f49189a8a58c2 SHA256 34f49d3afa35f5433d8779dede62e4a6567783ee05ab2d6aec1a36054c552a6e
 DIST raptor2-2.0.5.tar.gz 1681311 RMD160 fa810a61de230e6e660364a5e99d7ab56c5b0c42 SHA1 a75ec7890eaa22db86d9456ac1794dad89721099 SHA256 d4d3f09af5f1f1f7fe6894463f6c2d035a617f11eba26c16d13a2be815ab45bc
 EBUILD raptor-1.4.21-r1.ebuild 1652 RMD160 9ef3422d630aac250e6c36b3e5bb645d5a7a0e06 SHA1 28f614c698ec4ac1d55c12aae405f17da0dc0999 SHA256 c61a474d36504c0dcdc2c31f91b90d25641353348d7cdf2b488a00dc649652b8
 EBUILD raptor-2.0.4.ebuild 1799 RMD160 7ca6873ff8f14229979c48155b6daebafe21fc98 SHA1 2846ae787db23d269cf49678379494a872bf5b77 SHA256 7394a3e3fca95740fe6bc68c15fd77634445d9926886262e7395e7531e6b1fbb
-EBUILD raptor-2.0.5.ebuild 1703 RMD160 fbeb7ba540a90330b4949b7fa014cc1898657caf SHA1 b343fb845272da7e27eb8bf416cd0cdea6c4cf8b SHA256 25066cb2ea0427408c53a7da1cc1eeeff7743229b0b4f4180fba06a369292e4f
-MISC ChangeLog 13338 RMD160 55d8d088bcf57301de6de5befe675ad3095f9b5f SHA1 03f60cbc9b85125f39b7f4a8c8dabd6624906af3 SHA256 af7b33172b68ee812779b138fe9703a639e11f836bbec09fe0a05224c17f7a91
+EBUILD raptor-2.0.5.ebuild 1742 RMD160 d1c5fbeffca357f0537b10d1abc9f30aaf503bec SHA1 eaea6818adaf549c67a1ef6307a34ff7ff1e19a1 SHA256 cdc2d74c78c0e561ede2d5ba469e9fe835e03bbb05863d4d6dae30d30368124f
+MISC ChangeLog 13573 RMD160 7d10637d78759d2261c7c5f4c692f57c39c4f659 SHA1 f0d3b290d4bc6573d0a63d7d5d3d3c5ae5033d55 SHA256 1561ddfd9d91433eab13fdc831546cf831230df40c330407a53738d87c988230
 MISC metadata.xml 238 RMD160 a0d305ec6bd1653212d168b6e61cee0c00702d01 SHA1 508ad5cf65139bb32cf6caffb035ccbbe2f387ac SHA256 e9088dff670aeaaff724dfd30b8f35090c97131a5dbb310b06b943740510bf36
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOxAF8AAoJEEdUh39IaPFNhiwH/R/81yE0OxRm8XrbA+ji4mfy
-Yojm+HDM5wvv5O+jQyaZj3d3qFM3PH70jnGptSjjusa8Dgp/MMMKLloGPi/RtR2g
-gQ+tGetnC9Akf1steSoj+gAfwA2zo/ztrlbg+Sqt8QJnCVrd8RS047fzwwdIdjXE
-EIn5iw7HXCuZY+7o/NHMWKSn79cWUZqj4TkEu1RpkL2Zck2eLP6A7bqPRvaOxnjs
-X/w8otiW+sLu3JcHg9+zk3vn2dd598w8ZSuBuX0QahzMSloLSGIJEhxYBdVnIubZ
-3VITBjnage322RMT2a6L6UC5IL8e7EIx4idd88CDawuNAFtdwR3vUPCgyMLzvnQ=
-=d14C
+iQEcBAEBAgAGBQJO0STCAAoJEEdUh39IaPFNO7QIAJZUP+gXEh6O2quGyX+pSzIj
+dDv5Q9+8MP5wK0gdIZMRfjCz/TuRH2SHpVnfZhemk8fdqmmydTKiAqJE1rBonKE1
+tRexUcKiXbSuXFOPKwp5IVWX4dMW6DyT+deDiefd/Gfs1AAzDevwW7+ujL3uoI66
+jsu6fDSwNSUxI7T9gccJR+nft1GIHpCS4U6jAP1QDaVZMf52r2fow6ar2FPG5tOy
+7rgY6MFYqBPB0IN6ZNnRdGeheDmAU2NkDs/I2KvP8HYlU2MaAV+Iw8y7eozd+8bM
+gA+6X7HDk8HTGi/dC8Y57UDEQwXj69ansFsxy21hSfeAhzPbnpY34651cnSZYMY=
+=4GA5
 -----END PGP SIGNATURE-----
diff --git a/media-libs/raptor/files/raptor-2.0.5-expat.patch b/media-libs/raptor/files/raptor-2.0.5-expat.patch
new file mode 100644
index 000000000000..adaef31b1652
--- /dev/null
+++ b/media-libs/raptor/files/raptor-2.0.5-expat.patch
@@ -0,0 +1,43 @@
+06:21 < GitHub196> [raptor] dajobe pushed 1 new commit to master: http://git.io/-dmhKw
+06:21 < GitHub196> [raptor/master] Fix expat support - Dave Beckett
+
+http://github.com/dajobe/raptor/commit/2c4d76240b70e9c794d983ca856ceaea8fe7ee5b
+
+http://bugs.gentoo.org/show_bug.cgi?id=391737
+
+--- src/raptor_expat.c
++++ src/raptor_expat.c
+@@ -83,9 +83,9 @@
+ raptor_expat_update_document_locator(raptor_sax2* sax2,
+                                      raptor_locator* locator)
+ {
+-  locator->line = XML_GetCurrentLineNumber(sax2->xp);
+-  locator->column = XML_GetCurrentColumnNumber(sax2->xp);
+-  locator->byte = XML_GetCurrentByteIndex(sax2->xp);
++  locator->line = RAPTOR_BAD_CAST(int, XML_GetCurrentLineNumber(sax2->xp));
++  locator->column = RAPTOR_BAD_CAST(int, XML_GetCurrentColumnNumber(sax2->xp));
++  locator->byte = RAPTOR_BAD_CAST(int, XML_GetCurrentByteIndex(sax2->xp));
+ }
+ 
+ /* end if RAPTOR_XML_EXPAT */
+--- src/raptor_sax2.c
++++ src/raptor_sax2.c
+@@ -551,7 +551,7 @@
+ 
+ 
+ #ifdef RAPTOR_XML_EXPAT
+-  rc = XML_Parse(xp, (char*)buffer, len, is_end);
++  rc = XML_Parse(xp, (char*)buffer, RAPTOR_BAD_CAST(int, len), is_end);
+   if(!rc) /* expat: 0 is failure */
+     goto handle_error;
+   if(is_end)
+@@ -627,8 +627,7 @@
+     char *error_buffer;
+ 
+     error_length = strlen(error_message);
+-    error_buffer = (char*)RAPTOR_MALLOC(cstring, 
+-                                      ERROR_PREFIX_LEN + error_length+1);
++    error_buffer = RAPTOR_MALLOC(char*, ERROR_PREFIX_LEN + error_length + 1);
+     if(error_buffer) {
+       memcpy(error_buffer, error_prefix, ERROR_PREFIX_LEN);
+       memcpy(error_buffer + ERROR_PREFIX_LEN, error_message, error_length + 1);
diff --git a/media-libs/raptor/raptor-2.0.5.ebuild b/media-libs/raptor/raptor-2.0.5.ebuild
index 5023a371a911..85560543c5a2 100644
--- a/media-libs/raptor/raptor-2.0.5.ebuild
+++ b/media-libs/raptor/raptor-2.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.5.ebuild,v 1.1 2011/11/16 18:27:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/raptor/raptor-2.0.5.ebuild,v 1.2 2011/11/26 17:43:36 ssuominen Exp $
 
 EAPI=4
 inherit eutils libtool
@@ -33,6 +33,7 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS ChangeLog NEWS NOTICE README )
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-expat.patch
 	epunt_cxx
 	elibtoolize
 }