Merge branch 'robertkirkman:main' into main

Author: cryptrr

README.md

@@ -2,6 +2,25 @@
 
 This script builds a [termux/termux-app](https://github.com/termux/termux-app) or [termux-play-store/termux-apps/termux-app](https://github.com/termux-play-store/termux-apps/tree/main/termux-app) from source, but allows changing the package name from `com.termux` to anything else with a single command.
 
+## Building Termux in GitHub Actions
+
+1. Fork the repository:
+
+<img width="189" height="43" alt="image" src="https://github.com/user-attachments/assets/7aa63b58-b8d5-4b30-957b-fd041bee003d" />
+
+2. Click the "Actions" tab and enable GitHub Actions:
+
+<img width="953" height="407" alt="image" src="https://github.com/user-attachments/assets/76561301-61bd-4f58-8511-38d4486e26ac" />
+
+3. Click the "Generate Termux application" workflow, then click the "Run workflow" button and type your desired settings:
+
+<img width="450" height="810" alt="image" src="https://github.com/user-attachments/assets/7b914a69-7654-4150-8e68-4086a10ba3fd" />
+
+4. Click the "Run workflow" button, then wait for your build to complete. If the build is successful, there will be an artifact available to download containing all possible Termux APKs for the combination of settings you selected:
+
+<img width="1148" height="250" alt="image" src="https://github.com/user-attachments/assets/7bbc8338-1c9e-4a34-966f-87a65cadc471" />
+
+
 ## Building Termux locally
 
 ### Dependencies

build-termux.sh

@@ -9,7 +9,7 @@ TERMUX_APP__PACKAGE_NAME="com.termux"
 TERMUX_APP_TYPE="f-droid"
 DO_NOT_CLEAN=""
 TERMUX_GENERATOR_PLUGIN=""
-ADDITIONAL_PACKAGES=""
+ADDITIONAL_PACKAGES="xkeyboard-config" # for termux-x11-nightly which is always preinstalled
 BOOTSTRAP_ARCHITECTURES=""
 DISABLE_BOOTSTRAP_SECOND_STAGE=""
 ENABLE_SSH_SERVER=""
@@ -63,7 +63,7 @@ while (($# > 0)); do
             ;;
         -a|--add)
             if [ $# -gt 1 ] && [ -n "$2" ] && [[ $2 != -* ]]; then
-                ADDITIONAL_PACKAGES="$2"
+                ADDITIONAL_PACKAGES+=",$2"
                 shift 1
             else
                 echo "[!] Option '--add' requires an argument."

f-droid-patches/bootstrap-patches/build-bootstraps.patch

@@ -38,7 +38,7 @@
 +pull_package() {
 +	local package_name=$1
 +
-+	if grep -q "Package: $package_name" "${BOOTSTRAP_ROOTFS}/${TERMUX_PREFIX}/var/lib/dpkg/status"; then
++	if grep -q "Package: $package_name$" "${BOOTSTRAP_ROOTFS}/${TERMUX_PREFIX}/var/lib/dpkg/status"; then
 +		echo "[*] Skipping already extracted package '$package_name'..."
 +		return
 +	fi
@@ -298,7 +298,7 @@
 
  		# Extract all debs.
 -		extract_debs "$TERMUX_ARCH" || return $?
-+		for pull_pkg in "${PACKAGES[@]}"; do
++		for pull_pkg in "${PACKAGES[@]}" termux-x11-nightly; do
 +			pull_package "$pull_pkg"
 +		done
 +		unset pull_pkg

f-droid-patches/bootstrap-patches/libgts-always-hostbuild.patch

@@ -0,0 +1,15 @@
+diff --git a/packages/libgts/build.sh b/packages/libgts/build.sh
+index 532f0d5..f263c56 100644
+--- a/packages/libgts/build.sh
++++ b/packages/libgts/build.sh
+@@ -15,3 +15,10 @@ termux_step_host_build() {
+ 	$TERMUX_PKG_SRCDIR/configure
+ 	make -C src predicates_init
+ }
++
++# prevents error
++# /bin/bash: line 1: ./predicates_init: cannot execute binary file: Exec format error
++# during repeated builds
++termux_step_pre_configure() {
++	rm -rf $TERMUX_HOSTBUILD_MARKER
++}

f-droid-patches/bootstrap-patches/opengl-actual-package.patch

@@ -0,0 +1,9 @@
+--- a/packages/opengl/build.sh
++++ b/packages/opengl/build.sh
+@@ -6,6 +6,5 @@ TERMUX_PKG_VERSION=4.5
+ TERMUX_PKG_AUTO_UPDATE=false
+ TERMUX_PKG_SKIP_SRC_EXTRACT=true
+ TERMUX_PKG_DEPENDS="libglvnd, mesa"
+-TERMUX_PKG_ANTI_BUILD_DEPENDS="mesa"
+ TERMUX_PKG_METAPACKAGE=true
+ TERMUX_PKG_PLATFORM_INDEPENDENT=true

scripts/termux_generator_steps.sh

@@ -168,16 +168,10 @@ build_bootstraps() {
     local bootstrap_script_args=""
 
     if [ -n "$ENABLE_SSH_SERVER" ]; then
-        if [ -n "$ADDITIONAL_PACKAGES" ]; then
-            ADDITIONAL_PACKAGES+=",openssh"
-        else
-            ADDITIONAL_PACKAGES="openssh"
-        fi
+        ADDITIONAL_PACKAGES+=",openssh"
     fi
 
-    if [ -n "${ADDITIONAL_PACKAGES}" ]; then
-        bootstrap_script_args+=" --add ${ADDITIONAL_PACKAGES}"
-    fi
+    bootstrap_script_args+=" --add ${ADDITIONAL_PACKAGES}"
 
     if [[ "$TERMUX_APP_TYPE" == "f-droid" ]]; then
         local bootstrap_script="build-bootstraps.sh"