diff --git a/qtox/docker/Dockerfile.alpine-static b/qtox/docker/Dockerfile.alpine-static index 97d037c..7cda707 100644 --- a/qtox/docker/Dockerfile.alpine-static +++ b/qtox/docker/Dockerfile.alpine-static @@ -81,8 +81,9 @@ RUN tar zxf <(curl -L https://github.com/webmproject/libvpx/archive/refs/tags/v1 && make install \ && rm -rf /opt/buildhome/build -RUN tar zxf <(curl -L https://github.com/TokTok/c-toxcore/releases/download/v0.2.20/c-toxcore-0.2.20.tar.gz) \ - && cd c-toxcore-0.2.20 \ +RUN mkdir c-toxcore-v0.2.22 \ + && tar zxf <(curl -L https://github.com/TokTok/c-toxcore/releases/download/v0.2.22/c-toxcore-v0.2.22.tar.gz) -C c-toxcore-v0.2.22 \ + && cd c-toxcore-* \ && cmake \ -DCMAKE_TOOLCHAIN_FILE="$SYSROOT/static-toolchain.cmake" \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/qtox/docker/Dockerfile.android-builder b/qtox/docker/Dockerfile.android-builder index c6fe091..a88c5f0 100644 --- a/qtox/docker/Dockerfile.android-builder +++ b/qtox/docker/Dockerfile.android-builder @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-3.0-or-later -# Copyright © 2024-2025 The TokTok team +# Copyright © 2024-2026 The TokTok team ARG QT_VERSION=6.2.4 @@ -302,8 +302,9 @@ RUN tar jxf <(wget -O- https://github.com/kcat/openal-soft/releases/download/1.2 #COPY --from=build-libvpx $SYSROOT/usr $SYSROOT/usr #COPY --from=build-opus $SYSROOT/usr $SYSROOT/usr -RUN tar zxf <(wget -O- https://github.com/TokTok/c-toxcore/releases/download/v0.2.20/c-toxcore-0.2.20.tar.gz) \ - && cd c-toxcore-0.2.20 \ +RUN mkdir c-toxcore-v0.2.22 \ + && tar zxf <(wget -O- https://github.com/TokTok/c-toxcore/releases/download/v0.2.22/c-toxcore-v0.2.22.tar.gz) -C c-toxcore-v0.2.22 \ + && cd c-toxcore-* \ && cmake \ -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake" \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/qtox/download/common.sh b/qtox/download/common.sh index 5039fa4..c0d7224 100755 --- a/qtox/download/common.sh +++ b/qtox/download/common.sh @@ -3,6 +3,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later AND MIT # Copyright (c) 2017-2021 Maxim Biro # Copyright (c) 2021 by The qTox Project Contributors +# Copyright (c) 2026 The TokTok team check_sha256() { if uname | grep -q Darwin; then @@ -29,7 +30,7 @@ download_file() { } download_verify_extract_tarball() { - # Downlaoads the tarball at URL, ensures it has an sha256sum of HASH and + # Downloads the tarball at URL, ensures it has an sha256sum of HASH and # extracts it to the CWD local URL="$1" diff --git a/qtox/download/download_toxcore.sh b/qtox/download/download_toxcore.sh index 330733f..c4c6263 100755 --- a/qtox/download/download_toxcore.sh +++ b/qtox/download/download_toxcore.sh @@ -2,12 +2,12 @@ # SPDX-License-Identifier: GPL-3.0-or-later # Copyright © 2021 by The qTox Project Contributors -# Copyright © 2024-2025 The TokTok team +# Copyright © 2024-2026 The TokTok team set -euo pipefail -TOXCORE_VERSION=0.2.21 -TOXCORE_HASH=3443a45d085fb3dee20514243787d06acde2d6c89130076d6f932534581a4ac7 +TOXCORE_VERSION=0.2.22 +TOXCORE_HASH=276d447eb94e9d76e802cecc5ca7660c6c15128a83dfbe4353b678972aeb950a source "$(dirname "$(realpath "$0")")/common.sh"