TokTok · toktok-releaser · Jan 10, 2025 · Jan 8, 2025
diff --git a/qtox/build_qtbase_linux.sh b/qtox/build_qtbase_linux.sh
@@ -16,9 +16,10 @@ parse_arch --dep "qtbase" --supported "linux-x86_64" "$@"
 export CXXFLAGS="-DQT_MESSAGELOGCONTEXT"
 export OBJCXXFLAGS="$CXXFLAGS"
 
-mkdir -p qtbase/_build
-pushd qtbase/_build
-../configure -prefix "$DEP_PREFIX/qt" \
+mkdir -p _build
+pushd _build
+../configure \
+  -prefix "$QT_PREFIX" \
   -appstore-compliant \
   -release \
   "-$LIB_TYPE" \

diff --git a/qtox/build_qtbase_macos.sh b/qtox/build_qtbase_macos.sh
@@ -12,6 +12,8 @@ source "$SCRIPT_DIR/download/version_qt.sh"
 
 parse_arch --dep "qtbase" --supported "macos-arm64 macos-x86_64" "$@"
 
+"$SCRIPT_DIR/download/download_qtbase.sh"
+
 export CXXFLAGS="-DQT_MESSAGELOGCONTEXT"
 export OBJCXXFLAGS="$CXXFLAGS"
 
@@ -28,9 +30,7 @@ else
   QT_FORCE_DEBUG_INFO="-no-force-debug-info"
 fi
 
-tar Jxf <(curl -L "https://download.qt.io/archive/qt/$(echo "$QT_VERSION" | grep -o '...')/$QT_VERSION/submodules/qtbase-everywhere-src-$QT_VERSION.tar.xz")
-rm -rf qtbase && mv "qtbase-everywhere-src-$QT_VERSION" qtbase && cd qtbase
-rm -rf _build && mkdir _build && cd _build
+mkdir _build && pushd _build
 ../configure \
   --prefix="$QT_PREFIX" \
   -appstore-compliant \
@@ -61,5 +61,4 @@ rm -rf _build && mkdir _build && cd _build
 cat config.summary
 cmake --build .
 cmake --install .
-cd ../..
-rm -rf qtbase
+popd
diff --git a/qtox/build_qtbase_windows.sh b/qtox/build_qtbase_windows.sh
@@ -18,8 +18,9 @@ parse_arch --dep "qt" --supported "win32 win64" "$@"
 CROSS_COMPILE="$MINGW_ARCH-w64-mingw32-"
 "${CROSS_COMPILE}gcc" --version
 
-mkdir qtbase/_build && pushd qtbase/_build
-../configure -prefix "$DEP_PREFIX" \
+mkdir _build && pushd _build
+../configure \
+  -prefix "$QT_PREFIX" \
   -appstore-compliant \
   -release \
   -shared \

diff --git a/qtox/build_qtimageformats_windows.sh → qtox/build_qtimageformats.sh b/qtox/build_qtimageformats_windows.sh → qtox/build_qtimageformats.sh
@@ -11,12 +11,12 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
 source "$SCRIPT_DIR/build_utils.sh"
 
-parse_arch --dep "qt" --supported "win32 win64" "$@"
+parse_arch --dep "qtimageformats" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@"
 
 "$SCRIPT_DIR/download/download_qtimageformats.sh"
 
-mkdir qtimageformats/_build && pushd qtimageformats/_build
-"$DEP_PREFIX/bin/qt-configure-module" .. \
+mkdir _build && pushd _build
+"$QT_PREFIX/bin/qt-configure-module" .. \
   -- \
   -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \
   -Wno-dev

diff --git a/qtox/build_qtimageformats_linux.sh b/qtox/build_qtimageformats_linux.sh
diff --git a/qtox/build_qtimageformats_macos.sh b/qtox/build_qtimageformats_macos.sh
diff --git a/qtox/build_qtremoteobjects.sh b/qtox/build_qtremoteobjects.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+
+# SPDX-License-Identifier: GPL-3.0-or-later
+# Copyright © 2024-2025 The TokTok team
+
+set -euxo pipefail
+
+readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"
+
+source "$SCRIPT_DIR/build_utils.sh"
+
+parse_arch --dep "qtremoteobjects" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@"
+
+"$SCRIPT_DIR/download/download_qtremoteobjects.sh"
+
+mkdir _build && pushd _build
+"$QT_PREFIX/bin/qt-configure-module" .. \
+  -- \
+  -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \
+  -Wno-dev
+cmake --build .
+cmake --install .
+popd
diff --git a/qtox/build_qtsvg_linux.sh → qtox/build_qtsvg.sh b/qtox/build_qtsvg_linux.sh → qtox/build_qtsvg.sh
@@ -9,16 +9,14 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
 source "$SCRIPT_DIR/build_utils.sh"
 
-parse_arch --dep "qtsvg" --supported "linux-x86_64" "$@"
+parse_arch --dep "qtsvg" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@"
 
 "$SCRIPT_DIR/download/download_qtsvg.sh"
 
-export CXXFLAGS="-DQT_MESSAGELOGCONTEXT"
-export OBJCXXFLAGS="$CXXFLAGS"
-
-mkdir qtsvg/_build && pushd qtsvg/_build
-"$DEP_PREFIX/qt/bin/qt-configure-module" .. \
+mkdir _build && pushd _build
+"$QT_PREFIX/bin/qt-configure-module" .. \
   -- \
+  -DCMAKE_CXX_FLAGS="-DQT_MESSAGELOGCONTEXT" \
   -Wno-dev
 cmake --build .
 cmake --install .

diff --git a/qtox/build_qtsvg_macos.sh b/qtox/build_qtsvg_macos.sh
diff --git a/qtox/build_qtsvg_windows.sh b/qtox/build_qtsvg_windows.sh
diff --git a/qtox/build_qttools_windows.sh → qtox/build_qttools.sh b/qtox/build_qttools_windows.sh → qtox/build_qttools.sh
@@ -11,12 +11,12 @@ readonly SCRIPT_DIR="$(dirname "$(realpath "$0")")"
 
 source "$SCRIPT_DIR/build_utils.sh"
 
-parse_arch --dep "qt" --supported "win32 win64" "$@"
+parse_arch --dep "qttools" --supported "linux-x86_64 macos-arm64 macos-x86_64 win32 win64" "$@"
 
 "$SCRIPT_DIR/download/download_qttools.sh"
 
-mkdir qttools/_build && pushd qttools/_build
-"$DEP_PREFIX/bin/qt-configure-module" .. \
+mkdir _build && pushd _build
+"$QT_PREFIX/bin/qt-configure-module" .. \
   -no-feature-assistant \
   -no-feature-designer \
   -no-feature-kmap2qmap \

diff --git a/qtox/build_qttools_linux.sh b/qtox/build_qttools_linux.sh
diff --git a/qtox/build_qttools_macos.sh b/qtox/build_qttools_macos.sh
diff --git a/qtox/build_qtwayland_linux.sh b/qtox/build_qtwayland_linux.sh
@@ -16,8 +16,8 @@ parse_arch --dep "qtwayland" --supported "linux-x86_64" "$@"
 export CXXFLAGS="-DQT_MESSAGELOGCONTEXT"
 export OBJCXXFLAGS="$CXXFLAGS"
 
-mkdir qtwayland/_build && pushd qtwayland/_build
-"$DEP_PREFIX/qt/bin/qt-configure-module" .. \
+mkdir _build && pushd _build
+"$QT_PREFIX/bin/qt-configure-module" .. \
   -- \
   -Wno-dev
 cmake --build .

diff --git a/qtox/docker/Dockerfile.alpine b/qtox/docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: GPL-3.0-or-later.
+# SPDX-License-Identifier: GPL-3.0-or-later
 # Copyright © 2024-2025 The TokTok team
 
 FROM alpine:3.20