summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-06-20 15:08:53 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-06-20 15:08:53 +0000
commit84a2408c49aef9f98965ba8b0349093c0d6f425d (patch)
tree7f5ad701c0bfaebe9ef68bd1e13a9b79eff1320d /media-libs/taglib
parentnevermind, don't bump this yet (diff)
downloadgentoo-2-84a2408c49aef9f98965ba8b0349093c0d6f425d.tar.gz
gentoo-2-84a2408c49aef9f98965ba8b0349093c0d6f425d.tar.bz2
gentoo-2-84a2408c49aef9f98965ba8b0349093c0d6f425d.zip
Add fix to get tests for taglib-1.5 to compile with gcc-4.3. Bug 228413. Thanks to Olivier Huber <oli.huber@gmail.com>.
(Portage version: 2.1.5.5)
Diffstat (limited to 'media-libs/taglib')
-rw-r--r--media-libs/taglib/ChangeLog7
-rw-r--r--media-libs/taglib/files/taglib-1.5-gcc43-tests.patch11
-rw-r--r--media-libs/taglib/taglib-1.5.ebuild11
3 files changed, 24 insertions, 5 deletions
diff --git a/media-libs/taglib/ChangeLog b/media-libs/taglib/ChangeLog
index 46b58ee7050a..bb8aeb8bbfb3 100644
--- a/media-libs/taglib/ChangeLog
+++ b/media-libs/taglib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/taglib
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.63 2008/03/20 21:58:53 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.64 2008/06/20 15:08:52 loki_val Exp $
+
+ 20 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+ +files/taglib-1.5-gcc43-tests.patch, taglib-1.5.ebuild:
+ Add fix to get tests for taglib-1.5 to compile with gcc-4.3. Bug 228413.
+ Thanks to Olivier Huber <oli.huber@gmail.com>.
20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> -taglib-1.4.ebuild:
Old.
diff --git a/media-libs/taglib/files/taglib-1.5-gcc43-tests.patch b/media-libs/taglib/files/taglib-1.5-gcc43-tests.patch
new file mode 100644
index 000000000000..d373eeed0035
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.5-gcc43-tests.patch
@@ -0,0 +1,11 @@
+--- taglib/toolkit/tstring.h~ 2008-02-04 16:14:45.000000000 +0100
++++ taglib/toolkit/tstring.h 2008-06-19 20:34:29.340541954 +0200
+@@ -30,7 +30,7 @@
+ #include "taglib.h"
+ #include "tbytevector.h"
+
+-#include <string>
++#include <cstring>
+ #include <ostream>
+
+ /*!
diff --git a/media-libs/taglib/taglib-1.5.ebuild b/media-libs/taglib/taglib-1.5.ebuild
index f6fd14a233b5..1adbd0a51a73 100644
--- a/media-libs/taglib/taglib-1.5.ebuild
+++ b/media-libs/taglib/taglib-1.5.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.5.ebuild,v 1.1 2008/03/20 21:57:15 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.5.ebuild,v 1.2 2008/06/20 15:08:52 loki_val Exp $
-inherit libtool eutils
+inherit libtool eutils base
DESCRIPTION="A library for reading and editing audio meta data"
HOMEPAGE="http://developer.kde.org/~wheeler/taglib.html"
@@ -11,10 +11,13 @@ SRC_URI="http://developer.kde.org/~wheeler/files/src/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+IUSE="debug test"
RDEPEND=""
-DEPEND="dev-util/pkgconfig"
+DEPEND="dev-util/pkgconfig
+ test? ( dev-util/cppunit )"
+
+PATCHES=( "${FILESDIR}/${P}-gcc43-tests.patch" )
src_compile() {
econf $(use_enable debug) || die "econf failed."