mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-30 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

libmodulemd-v1: update to 1.8.16

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2019-10-24 13:11:26 +02:00
committed by Richard Purdie
parent 27f1aa36f5
commit b245171a00
2 changed files with 3 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
View File

@@ -1,60 +0,0 @@
From 71c51206e037c0bb5759e01b307b7ce1d5934703 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 6 Sep 2019 17:07:00 +0200
Subject: [PATCH] Do not generate gtkdoc or python bindings
All of these really need a configuration option.
Upstream-Status: Inappropriate [oe-core specific]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 12 ------------
modulemd/meson.build | 8 --------
2 files changed, 20 deletions(-)
diff --git a/meson.build b/meson.build
index 155c9e7..fe35d5e 100644
--- a/meson.build
+++ b/meson.build
@@ -51,25 +51,13 @@ gnome = import('gnome')
pkg = import('pkgconfig')
gobject = dependency('gobject-2.0')
yaml = dependency('yaml-0.1')
-gtkdoc = dependency('gtk-doc')
glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
-glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
sh = find_program('sh')
sed = find_program('sed')
test = find_program('test')
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'glib/index.html')])
-if ret.returncode() != 0
- error('Missing documentation for GLib.')
-endif
-
-ret = run_command ([test, '-e', join_paths(glib_docpath, 'gobject/index.html')])
-if ret.returncode() != 0
- error('Missing documentation for GObject.')
-endif
-
python_name = get_option('python_name')
if python_name != ''
diff --git a/modulemd/meson.build b/modulemd/meson.build
index 9a164b5..349c982 100644
--- a/modulemd/meson.build
+++ b/modulemd/meson.build
@@ -523,11 +523,3 @@ configure_file(
configuration : xcdata
)
-gnome.gtkdoc(
- 'modulemd-1.0',
- install_dir: 'modulemd-1.0',
- src_dir : './modulemd',
- main_xml : 'modulemd-docs.xml',
- install : true,
-)
-

7
meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
View File

@@ -4,18 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=1.x-maint \
file://0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch \
file://0001-Do-not-generate-gtkdoc-or-python-bindings.patch \
"
PV = "1.8.15"
SRCREV = "2d461725f781c6fdcf32893d8dcfa40bcef8dda5"
PV = "1.8.16"
SRCREV = "d0dcf7b373b3cf85cd39eb3bc23d31e06195a75a"
UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)"
S = "${WORKDIR}/git"
inherit meson gobject-introspection
EXTRA_OEMESON = "-Ddeveloper_build=false"
EXTRA_OEMESON = "-Ddeveloper_build=false -Dwith_docs=false"
DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"