From 7ed4279993d3bdb85b0f3047fc4995f6cd0f99c6 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 22 Oct 2022 08:14:51 +0900 Subject: [PATCH] termux_setup_gir: Add flag to opt out `TERMUX_PKG_DISABLE_GIR=true` disables building of introspection data. %ci:no-build --- packages/at-spi2-core/build.sh | 1 + packages/gdk-pixbuf/build.sh | 1 + packages/gobject-introspection/build.sh | 1 + packages/gst-plugins-base/build.sh | 1 + packages/gstreamer/build.sh | 1 + packages/harfbuzz/build.sh | 1 + packages/libsoup/build.sh | 1 + packages/pango/build.sh | 1 + scripts/build/setup/termux_setup_gir.sh | 17 +++++++++++++++++ scripts/build/termux_step_setup_variables.sh | 1 + x11-packages/gcr/build.sh | 1 + x11-packages/gtk3/build.sh | 1 + x11-packages/gtksourceview4/build.sh | 1 + x11-packages/libpeas/build.sh | 1 + 14 files changed, 30 insertions(+) diff --git a/packages/at-spi2-core/build.sh b/packages/at-spi2-core/build.sh index 7f09d02453..3b6ad1cb0f 100644 --- a/packages/at-spi2-core/build.sh +++ b/packages/at-spi2-core/build.sh @@ -12,6 +12,7 @@ TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, libxml2" TERMUX_PKG_PROVIDES="at-spi2-atk, atk" TERMUX_PKG_REPLACES="at-spi2-atk (<< 2.46.0), atk (<< 2.46.0), libatk" TERMUX_PKG_BREAKS="at-spi2-atk (<< 2.46.0), atk (<< 2.46.0), libatk" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Ddbus_daemon=$TERMUX_PREFIX/bin/dbus-daemon -Dintrospection=yes diff --git a/packages/gdk-pixbuf/build.sh b/packages/gdk-pixbuf/build.sh index 660c69a77c..6e59829df8 100644 --- a/packages/gdk-pixbuf/build.sh +++ b/packages/gdk-pixbuf/build.sh @@ -10,6 +10,7 @@ TERMUX_PKG_DEPENDS="glib, libpng, libtiff, libjpeg-turbo, zstd" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_BREAKS="gdk-pixbuf-dev" TERMUX_PKG_REPLACES="gdk-pixbuf-dev" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dgtk_doc=false -Dintrospection=enabled diff --git a/packages/gobject-introspection/build.sh b/packages/gobject-introspection/build.sh index 61804cce2f..8d0deb6628 100644 --- a/packages/gobject-introspection/build.sh +++ b/packages/gobject-introspection/build.sh @@ -9,6 +9,7 @@ TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gobject-introspection/${_MA TERMUX_PKG_SHA256=347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653 TERMUX_PKG_DEPENDS="glib, libffi" TERMUX_PKG_SUGGESTS="g-ir-scanner" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dcairo_libname=libcairo-gobject.so -Dpython=python diff --git a/packages/gst-plugins-base/build.sh b/packages/gst-plugins-base/build.sh index 936dc81cd2..2bc3adaa6c 100644 --- a/packages/gst-plugins-base/build.sh +++ b/packages/gst-plugins-base/build.sh @@ -10,6 +10,7 @@ TERMUX_PKG_DEPENDS="graphene, gstreamer, libandroid-shmem, libjpeg-turbo, libopu TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_BREAKS="gst-plugins-base-dev" TERMUX_PKG_REPLACES="gst-plugins-base-dev" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dintrospection=enabled -Dtests=disabled diff --git a/packages/gstreamer/build.sh b/packages/gstreamer/build.sh index 0e074c11a8..b38f5f871c 100644 --- a/packages/gstreamer/build.sh +++ b/packages/gstreamer/build.sh @@ -10,6 +10,7 @@ TERMUX_PKG_DEPENDS="glib" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_BREAKS="gstreamer-dev" TERMUX_PKG_REPLACES="gstreamer-dev" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dintrospection=enabled -Dcheck=disabled diff --git a/packages/harfbuzz/build.sh b/packages/harfbuzz/build.sh index 1b59a19790..36a94ada16 100644 --- a/packages/harfbuzz/build.sh +++ b/packages/harfbuzz/build.sh @@ -11,6 +11,7 @@ TERMUX_PKG_DEPENDS="freetype, glib, libbz2, libc++, libpng, libgraphite" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_BREAKS="harfbuzz-dev" TERMUX_PKG_REPLACES="harfbuzz-dev" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dgobject=enabled -Dgraphite=enabled diff --git a/packages/libsoup/build.sh b/packages/libsoup/build.sh index 732699105d..6c23f7e5a7 100644 --- a/packages/libsoup/build.sh +++ b/packages/libsoup/build.sh @@ -14,6 +14,7 @@ TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_RECOMMENDS="glib-networking" TERMUX_PKG_BREAKS="libsoup-dev" TERMUX_PKG_REPLACES="libsoup-dev" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dintrospection=enabled -Dvapi=enabled diff --git a/packages/pango/build.sh b/packages/pango/build.sh index 8a12d77fee..2b0c357a46 100644 --- a/packages/pango/build.sh +++ b/packages/pango/build.sh @@ -11,6 +11,7 @@ TERMUX_PKG_DEPENDS="fontconfig, fribidi, glib, harfbuzz, libcairo, libxft, zlib" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" TERMUX_PKG_BREAKS="pango-dev" TERMUX_PKG_REPLACES="pango-dev" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dintrospection=enabled " diff --git a/scripts/build/setup/termux_setup_gir.sh b/scripts/build/setup/termux_setup_gir.sh index 4e6e5dbfaa..d5448c51e9 100644 --- a/scripts/build/setup/termux_setup_gir.sh +++ b/scripts/build/setup/termux_setup_gir.sh @@ -1,4 +1,21 @@ termux_setup_gir() { + if [ "$TERMUX_PKG_DISABLE_GIR" = "true" ]; then + local args=" ${TERMUX_PKG_EXTRA_CONFIGURE_ARGS//$'\n'/ } " + args="${args//$'\t'/ }" + args="${args// --enable-introspection / --disable-introspection }" + args="${args// --enable-introspection=yes / --enable-introspection=no }" + args="${args// -DENABLE_INTROSPECTION=ON / -DENABLE_INTROSPECTION=OFF }" + args="${args// -Dbuild_introspection_data=true / -Dbuild_introspection_data=false }" + args="${args// -Dgir=true / -Dgir=false }" + args="${args// -Dgobject=enabled / -Dgobject=disabled }" + args="${args// -Dintrospection=enabled / -Dintrospection=disabled }" + args="${args// -Dintrospection=true / -Dintrospection=false }" + args="${args// -Dintrospection=yes / -Dintrospection=no }" + args="${args// -Dvapi=enabled / -Dvapi=disabled }" + args="${args// -Dvapi=true / -Dvapi=false }" + TERMUX_PKG_EXTRA_CONFIGURE_ARGS="$args" + fi + # Used by gi-cross-launcher: export TERMUX_PKG_GIR_PRE_GENERATED_DUMP_DIR="$TERMUX_PKG_BUILDER_DIR/gir/${TERMUX_PKG_VERSION##*:}" diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index f668b47b60..05805b875c 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -91,6 +91,7 @@ termux_step_setup_variables() { TERMUX_PKG_CONFLICTS="" # https://www.debian.org/doc/debian-policy/ch-relationships.html#s-conflicts TERMUX_PKG_DEPENDS="" TERMUX_PKG_DESCRIPTION="FIXME:Add description" + TERMUX_PKG_DISABLE_GIR=false # termux_setup_gir TERMUX_PKG_ESSENTIAL=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS="" TERMUX_PKG_EXTRA_HOSTBUILD_CONFIGURE_ARGS="" diff --git a/x11-packages/gcr/build.sh b/x11-packages/gcr/build.sh index 5640352954..3face45b58 100644 --- a/x11-packages/gcr/build.sh +++ b/x11-packages/gcr/build.sh @@ -11,6 +11,7 @@ TERMUX_PKG_SHA256=bb7128a3c2febbfee9c03b90d77d498d0ceb237b0789802d60185c71c4bea2 TERMUX_PKG_DEPENDS="glib, gtk3, libcairo, libgcrypt, p11-kit, pango" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, gnupg" TERMUX_PKG_RECOMMENDS="gnupg" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dintrospection=true -Dgtk=true diff --git a/x11-packages/gtk3/build.sh b/x11-packages/gtk3/build.sh index 3d8dbbfddd..563e862e10 100644 --- a/x11-packages/gtk3/build.sh +++ b/x11-packages/gtk3/build.sh @@ -11,6 +11,7 @@ TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, font TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, xorgproto" TERMUX_PKG_CONFLICTS="libgtk3" TERMUX_PKG_REPLACES="libgtk3" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --enable-introspection --disable-cups diff --git a/x11-packages/gtksourceview4/build.sh b/x11-packages/gtksourceview4/build.sh index a27a60351b..a63db4dfe3 100644 --- a/x11-packages/gtksourceview4/build.sh +++ b/x11-packages/gtksourceview4/build.sh @@ -9,6 +9,7 @@ TERMUX_PKG_SRCURL=https://download.gnome.org/sources/gtksourceview/${_MAJOR_VERS TERMUX_PKG_SHA256=c30019506320ca2474d834cced1e2217ea533e00eb2a3f4eb7879007940ec682 TERMUX_PKG_DEPENDS="atk, fribidi, glib, gtk3, libcairo, libxml2, pango" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dgir=true -Dvapi=false diff --git a/x11-packages/libpeas/build.sh b/x11-packages/libpeas/build.sh index 7a2c2e35b2..f6f2cbeb01 100644 --- a/x11-packages/libpeas/build.sh +++ b/x11-packages/libpeas/build.sh @@ -8,6 +8,7 @@ TERMUX_PKG_SRCURL=https://download.gnome.org/sources/libpeas/${_MAJOR_VERSION}/l TERMUX_PKG_SHA256=4305f715dab4b5ad3e8007daec316625e7065a94e63e25ef55eb1efb964a7bf0 TERMUX_PKG_DEPENDS="glib, gobject-introspection, gtk3" TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner" +TERMUX_PKG_DISABLE_GIR=false TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" -Dlua51=false -Dpython3=false