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>
This commit is contained in:
Alexander Kanavin
2021-07-14 14:25:52 +02:00
committed by Richard Purdie
parent 9371ad4858
commit 8508a47580
2 changed files with 6 additions and 38 deletions

View File

@@ -1,28 +0,0 @@
From a04fd2c8ac9e0f7a6fc17f02b2a95227b3d0aae4 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 31 Mar 2020 16:06:39 +0200
Subject: [PATCH] modulemd: generate the manpage only if the feature is enabled
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
modulemd/meson.build | 2 ++
1 file changed, 2 insertions(+)
diff --git a/modulemd/meson.build b/modulemd/meson.build
index 9ef1902..9f71e72 100644
--- a/modulemd/meson.build
+++ b/modulemd/meson.build
@@ -494,6 +494,7 @@ if with_docs
)
endif
+if with_manpages == 'enabled'
help2man_opts = [
'--no-info',
'--section=1',
@@ -506,3 +507,4 @@ custom_target(
],
install: true,
install_dir: join_paths(get_option('mandir'), 'man1'))
+endif

View File

@@ -4,25 +4,21 @@ DESCRIPTION = "${SUMMARY}"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb"
SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main \
file://0001-modulemd-generate-the-manpage-only-if-the-feature-is.patch \
"
SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main"
PV = "2.12.1"
SRCREV = "c0897fa0e9d7d1305fd4813b1010c1d4cca42346"
PV = "2.13.0"
SRCREV = "1a032da198333ee77bdbe4be65e60eb4115ea73f"
S = "${WORKDIR}/git"
inherit meson gobject-introspection python3-dir
inherit meson gobject-introspection
EXTRA_OEMESON = "-Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
EXTRA_OEMESON = "-Dwith_py3=false -Dwith_docs=false -Drpmio=disabled -Dlibmagic=disabled -Dwith_manpages=disabled -Dgobject_overrides_dir_py3=${PYTHON_SITEPACKAGES_DIR}/gi/overrides"
DEPENDS += "glib-2.0 libyaml glib-2.0-native python3"
DEPENDS += "glib-2.0 libyaml glib-2.0-native"
BBCLASSEXTEND = "native nativesdk"
GIR_MESON_OPTION = 'skip_introspection'
GIR_MESON_ENABLE_FLAG = 'false'
GIR_MESON_DISABLE_FLAG = 'true'
FILES_${PN} += "${libdir}/${PYTHON_DIR}/*"