From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9FB6713888F for ; Wed, 14 Oct 2015 06:37:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7026E07C9; Wed, 14 Oct 2015 06:37:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 73CC0E07C9 for ; Wed, 14 Oct 2015 06:37:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 440A43408FB for ; Wed, 14 Oct 2015 06:37:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 247A7F8E for ; Wed, 14 Oct 2015 06:37:01 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1444804608.e91c25c4d7a40388fdf840fbd243c68e3b7cb777.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/, games-util/xqf/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/xqf/Manifest games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch games-util/xqf/files/xqf-1.0.5-underlink.patch games-util/xqf/files/xqf-1.0.6.2-underlink.patch games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch games-util/xqf/xqf-1.0.6.2.ebuild X-VCS-Directories: games-util/xqf/files/ games-util/xqf/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: e91c25c4d7a40388fdf840fbd243c68e3b7cb777 X-VCS-Branch: master Date: Wed, 14 Oct 2015 06:37:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4678b567-0cb8-41f5-85ca-d340b0e6a485 X-Archives-Hash: d1ebb2b5a340b1dd02a78c187f199f0c commit: e91c25c4d7a40388fdf840fbd243c68e3b7cb777 Author: Michael Sterrett gentoo org> AuthorDate: Wed Oct 14 06:35:55 2015 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Wed Oct 14 06:36:48 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e91c25c4 version bump (bug #563036) with ebuild submission by Lars Wendler Package-Manager: portage-2.2.20.1 games-util/xqf/Manifest | 1 + games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch | 5 +-- games-util/xqf/files/xqf-1.0.5-underlink.patch | 4 +- ...underlink.patch => xqf-1.0.6.2-underlink.patch} | 10 ++--- .../xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch | 11 +++++ games-util/xqf/xqf-1.0.6.2.ebuild | 47 ++++++++++++++++++++++ 6 files changed, 68 insertions(+), 10 deletions(-) diff --git a/games-util/xqf/Manifest b/games-util/xqf/Manifest index 53ccf87..6161228 100644 --- a/games-util/xqf/Manifest +++ b/games-util/xqf/Manifest @@ -1 +1,2 @@ DIST xqf-1.0.5.tar.gz 742183 SHA256 ee0ab9a40516c55d9f00e65ab06b1c6669f0de858bc8a7416e6993a76c0d9b67 SHA512 2e571ed43da9ff440b6b13473ac618d2d87634a9571f892a11a7269e39518f74bf54e39e1508f734cb06e336f99cc2d3b9427666c93ff1ad8ec2b37ae6363035 WHIRLPOOL d65f896cfdbf28b4f1647dfe2ec54c68f356fa3d5e393e17b2c50145a0738fc3ff96a36481eb86b7dad96983ea66f311215a0812bdf72940a27bc0f0ff9d6cc4 +DIST xqf-1.0.6.2.tar.gz 595096 SHA256 bcfb87c9a452993b13bd1019b0c61459a37cbc37b13b951b73f2a93b2b1c83ad SHA512 8706104dde0f93a89f9f69a4b8f40f5c4c8160a3bb7a99f7572448c0110a595503e430fdba741c50b22f7e92a08f1cf6abee06aaa23956e4e37b7bf894a66a9c WHIRLPOOL f4c8e7d0122359aeb615249995eb979502024b18b083a984ad04d85c9f9c00a849899a39440939556d17536201319ea36c318a5493c8f5bfd7b9e26d68c9a3d4 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 index 567d82a..8797eee 100644 --- a/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch +++ b/games-util/xqf/files/xqf-1.0.5-cpu-overrun.patch @@ -1,6 +1,5 @@ -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 +--- xqf.orig/src/launch.c ++++ xqf/src/launch.c @@ -168,13 +168,17 @@ res = read (fd, cl->buffer + cl->pos, CLIENT_ERROR_BUFFER - 1 - cl->pos); diff --git a/games-util/xqf/files/xqf-1.0.5-underlink.patch b/games-util/xqf/files/xqf-1.0.5-underlink.patch index 523204c..0948b82 100644 --- a/games-util/xqf/files/xqf-1.0.5-underlink.patch +++ b/games-util/xqf/files/xqf-1.0.5-underlink.patch @@ -1,5 +1,5 @@ ---- src/Makefile.in.old 2011-06-14 21:32:28.929746563 +0200 -+++ src/Makefile.in 2011-06-14 21:32:46.567818865 +0200 +--- src/Makefile.in.old ++++ src/Makefile.in @@ -311,6 +311,7 @@ $(GEOIP_LIB) \ $(PACKAGE_LIBS) \ diff --git a/games-util/xqf/files/xqf-1.0.5-underlink.patch b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch similarity index 52% copy from games-util/xqf/files/xqf-1.0.5-underlink.patch copy to games-util/xqf/files/xqf-1.0.6.2-underlink.patch index 523204c..fe93c76 100644 --- a/games-util/xqf/files/xqf-1.0.5-underlink.patch +++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch @@ -1,10 +1,10 @@ ---- src/Makefile.in.old 2011-06-14 21:32:28.929746563 +0200 -+++ src/Makefile.in 2011-06-14 21:32:46.567818865 +0200 -@@ -311,6 +311,7 @@ +--- xqf-xqf-1.0.6.2/src/Makefile.am ++++ xqf-xqf-1.0.6.2/src/Makefile.am +@@ -41,6 +41,7 @@ $(GEOIP_LIB) \ $(PACKAGE_LIBS) \ $(GDK_PIXBUF_LIBS) \ -+ -lX11 -ldl \ - -lz ++ -lX11 \ + -lz -ldl xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic -Wl,--version-script=$(top_srcdir)/src/xqf.map diff --git a/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch new file mode 100644 index 0000000..9bd433b --- /dev/null +++ b/games-util/xqf/files/xqf-1.0.6.2-zlib-1.2.5.1-compile-fix.patch @@ -0,0 +1,11 @@ +--- xqf-1.0.5/src/zip/ioapi.h ++++ xqf-1.0.5/src/zip/ioapi.h +@@ -6,6 +6,8 @@ + Copyright (C) 1998-2003 Gilles Vollant + */ + ++#define OF(x) x ++ + #ifndef _ZLIBIOAPI_H + #define _ZLIBIOAPI_H + diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild b/games-util/xqf/xqf-1.0.6.2.ebuild new file mode 100644 index 0000000..7982b0a --- /dev/null +++ b/games-util/xqf/xqf-1.0.6.2.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit autotools eutils + +DESCRIPTION="A server browser for many FPS games (frontend for qstat)" +HOMEPAGE="http://xqf.github.io/en/" +SRC_URI="https://github.com/XQF/xqf/archive/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ppc ~x86" +IUSE="bzip2 geoip nls" + +RDEPEND="x11-libs/gtk+:2 + >=games-util/qstat-2.11 + nls? ( virtual/libintl ) + geoip? ( dev-libs/geoip ) + bzip2? ( app-arch/bzip2 )" +DEPEND="${RDEPEND} + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +S=${WORKDIR}/${PN}-${P} + +# bug #288853 +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-underlink.patch \ + "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch + sed -i \ + -e '/Icon/s/.png//' \ + xqf.desktop.in || die + + + mv configure.{in,ac} || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable nls) \ + $(use_enable geoip) \ + $(use_enable bzip2) +}