summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sping@gentoo.org>2012-03-22 14:04:19 +0000
committerSebastian Pipping <sping@gentoo.org>2012-03-22 14:04:19 +0000
commit78918a8e7f52def7be2022319b75fa552293dd49 (patch)
tree403cd7a231b2f10a9a7bad078d7956d4be93f951 /app-misc/spacenavd
parentStable for amd64, wrt bug #408161 (diff)
downloadgentoo-2-78918a8e7f52def7be2022319b75fa552293dd49.tar.gz
gentoo-2-78918a8e7f52def7be2022319b75fa552293dd49.tar.bz2
gentoo-2-78918a8e7f52def7be2022319b75fa552293dd49.zip
app-misc/spacenavd:Fix compilation for USE=-X (bug #409143)
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'app-misc/spacenavd')
-rw-r--r--app-misc/spacenavd/ChangeLog7
-rw-r--r--app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch13
-rw-r--r--app-misc/spacenavd/spacenavd-0.5-r2.ebuild3
3 files changed, 21 insertions, 2 deletions
diff --git a/app-misc/spacenavd/ChangeLog b/app-misc/spacenavd/ChangeLog
index 184df7324c98..b31931c38a91 100644
--- a/app-misc/spacenavd/ChangeLog
+++ b/app-misc/spacenavd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-misc/spacenavd
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/ChangeLog,v 1.4 2012/02/20 01:29:22 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/ChangeLog,v 1.5 2012/03/22 14:04:19 sping Exp $
+
+ 22 Mar 2012; Sebastian Pipping <sping@gentoo.org> spacenavd-0.5-r2.ebuild,
+ +files/spacenavd-0.5-no-x11.patch:
+ Fix compilation for USE=-X (bug #409143) reported by Piotr Szymaniak, patch
+ by Anthoine Bourgeois
20 Feb 2012; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Drop no-herd.
diff --git a/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
new file mode 100644
index 000000000000..bbdd7d6196ec
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch
@@ -0,0 +1,13 @@
+diff -Npur spacenavd-0.5.old/src/event.c spacenavd-0.5/src/event.c
+--- src/event.c 2012-03-21 22:15:37.093401293 +0100
++++ src/event.c 2012-03-21 22:14:10.734401301 +0100
+@@ -20,7 +20,9 @@ along with this program. If not, see <h
+ #include <stdlib.h>
+ #include "event.h"
+ #include "client.h"
++#ifdef USE_X11
+ #include "proto_x11.h"
++#endif
+ #include "proto_unix.h"
+ #include "spnavd.h"
+
diff --git a/app-misc/spacenavd/spacenavd-0.5-r2.ebuild b/app-misc/spacenavd/spacenavd-0.5-r2.ebuild
index fceafdbbaff1..4b6c1cafbc17 100644
--- a/app-misc/spacenavd/spacenavd-0.5-r2.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.5-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r2.ebuild,v 1.2 2012/02/11 23:31:46 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/spacenavd/spacenavd-0.5-r2.ebuild,v 1.3 2012/03/22 14:04:19 sping Exp $
EAPI="4"
@@ -27,6 +27,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-destdir.patch
epatch "${FILESDIR}"/${P}-custom-flags.patch
+ epatch "${FILESDIR}"/${P}-no-x11.patch
}
src_configure() {