From 9c349a64ea685d6c9b24670398bf464bbcec39b8 Mon Sep 17 00:00:00 2001
From: Twaik Yont <9674930+twaik@users.noreply.github.com>
Date: Wed, 16 Apr 2025 00:29:34 +0300
Subject: [PATCH] ci: implement auto-update groups

This change make it possible to:
1. Perform package updates in separate PR (and perform building for all archs, unlike auto-update workflow where package is build only for one arch).
2. Update all packages in update-group in a single step (and ensure all versions are aligned if needed).
3. Perform auto-updating big packages in separate run, no matter what uptime in auto-update workflow is.
[no ci]
---
 packages/emacs/build.sh                       |  7 --
 packages/flang/build.sh                       |  1 +
 packages/libllvm/build.sh                     |  7 --
 packages/libprotobuf/build.sh                 |  9 ---
 packages/mpv/build.sh                         | 12 +--
 packages/octave/build.sh                      |  9 ---
 packages/poppler/build.sh                     |  4 -
 packages/protobuf-static/build.sh             | 19 +----
 packages/tsmuxer/build.sh                     |  9 ---
 root-packages/v4l-utils/build.sh              |  1 +
 scripts/bin/update-packages                   | 73 +++++++++++++++++++
 scripts/build/termux_step_setup_variables.sh  |  1 +
 scripts/build/termux_step_start_build.sh      | 19 +++++
 .../utils/termux_pkg_upgrade_version.sh       | 29 +++++---
 x11-packages/emacs-x/build.sh                 |  8 +-
 x11-packages/extra-cmake-modules/build.sh     |  2 +
 x11-packages/firefox/build.sh                 | 12 +--
 x11-packages/kf6-attica/build.sh              |  2 +
 x11-packages/kf6-breeze-icons/build.sh        |  2 +
 x11-packages/kf6-karchive/build.sh            |  2 +
 x11-packages/kf6-kauth/build.sh               |  2 +
 x11-packages/kf6-kbookmarks/build.sh          |  2 +
 x11-packages/kf6-kcodecs/build.sh             |  2 +
 x11-packages/kf6-kcolorscheme/build.sh        |  2 +
 x11-packages/kf6-kcompletion/build.sh         |  2 +
 x11-packages/kf6-kconfig/build.sh             |  1 +
 x11-packages/kf6-kconfigwidgets/build.sh      |  2 +
 x11-packages/kf6-kcoreaddons/build.sh         |  2 +
 x11-packages/kf6-kcrash/build.sh              |  2 +
 x11-packages/kf6-kdbusaddons/build.sh         |  2 +
 x11-packages/kf6-kfilemetadata/build.sh       |  2 +
 x11-packages/kf6-kglobalaccel/build.sh        |  2 +
 x11-packages/kf6-kguiaddons/build.sh          |  2 +
 x11-packages/kf6-ki18n/build.sh               |  2 +
 x11-packages/kf6-kiconthemes/build.sh         |  2 +
 x11-packages/kf6-kio/build.sh                 |  2 +
 x11-packages/kf6-kirigami/build.sh            |  2 +
 x11-packages/kf6-kitemmodels/build.sh         |  2 +
 x11-packages/kf6-kitemviews/build.sh          |  2 +
 x11-packages/kf6-kjobwidgets/build.sh         |  2 +
 x11-packages/kf6-knewstuff/build.sh           |  2 +
 x11-packages/kf6-knotifications/build.sh      |  2 +
 x11-packages/kf6-knotifyconfig/build.sh       |  2 +
 x11-packages/kf6-kpackage/build.sh            |  2 +
 x11-packages/kf6-kservice/build.sh            |  2 +
 x11-packages/kf6-ktextwidgets/build.sh        |  2 +
 x11-packages/kf6-kwallet/build.sh             |  2 +
 x11-packages/kf6-kwidgetsaddons/build.sh      |  2 +
 x11-packages/kf6-kwindowsystem/build.sh       |  2 +
 x11-packages/kf6-kxmlgui/build.sh             |  2 +
 x11-packages/kf6-purpose/build.sh             |  2 +
 x11-packages/kf6-qqc2-desktop-style/build.sh  |  2 +
 x11-packages/kf6-solid/build.sh               |  2 +
 x11-packages/kf6-sonnet/build.sh              |  2 +
 x11-packages/kf6-syndication/build.sh         |  2 +
 x11-packages/mpv-x/build.sh                   | 13 +---
 x11-packages/octave-x/build.sh                | 10 +--
 x11-packages/poppler-qt/build.sh              |  5 +-
 x11-packages/thunderbird/build.sh             | 12 +--
 x11-packages/tsmuxergui/build.sh              | 10 +--
 x11-packages/vim-gtk/build.sh                 |  1 +
 x11-packages/webkit2gtk-4.1/build.sh          | 12 +--
 x11-packages/webkitgtk-6.0/build.sh           |  9 +--
 63 files changed, 209 insertions(+), 160 deletions(-)

diff --git a/packages/emacs/build.sh b/packages/emacs/build.sh
index 5971bab2d6ee3e..bbd78a50039a27 100644
--- a/packages/emacs/build.sh
+++ b/packages/emacs/build.sh
@@ -91,13 +91,6 @@ termux_step_post_get_source() {
 		termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
 	fi
 
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/emacs-x/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between emacs and emacs-x."
-	fi
-
 	# XXX: We have to start with new host build each time
 	#      to avoid build error when cross compiling.
 	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
diff --git a/packages/flang/build.sh b/packages/flang/build.sh
index 4839b1cd56c5a3..1f12deb5664650 100644
--- a/packages/flang/build.sh
+++ b/packages/flang/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE_FILE="flang/LICENSE.TXT"
 TERMUX_PKG_MAINTAINER="@termux"
 LLVM_MAJOR_VERSION=20
 TERMUX_PKG_VERSION=${LLVM_MAJOR_VERSION}.1.3
+TERMUX_PKG_ALIGN_VERSION_WITH=libllvm
 TERMUX_PKG_SRCURL=https://github.com/llvm/llvm-project/releases/download/llvmorg-$TERMUX_PKG_VERSION/llvm-project-$TERMUX_PKG_VERSION.src.tar.xz
 TERMUX_PKG_SHA256=b6183c41281ee3f23da7fda790c6d4f5877aed103d1e759763b1008bdd0e2c50
 TERMUX_PKG_AUTO_UPDATE=false
diff --git a/packages/libllvm/build.sh b/packages/libllvm/build.sh
index e72715b9f972a8..90ddae744ba1ea 100644
--- a/packages/libllvm/build.sh
+++ b/packages/libllvm/build.sh
@@ -85,13 +85,6 @@ termux_step_host_build() {
 }
 
 termux_step_pre_configure() {
-	# Version guard to keep flang in sync
-	local flang_version=$(. $TERMUX_SCRIPTDIR/packages/flang/build.sh; echo ${TERMUX_PKG_VERSION})
-	local flang_revision=$(TERMUX_PKG_REVISION=0; . $TERMUX_SCRIPTDIR/packages/flang/build.sh; echo ${TERMUX_PKG_REVISION})
-	if [ "${flang_version}" != "${TERMUX_PKG_VERSION}" ] || [ "${flang_revision}" != "${TERMUX_PKG_REVISION}" ]; then
-		termux_error_exit "Version mismatch between libllvm and flang. libllvm=$TERMUX_PKG_VERSION:$TERMUX_PKG_REVISION, flang=$flang_version:$flang_revision"
-	fi
-
 	# Add unknown vendor, otherwise it screws with the default LLVM triple
 	# detection.
 	export LLVM_DEFAULT_TARGET_TRIPLE=${CCTERMUX_HOST_PLATFORM/-/-unknown-}
diff --git a/packages/libprotobuf/build.sh b/packages/libprotobuf/build.sh
index 9b83a828bb3418..385ca007e86dd9 100644
--- a/packages/libprotobuf/build.sh
+++ b/packages/libprotobuf/build.sh
@@ -25,15 +25,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 "
 TERMUX_PKG_NO_STATICSPLIT=true
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/packages/protobuf-static/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between libprotobuf and protobuf-static."
-	fi
-}
-
 termux_step_post_make_install() {
 	install -Dm600 -t $TERMUX_PREFIX/share/doc/libutf8-range \
 		$TERMUX_PKG_SRCDIR/third_party/utf8_range/LICENSE
diff --git a/packages/mpv/build.sh b/packages/mpv/build.sh
index 519e9f2b4541c8..60888ec8096eac 100644
--- a/packages/mpv/build.sh
+++ b/packages/mpv/build.sh
@@ -6,7 +6,8 @@ TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
 TERMUX_PKG_VERSION="0.40.0"
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=10a0f4654f62140a6dd4d380dcf0bbdbdcf6e697556863dc499c296182f081a3
-TERMUX_PKG_AUTO_UPDATE=false
+TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/mpv
 TERMUX_PKG_DEPENDS="alsa-lib, ffmpeg, jack, libandroid-glob, libandroid-support, libarchive, libass, libcaca, libiconv, liblua52, libsixel, libuchardet, openal-soft, pulseaudio, rubberband, zlib, libplacebo"
 TERMUX_PKG_RM_AFTER_INSTALL="share/icons share/applications"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -31,15 +32,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dandroid-media-ndk=disabled
 "
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_m=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/mpv-x/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_m}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between mpv and mpv-x."
-	fi
-}
-
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob"
 	sed -i "s/host_machine.system() == 'android'/false/" ${TERMUX_PKG_SRCDIR}/meson.build
diff --git a/packages/octave/build.sh b/packages/octave/build.sh
index b5361f4150cd4e..d849b0e390d02b 100644
--- a/packages/octave/build.sh
+++ b/packages/octave/build.sh
@@ -37,15 +37,6 @@ ac_cv_func_setpwuid=no
 "
 TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/octave-x/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between octave and octave-x."
-	fi
-}
-
 termux_step_pre_configure() {
 	termux_setup_flang
 
diff --git a/packages/poppler/build.sh b/packages/poppler/build.sh
index c52bbf47dafe5e..1973d6675a8ed0 100644
--- a/packages/poppler/build.sh
+++ b/packages/poppler/build.sh
@@ -32,10 +32,6 @@ termux_step_pre_configure() {
 	if ! test "${_POPPLER_SOVERSION}"; then
 		termux_error_exit "Please set _POPPLER_SOVERSION variable."
 	fi
-	local sover_x11=$(. $TERMUX_SCRIPTDIR/x11-packages/poppler-qt/build.sh; echo $_POPPLER_SOVERSION)
-	if [ "${sover_x11}" != "${_POPPLER_SOVERSION}" ]; then
-		termux_error_exit "SOVERSION mismatch with \"poppler-qt\" package."
-	fi
 	local sover_cmake=$(sed -En 's/^set\(POPPLER_SOVERSION_NUMBER "([0-9]+)"\)$/\1/p' CMakeLists.txt)
 	if [ "${sover_cmake}" != "${_POPPLER_SOVERSION}" ]; then
 		termux_error_exit "SOVERSION guard check failed (CMakeLists.txt: \"${sover_cmake}\")."
diff --git a/packages/protobuf-static/build.sh b/packages/protobuf-static/build.sh
index d200ebf4328e40..71d1f750a2c1ec 100644
--- a/packages/protobuf-static/build.sh
+++ b/packages/protobuf-static/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 # Please align the version with `libprotobuf` package.
 TERMUX_PKG_VERSION=30.0
+TERMUX_PKG_ALIGN_VERSION_WITH=libprotobuf
 TERMUX_PKG_SRCURL=https://github.com/protocolbuffers/protobuf/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=9df0e9e8ebe39f4fbbb9cf7db3d811287fe3616b2f191eb2bf5eaa12539c881f
 v_proto_version_shared=$(. $TERMUX_SCRIPTDIR/packages/libprotobuf/build.sh; echo ${TERMUX_PKG_VERSION})
@@ -26,24 +27,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_INSTALL_LIBDIR=lib
 "
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/packages/libprotobuf/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between libprotobuf and protobuf-static."
-	fi
-}
-
-termux_step_pre_configure() {
-	# Version guard
-	local ver_shared=$(. $TERMUX_SCRIPTDIR/packages/libprotobuf/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	local ver_static=${TERMUX_PKG_VERSION#*:}
-	if [ "${ver_shared}" != "${ver_static}" ]; then
-		termux_error_exit "Version mismatch between libprotobuf and protobuf-static."
-	fi
-}
-
 termux_step_post_make_install() {
 	# Copy lib/*.cmake to opt/protobuf-cmake/static for future use
 	mkdir -p $TERMUX_PREFIX/opt/protobuf-cmake/static
diff --git a/packages/tsmuxer/build.sh b/packages/tsmuxer/build.sh
index 15e05ac51413d1..adb39c93bae3ab 100644
--- a/packages/tsmuxer/build.sh
+++ b/packages/tsmuxer/build.sh
@@ -9,12 +9,3 @@ TERMUX_PKG_SRCURL=https://github.com/justdan96/tsMuxer/archive/refs/tags/${_VERS
 TERMUX_PKG_SHA256=e975d7ab9a73448b1c2c1ded311977a6f0dc77398edb720158dbcf213d9cf4df
 TERMUX_PKG_AUTO_UPDATE=false
 TERMUX_PKG_DEPENDS="freetype, libc++, zlib"
-
-termux_step_post_get_source() {
-	# Version guard
-	local ver_t=${TERMUX_PKG_VERSION#*:}
-	local ver_g=$(. $TERMUX_SCRIPTDIR/x11-packages/tsmuxergui/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_t}" != "${ver_g}" ]; then
-		termux_error_exit "Version mismatch between tsmuxer and tsmuxergui."
-	fi
-}
diff --git a/root-packages/v4l-utils/build.sh b/root-packages/v4l-utils/build.sh
index dbcdc8e70f9bcd..44383b24d57672 100644
--- a/root-packages/v4l-utils/build.sh
+++ b/root-packages/v4l-utils/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-2.0, LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=1.24.1
 TERMUX_PKG_REVISION=1
+TERMUX_PKG_ALIGN_VERSION_WITH=libv4l
 TERMUX_PKG_SRCURL=https://linuxtv.org/downloads/v4l-utils/v4l-utils-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_SHA256=cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b
 TERMUX_PKG_DEPENDS="argp, libc++, libv4l"
diff --git a/scripts/bin/update-packages b/scripts/bin/update-packages
index 94d6a2646a7737..f665ca4fdc7833 100755
--- a/scripts/bin/update-packages
+++ b/scripts/bin/update-packages
@@ -12,6 +12,9 @@ set -u
 # Push changes to remote.
 : "${GIT_PUSH_PACKAGES:=false}"
 
+# Ensure unique workflow run ID exists or generate one.
+: "${GITHUB_RUN_ID:=$(shuf -i 1000000000-9999999999 -n 1)}"
+
 export TERMUX_PKG_UPDATE_METHOD=""             # Which method to use for updating? (repology, github or gitlab)
 export TERMUX_PKG_UPDATE_TAG_TYPE=""           # Whether to use latest-release-tag or newest-tag.
 export TERMUX_GITLAB_API_HOST="gitlab.com"     # Default host for gitlab-ci.
@@ -129,6 +132,13 @@ declare -A _LATEST_TAGS=()
 declare -A _FAILED_UPDATES=()
 declare -a _ALREADY_SEEN=() # Array of packages successfully updated or skipped.
 
+# get list of auto-update groups.
+readarray -t AUTO_UPDATE_GROUPS < <(
+	grep -hr TERMUX_PKG_AUTO_UPDATE_GROUP --include=build.sh "${TERMUX_SCRIPTDIR}" \
+		| sort -u \
+		| sed -e "s/^TERMUX_PKG_AUTO_UPDATE_GROUP=['\"]*//" -e "s/['\"]*\$//" || :
+)
+
 # _fetch_and_cache_tags fetches all possible tags using termux_pkg_auto_update, but using Ninja build system.
 # The key difference is that we make the process concurrent, allowing us to fetch tags simultaneously rather than one at a time.
 # Once all tags are cached, the termux_pkg_auto_update function will operate much more quickly.
@@ -292,6 +302,38 @@ _run_update() {
 	fi
 }
 
+_create_pending_prs_for_auto_update_groups() {
+	local changed_files current_ref versions title
+	current_ref="$(git rev-parse --abbrev-ref HEAD)"
+	for group in ${AUTO_UPDATE_GROUPS[@]}; do
+		# switch to potential PR branch if it exists.
+		git checkout "auto-update/${group}/${GITHUB_RUN_ID}" || continue
+
+		# obtain all build.sh files compared to origin.
+		readarray -t changed_files < <(git diff --name-only "$(git merge-base "${current_ref}" HEAD)" HEAD | grep '/build.sh$')
+
+		# read all versions
+		readarray -t versions < <(
+			for _build_sh in "${changed_files[@]}"; do
+			( # do everything in subshell to avoid variable mess
+				set +e +u
+				. "${_build_sh}" >/dev/null 2>&1
+				[[ -n "${TERMUX_PKG_VERSION#*:}" ]] && echo "${TERMUX_PKG_VERSION#*:}"
+			)
+			done | sort -u
+		)
+
+		if  (( "${#versions[*]}" == 1 )); then
+			title="bump(${group}): ${versions[@]}"
+		else
+			title="bump(${group}): group update"
+		fi
+
+		gh pr create --title "${title}" --body "This PR has been automatically submitted by Github Actions." --base "master"
+		git checkout "${current_ref}"
+	done
+}
+
 declare -a _CACHED_ISSUE_TITLES=()
 # Check if an issue with same title already exists and is open.
 _gh_check_issue_exists() {
@@ -315,6 +357,29 @@ _gh_check_issue_exists() {
 	return 1
 }
 
+declare -a _CACHED_PR_TITLES=()
+# Check if a PR with same title already exists and is open.
+_gh_check_pr_exists() {
+	local pkg_dir="$1" auto_update_group
+	if [[ -z "${_CACHED_PR_TITLES[*]}" ]]; then
+		readarray -t _CACHED_PR_TITLES < <(
+			gh pr list \
+				--limit 10000 \
+				--author termuxbot2 --label "bot" \
+				--state open \
+				--search "bump in:title type:issue" \
+				--json title | jq -r '.[] | .title' | sort -u
+		)
+	fi
+
+	auto_update_group="$(grep TERMUX_PKG_AUTO_UPDATE_GROUP "${pkg_dir}/build.sh" \
+		| sed -e "s/^TERMUX_PKG_AUTO_UPDATE_GROUP=['\"]*//" -e "s/['\"]*\$//" || :)"
+
+	[[ -z "${auto_update_group}" ]] && return 1
+
+	printf "%s\n" "${arr[@]}" | grep -q "^bump(${auto_update_group})"
+}
+
 _should_update() {
 	local pkg_dir="$1"
 
@@ -332,6 +397,12 @@ _should_update() {
 	if [[ " ${_ALREADY_SEEN[*]} ${!_FAILED_UPDATES[*]} " =~ " $(basename "${pkg_dir}") " ]]; then
 		return 1 # Skip.
 	fi
+
+	if [[ "${BUILD_PACKAGES}" == "true" && "${GITHUB_ACTIONS:-}" == "true" ]] && _gh_check_pr_exists "${pkg_dir}"; then
+		echo "INFO: Skipping '$(basename "${pkg_dir}")', existing update PR for it hasn't been merged yet."
+		return 1
+	fi
+
 	if [[ "${BUILD_PACKAGES}" == "true" ]] && [[ "${GITHUB_ACTIONS:-}" == "true" ]] && _gh_check_issue_exists "$(basename "${pkg_dir}")"; then
 		echo "INFO: Skipping '$(basename "${pkg_dir}")', an update issue for it hasn't been resolved yet."
 		return 1
@@ -399,6 +470,8 @@ else
 fi
 unset _unix_millis
 
+_create_pending_prs_for_auto_update_groups
+
 ################################################FAILURE HANDLING#################################################
 
 _gh_create_new_issue() {
diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh
index 8a2b7aafdd226c..7e1de31f66db29 100644
--- a/scripts/build/termux_step_setup_variables.sh
+++ b/scripts/build/termux_step_setup_variables.sh
@@ -9,6 +9,7 @@ termux_step_setup_variables() {
 	: "${TERMUX_PKGS__BUILD__RM_ALL_PKGS_BUILT_MARKER_AND_INSTALL_FILES:="true"}"
 	: "${TERMUX_PKGS__BUILD__RM_ALL_PKG_BUILD_DEPENDENT_DIRS:="false"}"
 	: "${TERMUX_PKG_API_LEVEL:="24"}"
+	: "${TERMUX_PKG_ALIGN_VERSION_WITH:=}"
 	: "${TERMUX_CONTINUE_BUILD:="false"}"
 	: "${TERMUX_QUIET_BUILD:="false"}"
 	: "${TERMUX_WITHOUT_DEPVERSION_BINDING:="false"}"
diff --git a/scripts/build/termux_step_start_build.sh b/scripts/build/termux_step_start_build.sh
index 8a428e003968e2..0d556cae11ee2b 100644
--- a/scripts/build/termux_step_start_build.sh
+++ b/scripts/build/termux_step_start_build.sh
@@ -4,6 +4,25 @@ termux_step_start_build() {
 	# Path to hostbuild marker, for use if package has hostbuild step
 	TERMUX_HOSTBUILD_MARKER="$TERMUX_PKG_HOSTBUILD_DIR/TERMUX_BUILT_FOR_$TERMUX_PKG_VERSION"
 
+	# Check if versions are aligned between linked packages.
+	# Also check if there are other packages wanting to keep version aligned with this package.
+	readarray -t PACKAGES_WANTING_VERSIONS_ALIGNED < <(grep -R -l \
+		-E "TERMUX_PKG_ALIGN_VERSION_WITH=['\"]?$TERMUX_PKG_NAME['\"]?" \
+		--include="build.sh" ${TERMUX_PACKAGES_DIRECTORIES} || :)
+	if [ -n "${TERMUX_PKG_ALIGN_VERSION_WITH}" ]; then
+		local _filename="$(find ${TERMUX_PACKAGES_DIRECTORIES} -mindepth 2 -maxdepth 2 -type f -path "*/${TERMUX_PKG_ALIGN_VERSION_WITH}/build.sh")"
+		[ -z "${_filename}" ] && termux_error_exit "Can not verify version aligning, package ${TERMUX_PKG_ALIGN_VERSION_WITH} is not found"
+		PACKAGES_WANTING_VERSIONS_ALIGNED+=("${_filename}")
+	fi
+
+	# Perform version aligning check
+	for _build_sh in "${PACKAGES_WANTING_VERSIONS_ALIGNED[@]}"; do
+		local version="$(set +e +u; . "${_build_sh}" &>/dev/null; echo ${TERMUX_PKG_VERSION#*:})"
+		if [ "${version#*:}" != "${TERMUX_PKG_VERSION#*:}" ]; then
+			termux_error_exit "Version mismatch between ${TERMUX_PKG_NAME} and $(basename $(dirname "$_build_sh"))."
+		fi
+	done
+
 	if [ "$TERMUX_PKG_METAPACKAGE" = "true" ]; then
 		# Metapackage has no sources and therefore platform-independent.
 		TERMUX_PKG_SKIP_SRC_EXTRACT=true
diff --git a/scripts/updates/utils/termux_pkg_upgrade_version.sh b/scripts/updates/utils/termux_pkg_upgrade_version.sh
index c4ab484cd68466..f75141b92b5161 100755
--- a/scripts/updates/utils/termux_pkg_upgrade_version.sh
+++ b/scripts/updates/utils/termux_pkg_upgrade_version.sh
@@ -24,8 +24,8 @@ termux_pkg_upgrade_version() {
 
 	local LATEST_VERSION="$1"
 	local SKIP_VERSION_CHECK="${2:-}"
-	local EPOCH
-	EPOCH="${TERMUX_PKG_VERSION%%:*}" # If there is no epoch, this will be the full version.
+	local EPOCH; EPOCH="${TERMUX_PKG_VERSION%%:*}" # If there is no epoch, this will be the full version.
+	local CURRENT_REF; CURRENT_REF="$(git rev-parse --abbrev-ref HEAD)"
 	# Check if it isn't the full version and add ':'.
 	if [[ "${EPOCH}" != "${TERMUX_PKG_VERSION}" ]]; then
 		EPOCH="${EPOCH}:"
@@ -122,32 +122,41 @@ termux_pkg_upgrade_version() {
 		fi
 	done < "${TERMUX_SCRIPTDIR}/scripts/big-pkgs.list"
 
-	_termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh
+	if [[ -z "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]]; then
+		_termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh
+
+		if ! "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./build-package.sh -C -a "${TERMUX_ARCH}" -i "${TERMUX_PKG_NAME}"; then
+			_termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh
+			git checkout -- "${TERMUX_PKG_BUILDER_DIR}"
+			termux_error_exit "ERROR: failed to build."
+		fi
 
-	if ! "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./build-package.sh -C -a "${TERMUX_ARCH}" -i "${TERMUX_PKG_NAME}"; then
 		_termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh
-		git checkout -- "${TERMUX_PKG_BUILDER_DIR}"
-		termux_error_exit "ERROR: failed to build."
 	fi
 
-	_termux_should_cleanup "${big_package}" && "${TERMUX_SCRIPTDIR}/scripts/run-docker.sh" ./clean.sh
-
 	if [[ "${GIT_COMMIT_PACKAGES}" == "true" ]]; then
-		echo "INFO: Committing package."
+		echo "INFO: Committing package${TERMUX_PKG_AUTO_UPDATE_GROUP:+" to ${TERMUX_PKG_AUTO_UPDATE_GROUP} update group"}."
 		stderr="$(
+			if [[ -n "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]]; then
+				# Switch to auto-update branch, create if needed
+				git checkout -b "auto-update/${TERMUX_PKG_AUTO_UPDATE_GROUP}/${GITHUB_RUN_ID}" || \
+					git checkout "auto-update/${TERMUX_PKG_AUTO_UPDATE_GROUP}/${GITHUB_RUN_ID}"
+			fi
 			git add "${TERMUX_PKG_BUILDER_DIR}" 2>&1 >/dev/null
 			git commit -m "bump(${repo}/${TERMUX_PKG_NAME}): ${LATEST_VERSION}" \
 				-m "This commit has been automatically submitted by Github Actions." 2>&1 >/dev/null
 		)" || {
 			git reset HEAD --hard
+			[[ -n "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]] && git checkout "${CURRENT_REF}"
 			termux_error_exit <<-EndOfError
 			ERROR: git commit failed. See below for details.
 			${stderr}
 			EndOfError
 		}
+		[[ -n "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]] && git checkout "${CURRENT_REF}"
 	fi
 
-	if [[ "${GIT_PUSH_PACKAGES}" == "true" ]]; then
+	if [[ "${GIT_PUSH_PACKAGES}" == "true" && -z "${TERMUX_PKG_AUTO_UPDATE_GROUP}" ]]; then
 		echo "INFO: Pushing package."
 		stderr="$(
 			# Fetch and pull before attempting to push to avoid a situation
diff --git a/x11-packages/emacs-x/build.sh b/x11-packages/emacs-x/build.sh
index 54e2bae5439126..81f585e56121c6 100644
--- a/x11-packages/emacs-x/build.sh
+++ b/x11-packages/emacs-x/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 # Update both emacs and emacs-x to the same version in one PR.
 TERMUX_PKG_VERSION=30.1
 TERMUX_PKG_REVISION=1
+TERMUX_PKG_ALIGN_VERSION_WITH=emacs
 TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/emacs/emacs-${TERMUX_PKG_VERSION}.tar.xz
 if [[ $TERMUX_PKG_VERSION == *-rc* ]]; then
 	TERMUX_PKG_SRCURL=https://alpha.gnu.org/gnu/emacs/pretest/emacs-${TERMUX_PKG_VERSION#*:}.tar.xz
@@ -76,13 +77,6 @@ termux_step_post_get_source() {
 		termux_error_exit "Package '$TERMUX_PKG_NAME' is not safe for on-device builds."
 	fi
 
-	# Version guard
-	local ver_e=$(. $TERMUX_SCRIPTDIR/packages/emacs/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	local ver_x=${TERMUX_PKG_VERSION#*:}
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between emacs and emacs-x."
-	fi
-
 	# XXX: We have to start with new host build each time
 	#      to avoid build error when cross compiling.
 	rm -Rf $TERMUX_PKG_HOSTBUILD_DIR
diff --git a/x11-packages/extra-cmake-modules/build.sh b/x11-packages/extra-cmake-modules/build.sh
index 6277e3ec6f29f1..04a40fdaf519ff 100644
--- a/x11-packages/extra-cmake-modules/build.sh
+++ b/x11-packages/extra-cmake-modules/build.sh
@@ -7,6 +7,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/extra-cmake-modules-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=7006017c00c817ff4c056995146d271791d1487a398d39ea6cac1cd59a8bf402
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="cmake"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBUILD_HTML_DOCS=OFF
diff --git a/x11-packages/firefox/build.sh b/x11-packages/firefox/build.sh
index eedae508868977..98301c1ad87306 100644
--- a/x11-packages/firefox/build.sh
+++ b/x11-packages/firefox/build.sh
@@ -10,6 +10,7 @@ TERMUX_PKG_DEPENDS="ffmpeg, fontconfig, freetype, gdk-pixbuf, glib, gtk3, liband
 TERMUX_PKG_BUILD_DEPENDS="libcpufeatures, libice, libsm"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/firefox
 
 termux_pkg_auto_update() {
 	# https://archive.mozilla.org/pub/firefox/releases/latest/README.txt
@@ -20,22 +21,11 @@ termux_pkg_auto_update() {
 	[[ -z "${api_url_r}" ]] && e=1
 	[[ -z "${latest_version}" ]] && e=1
 
-	local uptime_now=$(cat /proc/uptime)
-	local uptime_s="${uptime_now//.*}"
-	local uptime_h_limit=2
-	local uptime_s_limit=$((uptime_h_limit*60*60))
-	[[ -z "${uptime_s}" ]] && [[ "$(uname -o)" != "Android" ]] && e=1
-	[[ "${uptime_s}" == 0 ]] && [[ "$(uname -o)" != "Android" ]] && e=1
-	[[ "${uptime_s}" -gt "${uptime_s_limit}" ]] && e=1
-
 	if [[ "${e}" != 0 ]]; then
 		cat <<- EOL >&2
 		WARN: Auto update failure!
 		api_url_r=${api_url_r}
 		latest_version=${latest_version}
-		uptime_now=${uptime_now}
-		uptime_s=${uptime_s}
-		uptime_s_limit=${uptime_s_limit}
 		EOL
 		return
 	fi
diff --git a/x11-packages/kf6-attica/build.sh b/x11-packages/kf6-attica/build.sh
index 6c695254a6727c..2932705762a29f 100644
--- a/x11-packages/kf6-attica/build.sh
+++ b/x11-packages/kf6-attica/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=acccb7ff62e1e421faa5ffd381b41777d0c7bfba268fae1ed802b51a6bd98a
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-breeze-icons/build.sh b/x11-packages/kf6-breeze-icons/build.sh
index fc4bfedaea95ff..0783b3fb40103f 100644
--- a/x11-packages/kf6-breeze-icons/build.sh
+++ b/x11-packages/kf6-breeze-icons/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=76da054482c0b97e0ae68b94aaca9198c500288ded78b34bdb0b3cb88c473b
 TERMUX_PKG_DEPENDS="qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), python-lxml, qt6-qtbase-cross-tools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
diff --git a/x11-packages/kf6-karchive/build.sh b/x11-packages/kf6-karchive/build.sh
index df02a1e9fa23fc..2afe7f093724d6 100644
--- a/x11-packages/kf6-karchive/build.sh
+++ b/x11-packages/kf6-karchive/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/karchive-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=3c9b5dcf3abdfe2761e2153d70d9d667f1ff0fd2f6c80addba7549da954fcc90
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libbz2, libc++, liblzma, qt6-qtbase, zlib, zstd"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kauth/build.sh b/x11-packages/kf6-kauth/build.sh
index 81a2e64857f58d..45cd308e5cce4d 100644
--- a/x11-packages/kf6-kauth/build.sh
+++ b/x11-packages/kf6-kauth/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kauth-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=a33bf07828d88cf499c8bfe717f02f7e289dcf4f58b8f3aae9e2f95615a8d8d6
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION})"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kbookmarks/build.sh b/x11-packages/kf6-kbookmarks/build.sh
index 5eb01f17fc750c..b86abf28c28450 100644
--- a/x11-packages/kf6-kbookmarks/build.sh
+++ b/x11-packages/kf6-kbookmarks/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=6b1d53d48e3a8d2daf8335f105c3389f99708be46ff7cc02dee5d590e66db2
 TERMUX_PKG_DEPENDS="kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kconfigwidgets (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-kcodecs/build.sh b/x11-packages/kf6-kcodecs/build.sh
index dc00f321435f7f..f707a6b48a0dac 100644
--- a/x11-packages/kf6-kcodecs/build.sh
+++ b/x11-packages/kf6-kcodecs/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kcodecs-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=dddde05d970d026ae6a2b31e3559532107f4de60f26d7d87a45733176e122082
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kcolorscheme/build.sh b/x11-packages/kf6-kcolorscheme/build.sh
index 261eaab4b751a0..c53b98038e1dae 100644
--- a/x11-packages/kf6-kcolorscheme/build.sh
+++ b/x11-packages/kf6-kcolorscheme/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=8ab8a567bdb8b83f64824ad3d449077ecb92f73024314f55eeab7777d9129e
 TERMUX_PKG_DEPENDS="kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kguiaddons (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-kcompletion/build.sh b/x11-packages/kf6-kcompletion/build.sh
index 6e4d61c4fad358..00e001200666cb 100644
--- a/x11-packages/kf6-kcompletion/build.sh
+++ b/x11-packages/kf6-kcompletion/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=555ceacadbfd91a059dede3d9f06a9393858fdea12b5584135ad4139a2a791
 TERMUX_PKG_DEPENDS="kf6-kcodecs (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kconfig/build.sh b/x11-packages/kf6-kconfig/build.sh
index a1c97f3bee1a38..e39d31eff1c6b3 100644
--- a/x11-packages/kf6-kconfig/build.sh
+++ b/x11-packages/kf6-kconfig/build.sh
@@ -6,6 +6,7 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kconfig-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=2ec66c996288df472fcc3aba50540e266fb6218d60d38e7a4a445d4b193f9445
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools, qt6-qtbase-cross-tools"
diff --git a/x11-packages/kf6-kconfigwidgets/build.sh b/x11-packages/kf6-kconfigwidgets/build.sh
index 15c2f0021c0747..74a5cb7d42d0bf 100644
--- a/x11-packages/kf6-kconfigwidgets/build.sh
+++ b/x11-packages/kf6-kconfigwidgets/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=c5df55d73b116fe566863cc3b90bd4edfd5c4989f121ecfd8e0c1f7c8e4036
 TERMUX_PKG_DEPENDS="kf6-kcodecs (>= ${TERMUX_PKG_VERSION}), kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-kcoreaddons/build.sh b/x11-packages/kf6-kcoreaddons/build.sh
index cc2c30959ab83d..6897035df4e235 100644
--- a/x11-packages/kf6-kcoreaddons/build.sh
+++ b/x11-packages/kf6-kcoreaddons/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kcoreaddons-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=a110bc3303c541fbac3e2d3aa93c2eb25413055de24634a69034210f6dfddbdb
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, qt6-qtdeclarative, shared-mime-info"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kcrash/build.sh b/x11-packages/kf6-kcrash/build.sh
index ea139728e86b6f..cb6c89cdab2e98 100644
--- a/x11-packages/kf6-kcrash/build.sh
+++ b/x11-packages/kf6-kcrash/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), libc++, libx11,
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 # TERMUX_PKG_RECOMMENDS="drkonqi"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kdbusaddons/build.sh b/x11-packages/kf6-kdbusaddons/build.sh
index 1e0431891b8027..5b1ca57f3750b4 100644
--- a/x11-packages/kf6-kdbusaddons/build.sh
+++ b/x11-packages/kf6-kdbusaddons/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=9b2f16045a38b0db14d1946a3df552aed45edac981e5bff69fc9752abcb17f
 TERMUX_PKG_DEPENDS="qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kfilemetadata/build.sh b/x11-packages/kf6-kfilemetadata/build.sh
index 4484e1678f3486..b914d2f04e171e 100644
--- a/x11-packages/kf6-kfilemetadata/build.sh
+++ b/x11-packages/kf6-kfilemetadata/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="attr, ebook-tools, exiv2, ffmpeg, kf6-karchive (>= ${TERMUX_
 TERMUX_PKG_BUILD_DEPENDS="catdoc, extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), kdegraphics-mobipocket, qt6-qttools"
 TERMUX_PKG_RECOMMENDS="catdoc, kdegraphics-mobipocket"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 # libappimage can be added to TERMUX_PKG_BUILD_DEPENDS and TERMUX_PKG_RECOMMENDS when available
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
diff --git a/x11-packages/kf6-kglobalaccel/build.sh b/x11-packages/kf6-kglobalaccel/build.sh
index 687b1a7d2b414c..05b81056b27d83 100644
--- a/x11-packages/kf6-kglobalaccel/build.sh
+++ b/x11-packages/kf6-kglobalaccel/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=9954f16a8cf257f4569cfdbb64a842cf537fe2faf6b4fa8fe18f62744efe96
 TERMUX_PKG_DEPENDS="qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kguiaddons/build.sh b/x11-packages/kf6-kguiaddons/build.sh
index 60e2546e779960..bb7860b02a41b7 100644
--- a/x11-packages/kf6-kguiaddons/build.sh
+++ b/x11-packages/kf6-kguiaddons/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kguiaddons-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=9280a0f04f29b8e4ffabe3c942621e2c6092bdc0037a3ab9e0b99e5ea56884bf
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, libwayland, libx11, qt6-qtbase, qt6-qtwayland"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), plasma-wayland-protocols, qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-ki18n/build.sh b/x11-packages/kf6-ki18n/build.sh
index cee66c2e637cec..b3cdd78eb68ff1 100644
--- a/x11-packages/kf6-ki18n/build.sh
+++ b/x11-packages/kf6-ki18n/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/ki18n-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=008c0a32235dc2a7d3aa2fa9a98a540f1b4baf6ab5efd14839a11fda6e746a14
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="gettext, iso-codes, libc++, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), python, qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kiconthemes/build.sh b/x11-packages/kf6-kiconthemes/build.sh
index 5ecde613c099ef..f2332a3ffc5768 100644
--- a/x11-packages/kf6-kiconthemes/build.sh
+++ b/x11-packages/kf6-kiconthemes/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=a3278c5d29c2fdb0ef5dd72a0d5f9b5a75c072663026e1e4fdbb27f51bfa5a
 TERMUX_PKG_DEPENDS="kf6-breeze-icons (>= ${TERMUX_PKG_VERSION}), kf6-karchive (>= ${TERMUX_PKG_VERSION}), kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kconfigwidgets (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qtsvg, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kio/build.sh b/x11-packages/kf6-kio/build.sh
index 9941f8da7face5..019dd6cedd8eb9 100644
--- a/x11-packages/kf6-kio/build.sh
+++ b/x11-packages/kf6-kio/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=431552d0b740f357c4db7de2e28dcf0ec28e2bfb041a042da5708ae26ec2a2
 TERMUX_PKG_DEPENDS="kf6-karchive (>= ${TERMUX_PKG_VERSION}), kf6-kauth (>= ${TERMUX_PKG_VERSION}), kf6-kbookmarks (>= ${TERMUX_PKG_VERSION}), kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}), kf6-kcompletion (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-kdbusaddons (>= ${TERMUX_PKG_VERSION}), kf6-kguiaddons (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), kf6-kiconthemes (>= ${TERMUX_PKG_VERSION}), kf6-kitemviews (>= ${TERMUX_PKG_VERSION}), kf6-kjobwidgets (>= ${TERMUX_PKG_VERSION}), kf6-kservice (>= ${TERMUX_PKG_VERSION}), kf6-kwallet (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), kf6-kwindowsystem (>= ${TERMUX_PKG_VERSION}), kf6-solid (>= ${TERMUX_PKG_VERSION}), libacl, libandroid-shmem, libc++, libmount, libxml2, libxslt, qt6-qtbase, util-linux"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kirigami/build.sh b/x11-packages/kf6-kirigami/build.sh
index 0455724d3b2ac9..1419a9fbd55c5c 100644
--- a/x11-packages/kf6-kirigami/build.sh
+++ b/x11-packages/kf6-kirigami/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=dd5aa1b5b8fbc4eb731227851af7ca9caa1dcaac0dc99421dbd3d0d58d9883
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-shadertools, qt6-qtsvg, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kitemmodels/build.sh b/x11-packages/kf6-kitemmodels/build.sh
index c800cd93b6ce6c..6975777ab3b8fa 100644
--- a/x11-packages/kf6-kitemmodels/build.sh
+++ b/x11-packages/kf6-kitemmodels/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kitemmodels-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=416c4792e9918c4f909e1dad8fbe7551fb561703c02d4e0001b372df1fab58e6
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kitemviews/build.sh b/x11-packages/kf6-kitemviews/build.sh
index 60bfba2f019c20..9d3a8fa9a2d221 100644
--- a/x11-packages/kf6-kitemviews/build.sh
+++ b/x11-packages/kf6-kitemviews/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kitemviews-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=e0de8c9fa2baa27bde6abd3847b6d5f4cb54aeceab3436c64f89a50fe1d9695d
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kjobwidgets/build.sh b/x11-packages/kf6-kjobwidgets/build.sh
index 6f8482dc0c879c..3e667b6ebc5733 100644
--- a/x11-packages/kf6-kjobwidgets/build.sh
+++ b/x11-packages/kf6-kjobwidgets/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=68f838812c4304212c0d25611c4251c27a8760885b3db22dfa909355c573b8
 TERMUX_PKG_DEPENDS="kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-knotifications (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-knewstuff/build.sh b/x11-packages/kf6-knewstuff/build.sh
index 6dfe49cba21f03..639b90990c84f7 100644
--- a/x11-packages/kf6-knewstuff/build.sh
+++ b/x11-packages/kf6-knewstuff/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="kf6-attica (>= ${TERMUX_PKG_VERSION}), kf6-karchive (>= ${TE
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), kf6-kirigami (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_RECOMMENDS="kf6-kirigami"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-knotifications/build.sh b/x11-packages/kf6-knotifications/build.sh
index 0a8f47b002df9a..b5fb60b88030b1 100644
--- a/x11-packages/kf6-knotifications/build.sh
+++ b/x11-packages/kf6-knotifications/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=d2b12f1d4ae80f700bc874112ecee99b1e44438c49bb2a8a77ceb4c70569f9
 TERMUX_PKG_DEPENDS="kf6-kconfig (>= ${TERMUX_PKG_VERSION}), libc++, libcanberra, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-knotifyconfig/build.sh b/x11-packages/kf6-knotifyconfig/build.sh
index 41c3242b7c93fa..bc6f47062b2c35 100644
--- a/x11-packages/kf6-knotifyconfig/build.sh
+++ b/x11-packages/kf6-knotifyconfig/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=ab9b39ebfc1de82f8aabc3a441afed730202a33d72828308eadc81232ef839
 TERMUX_PKG_DEPENDS="kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), kf6-kio (>= ${TERMUX_PKG_VERSION}), libc++, libcanberra, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kpackage/build.sh b/x11-packages/kf6-kpackage/build.sh
index e11811d54172f6..26f852bde2d47e 100644
--- a/x11-packages/kf6-kpackage/build.sh
+++ b/x11-packages/kf6-kpackage/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=a622694aa723d79b7b4988cb2bc51f85d20fcaafee020f741ee52053dc8564
 TERMUX_PKG_DEPENDS="kf6-karchive (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kservice/build.sh b/x11-packages/kf6-kservice/build.sh
index 9f1a036f1bc84f..316d644a1384e2 100644
--- a/x11-packages/kf6-kservice/build.sh
+++ b/x11-packages/kf6-kservice/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=65d9542f729d30be3dcc12aa2ebeb50238ce4d30a850775f9b006b9b9f1c1c
 TERMUX_PKG_DEPENDS="kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-ktextwidgets/build.sh b/x11-packages/kf6-ktextwidgets/build.sh
index b2d71797dd72a5..c9ab5ffed2ab5f 100644
--- a/x11-packages/kf6-ktextwidgets/build.sh
+++ b/x11-packages/kf6-ktextwidgets/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=1ff29bf02b247f09ffaaafe4578f0977b51c42b67eef84fddb5677dd7d1edf
 TERMUX_PKG_DEPENDS="kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}), kf6-kcompletion (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kconfigwidgets (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), kf6-sonnet (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DWITH_TEXT_TO_SPEECH=OFF
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kwallet/build.sh b/x11-packages/kf6-kwallet/build.sh
index 88a589c795b070..5cca78fa5e4aa1 100644
--- a/x11-packages/kf6-kwallet/build.sh
+++ b/x11-packages/kf6-kwallet/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="gpgme, gpgmepp, kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}),
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), kf6-kservice (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 # TERMUX_PKG_RECOMMENDS="kwalletmanager"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-kwidgetsaddons/build.sh b/x11-packages/kf6-kwidgetsaddons/build.sh
index 2136292bccd0fc..020e5e4ed6d568 100644
--- a/x11-packages/kf6-kwidgetsaddons/build.sh
+++ b/x11-packages/kf6-kwidgetsaddons/build.sh
@@ -6,6 +6,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kwidgetsaddons-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=a1538829997319f8af0044ed7ae84f79b4e18cf2b32cacd4fdc4748b8f1c7406
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kwindowsystem/build.sh b/x11-packages/kf6-kwindowsystem/build.sh
index 08ecadb8f0c0c5..35b3a20ae7eb95 100644
--- a/x11-packages/kf6-kwindowsystem/build.sh
+++ b/x11-packages/kf6-kwindowsystem/build.sh
@@ -13,6 +13,8 @@ TERMUX_PKG_VERSION="6.13.0"
 TERMUX_PKG_SRCURL="https://download.kde.org/stable/frameworks/${TERMUX_PKG_VERSION%.*}/kwindowsystem-${TERMUX_PKG_VERSION}.tar.xz"
 TERMUX_PKG_SHA256=4fa83424f39a97d7fe784533d2ad4d4969ff878d26438dda9dc00e30745959ac
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_DEPENDS="libc++, libwayland, libx11, libxcb, libxfixes, qt6-qtbase, qt6-qtdeclarative, qt6-qtwayland, xcb-util-keysyms"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), libwayland-protocols, plasma-wayland-protocols, qt6-qttools"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
diff --git a/x11-packages/kf6-kxmlgui/build.sh b/x11-packages/kf6-kxmlgui/build.sh
index 11b23c4e4630f2..698e293e95cd5a 100644
--- a/x11-packages/kf6-kxmlgui/build.sh
+++ b/x11-packages/kf6-kxmlgui/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=e106482d3bb15f7afdeeb5542e0f0f3ca26b9b5c6374a03ca18153d5d2750d
 TERMUX_PKG_DEPENDS="kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kconfigwidgets (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>= ${TERMUX_PKG_VERSION}), kf6-kglobalaccel (>= ${TERMUX_PKG_VERSION}), kf6-kguiaddons (>= ${TERMUX_PKG_VERSION}), kf6-ki18n (>= ${TERMUX_PKG_VERSION}), kf6-kiconthemes (>= ${TERMUX_PKG_VERSION}), kf6-kitemviews (>= ${TERMUX_PKG_VERSION}), kf6-kwidgetsaddons (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-purpose/build.sh b/x11-packages/kf6-purpose/build.sh
index c03dad2649d08d..dc22be2ba70e44 100644
--- a/x11-packages/kf6-purpose/build.sh
+++ b/x11-packages/kf6-purpose/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kcoreaddons (>=
 # kaccounts-integration, libaccounts-qt, accounts-qml-module, kcmutils can be added to TERMUX_PKG_DEPENDS when available
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), kf6-kirigami (>= ${TERMUX_PKG_VERSION}), intltool"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-qqc2-desktop-style/build.sh b/x11-packages/kf6-qqc2-desktop-style/build.sh
index d1c16dcb9193b4..0872fe4f7d746e 100644
--- a/x11-packages/kf6-qqc2-desktop-style/build.sh
+++ b/x11-packages/kf6-qqc2-desktop-style/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=a8a5a8ce343ea77cb1d0b300c12e86829c913e036c6ff8ad5d21b8f9621842
 TERMUX_PKG_DEPENDS="kf6-kcolorscheme (>= ${TERMUX_PKG_VERSION}), kf6-kconfig (>= ${TERMUX_PKG_VERSION}), kf6-kiconthemes (>= ${TERMUX_PKG_VERSION}), kf6-kirigami (>= ${TERMUX_PKG_VERSION}), kf6-sonnet (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qtbase, qt6-qtdeclarative"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-solid/build.sh b/x11-packages/kf6-solid/build.sh
index 382bcdcf41e34c..e376027a2885da 100644
--- a/x11-packages/kf6-solid/build.sh
+++ b/x11-packages/kf6-solid/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="libimobiledevice, libplist, qt6-qtbase, libc++, util-linux"
 # media-player-info, systemd-libs, udisks2, upower can be added to TERMUX_PKG_DEPENDS when available
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qtdeclarative, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/kf6-sonnet/build.sh b/x11-packages/kf6-sonnet/build.sh
index ffaeca82edcf0c..2e1814a550217c 100644
--- a/x11-packages/kf6-sonnet/build.sh
+++ b/x11-packages/kf6-sonnet/build.sh
@@ -9,6 +9,8 @@ TERMUX_PKG_DEPENDS="aspell, hunspell, libc++, libvoikko, qt6-qtbase, qt6-qtdecla
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), qt6-qttools, qt6-qtbase-cross-tools"
 # hspell can be added to TERMUX_PKG_BUILD_DEPENDS and TERMUX_PKG_RECOMMENDS when available
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DCMAKE_SYSTEM_NAME=Linux
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
diff --git a/x11-packages/kf6-syndication/build.sh b/x11-packages/kf6-syndication/build.sh
index 2c678e29665ad3..5a448bc354be4d 100644
--- a/x11-packages/kf6-syndication/build.sh
+++ b/x11-packages/kf6-syndication/build.sh
@@ -8,6 +8,8 @@ TERMUX_PKG_SHA256=1fe07a581705659753f995a7ee09977bf528b020a65978349b9722862da08f
 TERMUX_PKG_DEPENDS="kf6-kcodecs (>= ${TERMUX_PKG_VERSION}), qt6-qtbase"
 TERMUX_PKG_BUILD_DEPENDS="extra-cmake-modules (>= ${TERMUX_PKG_VERSION}), libc++, qt6-qttools"
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/kframeworks6
+TERMUX_PKG_ALIGN_VERSION_WITH=kf6-kconfig
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DKDE_INSTALL_QMLDIR=lib/qt6/qml
 -DKDE_INSTALL_QTPLUGINDIR=lib/qt6/plugins
diff --git a/x11-packages/mpv-x/build.sh b/x11-packages/mpv-x/build.sh
index b196af8451c296..452ee1da819ce7 100644
--- a/x11-packages/mpv-x/build.sh
+++ b/x11-packages/mpv-x/build.sh
@@ -6,7 +6,9 @@ TERMUX_PKG_MAINTAINER="Joshua Kahn @TomJo2000"
 TERMUX_PKG_VERSION="0.40.0"
 TERMUX_PKG_SRCURL=https://github.com/mpv-player/mpv/archive/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=10a0f4654f62140a6dd4d380dcf0bbdbdcf6e697556863dc499c296182f081a3
-TERMUX_PKG_AUTO_UPDATE=false
+TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/mpv
+TERMUX_PKG_ALIGN_VERSION_WITH=mpv
 TERMUX_PKG_DEPENDS="alsa-lib, ffmpeg, jack, libandroid-glob, libandroid-shmem, libarchive, libass, libbluray, libcaca, libdrm, libdvdnav, libiconv, libjpeg-turbo, liblua52, libsixel, libuchardet, libx11, libxext, libxinerama, libxpresent, libxrandr, libxss, libzimg, littlecms, openal-soft, pipewire, pulseaudio, rubberband, zlib, libplacebo"
 TERMUX_PKG_CONFLICTS="mpv"
 TERMUX_PKG_REPLACES="mpv"
@@ -25,15 +27,6 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -Dandroid-media-ndk=disabled
 "
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_m=$(. $TERMUX_SCRIPTDIR/packages/mpv/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	local ver_x=${TERMUX_PKG_VERSION#*:}
-	if [ "${ver_m}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between mpv and mpv-x."
-	fi
-}
-
 termux_step_pre_configure() {
 	LDFLAGS+=" -landroid-glob -landroid-shmem"
 	sed -i "s/host_machine.system() == 'android'/false/" ${TERMUX_PKG_SRCDIR}/meson.build
diff --git a/x11-packages/octave-x/build.sh b/x11-packages/octave-x/build.sh
index a68b69cabea828..382eac3ce8eafa 100644
--- a/x11-packages/octave-x/build.sh
+++ b/x11-packages/octave-x/build.sh
@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="9.4.0"
 TERMUX_PKG_REVISION=1
+TERMUX_PKG_ALIGN_VERSION_WITH=octave
 TERMUX_PKG_SRCURL=https://ftpmirror.gnu.org/octave/octave-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=fff911909ef79f95ba244dab5b8c1cb8c693a6c447d31deabb53994f17cb7b3d
 TERMUX_PKG_DEPENDS="arpack-ng, clang, fftw, fltk, fontconfig, freetype, glpk, glu, graphicsmagick, libandroid-complex-math, libbz2, libc++, libcurl, libhdf5, libiconv, libopenblas, libsndfile, libx11, libxcursor, libxext, libxfixes, libxft, libxinerama, libxrender, make, opengl, openssl, pcre2, portaudio, qhull, qrupdate-ng, qt6-qt5compat, qt6-qtbase, qt6-qttools, readline, suitesparse, sundials, zlib"
@@ -38,15 +39,6 @@ ac_cv_func_setpwuid=no
 "
 TERMUX_PKG_EXCLUDED_ARCHES="arm, i686"
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/packages/octave/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between octave and octave-x."
-	fi
-}
-
 termux_step_pre_configure() {
 	termux_setup_flang
 
diff --git a/x11-packages/poppler-qt/build.sh b/x11-packages/poppler-qt/build.sh
index b9515298d07fb4..ff0cce13e01cfb 100644
--- a/x11-packages/poppler-qt/build.sh
+++ b/x11-packages/poppler-qt/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 # Please align the version with `poppler` package.
 TERMUX_PKG_VERSION="24.05.0"
 TERMUX_PKG_REVISION=4
+TERMUX_PKG_ALIGN_VERSION_WITH=poppler
 # Do not forget to bump revision of reverse dependencies and rebuild them
 # when SOVERSION is changed.
 _POPPLER_SOVERSION=137
@@ -34,10 +35,6 @@ termux_step_pre_configure() {
 	if ! test "${_POPPLER_SOVERSION}"; then
 		termux_error_exit "Please set _POPPLER_SOVERSION variable."
 	fi
-	local sover_main=$(. $TERMUX_SCRIPTDIR/packages/poppler/build.sh; echo $_POPPLER_SOVERSION)
-	if [ "${sover_main}" != "${_POPPLER_SOVERSION}" ]; then
-		termux_error_exit "SOVERSION mismatch with \"poppler\" package."
-	fi
 	local sover_cmake=$(sed -En 's/^set\(POPPLER_SOVERSION_NUMBER "([0-9]+)"\)$/\1/p' CMakeLists.txt)
 	if [ "${sover_cmake}" != "${_POPPLER_SOVERSION}" ]; then
 		termux_error_exit "SOVERSION guard check failed (CMakeLists.txt: \"${sover_cmake}\")."
diff --git a/x11-packages/thunderbird/build.sh b/x11-packages/thunderbird/build.sh
index 412d7f609c9b4b..0a7fb9c681e9cc 100644
--- a/x11-packages/thunderbird/build.sh
+++ b/x11-packages/thunderbird/build.sh
@@ -9,6 +9,7 @@ TERMUX_PKG_DEPENDS="ffmpeg, fontconfig, freetype, gdk-pixbuf, glib, gtk3, liband
 TERMUX_PKG_BUILD_DEPENDS="libcpufeatures, libice, libsm"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/thunderbird
 
 termux_pkg_auto_update() {
 	# https://archive.mozilla.org/pub/thunderbird/releases/latest/README.txt
@@ -19,22 +20,11 @@ termux_pkg_auto_update() {
 	[[ -z "${api_url_r}" ]] && e=1
 	[[ -z "${latest_version}" ]] && e=1
 
-	local uptime_now=$(cat /proc/uptime)
-	local uptime_s="${uptime_now//.*}"
-	local uptime_h_limit=2
-	local uptime_s_limit=$((uptime_h_limit*60*60))
-	[[ -z "${uptime_s}" ]] && [[ "$(uname -o)" != "Android" ]] && e=1
-	[[ "${uptime_s}" == 0 ]] && [[ "$(uname -o)" != "Android" ]] && e=1
-	[[ "${uptime_s}" -gt "${uptime_s_limit}" ]] && e=1
-
 	if [[ "${e}" != 0 ]]; then
 		cat <<- EOL >&2
 		WARN: Auto update failure!
 		api_url_r=${api_url_r}
 		latest_version=${latest_version}
-		uptime_now=${uptime_now}
-		uptime_s=${uptime_s}
-		uptime_s_limit=${uptime_s_limit}
 		EOL
 		return
 	fi
diff --git a/x11-packages/tsmuxergui/build.sh b/x11-packages/tsmuxergui/build.sh
index 8b743c24756a5d..c63dd4ee19a074 100644
--- a/x11-packages/tsmuxergui/build.sh
+++ b/x11-packages/tsmuxergui/build.sh
@@ -5,6 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
 # Update both tsmuxer and tsmuxergui to the same version in one PR.
 _VERSION_REAL=nightly-2023-01-30-02-16-12
 TERMUX_PKG_VERSION=$(cut -d- -f2,3,4 <<< "$_VERSION_REAL" | tr '-' '.')
+TERMUX_PKG_ALIGN_VERSION_WITH=tsmuxer
 TERMUX_PKG_SRCURL=https://github.com/justdan96/tsMuxer/archive/refs/tags/${_VERSION_REAL}.tar.gz
 TERMUX_PKG_SHA256=e975d7ab9a73448b1c2c1ded311977a6f0dc77398edb720158dbcf213d9cf4df
 TERMUX_PKG_AUTO_UPDATE=true
@@ -14,15 +15,6 @@ TERMUX_PKG_BUILD_DEPENDS="freetype, qt5-qtbase-cross-tools, qt5-qttools-cross-to
 TERMUX_PKG_RM_AFTER_INSTALL="bin/tsmuxer"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_INSTALL_DATADIR=share -DTSMUXER_GUI=ON"
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_t=$(. $TERMUX_SCRIPTDIR/packages/tsmuxer/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	local ver_g=${TERMUX_PKG_VERSION#*:}
-	if [ "${ver_t}" != "${ver_g}" ]; then
-		termux_error_exit "Version mismatch between tsmuxer and tsmuxergui."
-	fi
-}
-
 termux_step_post_make_install() {
 	mv ${TERMUX_PREFIX}/bin/tsMuxerGUI ${TERMUX_PREFIX}/bin/tsmuxergui
 }
diff --git a/x11-packages/vim-gtk/build.sh b/x11-packages/vim-gtk/build.sh
index e3d55dcc3a95e6..c33f7b04d6aa75 100644
--- a/x11-packages/vim-gtk/build.sh
+++ b/x11-packages/vim-gtk/build.sh
@@ -10,6 +10,7 @@ TERMUX_PKG_CONFLICTS="vim"
 TERMUX_PKG_BREAKS="vim-python"
 TERMUX_PKG_REPLACES="vim-python"
 TERMUX_PKG_VERSION="9.1.1300"
+TERMUX_PKG_ALIGN_VERSION_WITH=vim
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=fa550742316c3c0e7462078de4fc89057ee582d3ed5d4eb42a2594cec730fbcd
 TERMUX_PKG_BUILD_IN_SRC=true
diff --git a/x11-packages/webkit2gtk-4.1/build.sh b/x11-packages/webkit2gtk-4.1/build.sh
index 4acfd03811ab0b..19532ab78ada66 100644
--- a/x11-packages/webkit2gtk-4.1/build.sh
+++ b/x11-packages/webkit2gtk-4.1/build.sh
@@ -4,10 +4,13 @@ TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.48.0"
 TERMUX_PKG_REVISION=1
+TERMUX_PKG_ALIGN_VERSION_WITH=webkitgtk-6.0
 TERMUX_PKG_SRCURL=https://webkitgtk.org/releases/webkitgtk-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_SHA256=94904a55cf12d44a4e36ceadafff02d46da73d76be9b4769f34cbfdf0eebf88e
 TERMUX_PKG_DEPENDS="atk, enchant, fontconfig, freetype, glib, gst-plugins-bad, gst-plugins-base, gst-plugins-good, gstreamer, gtk3, harfbuzz, harfbuzz-icu, libc++, libcairo, libdrm, libgcrypt, libhyphen, libicu, libjpeg-turbo, libpng, libsoup3, libtasn1, libwebp, libxml2, libx11, libxcomposite, libxdamage, libxslt, libxt, littlecms, openjpeg, pango, woff2, zlib"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto"
+TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/webkit
 TERMUX_PKG_VERSIONED_GIR=false
 TERMUX_PKG_DISABLE_GIR=false
 
@@ -15,15 +18,6 @@ TERMUX_PKG_DISABLE_GIR=false
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DPORT=GTK -DENABLE_GAMEPAD=OFF -DUSE_SYSTEMD=OFF -DUSE_LIBSECRET=OFF -DENABLE_INTROSPECTION=ON -DENABLE_DOCUMENTATION=OFF -DENABLE_WAYLAND_TARGET=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_BUBBLEWRAP_SANDBOX=OFF -DUSE_LD_GOLD=OFF -DUSE_OPENGL_OR_ES=OFF -DENABLE_JOURNALD_LOG=OFF -DUSE_SOUP2=OFF -DUSE_GTK4=OFF -DUSE_AVIF=OFF -DUSE_GBM=OFF -DENABLE_SPEECH_SYNTHESIS=OFF -DUSE_LIBBACKTRACE=OFF -DUSE_SYSTEM_SYSPROF_CAPTURE=OFF
 "
 
-termux_step_post_get_source() {
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/webkitgtk-6.0/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between webkit2gtk-4.1 and webkitgtk-6.0."
-	fi
-}
-
 termux_step_pre_configure() {
 	termux_setup_gir
 
diff --git a/x11-packages/webkitgtk-6.0/build.sh b/x11-packages/webkitgtk-6.0/build.sh
index b3b5970592c064..a4c24fc404a220 100644
--- a/x11-packages/webkitgtk-6.0/build.sh
+++ b/x11-packages/webkitgtk-6.0/build.sh
@@ -8,17 +8,12 @@ TERMUX_PKG_SRCURL=https://webkitgtk.org/releases/webkitgtk-${TERMUX_PKG_VERSION}
 TERMUX_PKG_SHA256=94904a55cf12d44a4e36ceadafff02d46da73d76be9b4769f34cbfdf0eebf88e
 TERMUX_PKG_DEPENDS="enchant, fontconfig, freetype, glib, gst-plugins-bad, gst-plugins-base, gst-plugins-good, gstreamer, gtk4, harfbuzz, harfbuzz-icu, libc++, libcairo, libdrm, libgcrypt, libhyphen, libicu, libjpeg-turbo, libpng, libsoup3, libtasn1, libwebp, libxml2, libx11, libxcomposite, libxdamage, libxslt, libxt, littlecms, openjpeg, pango, woff2, zlib"
 TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto"
+TERMUX_PKG_AUTO_UPDATE=true
+TERMUX_PKG_AUTO_UPDATE_GROUP=x11/webkit
 TERMUX_PKG_VERSIONED_GIR=false
 TERMUX_PKG_DISABLE_GIR=false
 
 termux_step_post_get_source() {
-	# Version guard
-	local ver_e=${TERMUX_PKG_VERSION#*:}
-	local ver_x=$(. $TERMUX_SCRIPTDIR/x11-packages/webkit2gtk-4.1/build.sh; echo ${TERMUX_PKG_VERSION#*:})
-	if [ "${ver_e}" != "${ver_x}" ]; then
-		termux_error_exit "Version mismatch between webkit2gtk-4.1 and webkitgtk-6.0."
-	fi
-
 	local p
 	for p in $TERMUX_SCRIPTDIR/x11-packages/webkit2gtk-4.1/*.patch; do
 		echo "Applying $(basename "${p}")"