summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-07-30 17:54:28 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-31 23:03:01 +0100
commitb7bc14c397ee13d5a3b3af04ba8874f52f8eedd3 (patch)
tree544822869e927f693ec5c7974dc6096d59eec743 /meta/recipes-devtools
parent5d1ba9eee12829b4377d3919579669ed057f67c8 (diff)
downloadpoky-b7bc14c397ee13d5a3b3af04ba8874f52f8eedd3.tar.gz
libmodulemd: update to 2.6.0
(From OE-Core rev: 93e52d2d8985f7bba6a03a7a56fdc22087a62469) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd/0002-modulemd-v1-meson.build-do-not-generate-gir-or-gtkdo.patch26
-rw-r--r--meta/recipes-devtools/libmodulemd/libmodulemd_git.bb4
2 files changed, 17 insertions, 13 deletions
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 a3e62bf52c..0b7535624c 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,4 +1,4 @@
1From b77c9c3d07430b014b2d1bff42027f483c81f15a Mon Sep 17 00:00:00 2001 1From 4a2a592c5a3898df37ff231d9c410f0fd32f5d5d 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/v[12]/meson.build: do not generate gtkdoc or python 4Subject: [PATCH] modulemd/v[12]/meson.build: do not generate gtkdoc or python
@@ -10,13 +10,13 @@ Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 11
12--- 12---
13 meson.build | 3 +-- 13 meson.build | 3 +--
14 modulemd/v1/meson.build | 8 -------- 14 modulemd/v1/meson.build | 8 --------
15 modulemd/v2/meson.build | 8 -------- 15 modulemd/v2/meson.build | 12 ------------
16 3 files changed, 1 insertion(+), 18 deletions(-) 16 3 files changed, 1 insertion(+), 22 deletions(-)
17 17
18diff --git a/meson.build b/meson.build 18diff --git a/meson.build b/meson.build
19index 228bd34..a1e60bb 100644 19index 5a0cd3d..f51b16e 100644
20--- a/meson.build 20--- a/meson.build
21+++ b/meson.build 21+++ b/meson.build
22@@ -52,7 +52,6 @@ gnome = import('gnome') 22@@ -52,7 +52,6 @@ gnome = import('gnome')
@@ -27,17 +27,17 @@ index 228bd34..a1e60bb 100644
27 27
28 sh = find_program('sh') 28 sh = find_program('sh')
29 sed = find_program('sed') 29 sed = find_program('sed')
30@@ -110,4 +109,4 @@ configure_file( 30@@ -127,4 +126,4 @@ configure_file(
31 ) 31 )
32 32
33 subdir('modulemd') 33 subdir('modulemd')
34-subdir('bindings/python') 34-subdir('bindings/python')
35+ 35+
36diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build 36diff --git a/modulemd/v1/meson.build b/modulemd/v1/meson.build
37index 74db89a..4d54e69 100644 37index ddc95a1..e85fafd 100644
38--- a/modulemd/v1/meson.build 38--- a/modulemd/v1/meson.build
39+++ b/modulemd/v1/meson.build 39+++ b/modulemd/v1/meson.build
40@@ -341,11 +341,3 @@ configure_file( 40@@ -356,11 +356,3 @@ configure_file(
41 configuration : xcdata 41 configuration : xcdata
42 ) 42 )
43 43
@@ -50,10 +50,10 @@ index 74db89a..4d54e69 100644
50-) 50-)
51- 51-
52diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build 52diff --git a/modulemd/v2/meson.build b/modulemd/v2/meson.build
53index 7b94e0c..c5f72b9 100644 53index 93c7fbd..0d9ed24 100644
54--- a/modulemd/v2/meson.build 54--- a/modulemd/v2/meson.build
55+++ b/modulemd/v2/meson.build 55+++ b/modulemd/v2/meson.build
56@@ -530,11 +530,3 @@ configure_file( 56@@ -285,15 +285,3 @@ configure_file(
57 configuration : xcdata 57 configuration : xcdata
58 ) 58 )
59 59
@@ -62,6 +62,10 @@ index 7b94e0c..c5f72b9 100644
62- install_dir: 'modulemd-2.0', 62- install_dir: 'modulemd-2.0',
63- src_dir : './modulemd/v2', 63- src_dir : './modulemd/v2',
64- main_xml : 'modulemd-v2-docs.xml', 64- main_xml : 'modulemd-v2-docs.xml',
65- gobject_typesfile : join_paths(meson.current_build_dir(), 'modulemd-2.0.types'),
66- dependencies : [
67- modulemd_v2_dep,
68- ],
65- install : true, 69- install : true,
66-) 70-)
67- 71-
diff --git a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
index 7e8aea7be3..9ac7e140ab 100644
--- a/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
+++ b/meta/recipes-devtools/libmodulemd/libmodulemd_git.bb
@@ -8,8 +8,8 @@ SRC_URI = "git://github.com/fedora-modularity/libmodulemd;protocol=https \
8 file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \ 8 file://0001-v1-meson.build-explicitly-specify-the-v1-library-in-.patch \
9 " 9 "
10 10
11PV = "2.5.0" 11PV = "2.6.0"
12SRCREV = "8d9a99ddf037df7c032119cdd3a87238a3cc9090" 12SRCREV = "7c7f88258491866cdb86d26cadfce37a78f242ec"
13 13
14S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
15 15