diff --git a/flutter-web/Dockerfile b/flutter-web/Dockerfile index 7cbcc7f..90e638e 100644 --- a/flutter-web/Dockerfile +++ b/flutter-web/Dockerfile @@ -28,7 +28,7 @@ WORKDIR /home/builder SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN tar -C /home/builder -Jxf <(curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.29.0-stable.tar.xz) +RUN tar -C /home/builder -Jxf <(curl -L https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.38.9-stable.tar.xz) # Set flutter path ENV PATH="/home/builder/flutter/bin:/home/builder/flutter/bin/cache/dart-sdk/bin:$PATH" diff --git a/qtox/build_qtbase_macos.sh b/qtox/build_qtbase_macos.sh index 39b7239..1cc4bda 100755 --- a/qtox/build_qtbase_macos.sh +++ b/qtox/build_qtbase_macos.sh @@ -34,7 +34,7 @@ if [ "$MACOS_MINIMUM_SUPPORTED_VERSION" != "10.15" ]; then fi # We want -Werror to catch warnings related to macOS version compatibility. -sed -i '' -e 's/-Wextra/-Wextra -Werror "-Wno-#warnings" -Wno-deprecated-declarations/' cmake/QtCompilerFlags.cmake +sed -i '' -e 's/-Wextra/-Wextra -Werror "-Wno-#warnings" -Wno-cast-function-type-mismatch -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-vla-cxx-extension/' cmake/QtCompilerFlags.cmake mkdir _build && pushd _build ../configure \ diff --git a/qtox/docker/Dockerfile.alpine-static b/qtox/docker/Dockerfile.alpine-static index a54caba..97d037c 100644 --- a/qtox/docker/Dockerfile.alpine-static +++ b/qtox/docker/Dockerfile.alpine-static @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team +# Copyright © 2024-2026 The TokTok team -FROM alpine:edge AS common +FROM alpine:3.23 AS common RUN ["apk", "add", \ "bash", \ @@ -108,6 +108,7 @@ RUN tar zxf <(curl -L https://github.com/alsa-project/alsa-lib/archive/refs/tags RUN tar Jxf <(curl -L https://github.com/libsndfile/libsndfile/releases/download/1.2.2/libsndfile-1.2.2.tar.xz) \ && cd libsndfile-* \ && cmake \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ -DCMAKE_TOOLCHAIN_FILE="$SYSROOT/static-toolchain.cmake" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX="$SYSROOT/usr" \