gentoo resync : 03.03.2021

4 files changed, 114 insertions, 108 deletions

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 <string>
- #include <set>
- #include <sstream>
-+#include <deque>
- 
- #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 <stack>
- #include "Profiler2GPU.h"
- 
- #include "lib/ogl.h"
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
new file mode 100644
index 000000000000..7503ffc001b9
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
@@ -0,0 +1,32 @@
+--- a/libraries/source/fcollada/src/Makefile
++++ b/libraries/source/fcollada/src/Makefile
+@@ -7,6 +7,7 @@
+ 	PIC_FLAGS ?= -fpic
+ endif
+ 
++AR? ?= ar
+ CXX ?= g++
+ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+ CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
+@@ -16,6 +17,7 @@
+ LIBS += `pkg-config libxml-2.0 --libs`
+ INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
++RANLIB ?= ranlib
+ 
+ # FCollada is not aliasing-safe, so disallow dangerous optimisations
+ # (TODO: It'd be nice to fix FCollada, but that looks hard)
+@@ -246,11 +248,11 @@
+ 
+ output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs
+ 	@echo "$@"
+-	@ar -cr $@ $(OBJECTS_DEBUG); ranlib $@
++	@$(AR) -cr $@ $(OBJECTS_DEBUG); $(RANLIB) $@
+ 
+ output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs
+ 	@echo "$@"
+-	@ar -cr $@ $(OBJECTS_RELEASE); ranlib $@
++	@$(AR) -cr $@ $(OBJECTS_RELEASE); $(RANLIB) $@
+ 
+ output/FColladaTest: $(OBJECTS_TEST) | output_dirs
+ 	$(CXX) -o $@  $(OBJECTS_TEST) $(LIBS) $(LDFLAGS_TEST)
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
new file mode 100644
index 000000000000..f4436a7b92c4
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/773493
+--- a/libraries/source/spidermonkey/FixRust150.diff
++++ b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez <emilio@crisal.io>
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent  55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++  dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or `rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+++++ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++ 
++ [source."https://github.com/shravanrn/nix/"]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/"
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ 
++ [source."https://github.com/mozilla/rkv"]
++ git = "https://github.com/mozilla/rkv"
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++ 
++ [source."https://github.com/mozilla/neqo"]
++ git = "https://github.com/mozilla/neqo"
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+++++ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source = "git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
+++source = "git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++ dependencies = [
++  "bitflags",
++  "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+++++ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd", rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git = "https://github.com/PLSysSec/rlbox_lucet_sandbox/", rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/", branch = "r0.13.1", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/", rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross", branch = "wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure", rev = "64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+--- a/libraries/source/spidermonkey/patch.sh
++++ b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+ 
++# Bug 1684261 upstreamed from 78.8: https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)" = "FreeBSD" ];
+ then