diff options
| author |   Andreas Müller <schnitzeltony@gmail.com> | 2019-03-27 16:34:57 +0100 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-03-28 11:55:34 -0700 |
| commit | ff466c8eb98c60968425992d28baa81ee0fe10b6 (patch) | |
| tree | 89e8f6e87679d718484b9917272e68662fc7041b /meta-gnome | |
| parent | 322b50131cd52f4e72cdfbf9fb1cef69e16942fb (diff) | |
| download | meta-openembedded-contrib-ff466c8eb98c60968425992d28baa81ee0fe10b6.tar.gz | |
dconf: upgrade 0.30.1 -> 0.32.0
Instead of patching out docs just tell meson not to build man pages
Signed-off-by: Andreas Müller <schnitzeltony@gmail.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.patch | 27 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb (renamed from meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb) | 8 |
2 files changed, 4 insertions, 31 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 deleted file mode 100644 index 2f4283584a..0000000000 --- a/meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50a9133e0b13798640da0b7cd11b5a85e35b2038 Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@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@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.30.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb index 9f67673b12..8d1bbdfd1a 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e" -SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7" +SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" +SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" DEPENDS = "dbus glib-2.0 intltool-native" @@ -12,8 +12,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase bash-completion vala -SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch \ - " +# I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl +EXTRA_OEMESON = "-Dman=false" FILES_${PN} += " \ ${datadir}/dbus-1 \ |