From 2b9fe53c5379e1b72eb4451ceabedc0b8e3eeb3f Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Feb 2019 20:58:48 -0200 Subject: [PATCH] gtk+: enable gir --- srcpkgs/gtk+/template | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/srcpkgs/gtk+/template b/srcpkgs/gtk+/template index 87f12f3cf66..ac8f0d15531 100644 --- a/srcpkgs/gtk+/template +++ b/srcpkgs/gtk+/template @@ -1,25 +1,33 @@ # Template file for 'gtk+' pkgname=gtk+ version=2.24.32 -revision=1 +revision=2 build_style=gnu-configure +build_helper="gir" configure_args="--enable-man --enable-cups --with-xinput $(vopt_enable gir introspection)" -short_desc="The GTK+ toolkit (v2)" -maintainer="Juan RP " -homepage="http://www.gtk.org" -license="LGPL-2.1" -distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" -checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e - hostmakedepends="pkg-config perl xmlto glib-devel $(vopt_if gir gobject-introspection)" makedepends="libglib-devel libXcursor-devel libXext-devel libXrender-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel libXdamage-devel fontconfig-devel gdk-pixbuf-devel cairo-devel pango-devel atk-devel cups-devel" -depends="shared-mime-info dbus-x11 gtk-update-icon-cache-${version}_${revision}" +depends="shared-mime-info dbus-x11 gtk-update-icon-cache" conf_files="/etc/gtk-2.0/im-multipress.conf" +short_desc="GTK+ toolkit (v2)" +maintainer="Juan RP " +license="LGPL-2.1-or-later" +homepage="http://www.gtk.org" +distfiles="${GNOME_SITE}/gtk+/2.24/gtk+-${version}.tar.xz" +checksum=b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e CFLAGS="-UGDK_PIXBUF_DISABLE_DEPRECATED" +# Package build options +build_options="gir" + +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) build_options_default+=" gir" ;; + *-musl) ;; + *) build_options_default+=" gir" ;; +esac if [ "$CROSS_BUILD" ]; then hostmakedepends+=" automake libtool gtk-doc glib-devel gdk-pixbuf-devel gtk-update-icon-cache" @@ -33,14 +41,6 @@ post_install() { vinstall ${FILESDIR}/gtkrc 644 usr/share/gtk-2.0 } -# Package build options -build_options="gir" - -# Disable gir for cross builds. -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi - gtk+-devel_package() { depends="libglib-devel atk-devel cairo-devel gdk-pixbuf-devel pango-devel gtk+>=${version}_${revision}" short_desc+=" - development files"