summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2009-10-21 20:19:08 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2009-10-21 20:19:08 +0000
commit1accf1e4ecd080fbd9b3b2962aae6568297cc607 (patch)
treebe157a2903d6cd327ec25bdc9f08e3b29e991306 /games-util
parentFix playing of sound. Install sound files under SITEETC. (diff)
downloadgentoo-2-1accf1e4ecd080fbd9b3b2962aae6568297cc607.tar.gz
gentoo-2-1accf1e4ecd080fbd9b3b2962aae6568297cc607.tar.bz2
gentoo-2-1accf1e4ecd080fbd9b3b2962aae6568297cc607.zip
Add patch to avoid cpu burn - submitted by Yannick Martin via bug #288853
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'games-util')
-rw-r--r--games-util/xqf/ChangeLog8
-rw-r--r--games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch22
-rw-r--r--games-util/xqf/xqf-1.0.5.ebuild8
3 files changed, 35 insertions, 3 deletions
diff --git a/games-util/xqf/ChangeLog b/games-util/xqf/ChangeLog
index da998c6cccf2..5a08b058908d 100644
--- a/games-util/xqf/ChangeLog
+++ b/games-util/xqf/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/xqf
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.27 2009/07/26 22:04:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.28 2009/10/21 20:19:08 mr_bones_ Exp $
+
+ 21 Oct 2009; Michael Sterrett <mr_bones_@gentoo.org> xqf-1.0.5.ebuild,
+ +files/xqf-1.0.5-cpu-overrun.patch:
+ Add patch to avoid cpu burn - submitted by Yannick Martin via bug #288853
26 Jul 2009; Michael Sterrett <mr_bones_@gentoo.org> xqf-1.0.5.ebuild:
EAPI=2
@@ -139,7 +143,7 @@
fix sourceforge mirroring.
13 April 2002; Bart Verwilst <verwilst@gentoo.org>: just added a
- description, and cleaned up the $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.27 2009/07/26 22:04:36 mr_bones_ Exp $
+ description, and cleaned up the $Header: /var/cvsroot/gentoo-x86/games-util/xqf/ChangeLog,v 1.28 2009/10/21 20:19:08 mr_bones_ Exp $
*xqf-0.9.8 (6 Apr 2002)
diff --git a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
new file mode 100644
index 000000000000..567d82a6a6c2
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch
@@ -0,0 +1,22 @@
+diff -aburN xqf.orig/src/launch.c xqf/src/launch.c
+--- xqf.orig/src/launch.c 2009-10-13 11:58:24.000000000 +0200
++++ xqf/src/launch.c 2009-10-13 11:59:35.000000000 +0200
+@@ -168,13 +168,17 @@
+
+ res = read (fd, cl->buffer + cl->pos, CLIENT_ERROR_BUFFER - 1 - cl->pos);
+
+- if (res <= 0) { /* read error or EOF */
++ if (res < 0) { /* read error or EOF */
+ if (errno == EAGAIN || errno == EWOULDBLOCK)
+ return;
+
+ client_detach (cl);
+ return;
+ }
++ else if (res == 0) {
++ client_detach (cl);
++ return;
++ }
+
+ if (cl->pos + res == CLIENT_ERROR_BUFFER - 1) {
+ tmp = &cl->buffer[CLIENT_ERROR_BUFFER - 1];
diff --git a/games-util/xqf/xqf-1.0.5.ebuild b/games-util/xqf/xqf-1.0.5.ebuild
index 3c709fa4f6e6..f269dfe19925 100644
--- a/games-util/xqf/xqf-1.0.5.ebuild
+++ b/games-util/xqf/xqf-1.0.5.ebuild
@@ -1,8 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/xqf-1.0.5.ebuild,v 1.4 2009/07/26 22:04:36 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/xqf/xqf-1.0.5.ebuild,v 1.5 2009/10/21 20:19:08 mr_bones_ Exp $
EAPI=2
+inherit eutils
+
DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
HOMEPAGE="http://www.linuxgames.com/xqf/"
SRC_URI="mirror://sourceforge/xqf/${P}.tar.gz"
@@ -21,6 +23,10 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
nls? ( sys-devel/gettext )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-cpu-overrun.patch # bug #288853
+}
+
src_configure() {
econf \
$(use_enable nls) \