add patch to build with -DNDEBUG from Guenther Brunthaler (bug #154513)

(Portage version: 2.1.3.16)

5 files changed, 55 insertions, 5 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 2f7d3763a7c2..5565589b9ae3 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.39 2007/07/22 09:50:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.40 2007/10/29 22:07:43 mr_bones_ Exp $
+
+  29 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/clanlib-0.7.8-ndebug.patch, +files/clanlib-0.8.0-ndebug.patch,
+  clanlib-0.7.8-r2.ebuild, clanlib-0.8.0.ebuild:
+  add patch to build with -DNDEBUG from Guenther Brunthaler (bug #154513)
 
   22 Jul 2007; Hans de Graaff <graaff@gentoo.org> clanlib-0.6.5-r4.ebuild,
   clanlib-0.7.8-r2.ebuild:
diff --git a/dev-games/clanlib/clanlib-0.7.8-r2.ebuild b/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
index 6164527e51e5..8deca1764bfe 100644
--- a/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.8-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r2.ebuild,v 1.3 2007/07/22 09:50:49 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.8-r2.ebuild,v 1.4 2007/10/29 22:07:43 mr_bones_ Exp $
 
 inherit flag-o-matic eutils
 
@@ -40,7 +40,8 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PV}-port.patch \
 		"${FILESDIR}"/${PV}-install-opengl-wrap.patch \
 		"${FILESDIR}"/${P}-gcc41.patch \
-		"${FILESDIR}"/${P}-refreshfix.patch
+		"${FILESDIR}"/${P}-refreshfix.patch \
+		"${FILESDIR}"/${P}-ndebug.patch
 
 	if ! use doc ; then
 		sed -i \
diff --git a/dev-games/clanlib/clanlib-0.8.0.ebuild b/dev-games/clanlib/clanlib-0.8.0.ebuild
index bf44b3ac2c40..0308dc600247 100644
--- a/dev-games/clanlib/clanlib-0.8.0.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.0.ebuild,v 1.3 2007/07/10 03:23:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.0.ebuild,v 1.4 2007/10/29 22:07:43 mr_bones_ Exp $
 
 inherit flag-o-matic eutils
 
@@ -36,7 +36,9 @@ S=${WORKDIR}/ClanLib-${PV}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc42.patch
+	epatch \
+		"${FILESDIR}"/${P}-gcc42.patch \
+		"${FILESDIR}"/${P}-ndebug.patch
 }
 
 src_compile() {
diff --git a/dev-games/clanlib/files/clanlib-0.7.8-ndebug.patch b/dev-games/clanlib/files/clanlib-0.7.8-ndebug.patch
new file mode 100644
index 000000000000..e41bae1a3296
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.7.8-ndebug.patch
@@ -0,0 +1,21 @@
+Patch for clanlib-0.7.8-r2 Bug 154513:
+
+Signal handler deinit() was not declared.
+
+This leads to a compilation failure when a release version
+rather than a debug version is built (-DNDEBUG).
+
+This patch adds the missing declaration, thus make the
+file compile with or without -DNDEBUG.
+
+diff -Naur clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp
+--- clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2003-09-19 10:33:02.000000000 +0000
++++ clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2007-10-26 13:36:39.000000000 +0000
+@@ -52,6 +52,7 @@
+ 	_begin_time = (long) tv.tv_sec*(long) 1000+(long) tv.tv_usec/(long) 1000;
+ 
+ 	#ifdef NDEBUG
++	sighandler_t deinit;
+ 	signal(SIGSEGV, deinit);
+ 	#endif
+ }
diff --git a/dev-games/clanlib/files/clanlib-0.8.0-ndebug.patch b/dev-games/clanlib/files/clanlib-0.8.0-ndebug.patch
new file mode 100644
index 000000000000..e41bae1a3296
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.0-ndebug.patch
@@ -0,0 +1,21 @@
+Patch for clanlib-0.7.8-r2 Bug 154513:
+
+Signal handler deinit() was not declared.
+
+This leads to a compilation failure when a release version
+rather than a debug version is built (-DNDEBUG).
+
+This patch adds the missing declaration, thus make the
+file compile with or without -DNDEBUG.
+
+diff -Naur clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp
+--- clanlib-0.7.8-r2.orig/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2003-09-19 10:33:02.000000000 +0000
++++ clanlib-0.7.8-r2/work/ClanLib-0.7.8/Sources/Core/System/Unix/init_linux.cpp	2007-10-26 13:36:39.000000000 +0000
+@@ -52,6 +52,7 @@
+ 	_begin_time = (long) tv.tv_sec*(long) 1000+(long) tv.tv_usec/(long) 1000;
+ 
+ 	#ifdef NDEBUG
++	sighandler_t deinit;
+ 	signal(SIGSEGV, deinit);
+ 	#endif
+ }