[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/

2020-11-22 Thread David Seifert 
commit: 6ebb9c8d9e3d5bd63cebcf51b58ababdbcebc48d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Nov 22 14:15:23 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Nov 22 14:15:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ebb9c8d

games-util/xqf: Call AM_PROG_AR

Closes: https://bugs.gentoo.org/756040
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/xqf/files/xqf-1.0.6.2-underlink.patch | 28 
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch 
b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index a40961eb25f..0e3ba3ed22e 100644
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,13 +1,13 @@
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -41,6 +41,7 @@
-   $(GEOIP_LIB) \
-   $(PACKAGE_LIBS) \
-   $(GDK_PIXBUF_LIBS) \
-+  -lX11 \
-   -lz -ldl
+--- a/configure.in
 b/configure.in
+@@ -23,6 +23,7 @@
+ AC_ISC_POSIX
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
  
- xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map
+ dnl Checks for header files.
+ AC_HEADER_STDC
 --- a/po/POTFILES.in
 +++ b/po/POTFILES.in
 @@ -21,6 +21,7 @@
@@ -18,3 +18,13 @@
  #src/server.c
  #src/skin.c
  #src/skin_pcx.c
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -41,6 +41,7 @@
+   $(GEOIP_LIB) \
+   $(PACKAGE_LIBS) \
+   $(GDK_PIXBUF_LIBS) \
++  -lX11 \
+   -lz -ldl
+ 
+ xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map

[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/, games-util/xqf/

2020-11-21 Thread David Seifert 
commit: 279a598fceda81830fd5a42feb7f53581dbabeca
Author: David Seifert  gentoo  org>
AuthorDate: Sat Nov 21 20:37:52 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Nov 21 20:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=279a598f

games-util/xqf: Port to EAPI 7

Closes: https://bugs.gentoo.org/633562
Closes: https://bugs.gentoo.org/708754
Closes: https://bugs.gentoo.org/739402
Closes: https://bugs.gentoo.org/741774
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: David Seifert  gentoo.org>

 games-util/xqf/files/xqf-1.0.6.2-fno-common.patch | 21 +++
 games-util/xqf/files/xqf-1.0.6.2-underlink.patch  | 14 --
 games-util/xqf/xqf-1.0.6.2.ebuild | 31 +--
 3 files changed, 50 insertions(+), 16 deletions(-)

diff --git a/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch 
b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
new file mode 100644
index 000..15147ac6d91
--- /dev/null
+++ b/games-util/xqf/files/xqf-1.0.6.2-fno-common.patch
@@ -0,0 +1,21 @@
+--- a/src/filter.c
 b/src/filter.c
+@@ -88,6 +88,8 @@
+ const char* filter_quick_get(void);
+ void filter_quick_unset (void);
+ 
++unsigned int current_server_filter;
++
+ /* /QUICK FILTER */
+ 
+ struct filter filters[FILTERS_TOTAL] = {
+--- a/src/filter.h
 b/src/filter.h
+@@ -89,7 +89,6 @@
+ 
+ extern GArray* server_filters;
+ 
+-unsigned int current_server_filter;
+ extern unsigned int current_server_filter;
+ 
+ 

diff --git a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch 
b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
index fe93c762467..a40961eb25f 100644
--- a/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
+++ b/games-util/xqf/files/xqf-1.0.6.2-underlink.patch
@@ -1,5 +1,5 @@
 xqf-xqf-1.0.6.2/src/Makefile.am
-+++ xqf-xqf-1.0.6.2/src/Makefile.am
+--- a/src/Makefile.am
 b/src/Makefile.am
 @@ -41,6 +41,7 @@
$(GEOIP_LIB) \
$(PACKAGE_LIBS) \
@@ -8,3 +8,13 @@
-lz -ldl
  
  xqf_LDFLAGS = -Wl,-rpath,$(pkglibdir) -Wl,--export-dynamic 
-Wl,--version-script=$(top_srcdir)/src/xqf.map
+--- a/po/POTFILES.in
 b/po/POTFILES.in
+@@ -21,6 +21,7 @@
+ #src/rc.c
+ src/rcon.c
+ src/redial.c
++src/scripts.c
+ #src/server.c
+ #src/skin.c
+ #src/skin_pcx.c

diff --git a/games-util/xqf/xqf-1.0.6.2.ebuild 
b/games-util/xqf/xqf-1.0.6.2.ebuild
index 5ea89476375..9c9510182f8 100644
--- a/games-util/xqf/xqf-1.0.6.2.ebuild
+++ b/games-util/xqf/xqf-1.0.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="A server browser for many FPS games (frontend for qstat)"
 HOMEPAGE="http://xqf.github.io/en/;
@@ -13,26 +14,28 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="bzip2 geoip nls"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+   x11-libs/gdk-pixbuf-xlib
+   x11-libs/gtk+:2
>=games-util/qstat-2.11
nls? ( virtual/libintl )
geoip? ( dev-libs/geoip )
bzip2? ( app-arch/bzip2 )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )"
 
-S=${WORKDIR}/${PN}-${P}
+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
+PATCHES=(
+   "${FILESDIR}"/${P}-underlink.patch
+   "${FILESDIR}"/${P}-zlib-1.2.5.1-compile-fix.patch
+   "${FILESDIR}"/${P}-fno-common.patch
+)
 
+src_prepare() {
+   default
mv configure.{in,ac} || die
eautoreconf
 }

[gentoo-commits] repo/gentoo:master commit in: games-util/xqf/files/, games-util/xqf/

2015-10-14 Thread Michael Sterrett 
commit: e91c25c4d7a40388fdf840fbd243c68e3b7cb777
Author: Michael Sterrett  gentoo  org>
AuthorDate: Wed Oct 14 06:35:55 2015 +
Commit: Michael Sterrett  gentoo  org>
CommitDate: Wed Oct 14 06:36:48 2015 +
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.0 +0200
-+++ xqf/src/launch.c   2009-10-13 11:59:35.0 +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.old2011-06-14 21:32:28.929746563 +0200
-+++ src/Makefile.in2011-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.old2011-06-14 21:32:28.929746563 +0200
-+++ src/Makefile.in2011-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 000..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 000..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? (