From b00153a931dfcf0383cb94bf0f1a4c4bf54ea15a Mon Sep 17 00:00:00 2001 From: Piraty Date: Mon, 16 Dec 2019 14:33:08 +0100 Subject: [PATCH] libosinfo: update to 1.7.1. Closes #17478 --- .../libosinfo/patches/meson-force-cross.patch | 13 +++++++++ srcpkgs/libosinfo/template | 27 ++++++++++++------- 2 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 srcpkgs/libosinfo/patches/meson-force-cross.patch diff --git a/srcpkgs/libosinfo/patches/meson-force-cross.patch b/srcpkgs/libosinfo/patches/meson-force-cross.patch new file mode 100644 index 0000000000..f96de11dff --- /dev/null +++ b/srcpkgs/libosinfo/patches/meson-force-cross.patch @@ -0,0 +1,13 @@ +# upsteam: https://gitlab.com/libosinfo/libosinfo/merge_requests/36 + +--- meson.build ++++ meson.build +@@ -29,7 +29,7 @@ + + # gobject introspection + gir = find_program('g-ir-scanner', required: get_option('enable-introspection')) +-enable_introspection = gir.found() and not meson.is_cross_build() ++enable_introspection = gir.found() + + # vala + vapi_opt = get_option('enable-vala') diff --git a/srcpkgs/libosinfo/template b/srcpkgs/libosinfo/template index afaa912941..a8553d7c77 100644 --- a/srcpkgs/libosinfo/template +++ b/srcpkgs/libosinfo/template @@ -1,11 +1,14 @@ # Template file for 'libosinfo' pkgname=libosinfo -version=1.6.0 +version=1.7.1 revision=1 -build_style=gnu-configure +wrksrc="${pkgname}-v${version}" +build_style=meson build_helper="gir" -configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="glib-devel intltool pkg-config wget +configure_args="-Denable-introspection=$(vopt_if gir enabled disabled) + -Denable-vala=$(vopt_if vala enabled disabled) + -Denable-gtk-doc=$(vopt_if gtk_doc true false)" +hostmakedepends="glib-devel intltool pkg-config wget $(vopt_if gtk_doc gtk-doc) $(vopt_if vala vala)" makedepends="libxslt-devel libglib-devel libsoup-devel" depends="osinfo-db" @@ -15,13 +18,17 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://libosinfo.org/" changelog="https://gitlab.com/libosinfo/libosinfo/raw/master/NEWS" -distfiles="https://releases.pagure.org/libosinfo/${pkgname}-${version}.tar.gz" -checksum=3c385c1cceb46301fdc79115e7b28e3df7aa26fafce0a787a60132a86a1990c7 +distfiles="https://gitlab.com/libosinfo/libosinfo/-/archive/v${version}/libosinfo-v${version}.tar.gz" +checksum=419bcba4543f8e6976abc643ee287ff69346591471cb368d444714a2777d25d2 -# Package build options -build_options="gir vala" +build_options="gtk_doc gir vala" +desc_option_gtk_doc="Build GTK API docs" build_options_default="gir vala" +if [ -z "$CROSS_BUILD" ] ; then + build_options_default+=" gtk_doc" +fi + libosinfo-devel_package() { depends="libglib-devel ${sourcepkg}-${version}_${revision}" short_desc+=" - development files" @@ -29,7 +36,9 @@ libosinfo-devel_package() { vmove "usr/lib/*.so" vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc + if [ "$build_option_docs" ]; then + vmove usr/share/gtk-doc + fi if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi