[oe-commits] [meta-openembedded] 03/26: dconf: 0.28.0 -> 0.30.1

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 0437b7de540437ece2796b9d0a26c9d72e434b16
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Tue Nov 27 16:32:35 2018 +0800

    dconf: 0.28.0 -> 0.30.1
    
    - Do not compile docs to workaround build failure
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 .../0001-meson.build-do-not-compile-docs.patch     | 27 ++++++++++++++++++++++
 .../dconf/{dconf_0.28.0.bb => dconf_0.30.1.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 0000000..2f42835
--- /dev/null
+++ b/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch
@@ -0,0 +1,27 @@
+From 50a9133e0b13798640da0b7cd11b5a85e35b2038 Mon Sep 17 00:00:00 2001
+From: Hongxu Jia <hongxu.jia at windriver.com>
+Date: Fri, 23 Nov 2018 16:27:32 +0800
+Subject: [PATCH] meson.build: do not compile docs
+
+Upstream-Status: Inappropriate [oe specific]
+
+Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
+---
+ meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 04b6d47..46fdbc8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -81,7 +81,6 @@ subdir('gdbus')
+ subdir('gsettings')
+ subdir('client')
+ subdir('bin')
+-subdir('docs')
+ subdir('tests')
+ 
+ meson.add_install_script('meson_post_install.py', gio_module_dir)
+-- 
+2.7.4
+
diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb
similarity index 60%
rename from meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb
rename to meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb
index 99292a8..38d3ec9 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"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
 SECTION = "x11/gnome"
 
-SRC_URI[archive.md5sum] = "81faa8e68e5ea71ff0ee75050fc0759c"
-SRC_URI[archive.sha256sum] = "61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742"
+SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e"
+SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7"
 
 DEPENDS = "dbus glib-2.0 intltool-native"
 
@@ -12,6 +12,9 @@ GNOMEBASEBUILDCLASS = "meson"
 
 inherit gnomebase gsettings bash-completion vala
 
+SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch \
+           "
+
 FILES_${PN} += " \
     ${datadir}/dbus-1 \
     ${libdir}/gio/modules/*.so \

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.