new gcc-4.4 patch

Package-Manager: portage-2.1.6.13/cvs/Linux i686

3 files changed, 88 insertions, 14 deletions

diff --git a/media-plugins/vdr-cdda/ChangeLog b/media-plugins/vdr-cdda/ChangeLog
index 9a4adb49bc4d..f8a8fa251ad7 100644
--- a/media-plugins/vdr-cdda/ChangeLog
+++ b/media-plugins/vdr-cdda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-cdda
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.9 2009/12/23 21:12:27 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-cdda/ChangeLog,v 1.10 2009/12/27 16:40:24 hd_brummy Exp $
+
+  27 Dec 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
+  files/vdr-cdda-0.1.0_gcc-4.4.patch:
+  new gcc-4.4 patch
 
   23 Dec 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   vdr-cdda-0.1.0-r1.ebuild, +files/vdr-cdda-0.1.0_gcc-4.4.patch:
diff --git a/media-plugins/vdr-cdda/Manifest b/media-plugins/vdr-cdda/Manifest
index 88cdf3d596e5..f05f80e80634 100644
--- a/media-plugins/vdr-cdda/Manifest
+++ b/media-plugins/vdr-cdda/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
 AUX vdr-cdda-0.1.0-cdspeed.diff 607 RMD160 367e1b7fda29821d67f3ab6ca410419bf590ac8b SHA1 cf140290dc2e40dc3effabf8f99d257934c2839b SHA256 996bc3032c57a26ddf52f9933cfffc5aed1ef7a0dfdb79c5590e17fad7f57f77
 AUX vdr-cdda-0.1.0-linking-order.diff 408 RMD160 f5c43f5420bd477c3ae80d6339ebbef954cb9f20 SHA1 2459cd6680b9282cfc271c1e8ba8e49dd202ba07 SHA256 4e0264fd4c7d42c4202069862fbd5de92a6828f0f11d192f2ef22e4f532a6c78
 AUX vdr-cdda-0.1.0.patch 1472 RMD160 2afca5cfe8bbbfd90b7af389be82d12895c014b5 SHA1 fb72e5aff65695753611d8510f796c34573e960d SHA256 1871b9035839e7c9cb0e57f61cce5afb6e77639be749e17dac63602e101004b8
-AUX vdr-cdda-0.1.0_gcc-4.4.patch 605 RMD160 2308ac8a72978fb3bb1808caa84e6b58f32e6d40 SHA1 bc231e796dd5dc834d2142b3e3ba8da706d61cad SHA256 8c4b9a151c244e2493a55623635d9ce31d128dd019d952f18658fa0862c3d5ea
+AUX vdr-cdda-0.1.0_gcc-4.4.patch 2945 RMD160 de5446d4dd9200dd3579c8a45f18069018a03b3b SHA1 17afdc89ff2b2bd3c0eaa6676ebcf7f9cf955a6e SHA256 32bab359bde19f5580af4810d2374450cf595651c2d2f358f1ae2a666b88f280
 DIST vdr-cdda-0.1.0.tar.gz 43589 RMD160 8bb2210252134b7bd4940e36c56f70cae3be00a9 SHA1 5f9df82bd4d2cd99f3b4732b0e9d92051a0e42b9 SHA256 c68a9ff70bc8c794e582fd8702ffc30bf6c308209c0b0f4ca0136b7fac43c24c
 EBUILD vdr-cdda-0.1.0-r1.ebuild 682 RMD160 a28e0eead1e727f810a253ebcea2a1ca96b2576a SHA1 0d1b02e013b7a65d5e7533e57a47067489b3d5fa SHA256 8c4b823945ba85f2a75e421a5d5445a4e5dc5a115ad2add5a081000453ae682f
-MISC ChangeLog 1694 RMD160 85f8d64dd0c6c23b7083f18b55de8f6a62f709e7 SHA1 cfbd0014611132ffbc35e3c036a84d70a329ad23 SHA256 65f61c707f486bdc8cc808b5b0c0d9a2fa8968d175d41e2b92cab051186c9211
+MISC ChangeLog 1809 RMD160 2ac5f41dac45222a5500e75976501437275f028d SHA1 5c80f760b1eb394ec414c53cb450819752d51eb2 SHA256 53c5c015a2ee7b953a1ef8ea55512b6bf9fc73b06da51a5358c47f85f32ab414
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 Comment: added by hd_brummy@gentoo.org
 
-iD8DBQFLMohXdn07HTTCgIoRAkuJAJ4uR+eBysjqG5eaGbln5MGVsjfZrQCfeh/r
-sR8lUlIDwmts/akVoWoBfUQ=
-=06VA
+iD8DBQFLN47Ydn07HTTCgIoRAt8mAKCC9dbmaHqopPQPb+4NVAu6m6rm/ACfUuDK
+ILThusbuXKXV1Fmu8EIOI+Q=
+=N2Ne
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch
index 8bfd223da61d..aca7591c3959 100644
--- a/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch
+++ b/media-plugins/vdr-cdda/files/vdr-cdda-0.1.0_gcc-4.4.patch
@@ -1,15 +1,85 @@
-fix gcc-4.4 compile issues
-https://bugs.gentoo.org/show_bug.cgi?id=297361
---- cdda-0.1.0.orig/cdda_cddb.c	2005-12-24 11:17:06.000000000 +0100
-+++ cdda-0.1.0/cdda_cddb.c	2009-12-22 21:44:55.688664502 +0100
-@@ -58,7 +58,8 @@
+diff -Naur cdda-0.1.0.orig/cdda_cddb.c cdda-0.1.0/cdda_cddb.c
+--- cdda-0.1.0.orig/cdda_cddb.c	2009-12-27 17:18:37.000000000 +0100
++++ cdda-0.1.0/cdda_cddb.c	2009-12-27 17:28:09.000000000 +0100
+@@ -58,14 +58,14 @@
  
      sscanf(key, "%a[^\n0-9]%d", &p_key, &track);
  
 -    char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/');
-+    char *p_value1 = NULL, *p_value2 = NULL;
-+    const char *p_idx = index(value, '/');
++    const char *p_value1 = NULL, *p_value2 = NULL, *p_idx = index(value, '/');
      if (NULL != p_idx && 0x20 == *(p_idx-1) && 0x20 == *(p_idx+1) && 0x00 != *(p_idx+2))
        sscanf(value, "%a[^/] / %a[^/]", &p_value1, &p_value2);
      else
-
+       sscanf(value, "%a[^/]", &p_value1);
+ 
+-    FixString(p_value1);
+-    FixString(p_value2);
++    FixString((char *)p_value1);
++    FixString((char *)p_value2);
+ #ifdef DEBUG
+     printf("S key=<%s> track=%d value1=<%s> value2=<%s>\n", p_key, track, p_value1, p_value2);
+ #endif
+@@ -74,19 +74,19 @@
+       char *p_str = NULL;
+       if (0 == strncmp("DISCID", p_key, 6)) {
+         p_str = ConCatString(tag[0]->GetDiscId(), p_value1);
+-        free(p_value1);
++        free((char *)p_value1);
+         p_value1 = p_str;
+         tag[0]->SetDiscId(p_value1);
+         tag[0]->SetGenre(genre);
+       } else if (0 == strncmp("DTITLE", p_key, 6)) {
+         if (NULL != p_value1 && NULL != p_value2) {
+           p_str = ConCatString(tag[0]->GetPerformer(), p_value1);
+-          free(p_value1);
++          free((char *)p_value1);
+           p_value1 = p_str;
+           tag[0]->SetPerformer(p_value1);
+ 
+           p_str = ConCatString(tag[0]->GetTitle(), p_value2);
+-          free(p_value2);
++          free((char *)p_value2);
+           p_value2 = p_str;
+           tag[0]->SetTitle(p_value2);
+         } else if (NULL != p_value1 && NULL == p_value2) {
+@@ -94,7 +94,7 @@
+             tag[0]->SetPerformer(p_value1);
+           else {
+             p_str = ConCatString(tag[0]->GetTitle(), p_value1);
+-            free(p_value1);
++            free((char *)p_value1);
+             p_value1 = p_str;
+             tag[0]->SetTitle(p_value1);
+           }
+@@ -108,17 +108,17 @@
+           tag[track+1]->SetPerformer(tag[0]->GetPerformer());
+ 
+           p_str = ConCatString(tag[track+1]->GetTitle(), p_value1);
+-          free(p_value1);
++          free((char *)p_value1);
+           p_value1 = p_str;
+           tag[track+1]->SetTitle(p_value1);
+         } else {
+           p_str = ConCatString(tag[track+1]->GetPerformer(), p_value1);
+-          free(p_value1);
++          free((char *)p_value1);
+           p_value1 = p_str;
+           tag[track+1]->SetPerformer(p_value1);
+ 
+           p_str = ConCatString(tag[track+1]->GetTitle(), p_value2);
+-          free(p_value2);
++          free((char *)p_value2);
+           p_value2 = p_str;
+           tag[track+1]->SetTitle(p_value2);
+         }
+@@ -137,8 +137,8 @@
+       }
+     }
+     free(p_key);
+-    free(p_value1);
+-    free(p_value2);
++    free((char *)p_value1);
++    free((char *)p_value2);
+   }
+ }
+