summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-07-14 14:25:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-16 21:23:43 +0100
commit8508a475805acdd5b025213b9a2af8c97073cd70 (patch)
tree8bb1b757efda98472af54291652c6e8fcc38867f
parent9371ad48588e514f1ff51d3b2bc4a8cee127453d (diff)
downloadpoky-8508a475805acdd5b025213b9a2af8c97073cd70.tar.gz
libmodulemd: update 2.12.1 -> 2.13.0
Delete patch, as the issue is fixed upstream. Disable python bindings as they're not used anywhere, and require functional gobject introspection. (From OE-Core rev: abe4b9be9fc5e6a37be18b6e9d14b863f6fac3c7) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch28
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb16
2 files changed, 6 insertions, 38 deletions
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch
deleted file mode 100644
index d5c87a1154..0000000000
--- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 31 Mar 2020 16:06:39 +0200
4Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled
5
6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 modulemd/meson.build | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/modulemd/meson.build b/modulemd/meson.build
13index 9ef1902..9f71e72 100644
14--- a/modulemd/meson.build
15+++ b/modulemd/meson.build
16@@ -494,6 +494,7 @@ if with_docs
17 )
18 endif
19
20+if with_manpages == 'enabled'
21 help2man_opts = [
22 '--no-info',
23 '--section=1',
24@@ -506,3 +507,4 @@ custom_target(
25 ],
26 install: true,
27 install_dir: join_paths(get_option('mandir'), 'man1'))
28+endif
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index 771b2c094f..963e881d6c 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -4,25 +4,21 @@ DESCRIPTION = "${SUMMARY}"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" 5LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
6 6
7SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main \ 7SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main"
8 file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \
9 "
10 8
11PV = "2.12.1" 9PV = "2.13.0"
12SRCREV = "c0897fa0e9d7d1305fd4813b1010c1d4cca42346" 10SRCREV = "1a032da198333ee77bdbe4be65e60eb4115ea73f"
13 11
14S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
15 13
16inherit meson gobject-introspection python3-dir 14inherit meson gobject-introspection
17 15
18EXTRA_OEMESON = "-Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides" 16EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
19 17
20DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" 18DEPENDS += "glib-2.0 libyaml glib-2.0-native"
21 19
22BBCLASSEXTEND = "native nativesdk" 20BBCLASSEXTEND = "native nativesdk"
23 21
24GIR_MESON_OPTION = 'skip_introspection' 22GIR_MESON_OPTION = 'skip_introspection'
25GIR_MESON_ENABLE_FLAG = 'false' 23GIR_MESON_ENABLE_FLAG = 'false'
26GIR_MESON_DISABLE_FLAG = 'true' 24GIR_MESON_DISABLE_FLAG = 'true'
27
28FILES_${PN} += "${libdir}/${PYTHON_DIR}/*"