From ee3f2627d7f25d00887ef6b00a5bce4e5d0aa91b Mon Sep 17 00:00:00 2001 From: Michael Mair-Keimberger Date: Mon, 1 Mar 2021 20:47:26 +0100 Subject: games-strategy/0ad: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/19723 Package-Manager: Portage-3.0.15, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger Signed-off-by: Conrad Kostecki --- .../0ad/files/0ad-0.0.21_alpha-gentoo.patch | 88 ---------------------- .../files/0ad-0.0.23b-header_includes_fix.patch | 20 ----- 2 files changed, 108 deletions(-) delete mode 100644 games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch delete mode 100644 games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch (limited to 'games-strategy') 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 deleted file mode 100644 index 79549d193683..000000000000 --- a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make -+++ 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make -@@ -26,9 +26,9 @@ - DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN - INCLUDES += -I../../src/host/lua-5.1.4/src - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) -- CFLAGS += $(CPPFLAGS) -Wall -Os -- CXXFLAGS += $(CPPFLAGS) -Wall -Os -- LDFLAGS += -s -rdynamic -+ CFLAGS += $(CPPFLAGS) -Wall -+ CXXFLAGS += $(CPPFLAGS) -Wall -+ LDFLAGS += -rdynamic - LIBS += -lm -ldl - RESFLAGS += $(DEFINES) $(INCLUDES) - LDDEPS += -@@ -48,8 +48,8 @@ - DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN - INCLUDES += -I../../src/host/lua-5.1.4/src - CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES) -- CFLAGS += $(CPPFLAGS) -Wall -g -- CXXFLAGS += $(CPPFLAGS) -Wall -g -+ CFLAGS += $(CFLAGS) $(CPPFLAGS) -Wall -+ CXXFLAGS += $(CXXFLAGS) $(CPPFLAGS) -Wall - LDFLAGS += -rdynamic - LIBS += -lm -ldl - RESFLAGS += $(DEFINES) $(INCLUDES) ---- 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua -+++ 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua -@@ -136,8 +136,6 @@ - if not cfg.flags.Symbols then - if cfg.system == "macosx" then - table.insert(result, "-Wl,-x") -- else -- table.insert(result, "-s") - end - end - ---- 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile -+++ 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile -@@ -9,9 +9,9 @@ - - CXX ?= g++ - CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) --CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL --CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL --CXXFLAGS_TEST := -O0 -g -D_DEBUG -+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL -+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL -+CXXFLAGS_TEST := -D_DEBUG - LIBS += `pkg-config libxml-2.0 --libs` - INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` - INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) ---- 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh -+++ 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh -@@ -93,20 +93,8 @@ - cd js/src - - # Clean up data generated by previous builds that could cause problems --rm -rf build-debug - rm -rf build-release - --# We want separate debug/release versions of the library, so we have to change --# the LIBRARY_NAME for each build. --# (We use perl instead of sed so that it works with MozillaBuild on Windows, --# which has an ancient sed.) --perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/' moz.build --mkdir -p build-debug --cd build-debug --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 --${MAKE} ${MAKE_OPTS} --cd .. -- - perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-release'\''/' moz.build - mkdir -p build-release - cd build-release -@@ -161,12 +149,9 @@ - mkdir -p ${INCLUDE_DIR_DEBUG} - mkdir -p ${INCLUDE_DIR_RELEASE} - cp -R -L ${FOLDER}/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/ --cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/ - - mkdir -p lib/ --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} - 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} --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} - 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} - - # On Windows, also copy debugging symbols files 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 deleted file mode 100644 index 60bf9d1679be..000000000000 --- a/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 0ad-0.0.23b-alpha/source/ps/CLogger.h -+++ 0ad-0.0.23b-alpha/source/ps/CLogger.h -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #include "ps/ThreadUtil.h" - #include "third_party/cppformat/format.h" ---- 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp -+++ 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp -@@ -22,6 +22,7 @@ - - #include "precompiled.h" - -+#include - #include "Profiler2GPU.h" - - #include "lib/ogl.h" -- cgit v1.2.3-65-gdbad