From 0437b7de540437ece2796b9d0a26c9d72e434b16 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 27 Nov 2018 16:32:35 +0800 Subject: dconf: 0.28.0 -> 0.30.1 - Do not compile docs to workaround build failure Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- .../0001-meson.build-do-not-compile-docs.patch | 27 ++++++++++++++++++++++ meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb | 18 --------------- meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb | 21 +++++++++++++++++ 3 files changed, 48 insertions(+), 18 deletions(-) create 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.28.0.bb create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb 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 0000000000..2f4283584a --- /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 +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.28.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb deleted file mode 100644 index 99292a88cb..0000000000 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -SECTION = "x11/gnome" - -SRC_URI[archive.md5sum] = "81faa8e68e5ea71ff0ee75050fc0759c" -SRC_URI[archive.sha256sum] = "61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742" - -DEPENDS = "dbus glib-2.0 intltool-native" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings bash-completion vala - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ -" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.bb new file mode 100644 index 0000000000..38d3ec9b45 --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.30.1.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] = "a959eef51c917b3c57cfbef1448a375e" +SRC_URI[archive.sha256sum] = "549a3a7cc3881318107dc48a7b02ee8f88c9127acaf2d47f7724f78a8f6d02b7" + +DEPENDS = "dbus glib-2.0 intltool-native" + +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 \ +" -- cgit 1.2.3-korg