[oe] [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11

[Kang Kai]

On 2019/8/16 下午3:12, kai.kang at windriver.com wrote:
> From: Kai Kang <kai.kang at windriver.com>
>
> It fails to compile xfce4-datetime-setter occasionally when system load
> is high:
>
> | ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h: No such file or directory
> |    42 | #include "cc-datetime-resources.h"
> |       |          ^~~~~~~~~~~~~~~~~~~~~~~~~
> | compilation terminated.
>
> Update datetime_panel_dep to make sure cc-datetime-resources.h be
> generated before including.

Hi Andreas,

Any comment on this patch please? And I also sent a pull request on github.

Regards,
Kai


>
> xfce4-datetime-setter depends on libxfce4ui which requires distro
> feature 'x11', so make it require 'x11' too.
>
> Signed-off-by: Kai Kang <kai.kang at windriver.com>
> ---
>   .../files/fix-inner-dependency.patch          | 28 +++++++++++++++++++
>   .../xfce4-datetime-setter_3.32.2.bb           |  7 +++--
>   2 files changed, 33 insertions(+), 2 deletions(-)
>   create mode 100644 meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch
>
> diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch
> new file mode 100644
> index 000000000..9cccb892f
> --- /dev/null
> +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch
> @@ -0,0 +1,28 @@
> +It fails to compile xfce4-datetime-setter occasionally when system load is high:
> +
> +| ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h: No such file or directory
> +|    42 | #include "cc-datetime-resources.h"
> +|       |          ^~~~~~~~~~~~~~~~~~~~~~~~~
> +| compilation terminated.
> +
> +Update datetime_panel_dep to make sure cc-datetime-resources.h be generated
> +before including.
> +
> +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/2]
> +
> +Signed-off-by: Kai Kang <kai.kang at windriver.com>
> +---
> +diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build
> +index c5bf39c..241e177 100644
> +--- a/panels/datetime/meson.build
> ++++ b/panels/datetime/meson.build
> +@@ -175,7 +175,8 @@ datetime_panel_lib = static_library(
> +
> + datetime_panel_dep = declare_dependency(
> +   include_directories: [ common_inc, include_directories('.') ],
> +-  link_with: datetime_panel_lib
> ++  link_with: datetime_panel_lib,
> ++  sources: resources
> + )
> +
> + subdir('po-timezones')
> diff --git a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
> index d64358537..4d128ac51 100644
> --- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
> +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
> @@ -6,13 +6,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
>   
>   DEPENDS = "glib-2.0-native libxfce4ui"
>   
> -SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https"
> +SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \
> +           file://fix-inner-dependency.patch \
> +"
>   SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f"
>   
>   S = "${WORKDIR}/git"
>   
>   inherit gettext meson distro_features_check
> -REQUIRED_DISTRO_FEATURES = "systemd"
> +
> +REQUIRED_DISTRO_FEATURES = "systemd x11"
>   
>   FILES_${PN} += "${datadir}/icons/hicolor"
>   


-- 
Kai Kang