Re: [PR PATCH] [Updated] warzone2100: unmark nocross

Re: [PR PATCH] [Updated] warzone2100: unmark nocross

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There is an updated pull request by ndowens against master on the void-packages repository

https://github.com/ndowens/void-packages warzone2100
https://github.com/void-linux/void-packages/pull/16556

warzone2100: unmark nocross


A patch file from https://github.com/void-linux/void-packages/pull/16556.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-warzone2100-16556.patch --]
[-- Type: text/x-diff, Size: 2633 bytes --]

From 154152ce6da6534b4b218c07e7ba792841fcee2a Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Sat, 16 Nov 2019 13:25:09 -0600
Subject: [PATCH] warzone2100: unmark nocross

---
 srcpkgs/warzone2100/files/configure.patch | 22 ++++++++++++++++++++++
 srcpkgs/warzone2100/template              |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 srcpkgs/warzone2100/files/configure.patch

diff --git a/srcpkgs/warzone2100/files/configure.patch b/srcpkgs/warzone2100/files/configure.patch
new file mode 100644
index 00000000000..34b2a0e9e6c
--- /dev/null
+++ b/srcpkgs/warzone2100/files/configure.patch
@@ -0,0 +1,22 @@
+diff --git configure configure
+index 4cb3d5b..a9db926 100755
+--- configure
++++ configure
+@@ -6159,7 +6159,7 @@ if test "x$ac_cv_func_strlcpy" = xyes; then :
+ 
+ $as_echo "#define HAVE_SYSTEM_STRLCPY /**/" >>confdefs.h
+ 
+-		if test "$cross_compiling" = yes; then :
++		if test "$cross_compiling" = xxx; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
+@@ -6238,7 +6238,7 @@ if test "x$ac_cv_func_strlcat" = xyes; then :
+ 
+ $as_echo "#define HAVE_SYSTEM_STRLCAT /**/" >>confdefs.h
+ 
+-		if test "$cross_compiling" = yes; then :
++		if test "$cross_compiling" = xxx; then :
+   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template
index 9f19f6e3b71..836578aa0e9 100644
--- a/srcpkgs/warzone2100/template
+++ b/srcpkgs/warzone2100/template
@@ -5,7 +5,7 @@ revision=1
 wrksrc="warzone2100"
 build_style=gnu-configure
 configure_args="--with-distributor=void"
-hostmakedepends="zip unzip asciidoc pkg-config perl autoconf automake"
+hostmakedepends="zip unzip asciidoc pkg-config perl autoconf automake qt5-host-tools"
 makedepends="libpng-devel fribidi-devel fontconfig-devel SDL2-devel libvorbis-devel
  libtheora-devel libopenal-devel glew-devel physfs-devel harfbuzz-devel
  qt5-script-devel"
@@ -16,10 +16,10 @@ license="GPL-2.0-or-later"
 homepage="http://wz2100.net"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}_src.tar.xz"
 checksum=cc48c8128d17a499e833996470d843855389d9fc985c71f05be08901f33116e8
-nocross="cannot run test program while cross compiling"
 
 pre_configure() {
 	NOCONFIGURE=1 ./autogen.sh
+	patch -Np0 < "$FILESDIR"/configure.patch
 }
 
 warzone2100-data_package() {