summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-11-27 16:32:35 +0800
committerKhem Raj <raj.khem@gmail.com>2018-11-27 11:13:36 -0800
commit0437b7de540437ece2796b9d0a26c9d72e434b16 (patch)
tree57923ef1e4f5384a67c9efbd59f9e1a733f2868c /meta-gnome
parent49466c7917fbc6999ca6cd0651e092147f9e8329 (diff)
downloadmeta-openembedded-0437b7de540437ece2796b9d0a26c9d72e434b16.tar.gz
dconf: 0.28.0 -> 0.30.1
- Do not compile docs to workaround build failure Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch27
-rw-r--r--meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb (renamed from meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb)7
2 files changed, 32 insertions, 2 deletions
diff --git a/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch b/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch
new file mode 100644
index 000000000..2f4283584
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch
@@ -0,0 +1,27 @@
1From 50a9133e0b13798640da0b7cd11b5a85e35b2038 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Fri, 23 Nov 2018 16:27:32 +0800
4Subject: [PATCH] meson.build: do not compile docs
5
6Upstream-Status: Inappropriate [oe specific]
7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9---
10 meson.build | 1 -
11 1 file changed, 1 deletion(-)
12
13diff --git a/meson.build b/meson.build
14index 04b6d47..46fdbc8 100644
15--- a/meson.build
16+++ b/meson.build
17@@ -81,7 +81,6 @@ subdir('gdbus')
18 subdir('gsettings')
19 subdir('client')
20 subdir('bin')
21-subdir('docs')
22 subdir('tests')
23
24 meson.add_install_script('meson_post_install.py', gio_module_dir)
25--
262.7.4
27
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb
index 99292a88c..38d3ec9b4 100644
--- a/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb
+++ b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb
@@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1"
3LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" 3LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
4SECTION = "x11/gnome" 4SECTION = "x11/gnome"
5 5
6SRC_URI[archive.md5sum] = "81faa8e68e5ea71ff0ee75050fc0759c" 6SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e"
7SRC_URI[archive.sha256sum] = "61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742" 7SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7"
8 8
9DEPENDS = "dbus glib-2.0 intltool-native" 9DEPENDS = "dbus glib-2.0 intltool-native"
10 10
@@ -12,6 +12,9 @@ GNOMEBASEBUILDCLASS = "meson"
12 12
13inherit gnomebase gsettings bash-completion vala 13inherit gnomebase gsettings bash-completion vala
14 14
15SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch \
16 "
17
15FILES_${PN} += " \ 18FILES_${PN} += " \
16 ${datadir}/dbus-1 \ 19 ${datadir}/dbus-1 \
17 ${libdir}/gio/modules/*.so \ 20 ${libdir}/gio/modules/*.so \