diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-18 14:34:59 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-18 14:34:59 +0000 |
| commit | 1832d6e0d6324665c934788f4693713196c3b064 (patch) | |
| tree | 28ab7e8a9efb9fed0f4325b6e4719dc3dacb39d6 /media-libs/quarter | |
| parent | Restrict test suite which requires SQLite and downloads a full kernel from gi... (diff) | |
| download | gentoo-2-1832d6e0d6324665c934788f4693713196c3b064.tar.gz gentoo-2-1832d6e0d6324665c934788f4693713196c3b064.tar.bz2 gentoo-2-1832d6e0d6324665c934788f4693713196c3b064.zip | |
gcc-4.4 fix (bug 320353), rework libtool files and static libs installation
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/quarter')
| -rw-r--r-- | media-libs/quarter/ChangeLog | 9 | ||||
| -rw-r--r-- | media-libs/quarter/files/quarter-1.0.0-gcc44.patch | 11 | ||||
| -rw-r--r-- | media-libs/quarter/quarter-1.0.0-r1.ebuild (renamed from media-libs/quarter/quarter-1.0.0.ebuild) | 15 |
3 files changed, 30 insertions, 5 deletions
diff --git a/media-libs/quarter/ChangeLog b/media-libs/quarter/ChangeLog index b38b4e9d0228..a6cf6ca7da8a 100644 --- a/media-libs/quarter/ChangeLog +++ b/media-libs/quarter/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/quarter # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/ChangeLog,v 1.2 2010/01/30 04:18:11 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/ChangeLog,v 1.3 2010/05/18 14:34:59 reavertm Exp $ + +*quarter-1.0.0-r1 (18 May 2010) + + 18 May 2010; Maciej Mrozowski <reavertm@gentoo.org> -quarter-1.0.0.ebuild, + +quarter-1.0.0-r1.ebuild, +files/quarter-1.0.0-gcc44.patch: + gcc-4.4 fix (bug 320353), rework libtool files and static libs + installation 30 Jan 2010; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml: Updated my email diff --git a/media-libs/quarter/files/quarter-1.0.0-gcc44.patch b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch new file mode 100644 index 000000000000..9c3a44c1b513 --- /dev/null +++ b/media-libs/quarter/files/quarter-1.0.0-gcc44.patch @@ -0,0 +1,11 @@ +diff -ru ../Quarter-1.0.0/src/Quarter/Quarter.cpp ./src/Quarter/Quarter.cpp +--- ../Quarter-1.0.0/src/Quarter/Quarter.cpp 2009-01-26 22:47:07.000000000 +0100 ++++ ./src/Quarter/Quarter.cpp 2010-05-18 16:17:25.246880238 +0200 +@@ -123,6 +123,7 @@ + \subpage examiner + */ + ++#include <stdio.h> + + #include <Inventor/SoDB.h> + #include <Inventor/nodekits/SoNodeKit.h> diff --git a/media-libs/quarter/quarter-1.0.0.ebuild b/media-libs/quarter/quarter-1.0.0-r1.ebuild index d33c5cd5c9d4..3fee254655b3 100644 --- a/media-libs/quarter/quarter-1.0.0.ebuild +++ b/media-libs/quarter/quarter-1.0.0-r1.ebuild @@ -1,9 +1,11 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0.ebuild,v 1.1 2009/11/24 17:21:02 ayoy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/quarter/quarter-1.0.0-r1.ebuild,v 1.1 2010/05/18 14:34:59 reavertm Exp $ EAPI="2" +inherit base + MY_P="${P/q/Q}" DESCRIPTION="A glue between Nokia Qt4 and Coin3D" @@ -28,6 +30,10 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MY_P}" +PATCHES=( + "${FILESDIR}/${P}-gcc44.patch" +) + src_configure() { econf \ htmldir="${ROOT}usr/share/doc/${PF}/html" \ @@ -39,8 +45,9 @@ src_configure() { } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + base_src_install dodoc AUTHORS NEWS README || die "dodoc failed" # Do not install .la files - rm -f "${D}"/usr/lib*/*.la "${D}"/usr/lib*/qt4/plugins/designer/*.la + rm -f "${D}"/usr/lib*/qt4/plugins/designer/*.{la,a} + use static-libs || rm -f "${D}"/usr/lib*/*.la } |