From 86efc4b495f28b6efcb78df0cf4ed4236894407d Mon Sep 17 00:00:00 2001 From: Victor Toso Date: Fri, 27 Jul 2018 16:05:50 +0200 Subject: [PATCH] Switch to meson build system Add doc/grilo/grilo.types file to be able to build the docs with meson as that was missing from tarball. --- ...nclude-file-to-build-docs-with-meson.patch | 40 +++++++++++++++++++ grilo.spec | 22 +++++----- 2 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 0001-Include-file-to-build-docs-with-meson.patch diff --git a/0001-Include-file-to-build-docs-with-meson.patch b/0001-Include-file-to-build-docs-with-meson.patch new file mode 100644 index 0000000..04c8a48 --- /dev/null +++ b/0001-Include-file-to-build-docs-with-meson.patch @@ -0,0 +1,40 @@ +From a3ba6b49575c74890e38462c41aa27ada74047be Mon Sep 17 00:00:00 2001 +From: Victor Toso +Date: Fri, 27 Jul 2018 20:25:44 +0200 +Subject: [PATCH] Include file to build docs with meson + +Include missing file from tarball in order to switch to meson +without missing the docs +--- + doc/grilo/grilo.types | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + create mode 100644 doc/grilo/grilo.types + +diff --git a/doc/grilo/grilo.types b/doc/grilo/grilo.types +new file mode 100644 +index 0000000..ce9358c +--- /dev/null ++++ b/doc/grilo/grilo.types +@@ -0,0 +1,19 @@ ++% add a _get_type for every GObject whose properties and signals you want ++% documented ++% add the relevant includes to be able to call those _get_type functions ++ ++% adding a get_type here will: ++% - change output file name from grilo-(whatever).html to (whatever).html ++% - document properties and signals ++ ++#include ++ ++grl_data_get_type ++grl_config_get_type ++grl_related_keys_get_type ++grl_media_get_type ++grl_plugin_get_type ++grl_source_get_type ++grl_registry_get_type ++grl_caps_get_type ++grl_operation_options_get_type +-- +2.17.1 + diff --git a/grilo.spec b/grilo.spec index 6e9c3d1..c66229b 100644 --- a/grilo.spec +++ b/grilo.spec @@ -3,13 +3,15 @@ Name: grilo Version: 0.3.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Content discovery framework License: LGPLv2+ URL: https://wiki.gnome.org/Projects/Grilo Source0: https://download.gnome.org/sources/grilo/%{release_version}/grilo-%{version}.tar.xz +Patch0001: 0001-Include-file-to-build-docs-with-meson.patch +BuildRequires: meson BuildRequires: chrpath BuildRequires: gnome-common BuildRequires: intltool @@ -43,21 +45,16 @@ This package contains the core library and elements, as well as general and API documentation. %prep -%setup -q +%autosetup -p1 %build -%configure \ - --enable-vala \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-grl-net \ - --disable-debug \ - --disable-tests +%meson -Denable-gtk-doc=true -make %{?_smp_mflags} +%meson_build %install -%make_install +%meson_install + mkdir -p $RPM_BUILD_ROOT%{_libdir}/grilo-%{release_version}/ mkdir -p $RPM_BUILD_ROOT%{_datadir}/grilo-%{release_version}/plugins/ @@ -100,6 +97,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/grilo-simple-playlist %{_datadir}/vala/ %changelog +* Fri Jul 27 2018 Victor Toso - 0.3.6-3 +- Switch to meson build system + * Fri Jul 27 2018 Igor Gnatenko - 0.3.6-2 - Rebuild for new binutils