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
commitfe126c1acb4000bc6f5201405cb06a9d8ba185a5 (patch)
tree7496891f4ea24f388ccf2d9a897e9fa807125b3a /x11-misc/xhkeys
parentStable on amd64. Bug #335007. Remove old ebuild (diff)
downloadhistorical-fe126c1acb4000bc6f5201405cb06a9d8ba185a5.tar.gz
historical-fe126c1acb4000bc6f5201405cb06a9d8ba185a5.tar.bz2
historical-fe126c1acb4000bc6f5201405cb06a9d8ba185a5.zip
Fix build with linux-headers >= 2.6.23 wrt bug 337056. Thanks to Diego for the report.
Package-Manager: portage-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/Manifest5
-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
4 files changed, 32 insertions, 6 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/Manifest b/x11-misc/xhkeys/Manifest
index 8b3421561be5..c7dac1abea1a 100644
--- a/x11-misc/xhkeys/Manifest
+++ b/x11-misc/xhkeys/Manifest
@@ -1,5 +1,6 @@
AUX xhkeys 441 RMD160 9056e158e913acc51afef2ff3d7189fd2dfa2e0a SHA1 2196d39f8a9c1d10df836ed78cfddb07c584a8ad SHA256 e62e18ed90a4d2bc717127c33a2a2e0607be8d88b3236ef64ac497fc3cc802ec
+AUX xhkeys-2.2.1-linux_headers.patch 283 RMD160 838ce51f6109ab933914b319ec2576959951ceec SHA1 e6e1a69e9713f4d70e4dbe86516fbc6916926db6 SHA256 8b850999daad96491c6095c3d7fb6e04e9fc14a5d37a2618a24420926bb42afb
DIST xhkeys-2.2.1.tar.gz 146338 RMD160 39861a6a1e23e2783d66dcd357675059345a5e56 SHA1 1779001d797dd828dbc4ae1521b76c403e362c27 SHA256 4ddcdbb9687bdbfdd6c0f0974dfb463d939421ab3d3245368a18636b79fd6be9
-EBUILD xhkeys-2.2.1.ebuild 616 RMD160 7d07b02f47bd8377885f74f55c74c6216a9a625b SHA1 14c40d1a57535294b3d0ddfec0c32ea70fac6934 SHA256 aa1c61be89718c66effdc15c77236ce1ee0e231c9ca38cdd6fc56644cf657a70
-MISC ChangeLog 1872 RMD160 bb524608e67ee7196cde275379064a74cda43d23 SHA1 1fda48fa718163ff28e046e392a15f0ebba48102 SHA256 b3cd1f3e01000901e779b732b3667bac61f8568fa8c76906467a87207b09dacd
+EBUILD xhkeys-2.2.1.ebuild 722 RMD160 4dc4860417b8a2fe162fa08d621801c8e3b30735 SHA1 2d55d846afc7adac17ae63948186a89b00f34d90 SHA256 1af34f29dd7a5232f9e2d0eddae29d15c8d4908d0911c4e9f36fa9ea959ba6a0
+MISC ChangeLog 2083 RMD160 720bc14f3a59b3c8802c6d425434ed8ee9fb21c4 SHA1 aafa451309cc398e55bf5927dcb5c3c71ff4e1c1 SHA256 4e75f04d3d1faf6a428e591193ce18e6311c3645b9398034f9c88ebab23a819b
MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
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