From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] warzone2100: unmark nocross
Date: Wed, 01 Jan 2020 03:34:33 +0100 [thread overview]
Message-ID: <20200101023433.1YsddPBbuc8Zxq_GXQg6UpN-Q9aJTeQxzus7uCILcs0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16556@inbox.vuxu.org>
[-- 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() {
parent reply other threads:[~2020-01-01 2:34 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-16556@inbox.vuxu.org>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200101023433.1YsddPBbuc8Zxq_GXQg6UpN-Q9aJTeQxzus7uCILcs0@z \
--to=voidlinux-github@inbox.vuxu.org \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).