Test qemu

Signed-off-by: Aditya Alok <[email protected]>

Author: MrAdityaAlok

packages/p11-kit/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Provides a way to load and enumerate PKCS#11 modules"
 TERMUX_PKG_LICENSE="BSD 3-Clause"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="0.25.10"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/p11-glue/p11-kit/releases/download/$TERMUX_PKG_VERSION/p11-kit-$TERMUX_PKG_VERSION.tar.xz"
 TERMUX_PKG_SHA256=a62a137a966fb3a9bbfa670b4422161e369ddea216be51425e3be0ab2096e408
 TERMUX_PKG_DEPENDS="libffi, libtasn1"

packages/sbcl/build.sh

@@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="COPYING"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="2.5.9"
+TERMUX_PKG_REVISION=1
 # sourceforge archive is a precompiled SBCL release for GNU/Linux to use as host Lisp for bootstrapping
 TERMUX_PKG_SRCURL=(
 	https://github.com/sbcl/sbcl/archive/refs/tags/sbcl-${TERMUX_PKG_VERSION}.tar.gz

packages/yazi/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Blazing fast terminal file manager written in Rust, base
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="25.5.31"
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_REVISION=4
 TERMUX_PKG_SRCURL=https://github.com/sxyazi/yazi/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=4d005e7c3f32b5574d51ab105597f3da3a4be2f7b5cd1bcb284143ad38253ed4
 TERMUX_PKG_BUILD_DEPENDS='aosp-libs, imagemagick'

scripts/build/setup/termux_setup_proot.sh

@@ -12,8 +12,7 @@ termux_setup_proot() {
 	[[ -d "$TERMUX_PROOT_BIN" ]] && return
 
 	if ! [[ -d "$TERMUX_PREFIX/opt/aosp" ]]; then
-		echo "ERROR: Add 'aosp-libs' to TERMUX_PKG_BUILD_DEPENDS. 'proot' cannot run without it."
-		exit 1
+		termux_error_exit "ERROR: Add 'aosp-libs' to TERMUX_PKG_BUILD_DEPENDS. 'proot' cannot run without it."
 	fi
 
 	mkdir -p "$TERMUX_PROOT_BIN"
@@ -32,12 +31,14 @@ termux_setup_proot() {
 			"$TERMUX_PROOT_BIN"/qemu-"$TERMUX_ARCH" \
 			"${checksums[$TERMUX_ARCH]}"
 		chmod +x "$TERMUX_PROOT_BIN"/qemu-"$TERMUX_ARCH"
-		TERMUX_PROOT_QEMU="-q $TERMUX_PROOT_BIN/qemu-$TERMUX_ARCH"
+		TERMUX_PROOT_QEMU="$TERMUX_PROOT_BIN/qemu-$TERMUX_ARCH"
 	fi
 
 	# NOTE: We include current PATH too so that host binaries also become available under proot.
 	cat <<-EOF >"$TERMUX_PROOT_BIN/$TERMUX_PROOT_BIN_NAME"
 		#!/bin/bash
+		cmd="\$(command -v "\$1")" && shift
+		echo "[DEBUG]: Executing \$cmd with args \$@"
 		env -i \
 			PATH="$TERMUX_PREFIX/bin:$PATH" \
 			ANDROID_DATA=/data \
@@ -48,7 +49,7 @@ termux_setup_proot() {
 			TERM=$TERM \
 			TZ=UTC \
 			$TERMUX_PROOT_EXTRA_ENV_VARS \
-			$TERMUX_PROOT_BIN/proot $TERMUX_PROOT_QEMU -R / "\$@"
+			$TERMUX_PROOT_QEMU \$cmd "\$@"
 	EOF
 	chmod +x "$TERMUX_PROOT_BIN/$TERMUX_PROOT_BIN_NAME"
 }

x11-packages/fcitx5-chinese-addons/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Addons related to Chinese, including IME previous bundle
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="5.1.9"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL="https://github.com/fcitx/fcitx5-chinese-addons/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SHA256=2b2b5418c4a670be1b824c0ee6e5cae48e5115402fe3b2a407aceb19f122339b
 TERMUX_PKG_DEPENDS="boost, fcitx5, fcitx5-qt, libc++, libcurl, libime, libopencc, qt6-qtbase"

x11-packages/gimp/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="GNU Image Manipulation Program"
 TERMUX_PKG_LICENSE="GPL-3.0, LGPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.0.6"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=git+https://gitlab.gnome.org/GNOME/gimp
 TERMUX_PKG_GIT_BRANCH="GIMP_${TERMUX_PKG_VERSION//./_}"
 TERMUX_PKG_AUTO_UPDATE=true

x11-packages/icewm/build.sh

@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Window manager with goals of speed, simplicity, and usab
 TERMUX_PKG_LICENSE="LGPL-2.0-only"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="3.9.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL="https://github.com/ice-wm/icewm/releases/download/$TERMUX_PKG_VERSION/icewm-$TERMUX_PKG_VERSION.tar.lz"
 TERMUX_PKG_SHA256=1323527a9a49db66e9ce7b08e6ec43c87700243432fc6679681df367c67b2dc0
 TERMUX_PKG_AUTO_UPDATE=true

x11-packages/libime/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A library to support generic input method implementation
 TERMUX_PKG_LICENSE="LGPL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="1.1.11"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=git+https://github.com/fcitx/libime
 TERMUX_PKG_GIT_BRANCH="${TERMUX_PKG_VERSION}"
 TERMUX_PKG_DEPENDS="boost, fcitx5, libc++, libime-data, zstd"

x11-packages/telegram-desktop/build.sh

@@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_LICENSE_FILE="LICENSE, LEGAL"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="6.2.3"
+TERMUX_PKG_REVERSION=1
 TERMUX_PKG_SRCURL=https://github.com/telegramdesktop/tdesktop/releases/download/v$TERMUX_PKG_VERSION/tdesktop-$TERMUX_PKG_VERSION-full.tar.gz
 TERMUX_PKG_SHA256=eb78993b1e90944acbff1ffc81438b7eec9199fcae5e988af07f878eb0bfab2b
 TERMUX_PKG_DEPENDS="abseil-cpp, boost, ffmpeg, glib, hicolor-icon-theme, hunspell, kf6-kcoreaddons, libandroid-shmem, libc++, libdispatch, libdrm, libjxl, liblz4, libminizip, protobuf, librnnoise, libsigc++-3.0, libx11, libxcomposite, libxdamage, libxrandr, libxtst, openal-soft, opengl, openh264, openssl, pipewire, pulseaudio, qt6-qtbase, qt6-qtimageformats, qt6-qtsvg, xxhash, zlib"