From 591bab0e7d9a59969621f8d1ba9e0bcb1b992ab2 Mon Sep 17 00:00:00 2001
From: Matthias Schwarzott <zzam@gentoo.org>
Date: Mon, 15 Jun 2009 19:49:38 +0000
Subject: Make it compile with glibc-2.10 and gcc-4.4, Bug #273854. (Portage
 version: 2.1.6.13/cvs/Linux i686)

---
 media-plugins/vdr-extrecmenu/ChangeLog             |  7 ++-
 .../files/vdr-extrecmenu-1.2_pre1-gcc44.patch      | 50 ++++++++++++++++++++++
 .../vdr-extrecmenu/vdr-extrecmenu-1.2_pre1.ebuild  |  3 +-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 media-plugins/vdr-extrecmenu/files/vdr-extrecmenu-1.2_pre1-gcc44.patch

(limited to 'media-plugins/vdr-extrecmenu')

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/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
-- 
cgit v1.2.3-65-gdbad