Fixed compilation with --as-needed (bug 206817, patch by Arfrever Frehtes Taifersar Arahesis) and added missing include cstring (bug 228217, patch by Markus Peloquin)

(Portage version: 2.2_rc17/cvs/Linux 2.6.28-rc8 x86_64)

4 files changed, 40 insertions, 5 deletions

diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild
index f59f6589b9a2..24ba9e505040 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild,v 1.9 2006/10/22 00:18:33 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/3ddesktop-0.2.9.ebuild,v 1.10 2008/12/17 18:48:58 angelos Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="OpenGL virtual desktop switching"
 HOMEPAGE="http://desk3d.sourceforge.net/"
@@ -28,11 +28,17 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-asneeded.patch"
+	epatch "${FILESDIR}/${P}-missing-include.patch"
+
+	eautoreconf
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install || die
 	dodoc README AUTHORS TODO ChangeLog README.windowmanagers
 }
 
diff --git a/x11-misc/3ddesktop/ChangeLog b/x11-misc/3ddesktop/ChangeLog
index de7a08bf042f..ea5037915b51 100644
--- a/x11-misc/3ddesktop/ChangeLog
+++ b/x11-misc/3ddesktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/3ddesktop
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.38 2008/11/17 22:59:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/3ddesktop/ChangeLog,v 1.39 2008/12/17 18:48:58 angelos Exp $
+
+  17 Dec 2008; Christoph Mende <angelos@gentoo.org>
+  +files/3ddesktop-0.2.9-asneeded.patch,
+  +files/3ddesktop-0.2.9-missing-include.patch, 3ddesktop-0.2.9.ebuild:
+  Fixed compilation with --as-needed (bug 206817, patch by Arfrever Frehtes
+  Taifersar Arahesis) and added missing include cstring (bug 228217, patch
+  by Markus Peloquin)
 
   17 Nov 2008; Diego E. Pettenò <flameeyes@gentoo.org>
   files/3ddesktop-0.2.9-gcc4.patch:
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
new file mode 100644
index 000000000000..6e1ca15fd363
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-asneeded.patch
@@ -0,0 +1,11 @@
+--- Makefile.am
++++ Makefile.am
+@@ -37,7 +37,7 @@
+        camera.cpp \
+        config.cpp
+ 
+-3ddeskd_LDFLAGS = $(imlib2_libs) @GL_LIBS@ 
++3ddeskd_LDADD = $(imlib2_libs) @GL_LIBS@ 
+ 
+ noinst_HEADERS = 3ddesk.h \
+        arrange.hpp  \
diff --git a/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
new file mode 100644
index 000000000000..cc30fda093cc
--- /dev/null
+++ b/x11-misc/3ddesktop/files/3ddesktop-0.2.9-missing-include.patch
@@ -0,0 +1,11 @@
+diff -u -r a/config.hpp b/config.hpp
+--- a/config.hpp	2005-06-20 13:28:29.000000000 +0200
++++ b/config.hpp	2008-12-17 19:40:05.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <cstring>
+ 
+ #include <errno.h>
+ #include <unistd.h>