summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWulf Krueger <philantrop@gentoo.org>2008-01-06 23:27:57 +0000
committerWulf Krueger <philantrop@gentoo.org>2008-01-06 23:27:57 +0000
commitb6b5b068aafee2a83667eebc812befaa941cc374 (patch)
treee5d6c2924285080f59fd366503b580e9e444da84 /media-libs
parentMarked stable on amd64 as per bug 203653. (diff)
downloadgentoo-2-b6b5b068aafee2a83667eebc812befaa941cc374.tar.gz
gentoo-2-b6b5b068aafee2a83667eebc812befaa941cc374.tar.bz2
gentoo-2-b6b5b068aafee2a83667eebc812befaa941cc374.zip
Added a patch for gcc-4.3-compatibility as kindly provided by Ryan
(Portage version: 2.1.4_rc14)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/taglib/ChangeLog9
-rw-r--r--media-libs/taglib/files/taglib-1.4-gcc-4.3-include.patch51
-rw-r--r--media-libs/taglib/taglib-1.4-r1.ebuild6
3 files changed, 62 insertions, 4 deletions
diff --git a/media-libs/taglib/ChangeLog b/media-libs/taglib/ChangeLog
index 7c42ea7d49da..4d652bb3f27f 100644
--- a/media-libs/taglib/ChangeLog
+++ b/media-libs/taglib/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/taglib
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.59 2007/05/17 10:54:53 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.60 2008/01/06 23:27:56 philantrop Exp $
+
+ 06 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+ +files/taglib-1.4-gcc-4.3-include.patch, taglib-1.4-r1.ebuild:
+ Added a patch for gcc-4.3-compatibility as kindly provided by Ryan dirtyepic
+ Hill on bug 203635. Thanks, Ryan!
17 May 2007; Raúl Porcel <armin76@gentoo.org> taglib-1.4-r1.ebuild:
alpha stable wrt #163117
diff --git a/media-libs/taglib/files/taglib-1.4-gcc-4.3-include.patch b/media-libs/taglib/files/taglib-1.4-gcc-4.3-include.patch
new file mode 100644
index 000000000000..15fe13727c30
--- /dev/null
+++ b/media-libs/taglib/files/taglib-1.4-gcc-4.3-include.patch
@@ -0,0 +1,51 @@
+diff -Naur taglib-1.4-orig/bindings/c/tag_c.cpp taglib-1.4/bindings/c/tag_c.cpp
+--- taglib-1.4-orig/bindings/c/tag_c.cpp 2005-05-17 14:17:26.000000000 -0600
++++ taglib-1.4/bindings/c/tag_c.cpp 2007-12-28 18:27:28.000000000 -0600
+@@ -21,6 +21,8 @@
+
+ #include "tag_c.h"
+
++#include <cstring>
++
+ #include <fileref.h>
+ #include <tfile.h>
+ #include <vorbisfile.h>
+diff -Naur taglib-1.4-orig/taglib/toolkit/tbytevector.cpp taglib-1.4/taglib/toolkit/tbytevector.cpp
+--- taglib-1.4-orig/taglib/toolkit/tbytevector.cpp 2005-05-17 14:44:14.000000000 -0600
++++ taglib-1.4/taglib/toolkit/tbytevector.cpp 2007-12-28 18:26:39.000000000 -0600
+@@ -20,6 +20,7 @@
+ ***************************************************************************/
+
+ #include <iostream>
++#include <cstring>
+
+ #include <tstring.h>
+ #include <tdebug.h>
+diff -Naur taglib-1.4-orig/taglib/toolkit/tfile.cpp taglib-1.4/taglib/toolkit/tfile.cpp
+--- taglib-1.4-orig/taglib/toolkit/tfile.cpp 2005-07-25 15:16:32.000000000 -0600
++++ taglib-1.4/taglib/toolkit/tfile.cpp 2007-12-28 18:26:03.000000000 -0600
+@@ -27,6 +27,10 @@
+ #include <sys/stat.h>
+ #include <unistd.h>
+
++#include <cstdlib>
++#include <cstring>
++#include <climits>
++
+ using namespace TagLib;
+
+ class File::FilePrivate
+diff -Naur taglib-1.4-orig/taglib/toolkit/tstring.cpp taglib-1.4/taglib/toolkit/tstring.cpp
+--- taglib-1.4-orig/taglib/toolkit/tstring.cpp 2005-07-25 15:31:15.000000000 -0600
++++ taglib-1.4/taglib/toolkit/tstring.cpp 2007-12-28 18:24:59.000000000 -0600
+@@ -25,6 +25,10 @@
+
+ #include <iostream>
+
++#include <cstdlib>
++#include <cstring>
++#include <climits>
++
+ namespace TagLib {
+
+ inline unsigned short byteSwap(unsigned short x)
diff --git a/media-libs/taglib/taglib-1.4-r1.ebuild b/media-libs/taglib/taglib-1.4-r1.ebuild
index a84b8dc08ec5..4095a4fc1c28 100644
--- a/media-libs/taglib/taglib-1.4-r1.ebuild
+++ b/media-libs/taglib/taglib-1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.4-r1.ebuild,v 1.10 2007/05/17 10:54:53 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/taglib-1.4-r1.ebuild,v 1.11 2008/01/06 23:27:56 philantrop Exp $
inherit libtool eutils
@@ -19,6 +19,8 @@ src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-dirtypointer.patch
+ # Fixes bug 203635.
+ epatch "${FILESDIR}"/${P}-gcc-4.3-include.patch
elibtoolize
}