summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libmodulemd
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-02-19 18:46:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-20 11:30:35 +0000
commit67dc812011efbc13e4d77d4d6e3999d6d121fa12 (patch)
tree8e5318f33318f326fd10ab8e2da1ec449feddcd7 /meta/recipes-devtools/libmodulemd
parent226f235c51b2fce214362f1f657dfcfa855c5516 (diff)
downloadpoky-67dc812011efbc13e4d77d4d6e3999d6d121fa12.tar.gz
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). (From OE-Core rev: 3db1883a109b520909b12e91028ce8a79923e8f5) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libmodulemd')
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0001-spec_tmpl.sh-use-bin-sh-not-usr-bin-sh.patch7
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch76
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb19
3 files changed, 57 insertions, 45 deletions
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 @@
1From 590bd5ec9f378ab727ee404bb32f615e1bbd15bf Mon Sep 17 00:00:00 2001 1From 74ea6a665d0f3417e75f1d3d02f27a12f128ec70 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 6 Nov 2018 13:41:29 +0100 3Date: Tue, 6 Nov 2018 13:41:29 +0100
4Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh 4Subject: [PATCH] spec_tmpl.sh: use /bin/sh, not /usr/bin/sh
5 5
6Upstream-Status: Pending 6Upstream-Status: Pending
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 spec_tmpl.sh | 2 +- 10 spec_tmpl.sh | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
11 12
12diff --git a/spec_tmpl.sh b/spec_tmpl.sh 13diff --git a/spec_tmpl.sh b/spec_tmpl.sh
13index 45009c3..307c0c2 100755 14index 14e895a..fc80fc6 100755
14--- a/spec_tmpl.sh 15--- a/spec_tmpl.sh
15+++ b/spec_tmpl.sh 16+++ b/spec_tmpl.sh
16@@ -1,4 +1,4 @@ 17@@ -1,4 +1,4 @@
@@ -18,4 +19,4 @@ index 45009c3..307c0c2 100755
18+#!/bin/sh 19+#!/bin/sh
19 20
20 version=$1 21 version=$1
21 template=$2 22 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 @@
1From b6c8039afe016d25c17cdf1b2462d6a53d49fad1 Mon Sep 17 00:00:00 2001 1From b77c9c3d07430b014b2d1bff42027f483c81f15a Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 6 Nov 2018 13:43:00 +0100 3Date: Tue, 6 Nov 2018 13:43:00 +0100
4Subject: [PATCH] modulemd/v1/meson.build: do not generate gir or gtkdoc 4Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python
5 bindings
5 6
6Both of these really need a configuration option. 7All of these really need a configuration option.
7 8
8Upstream-Status: Inappropriate [oe-core specific] 9Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10 11
11--- 12---
12 meson.build | 1 - 13 meson.build | 3 +--
13 modulemd/v1/meson.build | 20 -------------------- 14 modulemd/v1/meson.build | 8 --------
14 2 files changed, 21 deletions(-) 15 modulemd/v2/meson.build | 8 --------
16 3 files changed, 1 insertion(+), 18 deletions(-)
15 17
16diff --git a/meson.build b/meson.build 18diff --git a/meson.build b/meson.build
17index db7c6a1..e0ea61a 100644 19index 228bd34..a1e60bb 100644
18--- a/meson.build 20--- a/meson.build
19+++ b/meson.build 21+++ b/meson.build
20@@ -49,7 +49,6 @@ gnome = import('gnome') 22@@ -52,7 +52,6 @@ gnome = import('gnome')
21 pkg = import('pkgconfig') 23 pkg = import('pkgconfig')
22 gobject = dependency('gobject-2.0') 24 gobject = dependency('gobject-2.0')
23 yaml = dependency('yaml-0.1') 25 yaml = dependency('yaml-0.1')
24-gtkdoc = dependency('gtk-doc') 26-gtkdoc = dependency('gtk-doc')
25 27
26 spec_tmpl = find_program('spec_tmpl.sh') 28 sh = find_program('sh')
29 sed = find_program('sed')
30@@ -110,4 +109,4 @@ configure_file(
31 )
27 32
33 subdir('modulemd')
34-subdir('bindings/python')
35+
28diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build 36diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
29index 38e0d15..d59e519 100644 37index 74db89a..4d54e69 100644
30--- a/modulemd/v1/meson.build 38--- a/modulemd/v1/meson.build
31+++ b/modulemd/v1/meson.build 39+++ b/modulemd/v1/meson.build
32@@ -311,19 +311,6 @@ if valgrind.found() 40@@ -341,11 +341,3 @@ configure_file(
33 timeout : 300) 41 configuration : xcdata
34 endif 42 )
35 43
36-gnome.generate_gir( 44-gnome.gtkdoc(
37- modulemd_v1_lib, 45- 'modulemd-1.0',
38- sources : modulemd_v1_srcs + modulemd_v1_hdrs, 46- install_dir: 'modulemd-1.0',
39- nsversion : '.'.join([libmodulemd_version_array[0], '0']), 47- src_dir : './modulemd/v1',
40- namespace : 'Modulemd', 48- main_xml : 'modulemd-v1-docs.xml',
41- symbol_prefix : 'modulemd_',
42- identifier_prefix : 'Modulemd',
43- includes : [
44- 'GObject-2.0',
45- ],
46- install : true, 49- install : true,
47- ) 50-)
48- 51-
49 xcdata = configuration_data() 52diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
50 xcdata.set('VERSION', libmodulemd_version) 53index 7b94e0c..c5f72b9 100644
51 configure_file( 54--- a/modulemd/v2/meson.build
52@@ -339,13 +326,6 @@ configure_file( 55+++ b/modulemd/v2/meson.build
53 configuration : cdata 56@@ -530,11 +530,3 @@ configure_file(
57 configuration : xcdata
54 ) 58 )
55 59
56-gnome.gtkdoc( 60-gnome.gtkdoc(
57- 'modulemd-1.0', 61- 'modulemd-2.0',
58- install_dir: 'modulemd-1.0', 62- install_dir: 'modulemd-2.0',
59- src_dir : './', 63- src_dir : './modulemd/v2',
60- main_xml : 'modulemd-docs.xml', 64- main_xml : 'modulemd-v2-docs.xml',
61- install : true) 65- install : true,
66-)
62- 67-
63 pkg.generate(
64 libraries : modulemd_v1_lib,
65 subdirs : v1_header_path,
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index d9bfdc0878..87e92114c8 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -7,15 +7,24 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
7 file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \ 7 file://0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch \
8 " 8 "
9 9
10PV = "1.7.0" 10PV = "2.1.0"
11SRCREV = "9af3e7b4bec2f8daaa857fa668b858e484487710" 11SRCREV = "072e6ee791fe7822a6d423bdac7e4a5cbb118bce"
12 12
13S = "${WORKDIR}/git" 13S = "${WORKDIR}/git"
14 14
15inherit meson 15inherit meson gobject-introspection
16 16
17EXTRA_OEMESON = "-Ddeveloper_build=false" 17EXTRA_OEMESON = "-Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=false"
18 18
19DEPENDS += "glib-2.0 libyaml" 19DEPENDS += "glib-2.0 libyaml glib-2.0-native"
20 20
21BBCLASSEXTEND = "native nativesdk" 21BBCLASSEXTEND = "native nativesdk"
22
23GI_ENABLE_FLAG = "-Dskip_introspection=false"
24GI_DISABLE_FLAG = "-Dskip_introspection=true"
25
26EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}"
27EXTRA_OEMESON_append_class-native = " ${GI_DISABLE_FLAG}"
28
29EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
30 '${GI_DISABLE_FLAG}', d)} "