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
commitc56b3f0fe698a6dc5d5a1922f684f4a26feb52e8 (patch)
treebb14e12b166b2c260dbabef9133f8380baf7aaba /games-util/xqf
parentFix playing of sound. Install sound files under SITEETC. (diff)
downloadhistorical-c56b3f0fe698a6dc5d5a1922f684f4a26feb52e8.tar.gz
historical-c56b3f0fe698a6dc5d5a1922f684f4a26feb52e8.tar.bz2
historical-c56b3f0fe698a6dc5d5a1922f684f4a26feb52e8.zip
Add patch to avoid cpu burn - submitted by Yannick Martin via bug #288853
Package-Manager: portage-2.1.6.13/cvs/Linux i686
Diffstat (limited to 'games-util/xqf')
-rw-r--r--games-util/xqf/ChangeLog8
-rw-r--r--games-util/xqf/Manifest5
-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
4 files changed, 38 insertions, 5 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/Manifest b/games-util/xqf/Manifest
index 58cab3179b2c..9e5fccfc1c00 100644
--- a/games-util/xqf/Manifest
+++ b/games-util/xqf/Manifest
@@ -1,7 +1,8 @@
AUX gtk2.patch 648 RMD160 ab9f3f1604602ca94d893ec791ffc442ef4fdc92 SHA1 8dd312a5ec06281835958b3e41c958a69c057a8b SHA256 c5b4b771e13f619b9f88ca9e843b06491395bb3e08aa7f4e85a1fc5b8e37c625
+AUX xqf-1.0.5-cpu-overrun.patch 637 RMD160 79527fbce64fd5744e2ef23f796e6a42147b662b SHA1 e98ce041c29e0a11f7da52b4dd70ee054e685962 SHA256 e0f86eba813ce6314d55d1d68f58e2f5290629790df1cbbc704f11f636413412
DIST xqf-1.0.4.tar.gz 720455 RMD160 cf2fb2e7003faa05f4e5d55571e40a6c2e6e2242 SHA1 5bdce8f7a23192d5319b9e7e31d8255e42cc3183 SHA256 16f6ac5aeb25e02c34f94162a7dbbbb916e1d55a5a949d27664508ab90127756
DIST xqf-1.0.5.tar.gz 742183 RMD160 159b9cd02a15fe3b1afd78952152adf5aaafc0c2 SHA1 052351ff26cf2f79f6bc2de5aacf63e76a02eb62 SHA256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67
EBUILD xqf-1.0.4-r1.ebuild 1255 RMD160 a11af617430af5c0ce76785b6d87b61add40f2e5 SHA1 54f6b9236d7cba1d70f0dec87d8583e1763977d4 SHA256 fc6615192478ff6d5d32a733bcf7ff9fd3b67f86590e146cd9bcd3579105798a
-EBUILD xqf-1.0.5.ebuild 909 RMD160 1c6093220b91a8f089cbc299dea1553a282eb58c SHA1 8cd4dae80a43c7b5b0f2edc91fce5e7a15674192 SHA256 5bb457fcca30c5a8f83f7498afefffe33029975822d30573c8dd350461a74aef
-MISC ChangeLog 4638 RMD160 1f5d72ef4a40ac449475e38cf697f88cd2ae699b SHA1 991a34f35451cc071d36fb120f47cf41bfc88692 SHA256 49c5d18f6d6ca4f08a66c8b49ca8c38d75ff14b353f52d559cf290161f67270d
+EBUILD xqf-1.0.5.ebuild 1003 RMD160 bb36117a9b10e2ca7fe07202f6f545fb44245145 SHA1 56111c1559d3c172fa550b9f688ada9d7ccd027d SHA256 ada19f840ebde188adb83148ca8bb4a0b11c5a9e1dc7d01b11f464e85321b0e4
+MISC ChangeLog 4826 RMD160 e9e9381cd97a63bb460316741ed22c50d66ba3a7 SHA1 fd6ca47357d28f49906ef621e1c59ab6fa379986 SHA256 4c2d2b121356f4aa0e286b305e99a6c2a6edf8370a997b1573325eee3daf1175
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
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) \