Gentoo Archives: gentoo-commits

From: Michael Sterrett <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-fps/urbanterror/, games-fps/urbanterror/files/
Date: Sat, 02 Apr 2016 18:53:48
Message-Id: 1459623178.427bb38ba9b9980affd2ec8d07553062334b3614.mr_bones_@gentoo
1 commit: 427bb38ba9b9980affd2ec8d07553062334b3614
2 Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 2 18:52:04 2016 +0000
4 Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 18:52:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=427bb38b
7
8 games-fps/urbanterror: fix building when USE=-curl is specified (bug #572074)
9
10 Package-Manager: portage-2.2.26
11
12 .../urbanterror/files/urbanterror-4.2.023-nocurl.patch | 16 ++++++++++++++++
13 games-fps/urbanterror/urbanterror-4.2.023.ebuild | 4 +++-
14 2 files changed, 19 insertions(+), 1 deletion(-)
15
16 diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
17 new file mode 100644
18 index 0000000..b7d1f31
19 --- /dev/null
20 +++ b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch
21 @@ -0,0 +1,16 @@
22 +fix building when USE=-curl is specified (bug #572074)
23 +
24 +--- ./code/client/cl_main.c.orig
25 ++++ ./code/client/cl_main.c
26 +@@ -1872,7 +1872,11 @@
27 + }
28 +
29 + qboolean CL_IsDownloading(void) {
30 ++#if USE_CURL
31 + return clc.cURLUsed;
32 ++#else
33 ++ return qfalse;
34 ++#endif
35 + }
36 +
37 + /*
38
39 diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
40 index a28e710..6065053 100644
41 --- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild
42 +++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild
43 @@ -81,7 +81,9 @@ src_unpack() {
44 }
45
46 src_prepare() {
47 - epatch "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch
48 + epatch \
49 + "${FILESDIR}"/${PN}-${ENGINE_PV}-build.patch \
50 + "${FILESDIR}"/${PN}-${ENGINE_PV}-nocurl.patch
51 }
52
53 src_compile() {