Fix building with GCC 4.4+ wrt #275169.

(Portage version: 2.2_rc36/cvs/Linux x86_64)

3 files changed, 30 insertions, 3 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/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"
 }