From a977186e517115528e67f6234e0fffd33cc3b790 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Fri, 6 Jul 2018 19:23:49 +0200 Subject: [PATCH] libgexiv2: change build style to gnu-configure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With meson running gtkdoc-mkhtml emits warnings which meson treats as error and makes the cross builds fail. Signed-off-by: Jürgen Buchmüller --- srcpkgs/libgexiv2/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libgexiv2/template b/srcpkgs/libgexiv2/template index e40755fa2f..f687ef9ab0 100644 --- a/srcpkgs/libgexiv2/template +++ b/srcpkgs/libgexiv2/template @@ -3,10 +3,10 @@ pkgname=libgexiv2 version=0.10.8 revision=1 wrksrc="${pkgname/lib/}-${version}" -build_style=meson -configure_args="-Ddisable-introspection=$(vopt_if gir false true) - -Denable-gtk-doc=true" -hostmakedepends="pkg-config $(vopt_if gir gobject-introspection) glib-devel gtk-doc" +build_style=gnu-configure +configure_args="$(vopt_if gir '--enable-introspection --enable-vala')" +hostmakedepends="pkg-config glib-devel gtk-doc + $(vopt_if gir 'gobject-introspection vala-devel')" makedepends="libglib-devel exiv2-devel" short_desc="GObject-based wrapper around the Exiv2 library" maintainer="Juan RP " @@ -18,7 +18,6 @@ checksum=81c528fd1e5e03577acd80fb77798223945f043fd1d4e06920c71202eea90801 build_options="gir" if [ -z "$CROSS_BUILD" ]; then build_options_default="gir" - hostmakedepends+=" vala" fi libgexiv2-devel_package() {