summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngmar Vanhassel <ingmar@gentoo.org>2008-03-06 01:14:14 +0000
committerIngmar Vanhassel <ingmar@gentoo.org>2008-03-06 01:14:14 +0000
commit52a9ebe2324389ffb47a21ac0490e34d238b514b (patch)
treee08c691d71a14f59c6b489993e00cc618c1590ea /media-libs/taglib
parentDocument for use with eclass-manpages (bug #210635). (diff)
downloadgentoo-2-52a9ebe2324389ffb47a21ac0490e34d238b514b.tar.gz
gentoo-2-52a9ebe2324389ffb47a21ac0490e34d238b514b.tar.bz2
gentoo-2-52a9ebe2324389ffb47a21ac0490e34d238b514b.zip
Update gcc 4.3 patch, Ryan Hill in bug 203635.
(Portage version: 2.1.4.4)
Diffstat (limited to 'media-libs/taglib')
-rw-r--r--media-libs/taglib/ChangeLog6
-rw-r--r--media-libs/taglib/files/taglib-1.4-gcc-4.3-include.patch27
2 files changed, 24 insertions, 9 deletions
diff --git a/media-libs/taglib/ChangeLog b/media-libs/taglib/ChangeLog
index 4d652bb3f27f..dde581d8a5a8 100644
--- a/media-libs/taglib/ChangeLog
+++ b/media-libs/taglib/ChangeLog
@@ -1,6 +1,10 @@
# 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.60 2008/01/06 23:27:56 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/taglib/ChangeLog,v 1.61 2008/03/06 01:14:13 ingmar Exp $
+
+ 06 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+ files/taglib-1.4-gcc-4.3-include.patch:
+ Update gcc 4.3 patch, Ryan Hill in bug 203635.
06 Jan 2008; Wulf C. Krueger <philantrop@gentoo.org>
+files/taglib-1.4-gcc-4.3-include.patch, taglib-1.4-r1.ebuild:
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
index 15fe13727c30..d0c61e30fa6c 100644
--- 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
@@ -1,6 +1,6 @@
-diff -Naur taglib-1.4-orig/bindings/c/tag_c.cpp taglib-1.4/bindings/c/tag_c.cpp
+diff -Naurp 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
++++ taglib-1.4/bindings/c/tag_c.cpp 2008-03-05 16:33:12.000000000 -0600
@@ -21,6 +21,8 @@
#include "tag_c.h"
@@ -10,9 +10,9 @@ diff -Naur taglib-1.4-orig/bindings/c/tag_c.cpp taglib-1.4/bindings/c/tag_c.cpp
#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
+diff -Naurp 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
++++ taglib-1.4/taglib/toolkit/tbytevector.cpp 2008-03-05 16:33:12.000000000 -0600
@@ -20,6 +20,7 @@
***************************************************************************/
@@ -21,9 +21,9 @@ diff -Naur taglib-1.4-orig/taglib/toolkit/tbytevector.cpp taglib-1.4/taglib/tool
#include <tstring.h>
#include <tdebug.h>
-diff -Naur taglib-1.4-orig/taglib/toolkit/tfile.cpp taglib-1.4/taglib/toolkit/tfile.cpp
+diff -Naurp 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
++++ taglib-1.4/taglib/toolkit/tfile.cpp 2008-03-05 16:33:12.000000000 -0600
@@ -27,6 +27,10 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -35,9 +35,9 @@ diff -Naur taglib-1.4-orig/taglib/toolkit/tfile.cpp taglib-1.4/taglib/toolkit/tf
using namespace TagLib;
class File::FilePrivate
-diff -Naur taglib-1.4-orig/taglib/toolkit/tstring.cpp taglib-1.4/taglib/toolkit/tstring.cpp
+diff -Naurp 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
++++ taglib-1.4/taglib/toolkit/tstring.cpp 2008-03-05 16:33:12.000000000 -0600
@@ -25,6 +25,10 @@
#include <iostream>
@@ -49,3 +49,14 @@ diff -Naur taglib-1.4-orig/taglib/toolkit/tstring.cpp taglib-1.4/taglib/toolkit/
namespace TagLib {
inline unsigned short byteSwap(unsigned short x)
+diff -Naurp taglib-1.4-orig/tests/toolkit-test.cpp taglib-1.4/tests/toolkit-test.cpp
+--- taglib-1.4-orig/tests/toolkit-test.cpp 2005-07-25 15:12:15.000000000 -0600
++++ taglib-1.4/tests/toolkit-test.cpp 2008-03-05 16:33:44.000000000 -0600
+@@ -23,6 +23,7 @@
+ */
+
+ #include <iostream>
++#include <cstring>
+
+ #include <tbytevector.h>
+ #include <tbytevectorlist.h>