From 20e11f9dfca2854c3782ab84880a956ec23aecbc Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Feb 2019 11:25:45 -0200 Subject: [PATCH] libhandy: enable gir, vala and glade --- srcpkgs/libhandy/patches/fix-gir-cross.patch | 18 ++++++++++++++++++ srcpkgs/libhandy/template | 15 +++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/libhandy/patches/fix-gir-cross.patch diff --git a/srcpkgs/libhandy/patches/fix-gir-cross.patch b/srcpkgs/libhandy/patches/fix-gir-cross.patch new file mode 100644 index 00000000000..bcaccd231bf --- /dev/null +++ b/srcpkgs/libhandy/patches/fix-gir-cross.patch @@ -0,0 +1,18 @@ +diff --git a/src/meson.build b/src/meson.build +index 1f08326..54531af 100644 +--- src/meson.build ++++ src/meson.build +@@ -178,7 +178,11 @@ if introspection + install: true, + install_dir_gir: girdir, + install_dir_typelib: typelibdir, +- extra_args: [ '--c-include=handy.h', '--quiet' ], ++ extra_args: [ ++ '--c-include=handy.h', ++ '--quiet', ++ '-DHANDY_COMPILATION', ++ ], + ) + + if get_option('vapi') + diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template index f7bc8fa63e0..62d0dfb6e12 100644 --- a/srcpkgs/libhandy/template +++ b/srcpkgs/libhandy/template @@ -4,13 +4,13 @@ version=0.0.7 revision=1 wrksrc="libhandy-v${version}" build_style=meson +build_helper="gir" # tests need X anyway, so no need to build them configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi) -Dglade_catalog=$(vopt_if glade enabled disabled) -Dintrospection=$(vopt_if gir enabled disabled)" -hostmakedepends="glib-devel pkg-config $(vopt_if gir gobject-introspection) - $(vopt_if vala vala-devel) $(vopt_if glade glade3-devel)" -makedepends="gtk+3-devel libglib-devel" +hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)" +makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)" short_desc="Library full of GTK+ widgets for mobile phones" maintainer="Rasmus Thomsen " license="LGPL-2.0-or-later" @@ -20,9 +20,12 @@ checksum=3464d4f508b4d2d9bdf351d6dccda1ef5bdeb62526ee8ce3a6377aaed2b4ca91 build_options="gir vala glade" desc_option_glade="Generate glade modules and catalog files" -if [ -z "$CROSS_BUILD" ]; then - build_options_default+=" gir vala glade" -fi + +case "$XBPS_TARGET_MACHINE" in + x86_64-musl) build_options_default+=" gir vala glade" ;; + *-musl) ;; + *) build_options_default+=" gir vala glade" ;; +esac libhandy-devel_package() { depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"