From 3db1883a109b520909b12e91028ce8a79923e8f5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Feb 2019 18:46:54 +0100 Subject: libmodulemd: update to 2.1.0 Add support for gobject-introspection. Add v2 API fixes to the gtkdoc/gi disabling patch. Add a dependency on glib-native to allow use of glib-mkenums. Disable v2 API/library for now as libdnf is not compatible with it, yet is erroneously linked against it (if it's enabled). Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...01-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch | 7 +- ...-meson.build-do-not-generate-gir-or-gtkdo.patch | 76 +++++++++++----------- 2 files changed, 43 insertions(+), 40 deletions(-) (limited to 'meta/recipes-devtools/libmodulemd/libmodulemd') diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch index 9465c38520..2598c177c4 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch +++ b/meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch @@ -1,16 +1,17 @@ -From 590bd5ec9f378ab727ee404bb32f615e1bbd15bf Mon Sep 17 00:00:00 2001 +From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 + --- spec_tmpl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec_tmpl.sh b/spec_tmpl.sh -index 45009c3..307c0c2 100755 +index 14e895a..fc80fc6 100755 --- a/spec_tmpl.sh +++ b/spec_tmpl.sh @@ -1,4 +1,4 @@ @@ -18,4 +19,4 @@ index 45009c3..307c0c2 100755 +#!/bin/sh version=$1 - template=$2 + libmodulemd_v1_version=$2 diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch index e94abd27c3..a3e62bf52c 100644 --- a/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch +++ b/meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch @@ -1,65 +1,67 @@ -From b6c8039afe016d25c17cdf1b2462d6a53d49fad1 Mon Sep 17 00:00:00 2001 +From b77c9c3d07430b014b2d1bff42027f483c81f15a Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 6 Nov 2018 13:43:00 +0100 -Subject: [PATCH] modulemd/v1/meson.build: do not generate gir or gtkdoc +Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python + bindings -Both of these really need a configuration option. +All of these really need a configuration option. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- - meson.build | 1 - - modulemd/v1/meson.build | 20 -------------------- - 2 files changed, 21 deletions(-) + meson.build | 3 +-- + modulemd/v1/meson.build | 8 -------- + modulemd/v2/meson.build | 8 -------- + 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/meson.build b/meson.build -index db7c6a1..e0ea61a 100644 +index 228bd34..a1e60bb 100644 --- a/meson.build +++ b/meson.build -@@ -49,7 +49,6 @@ gnome = import('gnome') +@@ -52,7 +52,6 @@ gnome = import('gnome') pkg = import('pkgconfig') gobject = dependency('gobject-2.0') yaml = dependency('yaml-0.1') -gtkdoc = dependency('gtk-doc') - spec_tmpl = find_program('spec_tmpl.sh') + sh = find_program('sh') + sed = find_program('sed') +@@ -110,4 +109,4 @@ configure_file( + ) + subdir('modulemd') +-subdir('bindings/python') ++ diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build -index 38e0d15..d59e519 100644 +index 74db89a..4d54e69 100644 --- a/modulemd/v1/meson.build +++ b/modulemd/v1/meson.build -@@ -311,19 +311,6 @@ if valgrind.found() - timeout : 300) - endif +@@ -341,11 +341,3 @@ configure_file( + configuration : xcdata + ) --gnome.generate_gir( -- modulemd_v1_lib, -- sources : modulemd_v1_srcs + modulemd_v1_hdrs, -- nsversion : '.'.join([libmodulemd_version_array[0], '0']), -- namespace : 'Modulemd', -- symbol_prefix : 'modulemd_', -- identifier_prefix : 'Modulemd', -- includes : [ -- 'GObject-2.0', -- ], +-gnome.gtkdoc( +- 'modulemd-1.0', +- install_dir: 'modulemd-1.0', +- src_dir : './modulemd/v1', +- main_xml : 'modulemd-v1-docs.xml', - install : true, -- ) +-) - - xcdata = configuration_data() - xcdata.set('VERSION', libmodulemd_version) - configure_file( -@@ -339,13 +326,6 @@ configure_file( - configuration : cdata +diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build +index 7b94e0c..c5f72b9 100644 +--- a/modulemd/v2/meson.build ++++ b/modulemd/v2/meson.build +@@ -530,11 +530,3 @@ configure_file( + configuration : xcdata ) -gnome.gtkdoc( -- 'modulemd-1.0', -- install_dir: 'modulemd-1.0', -- src_dir : './', -- main_xml : 'modulemd-docs.xml', -- install : true) +- 'modulemd-2.0', +- install_dir: 'modulemd-2.0', +- src_dir : './modulemd/v2', +- main_xml : 'modulemd-v2-docs.xml', +- install : true, +-) - - pkg.generate( - libraries : modulemd_v1_lib, - subdirs : v1_header_path, -- cgit 1.2.3-korg