public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michael Sterrett" <mr_bones_@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/
Date: Sat,  2 Apr 2016 18:53:12 +0000 (UTC)	[thread overview]
Message-ID: <1459623178.427bb38ba9b9980affd2ec8d07553062334b3614.mr_bones_@gentoo> (raw)

commit:     427bb38ba9b9980affd2ec8d07553062334b3614
Author:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 18:52:04 2016 +0000
Commit:     Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 18:52:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427bb38b

games-fps/urbanterror: fix building when USE=-curl is specified (bug #572074)

Package-Manager: portage-2.2.26

 .../urbanterror/files/urbanterror-4.2.023-nocurl.patch   | 16 ++++++++++++++++
 games-fps/urbanterror/urbanterror-4.2.023.ebuild         |  4 +++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
new file mode 100644
index 0000000..b7d1f31
--- /dev/null
+++ b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
@@ -0,0 +1,16 @@
+fix building when USE=-curl is specified (bug #572074)
+
+--- ./code/client/cl_main.c.orig
++++ ./code/client/cl_main.c
+@@ -1872,7 +1872,11 @@
+ }
+ 
+ qboolean CL_IsDownloading(void) {
++#if USE_CURL
+ 	return clc.cURLUsed;
++#else
++	return qfalse;
++#endif
+ }
+ 
+ /*

diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
index a28e710..6065053 100644
--- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild
+++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
@@ -81,7 +81,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
+	epatch \
+		"${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch \
+		"${FILESDIR}"/${PN}-${ENGINE_PV}-nocurl.patch
 }
 
 src_compile() {


             reply	other threads:[~2016-04-02 18:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-02 18:53 Michael Sterrett [this message]
  -- strict thread matches above, loose matches on Subject: below --
2018-03-15 22:27 [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/ Andreas Sturmlechner
2022-03-29 13:07 Florian Schmaus
2022-03-29 13:07 Florian Schmaus

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=1459623178.427bb38ba9b9980affd2ec8d07553062334b3614.mr_bones_@gentoo \
    --to=mr_bones_@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.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