summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <drac@gentoo.org>2008-04-22 17:09:31 +0000
committerSamuli Suominen <drac@gentoo.org>2008-04-22 17:09:31 +0000
commit9afdc1aefbbaa956b02f143cfbab1a2c032a66b6 (patch)
tree71ab7674ba318030ff604bfd2edf7053355b5a21 /x11-misc/lineak-xosdplugin
parentFix building with GCC 4.3, thanks to Peter Alfredsen wrt #218790. (diff)
downloadgentoo-2-9afdc1aefbbaa956b02f143cfbab1a2c032a66b6.tar.gz
gentoo-2-9afdc1aefbbaa956b02f143cfbab1a2c032a66b6.tar.bz2
gentoo-2-9afdc1aefbbaa956b02f143cfbab1a2c032a66b6.zip
Fix building with GCC 4.3, thanks to Peter Alfredsen wrt #218792.
(Portage version: 2.1.5_rc6)
Diffstat (limited to 'x11-misc/lineak-xosdplugin')
-rw-r--r--x11-misc/lineak-xosdplugin/ChangeLog9
-rw-r--r--x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch14
-rw-r--r--x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild17
3 files changed, 32 insertions, 8 deletions
diff --git a/x11-misc/lineak-xosdplugin/ChangeLog b/x11-misc/lineak-xosdplugin/ChangeLog
index 2ff73bdc13b7..cdc50104c2d4 100644
--- a/x11-misc/lineak-xosdplugin/ChangeLog
+++ b/x11-misc/lineak-xosdplugin/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/lineak-xosdplugin
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/ChangeLog,v 1.25 2007/07/28 16:20:43 angelos Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/ChangeLog,v 1.26 2008/04/22 17:09:31 drac Exp $
+
+ 22 Apr 2008; Samuli Suominen <drac@gentoo.org>
+ +files/lineak-xosdplugin-0.9.0-gcc43.patch,
+ lineak-xosdplugin-0.9.0.ebuild:
+ Fix building with GCC 4.3, thanks to Peter Alfredsen wrt #218792.
28 Jul 2007; Christoph Mende <angelos@gentoo.org>
lineak-xosdplugin-0.9.0.ebuild:
diff --git a/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
new file mode 100644
index 000000000000..ed3f4017fb57
--- /dev/null
+++ b/x11-misc/lineak-xosdplugin/files/lineak-xosdplugin-0.9.0-gcc43.patch
@@ -0,0 +1,14 @@
+diff -urNad lineak-xosdplugin-0.9~/xosd_plugin/xosdctrl.cpp lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp
+--- lineak-xosdplugin-0.9~/xosd_plugin/xosdctrl.cpp 2006-02-08 18:32:13.000000000 +0000
++++ lineak-xosdplugin-0.9/xosd_plugin/xosdctrl.cpp 2008-03-17 04:35:12.000000000 +0000
+@@ -21,6 +21,8 @@
+ #include <lineak/lconfig.h>
+ #include <lineak/lineak_core_functions.h>
+
++#include <cstdlib>
++#include <cstring>
+
+ using namespace lineak_core_functions;
+ using namespace std;
+
+
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild
index a8927621cc6d..6b9dcb0e75fe 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 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/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild,v 1.4 2007/07/28 16:20:43 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0.ebuild,v 1.5 2008/04/22 17:09:31 drac Exp $
-inherit multilib
+inherit eutils multilib
MY_P=${P/.0/}
@@ -15,11 +15,16 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="debug"
-RDEPEND="=x11-misc/lineakd-${PV}*
+DEPEND="=x11-misc/lineakd-${PV}*
x11-libs/xosd"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}"/${MY_P}
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gcc43.patch
+}
src_compile() {
econf $(use_enable debug) --with-x