diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2016-06-07 13:10:27 -0400 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2016-06-07 18:27:31 -0400 |
commit | 1aa37ab8bf7393291d4326762db5c2954d86b3d4 (patch) | |
tree | 9af4124398a48686253f5fb90d19259fa1df3868 /games-strategy/0ad/files | |
parent | bf51f6748e976ec2ee5b5e4d5e8119772089b130 (diff) | |
download | gentoo-1aa37ab8bf7393291d4326762db5c2954d86b3d4.tar.gz gentoo-1aa37ab8bf7393291d4326762db5c2954d86b3d4.tar.xz |
games-strategy/0ad: clean old
Package-Manager: portage-2.2.28
Diffstat (limited to 'games-strategy/0ad/files')
-rw-r--r-- | games-strategy/0ad/files/0ad-0.0.18_alpha-gentoo.patch | 101 | ||||
-rw-r--r-- | games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch | 14 |
2 files changed, 0 insertions, 115 deletions
diff --git a/games-strategy/0ad/files/0ad-0.0.18_alpha-gentoo.patch b/games-strategy/0ad/files/0ad-0.0.18_alpha-gentoo.patch deleted file mode 100644 index 5c48ec82ba5..00000000000 --- a/games-strategy/0ad/files/0ad-0.0.18_alpha-gentoo.patch +++ /dev/null @@ -1,101 +0,0 @@ -From: Julian Ospald <hasufell@gentoo.org> -Date: Sun Jun 24 18:32:38 UTC 2012 -Subject: build system - -* respect flags -* disable debug build of spidermonkey - ---- libraries/source/fcollada/src/Makefile -+++ 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) ---- build/premake/premake4/src/tools/gcc.lua -+++ 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 - ---- build/premake/premake4/build/gmake.unix/Premake4.make -+++ 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 += $(CPPFLAGS) -Wall -+ CXXFLAGS += $(CPPFLAGS) -Wall - LDFLAGS += -rdynamic - LIBS += -lm -ldl - RESFLAGS += $(DEFINES) $(INCLUDES) -@@ -302,4 +302,4 @@ - $(SILENT) $(CC) $(PCHINCLUDES) $(CFLAGS) -MF $(OBJDIR)/lauxlib.d -MT "$@" -o "$@" -c "$<"
-
- -include $(OBJECTS:%.o=%.d)
---include $(GCH:%.h.gch=%.h.d) -\ No newline at end of file -+-include $(GCH:%.h.gch=%.h.d) ---- libraries/source/spidermonkey/build.sh -+++ libraries/source/spidermonkey/build.sh -@@ -92,19 +92,7 @@ - cd mozjs31/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/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-debug'\''/' moz.build --mkdir -p build-debug --cd build-debug --CXXFLAGS="${TLCXXFLAGS}" ../configure ${CONF_OPTS} --with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES" --enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal # --enable-root-analysis --${MAKE} ${MAKE_OPTS} --cd .. - - perl -i.bak -pe 's/(LIBRARY_NAME\s+=).*/$1 '\''mozjs31-ps-release'\''/' moz.build - mkdir -p build-release -@@ -147,12 +135,9 @@ - mkdir -p ${INCLUDE_DIR_DEBUG} - mkdir -p ${INCLUDE_DIR_RELEASE} - cp -R -L mozjs31/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/ --cp -R -L mozjs31/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/ - - mkdir -p lib/ --cp -L mozjs31/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-debug${LIB_DST_SUFFIX} - cp -L mozjs31/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs31-ps-release${LIB_SRC_SUFFIX} lib/${LIB_PREFIX}mozjs31-ps-release${LIB_DST_SUFFIX} --cp -L mozjs31/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs31-ps-debug${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-debug${DLL_DST_SUFFIX} - cp -L mozjs31/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs31-ps-release${DLL_SRC_SUFFIX} ../../../binaries/system/${LIB_PREFIX}mozjs31-ps-release${DLL_DST_SUFFIX} - - # Flag that it's already been built successfully so we can skip it next time diff --git a/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch deleted file mode 100644 index ff46685cd3b..00000000000 --- a/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: ps/trunk/source/network/NetServer.cpp
-===================================================================
---- ps/trunk/source/network/NetServer.cpp (revision 17090)
-+++ ps/trunk/source/network/NetServer.cpp (revision 17091)
-@@ -237,5 +237,9 @@
- }
- // No cached URL, or it did not respond. Try getting a valid UPnP device for 10 seconds.
-+#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
-+ else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 2, 0)) != NULL)
-+#else
- else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
-+#endif
- {
- ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress));
|