From fd80468c2f62af020a6978a4bc5c1a4a31bda38a Mon Sep 17 00:00:00 2001
From: Chongyun Lee <45286352+licy183@users.noreply.github.com>
Date: Thu, 16 Nov 2023 18:11:48 +0800
Subject: [PATCH] libvte: bump to 0.74.1
---
scripts/build/setup/termux_setup_gir.sh | 1 +
x11-packages/libvte/build.sh | 31 ++--
x11-packages/libvte/gir/0.74.1/Vte-2.91.xml | 168 ++++++++++++++++++++
x11-packages/libvte/gir/0.74.1/Vte-3.91.xml | 160 +++++++++++++++++++
4 files changed, 342 insertions(+), 18 deletions(-)
create mode 100644 x11-packages/libvte/gir/0.74.1/Vte-2.91.xml
create mode 100644 x11-packages/libvte/gir/0.74.1/Vte-3.91.xml
diff --git a/scripts/build/setup/termux_setup_gir.sh b/scripts/build/setup/termux_setup_gir.sh
index d37eea8f2f..f291821090 100644
--- a/scripts/build/setup/termux_setup_gir.sh
+++ b/scripts/build/setup/termux_setup_gir.sh
@@ -35,6 +35,7 @@ termux_setup_gir() {
if [ "$TERMUX_ON_DEVICE_BUILD" = "true" ]; then
unset TERMUX_G_IR_COMPILER
+ mkdir -p "$bin"
sed -e "s|@TERMUX_PREFIX@|${TERMUX_PREFIX}|g" \
"$TERMUX_SCRIPTDIR/packages/gobject-introspection/gi-cross-launcher-on-device.in" \
> "$GI_CROSS_LAUNCHER"
diff --git a/x11-packages/libvte/build.sh b/x11-packages/libvte/build.sh
index 2f0cd8f6ba..e209af58b6 100644
--- a/x11-packages/libvte/build.sh
+++ b/x11-packages/libvte/build.sh
@@ -7,8 +7,8 @@ TERMUX_PKG_VERSION="2:0.74.1"
TERMUX_PKG_SRCURL=https://gitlab.gnome.org/GNOME/vte/-/archive/${TERMUX_PKG_VERSION:2}/vte-${TERMUX_PKG_VERSION:2}.tar.bz2
#TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/GNOME/sources/vte/${_MAJOR_VERSION}/vte-${_VERSION}.tar.xz
TERMUX_PKG_SHA256=193496182428a34cfe555ee3df7ac6185de7eb7fc4af60b5dd175be46854b21a
-TERMUX_PKG_DEPENDS="atk, fribidi, gdk-pixbuf, gtk4, libc++, libcairo, libgnutls, libicu, pango, pcre2, zlib"
-TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, bionic-host, ldd, glib-cross"
+TERMUX_PKG_DEPENDS="atk, fribidi, gdk-pixbuf, gtk3, gtk4, libc++, libcairo, libgnutls, libicu, pango, pcre2, zlib"
+TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, glib-cross"
TERMUX_PKG_RM_AFTER_INSTALL="lib/locale"
TERMUX_PKG_DISABLE_GIR=false
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
@@ -17,23 +17,18 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
"
termux_step_pre_configure() {
- CPPFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX -Wno-cast-function-type-strict -Wno-deprecated-declarations"
- mkdir -p ${TERMUX_PKG_TMPDIR}/bin
+ termux_setup_gir
+ local _WRAPPER_BIN="${TERMUX_PKG_BUILDDIR}/_wrapper/bin"
+ mkdir -p "${_WRAPPER_BIN}"
+ if [[ "${TERMUX_ON_DEVICE_BUILD}" == "false" ]]; then
sed "s|^export PKG_CONFIG_LIBDIR=|export PKG_CONFIG_LIBDIR=${TERMUX_PREFIX}/opt/glib/cross/lib/x86_64-linux-gnu/pkgconfig:|" \
"${TERMUX_STANDALONE_TOOLCHAIN}/bin/pkg-config" \
- > "${TERMUX_PKG_TMPDIR}/bin/pkg-config"
- chmod +x "${TERMUX_PKG_TMPDIR}/bin/pkg-config"
- export PKG_CONFIG="${TERMUX_PKG_TMPDIR}/bin/pkg-config"
-
-
- for i in ldd; do
- echo -e "#!/bin/sh\nunset LD_LIBRARY_PATH\nexec $TERMUX_PREFIX/bin/$i \"\$@\"" > ${TERMUX_PKG_TMPDIR}/bin/$i \
- && chmod +x ${TERMUX_PKG_TMPDIR}/bin/$i
- done
- for i in bash $CC $CXX $AR $LD $STRIP; do
- echo -e "#!/bin/sh\nunset LD_LIBRARY_PATH\nexec $(command -v $i) \"\$@\"" > ${TERMUX_PKG_TMPDIR}/bin/$i \
- && chmod +x ${TERMUX_PKG_TMPDIR}/bin/$i
- done
- export PATH="${TERMUX_PKG_TMPDIR}/bin:$PATH"
+ > "${_WRAPPER_BIN}/pkg-config"
+ chmod +x "${_WRAPPER_BIN}/pkg-config"
+ export PKG_CONFIG="${_WRAPPER_BIN}/pkg-config"
+ fi
+ export PATH="${_WRAPPER_BIN}:${PATH}"
+
+ CPPFLAGS+=" -DLINE_MAX=_POSIX2_LINE_MAX"
}
diff --git a/x11-packages/libvte/gir/0.74.1/Vte-2.91.xml b/x11-packages/libvte/gir/0.74.1/Vte-2.91.xml
new file mode 100644
index 0000000000..8d2b9e3c14
--- /dev/null
+++ b/x11-packages/libvte/gir/0.74.1/Vte-2.91.xml
@@ -0,0 +1,168 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/x11-packages/libvte/gir/0.74.1/Vte-3.91.xml b/x11-packages/libvte/gir/0.74.1/Vte-3.91.xml
new file mode 100644
index 0000000000..b45be1698a
--- /dev/null
+++ b/x11-packages/libvte/gir/0.74.1/Vte-3.91.xml
@@ -0,0 +1,160 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+