From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 6/6] libmodulemd-v1: update to 1.8.16
Date: Thu, 31 Oct 2019 10:36:55 +0100 [thread overview]
Message-ID: <20191031093655.14852-6-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20191031093655.14852-1-alex.kanavin@gmail.com>
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).
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...t-generate-gtkdoc-or-python-bindings.patch | 60 -------------------
.../libmodulemd/libmodulemd-v1_git.bb | 7 +--
2 files changed, 3 insertions(+), 64 deletions(-)
delete mode 100644 meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
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 d950ad5867e..00000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-Do-not-generate-gtkdoc-or-python-bindings.patch
+++ /dev/null
@@ -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,
--)
--
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb
index 9790470f4fe..5409051d79f 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"
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"
--
2.17.1
prev parent reply other threads:[~2019-10-31 9:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-31 9:36 [PATCH 1/6] runqemu: add options that enable virgl with the SDL frontend Alexander Kanavin
2019-10-31 9:36 ` [PATCH 2/6] selftest: skip virgl test on centos 7 entirely Alexander Kanavin
2019-10-31 9:36 ` [PATCH 3/6] oe-selftest: extend virgl gtk test to also check the SDL option Alexander Kanavin
2019-11-01 17:46 ` Ross Burton
2019-11-02 12:07 ` Alexander Kanavin
2019-11-02 22:29 ` Alexander Kanavin
2019-11-04 21:10 ` Alexander Kanavin
2019-11-08 17:20 ` Michael Halstead
2019-11-08 17:55 ` Alexander Kanavin
2019-11-08 18:01 ` Michael Halstead
2019-11-08 18:16 ` Alexander Kanavin
2019-10-31 9:36 ` [PATCH 4/6] gcr: update to 3.34.0 Alexander Kanavin
2019-10-31 9:56 ` Andreas Müller
2019-10-31 9:58 ` Alexander Kanavin
2019-10-31 10:02 ` Andreas Müller
2019-10-31 9:36 ` [PATCH 5/6] btrfs-tools: update to 5.3 Alexander Kanavin
2019-10-31 9:36 ` Alexander Kanavin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191031093655.14852-6-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox