gcc-4.7 compile fixed, bug 423623

(Portage version: 2.1.10.11/cvs/Linux i686)

5 files changed, 31 insertions, 37 deletions

diff --git a/media-video/noad/ChangeLog b/media-video/noad/ChangeLog
index d62abd060059..de2a2706e4f9 100644
--- a/media-video/noad/ChangeLog
+++ b/media-video/noad/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/noad
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.51 2012/05/16 09:33:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/ChangeLog,v 1.52 2012/06/27 18:34:25 hd_brummy Exp $
+
+  27 Jun 2012; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -files/patches-0.7.x/noad-0.7.2-cflags.patch,
+  -files/patches-0.7.x/noad-0.7.2-hangcheck.diff,
+  +files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff, noad-0.7.3.ebuild:
+  gcc-4.7 compile fixed, bug 423623
 
   16 May 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -files/0.6.0-r7/confd_vdraddon.noad, -noad-0.6.0-r9.ebuild,
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch b/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch
deleted file mode 100644
index 5e67e6814542..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.2-cflags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: noad-0.7.2/configure.ac
-===================================================================
---- noad-0.7.2.orig/configure.ac
-+++ noad-0.7.2/configure.ac
-@@ -267,7 +267,6 @@ AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([gettimeofday localtime_r memmove memset mkdir select socket strchr strdup strerror strrchr strstr])
- AC_CHECK_FUNCS([strsignal])
- #CXXFLAGS='-g -O3 -pg'
--CXXFLAGS='-g -O3'
- 
- dnl ---------------------------------------------------------------------------
- dnl check for a usable avcodec.h 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff
deleted file mode 100644
index 37788a197fd7..000000000000
--- a/media-video/noad/files/patches-0.7.x/noad-0.7.2-hangcheck.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru noad-0.6.0-orig/main.cpp noad-0.6.0/main.cpp
---- noad-0.6.0-orig/main.cpp	2007-05-12 17:28:01.000000000 +0200
-+++ noad-0.6.0/main.cpp	2007-05-12 18:20:30.000000000 +0200
-@@ -566,10 +566,17 @@
-     signal(SIGABRT, signal_handler);
-     signal(SIGSEGV, signal_handler);
-     signal(SIGUSR1, signal_handler);
-+    signal(SIGALRM, signal_handler);
-     
-     // do cleanup at exit...
-     atexit(cleanUp);
-     
-+   
-+    if (!bOnline) {
-+       // now start alarm timer to kill hanging noad (hardcoded 30min timeout)
-+       alarm(30*60);
-+    }
-+    
-     // now do the work..,
-     doNoad(bBefore, recDir);
- 
diff --git a/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
new file mode 100644
index 000000000000..ca37f8e22a87
--- /dev/null
+++ b/media-video/noad/files/patches-0.7.x/noad-0.7.3_gcc-4.7.diff
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/show_bug.cgi?id=423623
+compilefix gcc-4.7.x
+
+signed-of-by: Joerg Bornkessel <hd_brummy@gentoo.org> (2012/06/27)
+
+diff -Naur noad-0.7.3.orig/vdr_cl.h noad-0.7.3/vdr_cl.h
+--- noad-0.7.3.orig/vdr_cl.h	2012-06-27 20:27:57.000000000 +0200
++++ noad-0.7.3/vdr_cl.h	2012-06-27 20:30:56.000000000 +0200
+@@ -287,7 +287,7 @@
+ 				{
+ 					T *l = new T;
+                if (l->Parse(s))
+-						Add(l);
++						this->Add(l);
+                else 
+ 					{
+ 						esyslog("ERROR: error in %s, line %d", fileName, line);
diff --git a/media-video/noad/noad-0.7.3.ebuild b/media-video/noad/noad-0.7.3.ebuild
index 745b2dbe9b9c..bd2e8f119959 100644
--- a/media-video/noad/noad-0.7.3.ebuild
+++ b/media-video/noad/noad-0.7.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.2 2012/05/16 09:33:49 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.3.ebuild,v 1.3 2012/06/27 18:34:25 hd_brummy Exp $
 
-EAPI="3"
+EAPI="4"
 
 inherit eutils flag-o-matic autotools
 
@@ -24,13 +24,17 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 
 	epatch "${FILESDIR}"/patches-0.7.x/"${P}"-hangcheck.diff
-	eautoreconf
+
 	# UINT64_C is needed by ffmpeg headers
 	append-flags -D__STDC_CONSTANT_MACROS
 
 	if has_version ">=media-video/vdr-1.7.15"; then
 		sed -e "s:2001:6419:" -i svdrpc.cpp
 	fi
+
+	epatch "${FILESDIR}/patches-0.7.x/${P}_gcc-4.7.diff"
+
+	eautoreconf
 }
 
 src_configure() {