Fix building with GCC 4.4+ wrt #275169.

Package-Manager: portage-2.2_rc36/cvs/Linux x86_64

4 files changed, 33 insertions, 5 deletions

diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog
index 38a1cd85311e..86a54e1801bc 100644
--- a/dev-libs/xqilla/ChangeLog
+++ b/dev-libs/xqilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/xqilla
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.5 2009/03/03 09:00:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.6 2009/08/10 12:40:06 ssuominen Exp $
+
+  10 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> xqilla-2.2.0.ebuild,
+  +files/xqilla-2.2.0-gcc44.patch:
+  Fix building with GCC 4.4+ wrt #275169.
 
 *xqilla-2.2.0 (03 Mar 2009)
 
diff --git a/dev-libs/xqilla/Manifest b/dev-libs/xqilla/Manifest
index 7a11f90e2953..af3dca600c7a 100644
--- a/dev-libs/xqilla/Manifest
+++ b/dev-libs/xqilla/Manifest
@@ -1,7 +1,8 @@
+AUX xqilla-2.2.0-gcc44.patch 786 RMD160 4004b116bbf65b42f12b2d84153b632c87678ff5 SHA1 e47c4d147db7a8f7de8ec0b61a6070b09dc67c97 SHA256 5d798a2344adfab0501549eeec849ba0169a96c40b2616dca12bc1df0d9b64bd
 DIST XQilla-2.1.3.tar.gz 3197370 RMD160 c6bf589c4cffba3d59ac3819872836bde2ddd682 SHA1 9e484c67c10692da6c9ab7134d8df4829e212e8d SHA256 4a61f9c25578a40a356f49e358c874df577c6bf75b03848050e7726d3e6164ad
 DIST XQilla-2.2.0.tar.gz 4907127 RMD160 39598a7a8fbae30a392fe38d3bffa62b59fcdc8a SHA1 22b680afcb1fdc954ce9c34aec71f3add321dfbf SHA256 8d7e2916a922ecf75bf21069a18706cacdbbd413c49f6561537d00f592377c9d
 EBUILD xqilla-2.1.3-r1.ebuild 1182 RMD160 2e008a601677d51dc17465a622fb3a8396e1266b SHA1 ae7b134ec50bc1605e614edf069419cc82bdfcb8 SHA256 7783c49f9f6f1688c8b6a100c64912d35f837c19763a3348043fb46cff83610f
-EBUILD xqilla-2.2.0.ebuild 1364 RMD160 41ae8ae00af9c4bd1ae08579eca77094210c31d5 SHA1 822e28ec4cffb030a891e90a2a3ae41b110db2d4 SHA256 78ed82fdb2b41763ce2e7668a83350431e199ffc3f29d3f07a3249a7aee77a9b
+EBUILD xqilla-2.2.0.ebuild 1417 RMD160 e3804f0ff73656b2b77dd7d11152732b593b9dd1 SHA1 67040f5368830873df74ee6baa48f3e79f1ae954 SHA256 795c0a02c2395ce33d3ccbbd935ef9254637499fada2daf1cf230c80f9769b84
 EBUILD xqilla-9999.ebuild 1230 RMD160 7a401b22690e85278d27f9d4bf916d075e63978f SHA1 f27abc7d6ddc0f1a49a354e2f62af78f6ca3fdf5 SHA256 df3bee03c55e68ef39b1c8fbc144b581266a8071b6889db3a613dfcfc389b94d
-MISC ChangeLog 1776 RMD160 fba9c5a0faf744b334b2af6b6a92e5bcf15fa907 SHA1 6c6bfe1bb55e56afd8f518fb68af8d219bd092b6 SHA256 6188b61792b81319e42a7886a65107cfc03b58dab865ec0f77c48ea3f41c2f59
+MISC ChangeLog 1930 RMD160 06443a1eed9649a9b0ac3b89cb4ec44d7763e2f5 SHA1 f6f127af9335de399c112ec303f745f90613c222 SHA256 0700393c6b6532211fb23b77b0ac19b35f33fefae588be8b0a15cd0e2e2982dd
 MISC metadata.xml 356 RMD160 87fa3f6ed33803039bdb19ecb566ba91858de68a SHA1 2f5ed3e9d93dc8af9e3d11aafd1eee11f23e202a SHA256 9e6928e22e3a021b76957f9787dcd10dbecfe2af936fca3b24efbc5122a0959b
diff --git a/dev-libs/xqilla/files/xqilla-2.2.0-gcc44.patch b/dev-libs/xqilla/files/xqilla-2.2.0-gcc44.patch
new file mode 100644
index 000000000000..f526957c20fc
--- /dev/null
+++ b/dev-libs/xqilla/files/xqilla-2.2.0-gcc44.patch
@@ -0,0 +1,21 @@
+diff -ur XQilla-2.2.0.orig/src/lexer/XQLexer.cpp XQilla-2.2.0/src/lexer/XQLexer.cpp
+--- XQilla-2.2.0.orig/src/lexer/XQLexer.cpp	2008-08-18 03:43:07.000000000 +0300
++++ XQilla-2.2.0/src/lexer/XQLexer.cpp	2009-08-10 15:30:13.000000000 +0300
+@@ -1,3 +1,5 @@
++#include <cstdio>
++
+ #define yyFlexLexer xqFlexLexer
+ 
+ #line 4 "../src/lexer/XQLexer.cpp"
+diff -ur XQilla-2.2.0.orig/src/parser/XQParser.cpp XQilla-2.2.0/src/parser/XQParser.cpp
+--- XQilla-2.2.0.orig/src/parser/XQParser.cpp	2008-11-28 19:48:27.000000000 +0200
++++ XQilla-2.2.0/src/parser/XQParser.cpp	2009-08-10 15:21:11.000000000 +0300
+@@ -43,6 +43,8 @@
+    define necessary library symbols; they are noted "INFRINGES ON
+    USER NAME SPACE" below.  */
+ 
++#include <cstdio>
++
+ /* Identify Bison output.  */
+ #define YYBISON 1
+ 
diff --git a/dev-libs/xqilla/xqilla-2.2.0.ebuild b/dev-libs/xqilla/xqilla-2.2.0.ebuild
index f888c0df54d2..1e2b71f21f1e 100644
--- a/dev-libs/xqilla/xqilla-2.2.0.ebuild
+++ b/dev-libs/xqilla/xqilla-2.2.0.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.0.ebuild,v 1.1 2009/03/03 09:00:34 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.0.ebuild,v 1.2 2009/08/10 12:40:06 ssuominen Exp $
 
 EAPI="2"
+inherit eutils
 
 MY_P="XQilla-${PV}"
 
@@ -25,9 +26,10 @@ RDEPEND=">=dev-libs/xerces-c-3.0.1
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc44.patch
 	sed -i -e 's|^LDFLAGS =|LDFLAGS +=|' Makefile.in || die "sed failed"
 }