Merge remote-tracking branch 'upstream/master'

packages/below/build.sh

@@ -42,7 +42,7 @@ termux_step_pre_configure() {
 	done
 
 	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-		export CLANG=/usr/bin/clang-16
+		export CLANG=/usr/bin/clang-17
 	fi
 }
 

packages/forgejo/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://forgejo.org/
 TERMUX_PKG_DESCRIPTION="Forgejo is a self-hosted lightweight software forge."
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="7.0.3"
+TERMUX_PKG_VERSION="7.0.4"
 TERMUX_PKG_SRCURL=https://codeberg.org/forgejo/forgejo/archive/v$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=17e86d4db52483adb12c7f81b8a9df309fbc5242c96f7201b1c0402204399f2c
+TERMUX_PKG_SHA256=e9e1606f272e78a4cd93c60603c30ffcc037d1a41ac27d9fe2234c8bb06d4c20
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="dash, git"
 TERMUX_PKG_CONFFILES="etc/forgejo/app.ini"

packages/gmic/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu
 TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
 TERMUX_PKG_LICENSE="CeCILL-2.1"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="3.3.6"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION="3.4.0"
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
-TERMUX_PKG_SHA256=9d2d07a39040ed6abacafd49c16e746520631a16dc9215b161d1dc3ed0dd23fe
+TERMUX_PKG_SHA256=4fc0c79eed360c4f804d8110d7955bc8e0db9a14fba9483fe494f02c3640be69
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_DEPENDS="fftw, imath, libc++, libcurl, libjpeg-turbo, libpng, libtiff, openexr, zlib"
 TERMUX_PKG_BUILD_DEPENDS="graphicsmagick"

packages/just/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://just.systems
 TERMUX_PKG_DESCRIPTION="A handy way to save and run project-specific commands"
 TERMUX_PKG_LICENSE="CC0-1.0"
 TERMUX_PKG_MAINTAINER="@flipee"
-TERMUX_PKG_VERSION="1.29.0"
+TERMUX_PKG_VERSION="1.29.1"
 TERMUX_PKG_SRCURL=https://github.com/casey/just/archive/${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=f5c910c419b847dad7ea2ffd178507b896a4609a865927e026e27d1488562113
+TERMUX_PKG_SHA256=3e909245038295b6935448d48bb93418b4bc1b0b5621116d1568e12dd872512b
 TERMUX_PKG_AUTO_UPDATE=true
 TERMUX_PKG_BUILD_IN_SRC=true
 

packages/rust/build.sh

@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.rust-lang.org/
 TERMUX_PKG_DESCRIPTION="Systems programming language focused on safety, speed and concurrency"
 TERMUX_PKG_LICENSE="MIT"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.78.0"
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION="1.79.0"
 TERMUX_PKG_SRCURL=https://static.rust-lang.org/dist/rustc-${TERMUX_PKG_VERSION}-src.tar.xz
-TERMUX_PKG_SHA256=8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece
+TERMUX_PKG_SHA256=ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a
 _LLVM_MAJOR_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo $LLVM_MAJOR_VERSION)
 _LLVM_MAJOR_VERSION_NEXT=$((_LLVM_MAJOR_VERSION + 1))
 _LZMA_VERSION=$(. $TERMUX_SCRIPTDIR/packages/liblzma/build.sh; echo $TERMUX_PKG_VERSION)
@@ -27,29 +26,39 @@ lib/libz.so.1
 
 termux_pkg_auto_update() {
 	local e=0
-	local api_url="https://releases.rs"
-	local api_url_r=$(curl -Ls "${api_url}")
-	local latest_version=$(echo "${api_url_r}" | grep "html" | sed -ne "s|.*Stable: \([0-9]*\+.\+[0-9]*\+.\+[0-9]*\) Beta:.*|\1|p")
+	local api_url1="https://releases.rs"
+	local api_url2="https://forge.rust-lang.org/infra/other-installation-methods.html"
+	local api_url1_r=$(curl -Ls "${api_url1}")
+	local api_url2_r=$(curl -Ls "${api_url2}")
+	local latest_version=$(echo "${api_url1_r}" | grep "html" | sed -ne "s|.*Stable: \([0-9]*\+.\+[0-9]*\+.\+[0-9]*\) Beta:.*|\1|p")
 	if [[ "${latest_version}" == "${TERMUX_PKG_VERSION}" ]]; then
 		echo "INFO: Already up to date."
 		return
 	fi
-	[[ -z "${api_url_r}" ]] && e=1
+	local latest_version_url=$(echo "${api_url2_r}" | grep static.rust-lang.org | sed -nE 's|.*(https.*.xz)".*|\1|p')
+	if [[ -z "$(echo ${latest_version_url} | grep ${latest_version})" ]]; then
+		echo -e "INFO: Not updating to ${latest_version}. Only these are available:\n${latest_version_url}"
+		return
+	fi
+	[[ -z "${api_url1_r}" ]] && e=1
+	[[ -z "${api_url2_r}" ]] && e=1
 	[[ -z "${latest_version}" ]] && e=1
 
 	local uptime_now=$(cat /proc/uptime)
 	local uptime_s="${uptime_now//.*}"
 	local uptime_h_limit=4
 	local uptime_s_limit=$((uptime_h_limit*60*60))
-	[[ -z "${uptime_s}" ]] && e=1
-	[[ "${uptime_s}" == 0 ]] && e=1
+	[[ -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}
+		api_url1_r=${api_url1_r}
+		api_url2_r=${api_url2_r}
 		latest_version=${latest_version}
+		latest_version_url=${latest_version_url}
 		uptime_now=${uptime_now}
 		uptime_s=${uptime_s}
 		uptime_s_limit=${uptime_s_limit}
@@ -119,7 +128,7 @@ termux_step_configure() {
 	# like 30 to 40 + minutes ... so lets get it right
 
 	# upstream tests build using versions N and N-1
-	local BOOTSTRAP_VERSION=1.77.2
+	local BOOTSTRAP_VERSION=1.78.0
 	if rustup install $BOOTSTRAP_VERSION; then
 	rustup default $BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu
 	export PATH=$HOME/.rustup/toolchains/$BOOTSTRAP_VERSION-x86_64-unknown-linux-gnu/bin:$PATH
@@ -154,6 +163,12 @@ termux_step_configure() {
 	# NDK r26
 	export CARGO_TARGET_${env_host}_RUSTFLAGS+=" -C link-arg=-lc++_shared"
 
+	# rust 1.79.0
+	# note: ld.lld: error: undefined reference due to --no-allow-shlib-undefined: syncfs
+	"${CC}" ${CPPFLAGS} -c "${TERMUX_PKG_BUILDER_DIR}/syncfs.c"
+	"${AR}" rcu "${RUST_LIBDIR}/libsyncfs.a" syncfs.o
+	export CARGO_TARGET_${env_host}_RUSTFLAGS+=" -C link-arg=-l:libsyncfs.a"
+
 	export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_LIB_DIR=/usr/lib/x86_64-linux-gnu
 	export X86_64_UNKNOWN_LINUX_GNU_OPENSSL_INCLUDE_DIR=/usr/include
 	export PKG_CONFIG_ALLOW_CROSS=1

packages/rust/config.toml

@@ -43,7 +43,7 @@ channel = "stable"
 rpath = false
 
 [target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config-16"
+llvm-config = "/usr/bin/llvm-config-17"
 
 [target.aarch64-linux-android]
 llvm-config = "@TERMUX_PREFIX@/bin/llvm-config"

packages/vulkan-loader-generic/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Loader
 TERMUX_PKG_DESCRIPTION="Vulkan Loader"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.3.287"
+TERMUX_PKG_VERSION="1.3.288"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=8501325eb301c9cbd147acf439ad243dc6b4b417c08adc413cdeb4e188537fb0
+TERMUX_PKG_SHA256=c3acc079f05a3943ad6ab468adc002bae74f77a54878902166160292f4a52ff1
 TERMUX_PKG_BUILD_DEPENDS="vulkan-headers (=${TERMUX_PKG_VERSION})"
 TERMUX_PKG_CONFLICTS="vulkan-loader-android"
 TERMUX_PKG_PROVIDES="vulkan-loader-android"

packages/vulkan-tools/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Tools
 TERMUX_PKG_DESCRIPTION="Vulkan Tools and Utilities"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.3.287"
+TERMUX_PKG_VERSION="1.3.288"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=960e438cf0d77ec651d118655a2265437e6befdb628899378e04f9bfd7658df2
+TERMUX_PKG_SHA256=f6f3bc87b2daba09c444aad49067ad204e19894babacb8a9b262571a94f321d2
 TERMUX_PKG_DEPENDS="libc++, vulkan-loader"
 TERMUX_PKG_BUILD_DEPENDS="vulkan-headers (=${TERMUX_PKG_VERSION}), vulkan-volk"
 TERMUX_PKG_ANTI_BUILD_DEPENDS="vulkan-loader"

packages/vulkan-utility-libraries/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-Utility-Libraries
 TERMUX_PKG_DESCRIPTION="Utility Libraries for Vulkan"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.3.287"
+TERMUX_PKG_VERSION="1.3.288"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=843bfe91114caaefc88f824ce9055fecf3409b07a1e7c13df2264036fe7ce674
+TERMUX_PKG_SHA256=9192bd1352162d524b80d1d5edb5752eb3c9ba15c053a0f2b51b63e461a6c0a5
 TERMUX_PKG_BUILD_DEPENDS="libc++, vulkan-headers (=${TERMUX_PKG_VERSION})"
 TERMUX_PKG_NO_STATICSPLIT=true
 TERMUX_PKG_AUTO_UPDATE=true

packages/vulkan-validation-layers/build.sh

@@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/KhronosGroup/Vulkan-ValidationLayers
 TERMUX_PKG_DESCRIPTION="Vulkan Validation Layers"
 TERMUX_PKG_LICENSE="Apache-2.0"
 TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION="1.3.287"
+TERMUX_PKG_VERSION="1.3.288"
 TERMUX_PKG_SRCURL=https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_SHA256=5e2538b755d8c5f7e0f9eefd1e9a6a3cf2d9b04c0deb3624cee6fc59d322b410
+TERMUX_PKG_SHA256=7703075c39fec5d8e78de20db8a4fc578846c96a9017a60770dab06eececfff2
 TERMUX_PKG_DEPENDS="libc++, vulkan-loader"
 TERMUX_PKG_BUILD_DEPENDS="spirv-headers, spirv-tools, vulkan-headers (=${TERMUX_PKG_VERSION}), vulkan-utility-libraries (=${TERMUX_PKG_VERSION})"
 TERMUX_PKG_ANTI_BUILD_DEPENDS="vulkan-loader"

scripts/setup-ubuntu.sh

@@ -148,9 +148,9 @@ PACKAGES+=" composer"
 
 # Needed by package rust.
 PACKAGES+=" libssl-dev" # Needed to build Rust
-PACKAGES+=" llvm-16-dev"
-PACKAGES+=" llvm-16-tools"
-PACKAGES+=" clang-16"
+PACKAGES+=" llvm-17-dev"
+PACKAGES+=" llvm-17-tools"
+PACKAGES+=" clang-17"
 
 # Needed for package smalltalk.
 PACKAGES+=" libsigsegv-dev"
@@ -293,7 +293,7 @@ $SUDO cp $(dirname "$(realpath "$0")")/llvm-snapshot.gpg.key /etc/apt/trusted.gp
 $SUDO chmod a+r /etc/apt/trusted.gpg.d/apt.llvm.org.asc
 {
 	echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
-	echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-16 main"
+	echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"
 } | $SUDO tee /etc/apt/sources.list.d/apt-llvm-org.list > /dev/null
 
 $SUDO apt-get -yq update