diff options
| author |   Tony Vroon <chainsaw@gentoo.org> | 2011-09-24 12:36:27 +0000 |
|---|---|---|
| committer | Tony Vroon <chainsaw@gentoo.org> | 2011-09-24 12:36:27 +0000 |
| commit | 69308679055b7a2b31e99afec8e759bb19a71cae (patch) | |
| tree | 27548bd8787c1ddb1aa41290e0525496b182c06e /dev-libs/xqilla | |
| parent | Trying to use GTK+2 results in plugin build failures, particularly aosd. Stop... (diff) | |
| download | gentoo-2-69308679055b7a2b31e99afec8e759bb19a71cae.tar.gz gentoo-2-69308679055b7a2b31e99afec8e759bb19a71cae.tar.bz2 gentoo-2-69308679055b7a2b31e99afec8e759bb19a71cae.zip | |
Patch suggested by both Ryan Hill & Pacho Ramos allows building on GCC 4.6; closes bug #362307.
(Portage version: 2.1.10.18/cvs/Linux x86_64)
Diffstat (limited to 'dev-libs/xqilla')
| -rw-r--r-- | dev-libs/xqilla/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch | 11 | ||||
| -rw-r--r-- | dev-libs/xqilla/xqilla-2.2.4.ebuild | 17 |
3 files changed, 27 insertions, 10 deletions
diff --git a/dev-libs/xqilla/ChangeLog b/dev-libs/xqilla/ChangeLog index 51ab4ede75b2..4d5bb999abc7 100644 --- a/dev-libs/xqilla/ChangeLog +++ b/dev-libs/xqilla/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-libs/xqilla -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.11 2010/08/29 11:47:00 dev-zero Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/ChangeLog,v 1.12 2011/09/24 12:36:27 chainsaw Exp $ + + 24 Sep 2011; Tony Vroon <chainsaw@gentoo.org> xqilla-2.2.4.ebuild, + +files/xqilla-2.2.4-gcc46.patch: + Patch suggested by both Ryan Hill & Pacho Ramos allows building on GCC 4.6; + closes bug #362307. *xqilla-2.2.4 (29 Aug 2010) diff --git a/dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch b/dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch new file mode 100644 index 000000000000..d64a28d73ce0 --- /dev/null +++ b/dev-libs/xqilla/files/xqilla-2.2.4-gcc46.patch @@ -0,0 +1,11 @@ +diff -uNr XQilla-2.2.4.ORIG/include/xqilla/framework/XPath2MemoryManager.hpp XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp +--- XQilla-2.2.4.ORIG/include/xqilla/framework/XPath2MemoryManager.hpp 2011-09-24 13:31:20.666469427 +0100 ++++ XQilla-2.2.4/include/xqilla/framework/XPath2MemoryManager.hpp 2011-09-24 13:32:01.175470668 +0100 +@@ -23,6 +23,7 @@ + #define __XPATH2MEMORYMANAGER_HPP + + #include <algorithm> ++#include <cstddef> + #include <assert.h> + + #include <xqilla/framework/XQillaExport.hpp> diff --git a/dev-libs/xqilla/xqilla-2.2.4.ebuild b/dev-libs/xqilla/xqilla-2.2.4.ebuild index cf10fb921cfc..54d6ad587c44 100644 --- a/dev-libs/xqilla/xqilla-2.2.4.ebuild +++ b/dev-libs/xqilla/xqilla-2.2.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 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.1 2010/08/29 11:47:00 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/xqilla/xqilla-2.2.4.ebuild,v 1.2 2011/09/24 12:36:27 chainsaw Exp $ EAPI="2" -inherit autotools eutils +inherit autotools base MY_P="XQilla-${PV}" @@ -26,14 +26,15 @@ RDEPEND=">=dev-libs/xerces-c-3.1.0 DEPEND="${RDEPEND} doc? ( app-doc/doxygen )" +PATCHES=( + "${FILESDIR}/${PV}-respect-ldflags-no-rpath.patch" + "${FILESDIR}/${P}-gcc46.patch" +) + S="${WORKDIR}/${MY_P}" src_prepare() { - # respect our LDFLAGS and don't add an rpath for the xerces-c lib - # since that is in the default LDPATH anyway and the binaries - # may need relinking at install-time because they temporary use - # already installed libraries - epatch "${FILESDIR}/${PV}-respect-ldflags-no-rpath.patch" + base_src_prepare eautoreconf } |