[oe] [PATCH 01/16] dconf 0.18.0 -> 0.28.0

[Anuj Mittal]

On 08/01/2018 03:21 PM, Hongxu Jia wrote:
> - Remove dconf-editor
> 
> Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
> ---
>  meta-gnome/recipes-gnome/dconf/dconf_0.18.0.bb | 36 --------------------------
>  meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb | 23 ++++++++++++++++
>  2 files changed, 23 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 e24bde4..0000000
> --- 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 0000000..856494c
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.28.0.bb
> @@ -0,0 +1,23 @@
> +SUMMARY = "configuation database system"
> +LICENSE = "LGPLv2.1"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
> +
> +SECTION = "x11/gnome"
> +
> +inherit gnomebase gsettings
> +SRC_URI[archive.md5sum] = "81faa8e68e5ea71ff0ee75050fc0759c"
> +SRC_URI[archive.sha256sum] = "61d3b3865ef58b729c3b39aa0979f886c014aa8362f93dcfc74bf5648ed9c742"
> +GNOME_COMPRESS_TYPE = "xz"
> +
> +DEPENDS = "dbus glib-2.0 intltool-native"
> +
> +inherit vala meson
> +
> +EXTRA_OECONF += "--disable-man"

This won't have any affect if this is using meson. You can also just set
GNOMEBASEBUILDCLASS=meson and skip inheriting meson here.

> +
> +FILES_${PN} += " \
> +    ${datadir}/dbus-1 \
> +    ${libdir}/gio/modules/*.so \
> +    ${datadir}/bash-completion \

bash-completion.bbclass should be inherited instead ...

> +"
> +FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
>