From f01b7be260c768116343ba1825ee13cec5bdbc75 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Aug 25 2021 10:33:47 +0000 Subject: fix gtk-doc build --- diff --git a/0001-docs-Remove-types-handling-from-docs.patch b/0001-docs-Remove-types-handling-from-docs.patch new file mode 100644 index 0000000..fcec44f --- /dev/null +++ b/0001-docs-Remove-types-handling-from-docs.patch @@ -0,0 +1,47 @@ +From 7939e8defe7530431730eb6f83e423071846640d Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 25 Aug 2021 12:29:12 +0200 +Subject: [PATCH] docs: Remove types handling from docs + +umockdev doesn't export any GObject object types, so gtk-doc should not +be trying to create an empty types file, or including an object class +tree in its documentation. + +See https://gitlab.gnome.org/GNOME/gtk-doc/issues/48 +See https://github.com/mesonbuild/meson/issues/3892 +See https://bugzilla.redhat.com/show_bug.cgi?id=1604585 +--- + docs/reference/meson.build | 1 - + docs/reference/umockdev-docs.xml | 4 ---- + 2 files changed, 5 deletions(-) + +diff --git a/docs/reference/meson.build b/docs/reference/meson.build +index 737f861..25977af 100644 +--- a/docs/reference/meson.build ++++ b/docs/reference/meson.build +@@ -14,7 +14,6 @@ gnome.gtkdoc('umockdev', + src_dir: [meson.build_root(), umockdev_c, umockdev_ioctl_c], + content_files: [version_xml], + ignore_headers: ['uevent_sender.h', 'ioctl_tree.h', 'debug.h'], +- scan_args: ['--rebuild-types'], + dependencies: [glib, gobject, declare_dependency(link_with : [umockdev_lib])], + install: true, + ) +diff --git a/docs/reference/umockdev-docs.xml b/docs/reference/umockdev-docs.xml +index 4d7216f..0228aef 100644 +--- a/docs/reference/umockdev-docs.xml ++++ b/docs/reference/umockdev-docs.xml +@@ -33,10 +33,6 @@ + + + +- +- Object Hierarchy +- +- + + API Index + +-- +2.31.1 + diff --git a/umockdev.spec b/umockdev.spec index 072dc19..f15abe5 100644 --- a/umockdev.spec +++ b/umockdev.spec @@ -17,6 +17,9 @@ BuildRequires: libpcap-devel BuildRequires: vala BuildRequires: chrpath +# https://github.com/martinpitt/umockdev/pull/139 +Patch0: 0001-docs-Remove-types-handling-from-docs.patch + %description With this program and libraries you can easily create mock udev objects. This is useful for writing tests for software which talks to