* [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 @ 2019-08-16 7:12 kai.kang 2019-08-23 1:57 ` Kang Kai 0 siblings, 1 reply; 8+ messages in thread From: kai.kang @ 2019-08-16 7:12 UTC (permalink / raw) To: schnitzeltony, raj.khem; +Cc: openembedded-devel From: Kai Kang <kai.kang@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. xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too. Signed-off-by: Kai Kang <kai.kang@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@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" -- 2.20.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-16 7:12 [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 kai.kang @ 2019-08-23 1:57 ` Kang Kai 2019-08-23 20:38 ` Andreas Müller 0 siblings, 1 reply; 8+ messages in thread From: Kang Kai @ 2019-08-23 1:57 UTC (permalink / raw) To: schnitzeltony, raj.khem; +Cc: openembedded-devel On 2019/8/16 下午3:12, kai.kang@windriver.com wrote: > From: Kai Kang <kai.kang@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@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@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 ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-23 1:57 ` Kang Kai @ 2019-08-23 20:38 ` Andreas Müller 2019-08-23 20:45 ` Andreas Müller 0 siblings, 1 reply; 8+ messages in thread From: Andreas Müller @ 2019-08-23 20:38 UTC (permalink / raw) To: Kang Kai; +Cc: openembedded-devel On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <Kai.Kang@windriver.com> wrote: > > On 2019/8/16 下午3:12, kai.kang@windriver.com wrote: > > From: Kai Kang <kai.kang@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@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@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" > > > Woops I missed that completely - will check Andreas ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-23 20:38 ` Andreas Müller @ 2019-08-23 20:45 ` Andreas Müller 2019-08-27 1:10 ` Kang Kai 0 siblings, 1 reply; 8+ messages in thread From: Andreas Müller @ 2019-08-23 20:45 UTC (permalink / raw) To: Kang Kai; +Cc: openembedded-devel On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller <schnitzeltony@gmail.com> wrote: > > On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <Kai.Kang@windriver.com> wrote: > > > > On 2019/8/16 下午3:12, kai.kang@windriver.com wrote: > > > From: Kai Kang <kai.kang@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@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@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" > > > > > > Woops I missed that completely - will check Thanks! Did apply the patch Andreas ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-23 20:45 ` Andreas Müller @ 2019-08-27 1:10 ` Kang Kai 2019-08-27 1:37 ` Khem Raj 0 siblings, 1 reply; 8+ messages in thread From: Kang Kai @ 2019-08-27 1:10 UTC (permalink / raw) To: Andreas Müller; +Cc: openembedded-devel On 2019/8/24 上午4:45, Andreas Müller wrote: > On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller <schnitzeltony@gmail.com> wrote: >> On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <Kai.Kang@windriver.com> wrote: >>> On 2019/8/16 下午3:12, kai.kang@windriver.com wrote: >>>> From: Kai Kang <kai.kang@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@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@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" >>>> >> Woops I missed that completely - will check > Thanks! Did apply the patch Hi Andreas, Thanks. Hi Khem, Would you like to review this patch? Thanks. Kai > > Andreas > -- Kai Kang ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-27 1:10 ` Kang Kai @ 2019-08-27 1:37 ` Khem Raj 2019-08-27 1:39 ` Kang Kai 0 siblings, 1 reply; 8+ messages in thread From: Khem Raj @ 2019-08-27 1:37 UTC (permalink / raw) To: Kang Kai; +Cc: openembedded-devel On Mon, Aug 26, 2019 at 6:11 PM Kang Kai <Kai.Kang@windriver.com> wrote: > On 2019/8/24 上午4:45, Andreas Müller wrote: > > On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller <schnitzeltony@gmail.com> > wrote: > >> On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <Kai.Kang@windriver.com> > wrote: > >>> On 2019/8/16 下午3:12, kai.kang@windriver.com wrote: > >>>> From: Kai Kang <kai.kang@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@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@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" > >>>> > >> Woops I missed that completely - will check > > Thanks! Did apply the patch > > Hi Andreas, > > Thanks. > > > Hi Khem, > > Would you like to review this patch? Thanks. > > This looks fine to me have we not applied it yet ? > > Kai > > > > > > Andreas > > > > -- > Kai Kang > > ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-27 1:37 ` Khem Raj @ 2019-08-27 1:39 ` Kang Kai 2019-08-27 1:44 ` Khem Raj 0 siblings, 1 reply; 8+ messages in thread From: Kang Kai @ 2019-08-27 1:39 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-devel On 2019/8/27 上午9:37, Khem Raj wrote: > > > On Mon, Aug 26, 2019 at 6:11 PM Kang Kai <Kai.Kang@windriver.com > <mailto:Kai.Kang@windriver.com>> wrote: > > On 2019/8/24 上午4:45, Andreas Müller wrote: > > On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller > <schnitzeltony@gmail.com <mailto:schnitzeltony@gmail.com>> wrote: > >> On Fri, Aug 23, 2019 at 3:59 AM Kang Kai > <Kai.Kang@windriver.com <mailto:Kai.Kang@windriver.com>> wrote: > >>> On 2019/8/16 下午3:12, kai.kang@windriver.com > <mailto:kai.kang@windriver.com> wrote: > >>>> From: Kai Kang <kai.kang@windriver.com > <mailto:kai.kang@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@windriver.com > <mailto:kai.kang@windriver.com>> > >>>> --- > >>>> .../files/fix-inner-dependency.patch | 28 > +++++++++++++++++++ > >>>> .../xfce4-datetime-setter_3.32.2.bb > <http://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@windriver.com > <mailto:kai.kang@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 > <http://xfce4-datetime-setter_3.32.2.bb> > b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb > <http://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 > <http://xfce4-datetime-setter_3.32.2.bb> > >>>> +++ > b/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb > <http://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 > <http://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https>" > >>>> +SRC_URI = > "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https > <http://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" > >>>> > >> Woops I missed that completely - will check > > Thanks! Did apply the patch > > Hi Andreas, > > Thanks. > > > Hi Khem, > > Would you like to review this patch? Thanks. > > > This looks fine to me have we not applied it yet ? I didn't see it in master-next. :( Kai > > Kai > > > > > > Andreas > > > > -- > Kai Kang > -- Kai Kang ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 2019-08-27 1:39 ` Kang Kai @ 2019-08-27 1:44 ` Khem Raj 0 siblings, 0 replies; 8+ messages in thread From: Khem Raj @ 2019-08-27 1:44 UTC (permalink / raw) To: Kang Kai; +Cc: openembedded-devel On Mon, Aug 26, 2019 at 6:40 PM Kang Kai <Kai.Kang@windriver.com> wrote: > On 2019/8/27 上午9:37, Khem Raj wrote: > > > > On Mon, Aug 26, 2019 at 6:11 PM Kang Kai <Kai.Kang@windriver.com> wrote: > >> On 2019/8/24 上午4:45, Andreas Müller wrote: >> > On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller < >> schnitzeltony@gmail.com> wrote: >> >> On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <Kai.Kang@windriver.com> >> wrote: >> >>> On 2019/8/16 下午3:12, kai.kang@windriver.com wrote: >> >>>> From: Kai Kang <kai.kang@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@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@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" >> >>>> >> >> Woops I missed that completely - will check >> > Thanks! Did apply the patch >> >> Hi Andreas, >> >> Thanks. >> >> >> Hi Khem, >> >> Would you like to review this patch? Thanks. >> >> > This looks fine to me have we not applied it yet ? > > I didn't see it in master-next. :( > Thanks for letting me know Kai > > > >> Kai >> >> >> > >> > Andreas >> > >> >> -- >> Kai Kang >> >> > -- > Kai Kang > > ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-08-27 1:45 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-08-16 7:12 [meta-xfce][Patch] xfce4-datetime-setter: fix compile error and requires distro feature x11 kai.kang 2019-08-23 1:57 ` Kang Kai 2019-08-23 20:38 ` Andreas Müller 2019-08-23 20:45 ` Andreas Müller 2019-08-27 1:10 ` Kang Kai 2019-08-27 1:37 ` Khem Raj 2019-08-27 1:39 ` Kang Kai 2019-08-27 1:44 ` Khem Raj
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.