Make it compile with glibc-2.10 and gcc-4.4, Bug #273854.

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

4 files changed, 65 insertions, 9 deletions

diff --git a/media-plugins/vdr-extrecmenu/ChangeLog b/media-plugins/vdr-extrecmenu/ChangeLog
index 0775f61f2123..be3d968fce9c 100644
--- a/media-plugins/vdr-extrecmenu/ChangeLog
+++ b/media-plugins/vdr-extrecmenu/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-plugins/vdr-extrecmenu
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.23 2009/05/07 21:00:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/ChangeLog,v 1.24 2009/06/15 19:49:38 zzam Exp $
+
+  15 Jun 2009; Matthias Schwarzott <zzam@gentoo.org>
+  vdr-extrecmenu-1.2_pre1.ebuild,
+  +files/vdr-extrecmenu-1.2_pre1-gcc44.patch:
+  Make it compile with glibc-2.10 and gcc-4.4, Bug #273854.
 
   07 May 2009; Joerg Bornkessel <hd_brummy@gentoo.org>
   -files/vdr-extrecmenu-0.12a-uint32_t.diff, -vdr-extrecmenu-0.13.ebuild,
diff --git a/media-plugins/vdr-extrecmenu/Manifest b/media-plugins/vdr-extrecmenu/Manifest
index 2dd31ff510a3..406f758fdb19 100644
--- a/media-plugins/vdr-extrecmenu/Manifest
+++ b/media-plugins/vdr-extrecmenu/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 AUX vdr-extrecmenu-1.2_pre1-gcc43.patch 417 RMD160 173e36cf5d3ff55ca2a1399b4ade9122bcf41ecb SHA1 2124b11f940d796b85c96009e6cdf594372a793d SHA256 747e9cfdda5efcbc76d3e1d76f815b22eb4b3653b1284e60e88fe4c96ba88eda
+AUX vdr-extrecmenu-1.2_pre1-gcc44.patch 1494 RMD160 b9d503c93787d89a21b10ffcb7f64c868f761580 SHA1 563830d2e54450488ab258567ef29848f0789922 SHA256 0baa478f99fe78ee9d585cf63ae9c6095d9adf4f5457043ff8f9a1cbfbb3e7b9
 DIST vdr-extrecmenu-1.1.tgz 45180 RMD160 f108d786fbaa775c1934d9bbf45d36207ff8beda SHA1 c81ab3d1f7dd4d1e9470842bd55ef08fbde7a39f SHA256 1486cb9226165266cf0777e32320fc978a553522f310e67aa71b5d9d2b5808b2
 DIST vdr-extrecmenu-1.2-test1.tgz 328051 RMD160 f50b73756a4585e1c6e0550abf0919209b178365 SHA1 4664a463698741d90640f4254c3637e9b551c017 SHA256 43a6e421f1ec5cd6dea132f7545fc56a3db6e603aee1c49ee73fd8e99e7fe280
 EBUILD vdr-extrecmenu-1.1.ebuild 739 RMD160 f4682f45bcf70549fba7335b5adb66c2cf3274de SHA1 d009a1ab4507cf7bcb4d644c27e3a54daf38299c SHA256 a560a3312eaf3209d5639f151af370d695b8e11299917b530a359fc29dbf3fdb
-EBUILD vdr-extrecmenu-1.2_pre1.ebuild 815 RMD160 e9b9402d3e9e02026cc24b0ad2e7669d84276214 SHA1 f827c2e31d4d9cb647ae950ef246198a121f01d3 SHA256 6d8f7786413f107310609254768cbdbfa8d8a4bcb72c6c4f03645ef3bc008b7d
-MISC ChangeLog 3805 RMD160 545a985333f16368def00318cd8305ca8f7ababd SHA1 396be5e5b257a9c5b52f62b94c6612094f14589d SHA256 0efccb878f268b31cbb2926b1bba637e450408a21118fa814b6919470ea351de
+EBUILD vdr-extrecmenu-1.2_pre1.ebuild 849 RMD160 0504953d9dc06b1319ad644bf2344eb854eab248 SHA1 86868f5bcca3dafddae1934912abf1b0219824e4 SHA256 ceb92879508de0233520a659e7b2e071f01f77865a2d14a04c011efbeceda265
+MISC ChangeLog 3994 RMD160 385a1430ef8fee0ed2ba74cc05ec965c425ce9f7 SHA1 09ef4ba1ee3d91510f9f94cb6c8a34dea01f4a2d SHA256 2c02c2dc2d52710a98aa80fa0884a668599492990f07f0a86f37f52cce17c745
 MISC metadata.xml 337 RMD160 f0276e381deb2e62761aa580195b1c05be29f5d5 SHA1 401d1f6dd5361fa11c936bfa18aa86047a82c614 SHA256 ca40fe91ad4ff2629c376890772b86f0e306359568fd5dad9a5c9804d0791b7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-Comment: added by hd_brummy@gentoo.org
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFKA0vidn07HTTCgIoRAsyoAJ9O+QkIB8P7KhFXrObe6ifMaA7LuQCeMDcf
-7qqoxNl3nPP9Cno0cafVG7E=
-=9PRO
+iEYEARECAAYFAko2pdgACgkQt2vP6XvVdOdDzgCfW1/JMfx8G76ClAbWpSf4O81d
+NJkAoKryE9yvqCSqwD4S0G8jjoMMo1uF
+=siIz
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch
new file mode 100644
index 000000000000..3cda48b25805
--- /dev/null
+++ b/media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch
@@ -0,0 +1,50 @@
+diff -ru extrecmenu-1.2-orig/mymenueditrecording.c extrecmenu-1.2/mymenueditrecording.c
+--- extrecmenu-1.2-orig/mymenueditrecording.c	2009-06-15 21:37:04.928136215 +0200
++++ extrecmenu-1.2/mymenueditrecording.c	2009-06-15 21:40:02.881447945 +0200
+@@ -25,15 +25,15 @@
+ 
+  if(recording)
+  {
+-  char *p=strrchr(recording->Name(),'~');
++  const char *p=strrchr(recording->Name(),'~');
+   if(p)
+   {
+    strn0cpy(name,++p,sizeof(name));
+    strn0cpy(path,recording->Name(),sizeof(path));
+    
+-   p=strrchr(path,'~');
+-   if(p)
+-    *p=0;
++   char *p2 = strrchr(path,'~');
++   if(p2)
++    *p2=0;
+   }
+   else
+    strn0cpy(name,recording->Name(),sizeof(name));  
+@@ -307,7 +307,7 @@
+         asprintf(&dir,"%s%s%s",base?base:"",base?"~":"",item->Text());
+       else  // needed for move recording menu
+       {
+-        char *p=strrchr(recording->Name(),'~');
++        const char *p=strrchr(recording->Name(),'~');
+         asprintf(&dir,"%s%s%s~%s",base?base:"",base?"~":"",item->Text(),p?p+1:recording->Name());
+       }
+     }
+@@ -315,7 +315,7 @@
+     {
+       if(!dirname)
+       {
+-        char *p=strrchr(recording->Name(),'~');
++        const char *p=strrchr(recording->Name(),'~');
+         asprintf(&dir,"%s",p?++p:recording->Name());
+       }
+     }
+@@ -326,7 +326,7 @@
+       asprintf(&dir,"%s",base);
+     else
+     {
+-      char *p=strrchr(recording->Name(),'~');
++      const char *p=strrchr(recording->Name(),'~');
+       asprintf(&dir,"%s~%s",base,p?p:recording->Name());
+     }
+   }
diff --git a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild
index de6d49fd137f..348b5d5e20dc 100644
--- a/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild
+++ b/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild,v 1.4 2009/05/07 21:00:04 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild,v 1.5 2009/06/15 19:49:38 zzam Exp $
 
 inherit vdr-plugin eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	vdr-plugin_src_unpack
 
 	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
 
 	if grep -q fskProtection /usr/include/vdr/timers.h; then
 		sed -i "s:#WITHPINPLUGIN:WITHPINPLUGIN:" Makefile