From 1cab495038247247b0ffa94e2bfbc76561d855ba Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Tue, 14 Oct 2025 16:41:04 +0000 Subject: [PATCH] Update repo --- build-package.sh | 4 ++ scripts/build/setup/termux_setup_bpc.sh | 56 +++++++++++++++++++++++++ scripts/lint-packages.sh | 4 ++ scripts/setup-ubuntu.sh | 1 - 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 scripts/build/setup/termux_setup_bpc.sh diff --git a/build-package.sh b/build-package.sh index eaa1077ccc..115d1afc62 100755 --- a/build-package.sh +++ b/build-package.sh @@ -76,6 +76,10 @@ source "$TERMUX_SCRIPTDIR/scripts/build/termux_download.sh" # shellcheck source=scripts/build/setup/termux_setup_proot.sh source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_proot.sh" +# Utility function to setup blueprint-compiler (may be used by gnome-calculator and epiphany). +# shellcheck source=scripts/build/setup/termux_setup_bpc.sh. +source "$TERMUX_SCRIPTDIR/scripts/build/setup/termux_setup_bpc.sh" + # Installing packages if necessary for the full operation of CGCT. # shellcheck source=scripts/build/termux_step_setup_cgct_environment.sh source "$TERMUX_SCRIPTDIR/scripts/build/termux_step_setup_cgct_environment.sh" diff --git a/scripts/build/setup/termux_setup_bpc.sh b/scripts/build/setup/termux_setup_bpc.sh new file mode 100644 index 0000000000..c73b6abdb7 --- /dev/null +++ b/scripts/build/setup/termux_setup_bpc.sh @@ -0,0 +1,56 @@ +termux_setup_bpc() { + local _BPC_BUILD_SH="$TERMUX_SCRIPTDIR/packages/blueprint-compiler/build.sh" + local _BPC_VERSION=$(bash -c ". $_BPC_BUILD_SH; echo \${TERMUX_PKG_VERSION#*:}") + local _BPC_SRCURL=$(bash -c ". $_BPC_BUILD_SH; echo \${TERMUX_PKG_SRCURL}") + local _BPC_SHA256=$(bash -c ". $_BPC_BUILD_SH; echo \${TERMUX_PKG_SHA256}") + local _BPC_SRCARCHIVE="${TERMUX_PKG_TMPDIR}/bpc-${_BPC_VERSION}.tar.gz" + local _BPC_SRCDIR="${TERMUX_PKG_TMPDIR}/bpc-${_BPC_VERSION}" + local _BPC_FOLDER + + if [[ "$TERMUX_ON_DEVICE_BUILD" == "true" ]]; then + if ([ ! -e "$TERMUX_BUILT_PACKAGES_DIRECTORY/blueprint-compiler" ] || + [ "$(cat "$TERMUX_BUILT_PACKAGES_DIRECTORY/blueprint-compiler")" != "$_BPC_VERSION" ]) && + ([[ "$TERMUX_APP_PACKAGE_MANAGER" = "apt" && "$(dpkg-query -W -f '${db:Status-Status}\n' blueprint-compiler 2>/dev/null)" != "installed" ]] || + [[ "$TERMUX_APP_PACKAGE_MANAGER" = "pacman" && ! "$(pacman -Q blueprint-compiler 2>/dev/null)" ]]); then + echo "Package 'blueprint-compiler' is not installed." + echo "You can install it with" + echo + echo " pkg install blueprint-compiler" + echo + echo " pacman -S blueprint-compiler" + echo + echo "or build it from source with" + echo + echo " ./build-package.sh blueprint-compiler" + echo + exit 1 + fi + return + fi + + if [ "${TERMUX_PACKAGES_OFFLINE-false}" = "true" ]; then + _BPC_FOLDER="${TERMUX_SCRIPTDIR}/build-tools/bpc-${_BPC_VERSION}" + else + _BPC_FOLDER="${TERMUX_COMMON_CACHEDIR}/bpc-${_BPC_VERSION}" + fi + + if [ ! -d "$_BPC_FOLDER" ]; then + ( + termux_download "$_BPC_SRCURL" "$_BPC_SRCARCHIVE" "$_BPC_SHA256" + + rm -Rf "$_BPC_SRCDIR" + mkdir -p "$_BPC_SRCDIR/build" + tar -xf "$_BPC_SRCARCHIVE" --strip-components=1 -C "$_BPC_SRCDIR" + # termux_setup_meson for hostbuilds copied from glib package + AR=;CC=;CFLAGS=;CPPFLAGS=;CXX=;CXXFLAGS=;LD=;LDFLAGS=;PKG_CONFIG=;STRIP= + termux_setup_meson + unset AR CC CFLAGS CPPFLAGS CXX CXXFLAGS LD LDFLAGS PKG_CONFIG STRIP + ${TERMUX_MESON} setup "$_BPC_SRCDIR" "$_BPC_SRCDIR/build" --prefix "$_BPC_FOLDER" + ninja -C "$_BPC_SRCDIR/build" -j "$TERMUX_PKG_MAKE_PROCESSES" + ninja -C "$_BPC_SRCDIR/build" install + ) + fi + + export PATH="$_BPC_FOLDER/bin:$PATH" + export GI_TYPELIB_PATH="$TERMUX_PREFIX/lib/girepository-1.0" +} diff --git a/scripts/lint-packages.sh b/scripts/lint-packages.sh index d0336365c2..497de05faa 100755 --- a/scripts/lint-packages.sh +++ b/scripts/lint-packages.sh @@ -127,6 +127,10 @@ check_indentation() { # - Modify TERMUX_PKG_VERSION # - Or specify one of the CI skip tags check_version_change() { + # !!! vvv TEMPORARY - REMOVE WHEN THIS FUNCTION IS FIXED vvv !!! + return + # !!! ^^^ TEMPORARY - REMOVE WHEN THIS FUNCTION IS FIXED ^^^ !!! + local base_commit commit_diff package_dir="${1%/*}" base_commit="$(< "$TERMUX_SCRIPTDIR/.git/refs/remotes/origin/master")" diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 529b083ad8..b10c571c48 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -208,7 +208,6 @@ PACKAGES+=" libunistring-dev" # Needed by packages in X11 repository. PACKAGES+=" alex" -PACKAGES+=" blueprint-compiler" PACKAGES+=" docbook-xsl-ns" PACKAGES+=" gnome-common" PACKAGES+=" gobject-introspection"