| 1 |
commit: fb783bc49c404ec6cc0405f872126b6bc2e78e31 |
| 2 |
Author: Nils Freydank <holgersson <AT> posteo <DOT> de> |
| 3 |
AuthorDate: Sun Jul 16 20:58:37 2017 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 16 21:02:30 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb783bc4 |
| 7 |
|
| 8 |
games-fps/urbanterror: Cleanup old unused patches |
| 9 |
|
| 10 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 12 |
|
| 13 |
.../files/urbanterror-4.2.023-build.patch | 75 ---------------------- |
| 14 |
.../files/urbanterror-4.2.023-nocurl.patch | 16 ----- |
| 15 |
2 files changed, 91 deletions(-) |
| 16 |
|
| 17 |
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index daa7e324a67..00000000000 |
| 20 |
--- a/games-fps/urbanterror/files/urbanterror-4.2.023-build.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,75 +0,0 @@ |
| 23 |
-Author: hasufell <hasufell@g.o> |
| 24 |
-Date: Wed Jul 10 01:25:27 2013 +0200 |
| 25 |
- |
| 26 |
- respect CFLAGS/LDFLAGS |
| 27 |
- |
| 28 |
---- a/Makefile |
| 29 |
-+++ b/Makefile |
| 30 |
-@@ -213,7 +213,7 @@ |
| 31 |
- endif |
| 32 |
- endif |
| 33 |
- |
| 34 |
-- BASE_CFLAGS = -Wall -fno-strict-aliasing -Wimplicit -Wstrict-prototypes -pipe |
| 35 |
-+ BASE_CFLAGS = -Wall -Wimplicit -Wstrict-prototypes |
| 36 |
- |
| 37 |
- ifeq ($(USE_OPENAL),1) |
| 38 |
- BASE_CFLAGS += -DUSE_OPENAL=1 |
| 39 |
-@@ -239,19 +239,15 @@ |
| 40 |
- BASE_CFLAGS += -I/usr/X11R6/include |
| 41 |
- endif |
| 42 |
- |
| 43 |
-- OPTIMIZE = -O3 -ffast-math -funroll-loops -fomit-frame-pointer |
| 44 |
-+ OPTIMIZE = |
| 45 |
- |
| 46 |
- ifeq ($(ARCH),x86_64) |
| 47 |
-- OPTIMIZE = -O3 -fomit-frame-pointer -ffast-math -funroll-loops \ |
| 48 |
-- -falign-loops=2 -falign-jumps=2 -falign-functions=2 \ |
| 49 |
-- -fstrength-reduce |
| 50 |
-+ OPTIMIZE = |
| 51 |
- # experimental x86_64 jit compiler! you need GNU as |
| 52 |
- HAVE_VM_COMPILED = true |
| 53 |
- else |
| 54 |
- ifeq ($(ARCH),i386) |
| 55 |
-- OPTIMIZE = -O3 -march=i586 -fomit-frame-pointer -ffast-math \ |
| 56 |
-- -funroll-loops -falign-loops=2 -falign-jumps=2 \ |
| 57 |
-- -falign-functions=2 -fstrength-reduce |
| 58 |
-+ OPTIMIZE = |
| 59 |
- HAVE_VM_COMPILED=true |
| 60 |
- else |
| 61 |
- ifeq ($(ARCH),ppc) |
| 62 |
-@@ -265,7 +261,7 @@ |
| 63 |
- BASE_CFLAGS += -DNO_VM_COMPILED |
| 64 |
- endif |
| 65 |
- |
| 66 |
-- DEBUG_CFLAGS = $(BASE_CFLAGS) -g -O0 |
| 67 |
-+ DEBUG_CFLAGS = $(BASE_CFLAGS) $(OPTIMIZE) |
| 68 |
- |
| 69 |
- RELEASE_CFLAGS=$(BASE_CFLAGS) -DNDEBUG $(OPTIMIZE) |
| 70 |
- |
| 71 |
-@@ -274,7 +270,7 @@ |
| 72 |
- SHLIBLDFLAGS=-shared $(LDFLAGS) |
| 73 |
- |
| 74 |
- THREAD_LDFLAGS=-lpthread |
| 75 |
-- LDFLAGS=-ldl -lm |
| 76 |
-+ LDFLAGS+=-ldl -lm |
| 77 |
- |
| 78 |
- ifeq ($(USE_SDL),1) |
| 79 |
- CLIENT_LDFLAGS=$(shell sdl-config --libs) |
| 80 |
-@@ -1158,13 +1154,13 @@ |
| 81 |
- |
| 82 |
- $(B)/Quake3-UrT.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ) $(LIBSDLMAIN) |
| 83 |
- $(echo_cmd) "LD $@" |
| 84 |
-- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ) $(CLIENT_LDFLAGS) \ |
| 85 |
-- $(LDFLAGS) $(LIBSDLMAIN) |
| 86 |
-+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ) \ |
| 87 |
-+ $(LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 88 |
- |
| 89 |
- $(B)/Quake3-UrT-smp.$(ARCH)$(BINEXT): $(Q3OBJ) $(Q3POBJ_SMP) $(LIBSDLMAIN) |
| 90 |
- $(echo_cmd) "LD $@" |
| 91 |
-- $(Q)$(CC) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) $(CLIENT_LDFLAGS) \ |
| 92 |
-- $(THREAD_LDFLAGS) $(LDFLAGS) $(LIBSDLMAIN) |
| 93 |
-+ $(Q)$(CC) $(CFLAGS) -o $@ $(Q3OBJ) $(Q3POBJ_SMP) \ |
| 94 |
-+ $(LDFLAGS) $(THREAD_LDFLAGS) $(CLIENT_LDFLAGS) $(LIBSDLMAIN) |
| 95 |
- |
| 96 |
- ifneq ($(strip $(LIBSDLMAIN)),) |
| 97 |
- ifneq ($(strip $(LIBSDLMAINSRC)),) |
| 98 |
|
| 99 |
diff --git a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch b/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch |
| 100 |
deleted file mode 100644 |
| 101 |
index b7d1f310642..00000000000 |
| 102 |
--- a/games-fps/urbanterror/files/urbanterror-4.2.023-nocurl.patch |
| 103 |
+++ /dev/null |
| 104 |
@@ -1,16 +0,0 @@ |
| 105 |
-fix building when USE=-curl is specified (bug #572074) |
| 106 |
- |
| 107 |
---- ./code/client/cl_main.c.orig |
| 108 |
-+++ ./code/client/cl_main.c |
| 109 |
-@@ -1872,7 +1872,11 @@ |
| 110 |
- } |
| 111 |
- |
| 112 |
- qboolean CL_IsDownloading(void) { |
| 113 |
-+#if USE_CURL |
| 114 |
- return clc.cURLUsed; |
| 115 |
-+#else |
| 116 |
-+ return qfalse; |
| 117 |
-+#endif |
| 118 |
- } |
| 119 |
- |
| 120 |
- /* |
Archives