summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libmodulemd
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-10-24 13:11:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-10-31 16:09:34 +0000
commitb245171a00199801d13cae93664179b6bcf3f28f (patch)
treeb038d8b28babf73f08a5dd3da6be39e41b13eda8 /meta/recipes-devtools/libmodulemd
parent27f1aa36f5f8edd8a67226dd98151d2b4105142d (diff)
downloadpoky-b245171a00199801d13cae93664179b6bcf3f28f.tar.gz
libmodulemd-v1: update to 1.8.16
Upstream added support for optional docs, so 0001-Do-not-generate-gtkdoc-or-python-bindings.patch is replaced with an option to disable gtk-doc (as the modulemd feature is not used in oe-core anyway). (From OE-Core rev: cb5bb2b9635ebf709f1eb0b154f28419d548ad70) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libmodulemd')
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch60
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb7
2 files changed, 3 insertions, 64 deletions
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
deleted file mode 100644
index d950ad5867..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Sep 2019 17:07:00 +0200
4Subject: [PATCH] Do not generate gtkdoc or python bindings
5
6All of these really need a configuration option.
7
8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 meson.build | 12 ------------
12 modulemd/meson.build | 8 --------
13 2 files changed, 20 deletions(-)
14
15diff --git a/meson.build b/meson.build
16index 155c9e7..fe35d5e 100644
17--- a/meson.build
18+++ b/meson.build
19@@ -51,25 +51,13 @@ gnome = import('gnome')
20 pkg = import('pkgconfig')
21 gobject = dependency('gobject-2.0')
22 yaml = dependency('yaml-0.1')
23-gtkdoc = dependency('gtk-doc')
24
25 glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
26-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
27
28 sh = find_program('sh')
29 sed = find_program('sed')
30 test = find_program('test')
31
32-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
33-if ret.returncode() != 0
34- error('Missing documentation for GLib.')
35-endif
36-
37-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
38-if ret.returncode() != 0
39- error('Missing documentation for GObject.')
40-endif
41-
42 python_name = get_option('python_name')
43
44 if python_name != ''
45diff --git a/modulemd/meson.build b/modulemd/meson.build
46index 9a164b5..349c982 100644
47--- a/modulemd/meson.build
48+++ b/modulemd/meson.build
49@@ -523,11 +523,3 @@ configure_file(
50 configuration : xcdata
51 )
52
53-gnome.gtkdoc(
54- 'modulemd-1.0',
55- install_dir: 'modulemd-1.0',
56- src_dir : './modulemd',
57- main_xml : 'modulemd-docs.xml',
58- install : true,
59-)
60-
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
index 9790470f4f..5409051d79 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
@@ -4,18 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
4 4
5SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \ 5SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \
6 file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \ 6 file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
7 file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \
8 " 7 "
9 8
10PV = "1.8.15" 9PV = "1.8.16"
11SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5" 10SRCREV = "d0dcf7b373b3cf85cd39eb3bc23d31e06195a75a"
12UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)" 11UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
13 12
14S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
15 14
16inherit meson gobject-introspection 15inherit meson gobject-introspection
17 16
18EXTRA_OEMESON = "-Ddeveloper_build=false" 17EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false"
19 18
20DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" 19DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
21 20