summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2010-09-13 11:20:46 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2010-09-13 11:20:46 +0000
commit1618be84afe03da5ba8390d0e7132d89e244803a (patch)
tree8660f21eb476dd7183e89babf64fb4e803c6da30 /x11-misc/xhkeys
parentStable on amd64. Bug #335007. Remove old ebuild (diff)
downloadgentoo-2-1618be84afe03da5ba8390d0e7132d89e244803a.tar.gz
gentoo-2-1618be84afe03da5ba8390d0e7132d89e244803a.tar.bz2
gentoo-2-1618be84afe03da5ba8390d0e7132d89e244803a.zip
Fix build with linux-headers >= 2.6.23 wrt bug 337056. Thanks to Diego for the report.
(Portage version: 2.2_rc77/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/xhkeys')
-rw-r--r--x11-misc/xhkeys/ChangeLog9
-rw-r--r--x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch12
-rw-r--r--x11-misc/xhkeys/xhkeys-2.2.1.ebuild12
3 files changed, 29 insertions, 4 deletions
diff --git a/x11-misc/xhkeys/ChangeLog b/x11-misc/xhkeys/ChangeLog
index 8128b297a358..6b32e36538c0 100644
--- a/x11-misc/xhkeys/ChangeLog
+++ b/x11-misc/xhkeys/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/xhkeys
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/ChangeLog,v 1.14 2009/12/15 17:47:29 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/ChangeLog,v 1.15 2010/09/13 11:20:46 xarthisius Exp $
+
+ 13 Sep 2010; Kacper Kowalik <xarthisius@gentoo.org> xhkeys-2.2.1.ebuild,
+ +files/xhkeys-2.2.1-linux_headers.patch:
+ Fix build with linux-headers >= 2.6.23 wrt bug 337056. Thanks to Diego for
+ the report.
15 Dec 2009; Samuli Suominen <ssuominen@gentoo.org> xhkeys-2.2.1.ebuild:
Fix HOMEPAGE and SRC_URI wrt #297028.
diff --git a/x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch b/x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch
new file mode 100644
index 000000000000..a0cf8ea8eaec
--- /dev/null
+++ b/x11-misc/xhkeys/files/xhkeys-2.2.1-linux_headers.patch
@@ -0,0 +1,12 @@
+Fix compilation for >=linux-headers-2.6.23
+
+--- xhkeys-2.2.1/xhkeys_cdaudio.c
++++ xhkeys-2.2.1/xhkeys_cdaudio.c
+@@ -16,6 +16,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <ctype.h>
++#include <limits.h>
+ #include <linux/cdrom.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
diff --git a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
index 12db78e03a84..059af0954cd3 100644
--- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
+++ b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/xhkeys-2.2.1.ebuild,v 1.6 2009/12/15 17:47:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xhkeys/xhkeys-2.2.1.ebuild,v 1.7 2010/09/13 11:20:46 xarthisius Exp $
+
+inherit eutils
DESCRIPTION="assign particular actions to any key or key combination"
HOMEPAGE="http://wmalms.tripod.com/#XHKEYS"
@@ -18,6 +20,12 @@ DEPEND="${RDEPEND}
x11-proto/xextproto
x11-proto/xproto"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-linux_headers.patch
+}
+
src_install() {
dobin xhkeys xhkconf || die
dodoc README VERSION