diff options
Diffstat (limited to 'meta/recipes-devtools/libmodulemd')
4 files changed, 24 insertions, 108 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 @@ -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/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch deleted file mode 100644 index 847b5f700b..0000000000 --- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 4e67f6049b3f822fe6f5af46790a51ace581bf82 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 6 Nov 2018 13:41:29 +0100 -Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - spec_tmpl.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/spec_tmpl.sh b/spec_tmpl.sh -index 0238087..126853c 100755 ---- a/spec_tmpl.sh -+++ b/spec_tmpl.sh -@@ -1,4 +1,4 @@ --#!/usr/bin/sh -+#!/bin/sh - - version=$1 - template=$2 diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb deleted file mode 100644 index 9790470f4f..0000000000 --- a/meta/recipes-devtools/libmodulemd/libmodulemd-v1_git.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "C Library for manipulating module metadata files" -LICENSE = "MIT" -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" -UPSTREAM_CHECK_GITTAGREGEX = "libmodulemd-(?P<pver>1.*\d)" - -S = "${WORKDIR}/git" - -inherit meson gobject-introspection - -EXTRA_OEMESON = "-Ddeveloper_build=false" - -DEPENDS += "glib-2.0 libyaml glib-2.0-native python3" - -BBCLASSEXTEND = "native nativesdk" - -GIR_MESON_OPTION = 'skip_introspection' -GIR_MESON_ENABLE_FLAG = 'false' -GIR_MESON_DISABLE_FLAG = 'true' diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb new file mode 100644 index 0000000000..d3bef83306 --- /dev/null +++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "C Library for manipulating module metadata files" +HOMEPAGE = "https://github.com/fedora-modularity/libmodulemd" +DESCRIPTION = "${SUMMARY}" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=25a3927bff3ee4f5b21bcb0ed3fcd6bb" + +SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https;branch=main" + +PV = "2.15.0" +SRCREV = "bfde7f2d04fbb22e26c9eb843e4ccc478762dd8d" + +S = "${WORKDIR}/git" + +inherit meson gobject-introspection pkgconfig + +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" + +BBCLASSEXTEND = "native nativesdk" + +GIR_MESON_OPTION = 'skip_introspection' +GIR_MESON_ENABLE_FLAG = 'false' +GIR_MESON_DISABLE_FLAG = 'true' |