From ff466c8eb98c60968425992d28baa81ee0fe10b6 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 27 Mar 2019 16:34:57 +0100 Subject: dconf: upgrade 0.30.1 -> 0.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead of patching out docs just tell meson not to build man pages Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../0001-meson.build-do-not-compile-docs.patch | 27 ---------------------- meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb | 21 ----------------- meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb | 21 +++++++++++++++++ 3 files changed, 21 insertions(+), 48 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf/0001-meson.build-do-not-compile-docs.patch delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb (limited to 'meta-gnome/recipes-gnome') 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 -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 ---- - 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.30.1.bb deleted file mode 100644 index 9f67673b12..0000000000 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "x11/gnome" - -SRC_URI[archive.md5sum] = "a959eef51c917b3c57cfbef1448a375e" -SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7" - -DEPENDS = "dbus glib-2.0 intltool-native" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase bash-completion vala - -SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch \ - " - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ -" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb new file mode 100644 index 0000000000..8d1bbdfd1a --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.32.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "configuation database system" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" +SECTION = "x11/gnome" + +SRC_URI[archive.md5sum] = "e1ac0b6285abefeed69ca9e380e44f5a" +SRC_URI[archive.sha256sum] = "68bce78b19bc94cb2c3bb8587e37f9e5e338568c3a674f86edde9c9f1624ffab" + +DEPENDS = "dbus glib-2.0 intltool-native" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase bash-completion vala + +# 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 \ + ${libdir}/gio/modules/*.so \ +" -- cgit 1.2.3-korg