From c771e772b1ac31ce8f92aafde1af44b3ac169443 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 18 Sep 2020 03:03:20 +0200 Subject: [PATCH] libportal: fix cross --- srcpkgs/libportal/patches/optional_docs.patch | 35 +++++++++++++++++++ srcpkgs/libportal/template | 15 ++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/libportal/patches/optional_docs.patch diff --git a/srcpkgs/libportal/patches/optional_docs.patch b/srcpkgs/libportal/patches/optional_docs.patch new file mode 100644 index 0000000000..dec87939c7 --- /dev/null +++ b/srcpkgs/libportal/patches/optional_docs.patch @@ -0,0 +1,35 @@ +From b7157e5d0c80981c74acfc7258683e84969649b0 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 18 Mar 2020 16:11:41 +0100 +Subject: [PATCH] build: Make docs building optional + +--- + meson.build | 4 +++- + meson_options.txt | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 3ca0fb3..49fa112 100644 +--- meson.build ++++ meson.build +@@ -25,7 +25,9 @@ top_inc = include_directories('.') + libportal_inc = include_directories('libportal') + + subdir('libportal') +-subdir('doc') ++if get_option('gtk_doc') ++ subdir('doc') ++endif + if get_option('build-portal-test') + subdir('portal-test') + endif +diff --git a/meson_options.txt b/meson_options.txt +index f138e4f..8501dc9 100644 +--- meson_options.txt ++++ meson_options.txt +@@ -1,3 +1,4 @@ + option('build-portal-test', type: 'boolean', value: false, + description : 'Build the portal-test application') +- ++option('gtk_doc', type: 'boolean', value: true, ++ description : 'Build API reference with gtk-doc') diff --git a/srcpkgs/libportal/template b/srcpkgs/libportal/template index a325b3aa2a..48211c3767 100644 --- a/srcpkgs/libportal/template +++ b/srcpkgs/libportal/template @@ -1,9 +1,10 @@ # Template file for 'libportal' pkgname=libportal version=0.3 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config gtk-doc" +configure_args="$(vopt_bool gtk_doc gtk_doc)" +hostmakedepends="pkg-config gtk-doc glib-devel" makedepends="glib-devel" short_desc="Flatpak portal library" maintainer="q66 " @@ -12,6 +13,12 @@ homepage="https://github.com/flatpak/libportal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" checksum=fd35d66357169e63e33ef46c43fdf22ddc07dbd960ec3462b58ca9ef15a65bd7 +build_options="gtk_doc" + +if [ -z "$CROSS_BUILD" ]; then + build_options_default="gtk_doc" +fi + libportal-devel_package() { depends="libportal>=${version}_${revision} glib-devel" short_desc+=" - development files" @@ -19,6 +26,8 @@ libportal-devel_package() { vmove usr/include vmove "usr/lib/*.so" vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } }