From ff85192d7c0576c3d89387e53d5ca0b7b3c41659 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 1 Aug 2018 16:27:41 +0800 Subject: dconf 0.18.0 -> 0.28.0 - Remove dconf-editor - Use meson to replace autotools Signed-off-by: Hongxu Jia Signed-off-by: Khem Raj --- meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 36 -------------------------- meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb | 21 +++++++++++++++ 2 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb create mode 100644 meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb deleted file mode 100644 index e24bde4497..0000000000 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "configuation database system" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -SECTION = "x11/gnome" - -inherit gnomebase gsettings -SRC_URI[archive.md5sum] = "69a12ed68893f2e1e81ac4e531bc1515" -SRC_URI[archive.sha256sum] = "109b1bc6078690af1ed88cb144ef5c5aee7304769d8bdc82ed48c3696f10c955" -GNOME_COMPRESS_TYPE = "xz" - -DEPENDS = "dbus glib-2.0 libxml2 intltool-native" - -inherit vala gtk-doc distro_features_check - -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "editor", "", d)}" - -#note: editor will be removed in version 0.23.1 -PACKAGECONFIG[editor] = "--enable-editor,--disable-editor,gtk+3" - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains("PACKAGECONFIG", "editor", "x11", "", d)}" - -EXTRA_OECONF += "--disable-man" - -PACKAGES =+ "${@bb.utils.contains("DISTRO_FEATURES", "x11", "dconf-editor", "", d)}" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${libdir}/gio/modules/*.so \ - ${datadir}/bash-completion \ -" -FILES_dconf-editor = " \ - ${bindir}/dconf-editor \ - ${datadir}/icons \ -" -FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb new file mode 100644 index 0000000000..edda1cc081 --- /dev/null +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "configuation database system" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +SECTION = "x11/gnome" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase gsettings bash-completion +SRC_URI[archive.md5sum] = "81faa8e68e5ea71ff0ee75050fc0759c" +SRC_URI[archive.sha256sum] = "61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742" +GNOME_COMPRESS_TYPE = "xz" + +DEPENDS = "dbus glib-2.0 intltool-native" + +inherit vala + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${libdir}/gio/modules/*.so \ +" +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so" -- cgit 1.2.3-korg