From e1c72ccd573d3f051be78539fe5c22fc19590ab4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Jan 2025 11:37:40 +0000 Subject: [PATCH] chore(deps): Bump qtox from `aba18f1` to `0a053a7` Bumps [qtox](https://github.com/TokTok/qtox) from `aba18f1` to `0a053a7`. - [Release notes](https://github.com/TokTok/qtox/releases) - [Commits](https://github.com/TokTok/qtox/compare/aba18f10528d372c5c6e600f050d4b5e13f64a31...0a053a7e7c6fd061ac99aa865a2b72b5cb7806c4) --- updated-dependencies: - dependency-name: qtox dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .bazelrc | 8 ++++++-- c-toxcore | 2 +- cspell.config.yaml | 3 +++ jvm-toxcore-c | 2 +- qtox | 2 +- tools/built/src/Dockerfile.asan | 6 +++++- tools/built/src/Dockerfile.debug | 6 +++++- tools/built/src/Dockerfile.msan | 6 +++++- tools/built/src/Dockerfile.tsan | 6 +++++- tools/built/src/Dockerfile.windows | 2 +- tools/built/src/home/.config/home-manager/home.nix | 2 ++ toxic | 2 +- toxins | 2 +- zig-toxcore-c | 2 +- 14 files changed, 38 insertions(+), 13 deletions(-) create mode 100644 cspell.config.yaml diff --git a/.bazelrc b/.bazelrc index 2bf4d4c4..fc8bf889 100644 --- a/.bazelrc +++ b/.bazelrc @@ -263,12 +263,16 @@ build --cxxopt='-fno-rtti' build --cxxopt='-DGOOGLE_PROTOBUF_NO_RTTI' # Disable deprecated Tox APIs. -#build --copt='-DTOX_HIDE_DEPRECATED' +build --copt='-DTOX_HIDE_DEPRECATED' +build --per_file_copt='//c-toxcore/toxcore:tox(_api)?.c@-UTOX_HIDE_DEPRECATED' +build --per_file_copt='//py_toxcore_c[:/]@-UTOX_HIDE_DEPRECATED' # Enable trace logging for toxcore. build --per_file_copt='//c-toxcore/@-DMIN_LOGGER_LEVEL=LOGGER_LEVEL_TRACE' build --per_file_copt='//c-toxcore/@-DMAX_VLA_SIZE=2048' build --per_file_copt='//c-toxcore/@-Wframe-larger-than=20000' +# build --per_file_copt='//c-toxcore/.*\\.cc$@-Wframe-larger-than=20000' +# build --per_file_copt='//c-toxcore/.*\\.c$@-Wframe-larger-than=4096' # Disable most logging when running with flakynet (we get lots of warnings). build:flakynet --per_file_copt='//c-toxcore/@-UMIN_LOGGER_LEVEL,-DMIN_LOGGER_LEVEL=LOGGER_LEVEL_ERROR' @@ -379,7 +383,7 @@ build --per_file_copt='//py_toxcore_c[:/]@-Wno-zero-as-null-pointer-constant' build --per_file_copt='//py_toxcore_c[:/]@-fno-sanitize=enum' # Protobuf generated code has so many warnings we just ignore all of them. -build --per_file_copt='\.pb\.cc$@-w' +build --per_file_copt='\\.pb\\.cc$@-w' # X11/Xfuncproto.h does this. build --per_file_copt='//qtox[:/].*x11.cpp$@-Wno-variadic-macros' diff --git a/c-toxcore b/c-toxcore index 2f62f3d0..bc43cec0 160000 --- a/c-toxcore +++ b/c-toxcore @@ -1 +1 @@ -Subproject commit 2f62f3d0e775ed3c96760353badf6120da42c1d6 +Subproject commit bc43cec0626c65517e2a09fd5a6c1a48fa4b2847 diff --git a/cspell.config.yaml b/cspell.config.yaml new file mode 100644 index 00000000..d907ce96 --- /dev/null +++ b/cspell.config.yaml @@ -0,0 +1,3 @@ +version: "0.2" +ignorePaths: + - "c-toxcore/**" diff --git a/jvm-toxcore-c b/jvm-toxcore-c index 325989be..858fd65a 160000 --- a/jvm-toxcore-c +++ b/jvm-toxcore-c @@ -1 +1 @@ -Subproject commit 325989be737ffbe1b81caebc8d2e5e725de2ff4c +Subproject commit 858fd65a1add71eca938274ec3f5fe09a29422ab diff --git a/qtox b/qtox index 3e7fd1b4..307d086b 160000 --- a/qtox +++ b/qtox @@ -1 +1 @@ -Subproject commit 3e7fd1b40b350036577710393ac6b3889f459f7a +Subproject commit 307d086ba45ebd3702c4a22cf1f899d4350efdfa diff --git a/tools/built/src/Dockerfile.asan b/tools/built/src/Dockerfile.asan index b4d90a27..8f7bcd8f 100644 --- a/tools/built/src/Dockerfile.asan +++ b/tools/built/src/Dockerfile.asan @@ -1,7 +1,11 @@ # Pre-build //third_party in asan mode for speedy PR builds on sub-repos. FROM toxchat/toktok-stack:latest -RUN echo 'build --config=asan' >>.bazelrc.local +RUN echo 'build --config=asan' >>.bazelrc.local; \ + if curl -s -m1 http://code.tox.chat/bazel/ \ + | grep "resource name must be a SHA256 hash"; then \ + echo 'build --config=remote-grpc' | tee -a .bazelrc.local; \ + fi RUN sudo nix-daemon --daemon \ & bazel build -k //third_party/... diff --git a/tools/built/src/Dockerfile.debug b/tools/built/src/Dockerfile.debug index 7089c0c1..e80ccb14 100644 --- a/tools/built/src/Dockerfile.debug +++ b/tools/built/src/Dockerfile.debug @@ -1,7 +1,11 @@ # Pre-build //third_party in debug mode for speedy PR builds on sub-repos. FROM toxchat/toktok-stack:latest -RUN echo 'build --config=debug' >>.bazelrc.local +RUN echo 'build --config=debug' >>.bazelrc.local; \ + if curl -s -m1 http://code.tox.chat/bazel/ \ + | grep "resource name must be a SHA256 hash"; then \ + echo 'build --config=remote-grpc' | tee -a .bazelrc.local; \ + fi RUN sudo nix-daemon --daemon & bazel build -k //third_party/... diff --git a/tools/built/src/Dockerfile.msan b/tools/built/src/Dockerfile.msan index 94949a58..21b92b63 100644 --- a/tools/built/src/Dockerfile.msan +++ b/tools/built/src/Dockerfile.msan @@ -1,7 +1,11 @@ # Pre-build //third_party in msan mode for speedy PR builds on sub-repos. FROM toxchat/toktok-stack:latest -RUN echo 'build --config=msan' >>.bazelrc.local +RUN echo 'build --config=msan' >>.bazelrc.local; \ + if curl -s -m1 http://code.tox.chat/bazel/ \ + | grep "resource name must be a SHA256 hash"; then \ + echo 'build --config=remote-grpc' | tee -a .bazelrc.local; \ + fi # Don't build any Go code. It needs sanitizer/msan_interface.h. RUN sudo nix-daemon --daemon \ diff --git a/tools/built/src/Dockerfile.tsan b/tools/built/src/Dockerfile.tsan index aeb01527..f700c4a0 100644 --- a/tools/built/src/Dockerfile.tsan +++ b/tools/built/src/Dockerfile.tsan @@ -1,7 +1,11 @@ # Pre-build //third_party in tsan mode for speedy PR builds on sub-repos. FROM toxchat/toktok-stack:latest -RUN echo 'build --config=tsan' >>.bazelrc.local +RUN echo 'build --config=tsan' >>.bazelrc.local; \ + if curl -s -m1 http://code.tox.chat/bazel/ \ + | grep "resource name must be a SHA256 hash"; then \ + echo 'build --config=remote-grpc' | tee -a .bazelrc.local; \ + fi RUN sudo nix-daemon --daemon \ & bazel build -k //third_party/... diff --git a/tools/built/src/Dockerfile.windows b/tools/built/src/Dockerfile.windows index 171022c2..9fdede10 100644 --- a/tools/built/src/Dockerfile.windows +++ b/tools/built/src/Dockerfile.windows @@ -1,6 +1,6 @@ FROM toxchat/toktok-stack:latest -RUN echo 'build --config=linux-arm64-musl' >>.bazelrc.local; \ +RUN echo 'build --config=windows-x86_64' >>.bazelrc.local; \ if curl -s -m1 http://code.tox.chat/bazel/ \ | grep "resource name must be a SHA256 hash"; then \ echo 'build --config=remote-grpc' | tee -a .bazelrc.local; \ diff --git a/tools/built/src/home/.config/home-manager/home.nix b/tools/built/src/home/.config/home-manager/home.nix index 6fd2f402..d7849d00 100644 --- a/tools/built/src/home/.config/home-manager/home.nix +++ b/tools/built/src/home/.config/home-manager/home.nix @@ -17,6 +17,8 @@ MSAN_OPTIONS = "color=always:external_symbolizer_path=${pkgs.llvm}/bin/llvm-symbolizer"; TSAN_OPTIONS = "color=always,history_size=7,force_seq_cst_atomics=1:external_symbolizer_path=${pkgs.llvm}/bin/llvm-symbolizer"; UBSAN_OPTIONS = "color=always,print_stacktrace=1:external_symbolizer_path=${pkgs.llvm}/bin/llvm-symbolizer"; + + QT_QPA_PLATFORM = "offscreen"; }; home.sessionPath = [ "${config.home.homeDirectory}/.bin" diff --git a/toxic b/toxic index 5e17fc4d..70b00417 160000 --- a/toxic +++ b/toxic @@ -1 +1 @@ -Subproject commit 5e17fc4d9c3cac14f169baeda428e168d92bc39d +Subproject commit 70b004176db30b05b037c34478a507b598214b96 diff --git a/toxins b/toxins index 08fc7bbd..0871ca49 160000 --- a/toxins +++ b/toxins @@ -1 +1 @@ -Subproject commit 08fc7bbd0a6833b09af5648deecea8161f26fbad +Subproject commit 0871ca49f8830a1bd0ad279c93a5f10804571666 diff --git a/zig-toxcore-c b/zig-toxcore-c index 23385b2e..91887865 160000 --- a/zig-toxcore-c +++ b/zig-toxcore-c @@ -1 +1 @@ -Subproject commit 23385b2e0e93a47abd60b5943072023c060f0fa8 +Subproject commit 918878655cce5a833a7bc86c76e426e05832e91d