Fix building with GCC 4.7 (bug #441800).

Signed-off-by: Ryan Hill <dirtyepic@gentoo.org>
Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 41 insertions, 6 deletions

diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog
index cbbc1e906c3d..118632c5f75d 100644
--- a/dev-libs/xqilla/ChangeLog
+++ b/dev-libs/xqilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xqilla
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.13 2012/05/24 20:25:19 dev-zero Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.14 2013/07/17 08:28:02 dirtyepic Exp $
+
+  17 Jul 2013; Ryan Hill <dirtyepic@gentoo.org> xqilla-2.2.4.ebuild,
+  +files/xqilla-2.2.4-gcc47.patch:
+  Fix building with GCC 4.7 (bug #441800).
 
 *xqilla-2.3.0 (24 May 2012)
 
diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index a92f78994248..93f82411cabd 100644
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -1,8 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.2.4-respect-ldflags-no-rpath.patch 561 SHA256 b05b7b14e1f23b51528c8b6da1dd47639496f4ed808da4c8fb83b700219ea111 SHA512 0637f0cae147c2cc90c29c392ee15d4a417efb759c35344e8fff53af670fbee22c273c27a9268eafad20b5042def7741bb4d9e6f3a8adc275cc72b9f2ec46961 WHIRLPOOL 8b35af1c88783f58dc405edf9dcdf81dc13cd4448538adf37f4870012eb28b42546de5d5497b5d9d5c2d06e900813372311bb12c266fbcfe9372dd4acaa56af9
 AUX xqilla-2.2.4-gcc46.patch 514 SHA256 de7c144ad4ea2313840ee6e7cc2b00ec7fd7c9732b70821dbf5680f4a238a639 SHA512 4e5184fccfa821b283026613e04dcea28c78600a660d93277c380ccdcbd1d2081387edff97ae5170f39878a2e0c28bbe46efa8c94c0520b0f23af87234d87c92 WHIRLPOOL ddf7753f2555efce428ef3f1d4f6b9102d59149bf5b8fe19b5ddb2ee2c7ee6beceffa68176889be46d4b48aaf1d87476208e35859e0137f02a01481ed49a7f38
+AUX xqilla-2.2.4-gcc47.patch 610 SHA256 ffbc369840fd4639cee372dd8598a6b60502e5e52d11ddd57e92b689b96ae815 SHA512 f784975214be83c12efa26d02717115d1aa702e7bd67ee1de460e765a420d3af4d00a13fd24b48ff5d4519e67226df2202bc212fa2c5e7b3920e44f2267f9e8c WHIRLPOOL d5085b87d42c56934a0fbf04f1b1027e0bc24b408b54b82503ab0442933708051122768875a639b95bf644dec84ac88ab63534df2ddf75ea2e208394a69d9987
 DIST XQilla-2.2.4.tar.gz 15667750 SHA256 f39f8d11bca67ded2036d543bb6780ebeeee5b5723d75f067f256ae26516854b SHA512 2071377519846d131fc7dc5b97ddf653763e898921490278200be1be48464d67e6466af2a447b266f952a2af2b1eac2febc33c0d4aca0cbefe9672ced42d5f14 WHIRLPOOL ccf294529721035d8995438a905c401c7de43e3f72c7ed27b8b0d347a818459a784b37e3f84ebc221b2583959a869b8d6d76d694a1b1e5318ba9eff53229c53a
 DIST XQilla-2.3.0.tar.gz 7409736 SHA256 60e163cbbbe2900f999ee863bfa5a63d913b1d6e2ea17376302d565d2e9e1bc7 SHA512 cd9b8ce8f44b307ea17ed8d2507d811eca6c69a425341bea568719ef3468840f713f4e5fc3abf61e27cdcc01c2c834fb3745730bb2244777388f293c9d2723ac WHIRLPOOL 6ec8c0b8d88087b813071138c5652bd6cd31664108c06f34b0a80b3ab3c987332106a4e60c18c43fa6798f0ace1756945d7a0c4c6849e4a3b816736e8afcb586
-EBUILD xqilla-2.2.4.ebuild 1554 SHA256 43e0440e4599458ad93f72dace4e5a37813461b3af446ec25c688a233f449deb SHA512 570cf271e609f02e87202ab21dccf331df9ed568cb701980267614536a54582b09f72c16cf0ff0ffcafc5290fc0e81dbd5a04ca813d524e980bd564217d99e4b WHIRLPOOL f9da3c527de04cda9b36b7c72987c77c93c6c420c9cb2b1fc8eb8827670de368ec23f9f2e16a8138b315398ffa43269d4b2292685aad132692543d40128c2314
+EBUILD xqilla-2.2.4.ebuild 1587 SHA256 14821db34f4a1bcbda39193d38be5c0fdc540fc586088f1ee2ba0aa8f7ff2c6d SHA512 bbc6dec46dafaa7151dade903d4660201fd9d70c8ad9fc2e0f94930c7017ec9144a2ee2c7d32e2b7c9722cbde6e4db265445e9f323a030ccd33cb1f0c5aa05ef WHIRLPOOL 3aeed98628e5dea5d8a29e06071d107e6d0915341d6b64bb3d13e02f546a4e91d27996d20bf3fbf4fd0a21bba129c17c39a82ffaaf2dccd600a3cfaeee2e6e98
 EBUILD xqilla-2.3.0.ebuild 1555 SHA256 9a15d168f3ea96fc49e23de9ed7fa037edc97756c588ee2900617c7c27c94ba7 SHA512 eb3a0f8340c9c60f42a19723ee60693b906f1aed2843f504f2fc916f7138fae78fc2fbac7233c6ee2f460144f3438c0601fa7956c7c0d1a94ccb6a4ccead022c WHIRLPOOL b01a36f3208342ac609055a910e12da0d1fae6e9bf430aa0494826f49e2af9a736943b29ca3bef211130d773874ebe1fc970bce54215c8600ff3e4cec82090ab
-MISC ChangeLog 3203 SHA256 814b9a4721b95402c69c6b353c8d5f97bb6979ddc9fc68bbd152eec9f5582933 SHA512 9b2c5363687c3b08c50f2438475841cbe465cfd402f96ee868c934af67557e2a8295652382ab1cedd371e0fa71e77c5e62a4a6416ed6d221cefd750b3ab39b2d WHIRLPOOL 37f1d6c9f0a4a28db2677f8a2fa6da533994b23c7e89a1b7eb4bae53c12787d283f6010407e8e648b7748f09c3f1bc2868548bbb649372e2fd19b5eb9632b273
+MISC ChangeLog 3352 SHA256 9218fb424d0f6749d62e437e86ca18d86f518ba9e03e3a30c466cc1b2f3f8847 SHA512 17d8da70905a31c5c9b61b735c04d9fe735a3269b2c6dcb8c22e382709a0347473e8c0f0c0c5fdffb5cdb990598ce078a2e8f63702691254a765507279823460 WHIRLPOOL 81d5d9d25bf753c2758621735e2e719aa4d6675805fc7eab7fe88e7bc8a841ecf603285996779232d0de6a4cdf68acbecad10a2fad0bd433144a0276d0b94972
 MISC metadata.xml 356 SHA256 9e6928e22e3a021b76957f9787dcd10dbecfe2af936fca3b24efbc5122a0959b SHA512 f862760e5a3179d00d259ba77d93f1e98c2b661d9620f7ab33f2cb6732ccee5a556f3cab3daaf382ccba7425a99a756c82be8ceffec393c0883f160718569c76 WHIRLPOOL 850fa4ad7f49ddb9daaed6e623d6a4ded572d91cf3358f531c485fd77828232bcbf386f89db85c37329a0645f20df2c05763b46ce899be8376719850b7448379
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQEcBAEBCAAGBQJR5lgkAAoJEO04vUmVeoRjIhYIAIn782XkV2NC14bVLkjnD8tp
+grEM3+2oyZggwbKY6HxgL7difANUCTIKOIt7nXywYzhugZFGZNZMf9wvKUiUWtLC
+mqG3+wviw0IBqm4VN4F+yySi0ylNFNbe4xdvHQcDp1zkgfhCtte6zPx0o+mo6YXJ
+fj2tpLma5HaGcnkZgaXz/8M/+TeE4y5WOBzMuAaBbWFV8Adli7kXwkTlM9CClI2M
+KTYLxA6fom1WlyByVsW+BqaUPqVrh+9dSyT37OYVD8gf7+hDYw6/kIhrFNHGse1V
+oAhqDFyatxJgG/BltevQPxKaHRpEdJBUuEvKHPVydeILhsbYYWeZeLB1RIviMB4=
+=y0Rz
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/xqilla/files/xqilla-2.2.4-gcc47.patch b/dev-libs/xqilla/files/xqilla-2.2.4-gcc47.patch
new file mode 100644
index 000000000000..d7f5cde5993e
--- /dev/null
+++ b/dev-libs/xqilla/files/xqilla-2.2.4-gcc47.patch
@@ -0,0 +1,15 @@
+Fix build failure with GCC 4.7.
+https://bugs.gentoo.org/441800
+
+
+--- a/src/items/DatatypeFactoryTemplate.hpp
++++ b/src/items/DatatypeFactoryTemplate.hpp
+@@ -79,7 +79,7 @@ public:
+   AnyAtomicType::Ptr createInstance(const XMLCh* value,
+                                     const DynamicContext* context) const
+   {
+-    return createInstanceNoCheck(DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeURI(),
++    return this->createInstanceNoCheck(DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeURI(),
+                                  DatatypeFactoryTemplate<TYPE>::getPrimitiveTypeName(), value, context);
+   }
+ 
diff --git a/dev-libs/xqilla/xqilla-2.2.4.ebuild b/dev-libs/xqilla/xqilla-2.2.4.ebuild
index 54d6ad587c44..b74576e5f18a 100644
--- a/dev-libs/xqilla/xqilla-2.2.4.ebuild
+++ b/dev-libs/xqilla/xqilla-2.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.4.ebuild,v 1.2 2011/09/24 12:36:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.4.ebuild,v 1.3 2013/07/17 08:28:02 dirtyepic Exp $
 
 EAPI="2"
 inherit autotools base
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PV}-respect-ldflags-no-rpath.patch"
 	"${FILESDIR}/${P}-gcc46.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
 )
 
 S="${WORKDIR}/${MY_P}"