Update gcc 4.3 patch, Ryan Hill in bug 203635.

Package-Manager: portage-2.1.4.4

diff --git a/media-libs/taglib/ChangeLog b/media-libs/taglib/ChangeLog
index 4d652bb3f27f2cdaf3f9086d32b55ab359b7b7d2..dde581d8a5a88a5e352ebdcdc9de3641a3038408 100644 (file)
--- 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/Manifest b/media-libs/taglib/Manifest
index 4ac3aea6414689d8a33ac647176aeac38b205bff..18f4a9e5d0eda1fdf98bd9d667758937fd54e534 100644 (file)
--- a/media-libs/taglib/Manifest
+++ b/media-libs/taglib/Manifest
@@ -1,7 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX taglib-1.4-dirtypointer.patch 411 RMD160 49a17e33db8ea86f2a509097229464179c16d721 SHA1 1fd009c4326c00ea1e9401d096d466a0dbd33a6c SHA256 d2260ce74a023ff6674aa840fc1c198165fa2939b6bf4d873a03ace88f6e348a
-AUX taglib-1.4-gcc-4.3-include.patch 1671 RMD160 c9f5af81e95964a9aec0971b681dd1176389baa6 SHA1 4918e6b0decc6984971ee12251f1c94ef7186eb0 SHA256 7d7dddeea3f7a512bb875eab8a536bbfd3906042b95c07944c0a89e203ffe5c0
+AUX taglib-1.4-gcc-4.3-include.patch 2037 RMD160 a81acf7d53967401cbce0cdbab59566b87cdc224 SHA1 b5aedb9bc052ccc075f473b97f6e738d5929d234 SHA256 6623d612e368f44e82b104be9f3ef15d672301309a585feeb45f2492734d5608
 DIST taglib-1.4.tar.gz 732938 RMD160 447055f5bc03dd8869e95205690cadd437372b21 SHA1 9830aed2e8d4e0d5da399e2e6b0c5d5db3a0c270 SHA256 0ff805bb8dbf72a45d347f2310f7e5c86e2e7419a069d546e53cf5f221c196ab
 EBUILD taglib-1.4-r1.ebuild 907 RMD160 a73a0b65977c58ebaf1c320a9c7af8d2d83f5979 SHA1 3d77884736ad328093087b4c8092eaf84a421d09 SHA256 9e8e7e7094447686dacd9871b6c0b4393c8c58143c33dca0da82b0781ba68366
 EBUILD taglib-1.4.ebuild 766 RMD160 d4c6a3f784de3ab7efd72a53a9956fb570d7f9ec SHA1 03af36ccfed731f61d943c698ea94291a7441556 SHA256 ab01b0b855ecd94a8ae7b5927a71a9ceebff885f1aa9561c8831c5b1bee0a02d
-MISC ChangeLog 6660 RMD160 7bce8577c531faed46ea2fd598a21401382f0344 SHA1 a12623304145e060470cc14c2f8c82ac5475552a SHA256 0c88d7a90e3764911a8b9b20e26da02a8596a037c872fa2b051663761a8532ab
+MISC ChangeLog 6800 RMD160 f5e2c8522b7809aa60907657ce0ccfbba644b570 SHA1 2d0e4009dcb1193d613e03288d371126d641e289 SHA256 1531bb2e0b54fe344b402fb700c4988e172de60114043d2a044d622551b05bb9
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHz0ULB18eXLOpYdkRAlGWAKCNiaw/81CF+ylwhh5YPHW2owYglQCeOoKj
+3ZOPd6oQwbrJwGifhvGZaUU=
+=4DRx
+-----END PGP SIGNATURE-----

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 15fe13727c30fdc216aeb0f54179b311c32bece0..d0c61e30fa6c8047c8381566ee8fdc1d4712134f 100644 (file)
--- 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>