From a91eb4ce87ae97daa1d3f1bdf2e1f57b92562f2d Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Wed, 21 Jan 2026 14:46:09 +0000 Subject: [PATCH] fix(x11/qt6-qt{declarative,tools}): fix repeated builds - Fixes error `ln: failed to create symbolic link '/data/data/com.termux/files/usr/opt/qt6/cross/bin/qmlls6': File exists` in `scripts/run-docker.sh ./build-package.sh -I -f qt6-qtdeclarative qt6-qtdeclarative qt6-qttools qt6-qttools` --- x11-packages/qt6-qtdeclarative/build.sh | 5 +++-- x11-packages/qt6-qttools/build.sh | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/x11-packages/qt6-qtdeclarative/build.sh b/x11-packages/qt6-qtdeclarative/build.sh index b79ef56fdc..0a56d7314f 100644 --- a/x11-packages/qt6-qtdeclarative/build.sh +++ b/x11-packages/qt6-qtdeclarative/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Classes for QML and JavaScript languages" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.10.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/qtdeclarative-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=4fb4efb894e0b96288543505d69794d684bcfbe4940ce181d3e6817bda54843e TERMUX_PKG_DEPENDS="libc++, qt6-qtbase (>= ${TERMUX_PKG_VERSION})" @@ -48,7 +49,7 @@ termux_step_host_build() { -exec sed -e "s|^${TERMUX_PREFIX}/opt/qt6/cross|..|g" -i "{}" \; while read -r target link; do - ln -sv "$target" "$TERMUX_PREFIX/opt/qt6/cross/$link" + ln -sfv "$target" "$TERMUX_PREFIX/opt/qt6/cross/$link" done < "$PWD/user_facing_tool_links.txt" } @@ -75,6 +76,6 @@ termux_step_post_make_install() { -exec cat "{}" \; while read -r target link; do - ln -sv "$target" "$TERMUX_PREFIX/$link" + ln -sfv "$target" "$TERMUX_PREFIX/$link" done < "$PWD/user_facing_tool_links.txt" } diff --git a/x11-packages/qt6-qttools/build.sh b/x11-packages/qt6-qttools/build.sh index 9eb5a45aa3..098d075aaf 100644 --- a/x11-packages/qt6-qttools/build.sh +++ b/x11-packages/qt6-qttools/build.sh @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Qt Development Tools (Linguist, Assistant, Designer, etc TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION="6.10.1" +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL="https://download.qt.io/official_releases/qt/${TERMUX_PKG_VERSION%.*}/${TERMUX_PKG_VERSION}/submodules/qttools-everywhere-src-${TERMUX_PKG_VERSION}.tar.xz" TERMUX_PKG_SHA256=8148408380ffea03101a26305c812b612ea30dbc07121e58707601522404d49b TERMUX_PKG_DEPENDS="libc++, qt6-qtbase (>= ${TERMUX_PKG_VERSION}), zstd" @@ -45,7 +46,7 @@ termux_step_host_build() { -exec sed -e "s|^${TERMUX_PREFIX}/opt/qt6/cross|..|g" -i "{}" \; while read -r target link; do - ln -sv "$target" "$TERMUX_PREFIX/opt/qt6/cross/$link" + ln -sfv "$target" "$TERMUX_PREFIX/opt/qt6/cross/$link" done < "$PWD/user_facing_tool_links.txt" } @@ -67,6 +68,6 @@ termux_step_post_make_install() { -exec cat "{}" \; while read -r target link; do - ln -sv "$target" "$TERMUX_PREFIX/$link" + ln -sfv "$target" "$TERMUX_PREFIX/$link" done < "$PWD/user_facing_tool_links.txt" }