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
commitf4017b22b4aaa3450c148678eb2b7fae8b6febce (patch)
tree7caea86e5848963a5763c6edca7a60f14be4c38b /app-misc
parentStable for amd64, wrt bug #408161 (diff)
downloadhistorical-f4017b22b4aaa3450c148678eb2b7fae8b6febce.tar.gz
historical-f4017b22b4aaa3450c148678eb2b7fae8b6febce.tar.bz2
historical-f4017b22b4aaa3450c148678eb2b7fae8b6febce.zip
app-misc/spacenavd:Fix compilation for USE=-X (bug #409143)
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/spacenavd/ChangeLog7
-rw-r--r--app-misc/spacenavd/Manifest15
-rw-r--r--app-misc/spacenavd/files/spacenavd-0.5-no-x11.patch13
-rw-r--r--app-misc/spacenavd/spacenavd-0.5-r2.ebuild3
4 files changed, 29 insertions, 9 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/Manifest b/app-misc/spacenavd/Manifest
index 0fd8de1d190a..b928c8e7e8cf 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX 99-space-navigator.rules 442 RMD160 549c74ba04736c33ed0f39a6782a49eca44f316d SHA1 91f67b9c885f6675464ab964b9dd8bcdade26ad6 SHA256 648add933b7775f02d8a54d9070a7505098d41b8e5b605bb56b11419cddb099b
AUX spacenavd-0.5-custom-flags.patch 2008 RMD160 c665becac1ff1b31eec94fe3ef70b98f851a2488 SHA1 79909d72d9da7ff0af369685869bb6709edadc90 SHA256 78c8aebbd33f0c135501e6dea132c4f6edd9068bfddf741bfc8fe11d5269f546
AUX spacenavd-0.5-destdir.patch 649 RMD160 3ffb705f3a0a2a940e4e4a9c3d34c3ede6c95f33 SHA1 8a946d85a1d8d454579e635c2248bc17dc1a399d SHA256 df58f5006d3b1be15a40182ca91ea964d62572a6e0a47b05c037958674db5366
+AUX spacenavd-0.5-no-x11.patch 388 RMD160 15c97e8622b6893e6d2492bdfd655b638fbfe403 SHA1 812c5502ae16f9fa5e4da21a466a3c1dc4f05cce SHA256 1c4a16f41176da31e61cb4a0984d4d3b158d334e598325c2eda9e8f6ab6ef933
AUX spnavd 579 RMD160 13e324d36ffb8900eb672492b7d8e10ae6a6c718 SHA1 dbef423d85a95f9fc329cfa379256a7331bdd7ac SHA256 2ad811c9c2de7ffa054e22a3d1a8c597b0a1cdc9fda719a7cc94a4fd8ca7ad42
DIST spacenavd-0.5.tar.gz 41746 RMD160 7b455d4cd96074707e671103e45cd0a5423cafc3 SHA1 76438d6fce981337b272210311124fe711606235 SHA256 0eecc5b5ad47ee6376d1521f2bc7c8f8fc02904cf3fede3f77e59f4795b592e3
-EBUILD spacenavd-0.5-r2.ebuild 2223 RMD160 4250465c79cb5afc5216329386c591950242dd3a SHA1 e0fd7c06b81eb295925f0db4b2ae7d1b8a840760 SHA256 df2527b7376c7a5d4d1024198b40ced2395798f14a95097a9dd972c0bbec75cb
-MISC ChangeLog 951 RMD160 b0198dadacaf1037f5ceac73540a0250cd4b4c54 SHA1 02994641e840f33f98496d2ddcf11435ff4ca75a SHA256 4d7c4a59c5ca3db012312eea4d6122420ab455d589d0b09a2836da49200f1f8e
+EBUILD spacenavd-0.5-r2.ebuild 2263 RMD160 091ae581aedccc14ace9c43efff41379bf5a6c6b SHA1 4b0bb1b3184fb6ae8205a3537c406b6741b4111a SHA256 b1aea8541e05dd1500c56fea4c5fe014e9d7d09367bfeaa701a4b945c01f4f5b
+MISC ChangeLog 1166 RMD160 0d8416403d69568179144f9e170e04fb6da05415 SHA1 8847aee0d32dabcd93303277cb91dc079fa07eee SHA256 8405d8c6ff1f1218bc845c3d0d75c174d6caa966b35f73712aad03e44d7ea324
MISC metadata.xml 821 RMD160 951f738e0caf95917df60ef10204c46d3a1a17da SHA1 9471ed43b7d6133a77c866bf63a4e9c26795c75f SHA256 5f91f3fad50f9442505f53a8ffa638f6a76622010405214d3071db8360863ba1
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iF4EAREIAAYFAk9BofgACgkQC77qH+pIQ6RMUwEAynrGymbu9OnxOyZk3YI2sEbL
-hkEhtq1nveALH62aRfMA/2fv1e1TBK9HmYNf4zJZzonREzsrI6/DD2ro/oss6vq0
-=gy2E
+iEYEARECAAYFAk9rMUoACgkQsAvGakAaFgBj8gCfW2wpfEu7BpoAn06rSgrCU9/B
+HK8AoJJuYY1+SsHe9WoS6s7lHQXv7E/S
+=t01m
-----END PGP SIGNATURE-----
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() {