From ddc4fcc572bdc9f8cf068897a7cd59b0c18d68cd Mon Sep 17 00:00:00 2001 From: maxice8 Date: Thu, 7 Feb 2019 16:04:10 -0200 Subject: [PATCH] geocode-glib: enable gir --- .../geocode-glib/patches/fix-gir-cross.patch | 17 +++++++++++++++++ srcpkgs/geocode-glib/template | 18 ++++++++++-------- 2 files changed, 27 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/geocode-glib/patches/fix-gir-cross.patch diff --git a/srcpkgs/geocode-glib/patches/fix-gir-cross.patch b/srcpkgs/geocode-glib/patches/fix-gir-cross.patch new file mode 100644 index 00000000000..17d12c6b0cb --- /dev/null +++ b/srcpkgs/geocode-glib/patches/fix-gir-cross.patch @@ -0,0 +1,17 @@ +diff --git a/geocode-glib/meson.build b/geocode-glib/meson.build +index 8bc2bfc..0377535 100644 +--- geocode-glib/meson.build ++++ geocode-glib/meson.build +@@ -69,10 +69,9 @@ pkgconf.generate(libraries: libgcglib, + ]) + + gir = find_program('g-ir-scanner', required: false) +-cross_build = meson.is_cross_build() + enable_gir = get_option('enable-introspection') + +-if gir.found() and not cross_build and enable_gir ++if gir.found() and enable_gir + gir_args = [ + '--quiet', + '--c-include=geocode-glib/geocode-glib.h' + diff --git a/srcpkgs/geocode-glib/template b/srcpkgs/geocode-glib/template index 4da78ea15c9..49e7e9853ff 100644 --- a/srcpkgs/geocode-glib/template +++ b/srcpkgs/geocode-glib/template @@ -1,26 +1,28 @@ # Template file for 'geocode-glib' pkgname=geocode-glib version=3.26.0 -revision=1 +revision=2 build_style=meson +build_helper="gir" configure_args="-Denable-gtk-doc=false -Denable-introspection=$(vopt_if gir true false) -Denable-installed-tests=false" -hostmakedepends="pkg-config intltool glib-devel $(vopt_if gir gobject-introspection)" +hostmakedepends="pkg-config intltool glib-devel" makedepends="json-glib-devel libsoup-gnome-devel" short_desc="GLib library for geocoding and reverse geocoding" +maintainer="Juan RP " license="LGPL-2.1" homepage="http://www.gnome.org" -maintainer="Juan RP " -distfiles="${GNOME_SITE}/$pkgname/${version%.*}/${pkgname}-${version}.tar.xz" +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" checksum=ea4086b127050250c158beff28dbcdf81a797b3938bb79bbaaecc75e746fbeee # Package build options build_options="gir" -# Disable gir for cross 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 geocode-glib-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}"