| 1 |
commit: ee3f2627d7f25d00887ef6b00a5bce4e5d0aa91b |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Mon Mar 1 19:47:26 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 1 22:11:30 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3f2627 |
| 7 |
|
| 8 |
games-strategy/0ad: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/19723 |
| 11 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../0ad/files/0ad-0.0.21_alpha-gentoo.patch | 88 ---------------------- |
| 16 |
.../files/0ad-0.0.23b-header_includes_fix.patch | 20 ----- |
| 17 |
2 files changed, 108 deletions(-) |
| 18 |
|
| 19 |
diff --git a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch b/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 79549d19368..00000000000 |
| 22 |
--- a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,88 +0,0 @@ |
| 25 |
---- 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make |
| 26 |
-+++ 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make |
| 27 |
-@@ -26,9 +26,9 @@ |
| 28 |
- DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN |
| 29 |
- INCLUDES += -I../../src/host/lua-5.1.4/src |
| 30 |
- CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) |
| 31 |
-- CFLAGS += $(CPPFLAGS) -Wall -Os |
| 32 |
-- CXXFLAGS += $(CPPFLAGS) -Wall -Os |
| 33 |
-- LDFLAGS += -s -rdynamic |
| 34 |
-+ CFLAGS += $(CPPFLAGS) -Wall |
| 35 |
-+ CXXFLAGS += $(CPPFLAGS) -Wall |
| 36 |
-+ LDFLAGS += -rdynamic |
| 37 |
- LIBS += -lm -ldl |
| 38 |
- RESFLAGS += $(DEFINES) $(INCLUDES) |
| 39 |
- LDDEPS += |
| 40 |
-@@ -48,8 +48,8 @@ |
| 41 |
- DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN |
| 42 |
- INCLUDES += -I../../src/host/lua-5.1.4/src |
| 43 |
- CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) |
| 44 |
-- CFLAGS += $(CPPFLAGS) -Wall -g |
| 45 |
-- CXXFLAGS += $(CPPFLAGS) -Wall -g |
| 46 |
-+ CFLAGS += $(CFLAGS) $(CPPFLAGS) -Wall |
| 47 |
-+ CXXFLAGS += $(CXXFLAGS) $(CPPFLAGS) -Wall |
| 48 |
- LDFLAGS += -rdynamic |
| 49 |
- LIBS += -lm -ldl |
| 50 |
- RESFLAGS += $(DEFINES) $(INCLUDES) |
| 51 |
---- 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua |
| 52 |
-+++ 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua |
| 53 |
-@@ -136,8 +136,6 @@ |
| 54 |
- if not cfg.flags.Symbols then |
| 55 |
- if cfg.system == "macosx" then |
| 56 |
- table.insert(result, "-Wl,-x") |
| 57 |
-- else |
| 58 |
-- table.insert(result, "-s") |
| 59 |
- end |
| 60 |
- end |
| 61 |
- |
| 62 |
---- 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile |
| 63 |
-+++ 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile |
| 64 |
-@@ -9,9 +9,9 @@ |
| 65 |
- |
| 66 |
- CXX ?= g++ |
| 67 |
- CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) |
| 68 |
--CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL |
| 69 |
--CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL |
| 70 |
--CXXFLAGS_TEST := -O0 -g -D_DEBUG |
| 71 |
-+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL |
| 72 |
-+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL |
| 73 |
-+CXXFLAGS_TEST := -D_DEBUG |
| 74 |
- LIBS += `pkg-config libxml-2.0 --libs` |
| 75 |
- INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` |
| 76 |
- INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) |
| 77 |
---- 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh |
| 78 |
-+++ 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh |
| 79 |
-@@ -93,20 +93,8 @@ |
| 80 |
- cd js/src |
| 81 |
- |
| 82 |
- # Clean up data generated by previous builds that could cause problems |
| 83 |
--rm -rf build-debug |
| 84 |
- rm -rf build-release |
| 85 |
- |
| 86 |
--# We want separate debug/release versions of the library, so we have to change |
| 87 |
--# the LIBRARY_NAME for each build. |
| 88 |
--# (We use perl instead of sed so that it works with MozillaBuild on Windows, |
| 89 |
--# which has an ancient sed.) |
| 90 |
--perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build |
| 91 |
--mkdir -p build-debug |
| 92 |
--cd build-debug |
| 93 |
--CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal |
| 94 |
--${MAKE} ${MAKE_OPTS} |
| 95 |
--cd .. |
| 96 |
-- |
| 97 |
- perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build |
| 98 |
- mkdir -p build-release |
| 99 |
- cd build-release |
| 100 |
-@@ -161,12 +149,9 @@ |
| 101 |
- mkdir -p ${INCLUDE_DIR_DEBUG} |
| 102 |
- mkdir -p ${INCLUDE_DIR_RELEASE} |
| 103 |
- cp -R -L ${FOLDER}/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/ |
| 104 |
--cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/ |
| 105 |
- |
| 106 |
- mkdir -p lib/ |
| 107 |
--cp -L ${FOLDER}/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_DST_SUFFIX} |
| 108 |
- cp -L ${FOLDER}/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs38-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs38-ps-release${LIB_DST_SUFFIX} |
| 109 |
--cp -L ${FOLDER}/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs38-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-debug${DLL_DST_SUFFIX} |
| 110 |
- cp -L ${FOLDER}/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs38-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs38-ps-release${DLL_DST_SUFFIX} |
| 111 |
- |
| 112 |
- # On Windows, also copy debugging symbols files |
| 113 |
|
| 114 |
diff --git a/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch b/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch |
| 115 |
deleted file mode 100644 |
| 116 |
index 60bf9d1679b..00000000000 |
| 117 |
--- a/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch |
| 118 |
+++ /dev/null |
| 119 |
@@ -1,20 +0,0 @@ |
| 120 |
---- 0ad-0.0.23b-alpha/source/ps/CLogger.h |
| 121 |
-+++ 0ad-0.0.23b-alpha/source/ps/CLogger.h |
| 122 |
-@@ -22,6 +22,7 @@ |
| 123 |
- #include <string> |
| 124 |
- #include <set> |
| 125 |
- #include <sstream> |
| 126 |
-+#include <deque> |
| 127 |
- |
| 128 |
- #include "ps/ThreadUtil.h" |
| 129 |
- #include "third_party/cppformat/format.h" |
| 130 |
---- 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp |
| 131 |
-+++ 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp |
| 132 |
-@@ -22,6 +22,7 @@ |
| 133 |
- |
| 134 |
- #include "precompiled.h" |
| 135 |
- |
| 136 |
-+#include <stack> |
| 137 |
- #include "Profiler2GPU.h" |
| 138 |
- |
| 139 |
- #include "lib/ogl.h" |
Archives