From e6dd7107a70e8846cc577cb01c1b18a4c2f40d99 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 4 Feb 2019 02:33:10 -0200 Subject: [PATCH] gtk+3: enable gir required for amtk --- srcpkgs/gtk+3/template | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 1a09502be3c..8c9c6f6c9fa 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,9 +1,10 @@ # Template file for 'gtk+3' pkgname=gtk+3 version=3.24.4 -revision=1 +revision=2 wrksrc="gtk+-${version}" build_style=gnu-configure +build_helper="gir" #XXX broken configure script: Can't use vopt_enable cloudproviders, configure #checks for libcloudproviders when we pass '--disable-cloudproviders' to it! configure_args="--disable-schemas-compile @@ -12,9 +13,8 @@ configure_args="--disable-schemas-compile $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend) $(vopt_if cloudproviders '--enable-cloudproviders')" conf_files="/etc/gtk-3.0/im-multipress.conf" -hostmakedepends="gettext-devel glib-devel gobject-introspection gtk-doc - gtk-update-icon-cache pkg-config perl - $(vopt_if wayland 'wayland-devel wayland-protocols')" +hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl + pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel iso-codes $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') @@ -37,10 +37,11 @@ desc_option_cloudproviders="Enable integration with cloudproviders, such as Next # Enable all options (other than cloudproviders) by default. build_options_default="colord cups broadway wayland x11" -# Enable gir only for native builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir" -fi +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) build_options_default+=" gir" ;; + *-musl) ;; + *) build_options_default+=" gir" ;; +esac do_check() { # Requires xserver running