xfce4-datetime-setter: fix compile error and requires distro feature x11
PATCH 1/1 xfce4-datetime-setter: fix compile error and requires distro feature x11
From: Kai Kang <[email protected]>
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.
--- .../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
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +28 -0
@@ -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 <[email protected]> +--- +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')
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +5 -2
@@ -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"
Signature · 1 line
2.20.0
Quoted 5 lines · On 2019/8/16 下午3:12, [email protected] wrote:
From: Kai Kang <[email protected]>
It fails to compile xfce4-datetime-setter occasionally when system load is high:
Quoted 7 lines
| ../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_depto make surecc-datetime-resources.hbe generated before including.
Hi Andreas,
Any comment on this patch please? And I also sent a pull request on github.
Regards,
Kai
Quoted 68 lines
xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too.
Signed-off-by Kai Kang <[email protected]>--- .../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.patchmeta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +28
-0@@ -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 <[email protected]> +--- +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')meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +5
-2@@ -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"
Signature · 1 line
Kai Kang
Quoted 84 lines · Kang Kai
Quoted 5 lines · On 2019/8/16 下午3:12, [email protected] wrote:
From: Kai Kang <[email protected]>
It fails to compile xfce4-datetime-setter occasionally when system load is high:
Quoted 7 lines
| ../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_depto make surecc-datetime-resources.hbe generated before including.Hi Andreas,
Any comment on this patch please? And I also sent a pull request on github.
Regards,
KaiQuoted 61 lines
xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too.
Signed-off-by Kai Kang <[email protected]>--- .../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.patchmeta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +28
-0@@ -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 <[email protected]> +--- +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')meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +3
-1@@ -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"
Quoted 8 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" · line 21
Quoted 7 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +2
-1inherit 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
Quoted 91 lines · Andreas Müller
Quoted 89 lines · Kang Kai
Quoted 5 lines · On 2019/8/16 下午3:12, [email protected] wrote:
From: Kai Kang <[email protected]>
It fails to compile xfce4-datetime-setter occasionally when system load is high:
Quoted 7 lines
| ../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_depto make surecc-datetime-resources.hbe generated before including.Hi Andreas,
Any comment on this patch please? And I also sent a pull request on github.
Regards,
KaiQuoted 66 lines
xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too.
Signed-off-by Kai Kang <[email protected]>--- .../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.patchmeta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +28
-0@@ -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 <[email protected]> +--- +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')meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +5
-2@@ -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"
Quoted 4 lines
Quoted 3 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" · line 21
Quoted 2 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +0
-0FILES_${PN} += "${datadir}/icons/hicolor"Woops I missed that completely - will check
Thanks! Did apply the patch
Andreas
Quoted 88 lines · Andreas Müller
Quoted 87 lines · Andreas Müller
Quoted 86 lines · Kang Kai
Quoted 5 lines · On 2019/8/16 下午3:12, [email protected] wrote:
From: Kai Kang <[email protected]>
It fails to compile xfce4-datetime-setter occasionally when system load is high:
Quoted 7 lines
| ../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_depto make surecc-datetime-resources.hbe generated before including.Hi Andreas,
Any comment on this patch please? And I also sent a pull request on github.
Regards,
KaiQuoted 65 lines
xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too.
Signed-off-by Kai Kang <[email protected]>--- .../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.patchmeta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +28
-0@@ -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 <[email protected]> +--- +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')meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +5
-2@@ -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"
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" · line 21
Quoted 2 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +0
-0FILES_${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
Quoted 3 lines
Andreas
Signature · 1 line
Kai Kang
Quoted 117 lines · Kang Kai
Quoted 1 line · Andreas Müller
On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller <[email protected]>
Quoted 1 line · wrote:
Quoted 1 line
On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines
Quoted 4 lines · On 2019/8/16 下午3:12, [email protected] wrote:
Quoted 3 lines
From: Kai Kang <[email protected]>
It fails to compile xfce4-datetime-setter occasionally when system
load
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
is high:
|
../git/xfce/main.c:42:10: fatal error:cc-datetime-resources.h: Nosuch file or directory
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 6 lines
| 42 | #include "cc-datetime-resources.h" | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated.Update
datetime_panel_depto make surecc-datetime-resources.hbe generated before including.Hi Andreas,
Any comment on this patch please? And I also sent a pull request on
github.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Regards,
KaiQuoted 6 lines
xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too.
Signed-off-by Kai Kang <[email protected]>--- .../files/fix-inner-dependency.patch | 28+++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
.../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.patchQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
diff --git
a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patchb/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patchQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 000000000..9cccb892f
---/dev/null
+++
b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patchQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review line 1
Quoted 2 lines
(quoted diff) +1
-0@@ -0,0 +1,28 @@ +It fails to compile xfce4-datetime-setter occasionally when systemload is high:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review line 3
Quoted 2 lines
(quoted diff) +2
-0+ +| ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h: Nosuch file or directory
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch
Quoted 5 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +5
-0+| 42 | #include "cc-datetime-resources.h" +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ +| compilation terminated. + +Update datetime_panel_dep to make sure cc-datetime-resources.h begenerated
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch
Quoted 3 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +3
-0+before including. + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/2]
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch
Quoted 4 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +4
-0+ +Signed-off-by: Kai Kang <[email protected]> +--- +diff --git a/panels/datetime/meson.buildb/panels/datetime/meson.build
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +6
-0+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(Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch new file +7
-0+ include_directories: [ common_inc, include_directories('.') ], +- link_with: datetime_panel_lib ++ link_with: datetime_panel_lib, ++ sources: resources + ) + + subdir('po-timezones')(quoted diff) +0
-0xfce4-datetime-setter_3.32.2.bb
b/meta-xfce/recipes-apps/xfce4-datetime-setter/
xfce4-datetime-setter_3.32.2.bbQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
index
d64358537..4d128ac51100644
--- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
+++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/
xfce4-datetime-setter_3.32.2.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review LIC_FILES_CHKSUM =
Quoted 1 line
(quoted diff) +0
-0@@ -6,13 +6,16 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=75859989545e37968a99b631ef42722e"
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
Quoted 4 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +0
-1DEPENDS = "glib-2.0-native libxfce4ui" -SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review LIC_FILES_CHKSUM = · line 8
Quoted 1 line
(quoted diff) +1
-0+SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +4
-1+ 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"Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" · line 21
Quoted 2 lines
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb +0
-0FILES_${PN} += "${datadir}/icons/hicolor"Woops I missed that completely - will check
Thanks! Did apply the patch
Quoted 10 lines
Hi Andreas,
Thanks.
Hi Khem,
Would you like to review this patch? Thanks.
This looks fine to me have we not applied it yet ?
Quoted 12 lines
Kai
Quoted 3 lines
Andreas
--
Kai Kang
Quoted 143 lines · Khem Raj
On Mon, Aug 26, 2019 at 6:11 PM Kang Kai <[email protected] <mailto:[email protected]>> wrote:
On 2019/8/24 上午4:45, Andreas Müller wrote: > On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller <[email protected] <mailto:[email protected]>> wrote: >> On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <[email protected] <mailto:[email protected]>> wrote: >>> On 2019/8/16 下午3:12, [email protected] <mailto:[email protected]> wrote: >>>> From: Kai Kang <[email protected] <mailto:[email protected]>> >>>> >>>> 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 <[email protected] <mailto:[email protected]>> >>>> --- >>>> .../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 <[email protected] <mailto:[email protected]>> >>>> +--- >>>> +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.
Quoted 1 line
This looks fine to me have we not applied it yet ?
I didn't see it in master-next. :(
Kai
Quoted 11 lines
Kai
>
> Andreas
>
--
Kai KangSignature · 1 line
Kai Kang
Quoted 128 lines · Kang Kai
On 2019/8/27 上午9:37, Khem Raj wrote:
Quoted 122 lines · Kang Kai
Quoted 1 line · Andreas Müller
On Fri, Aug 23, 2019 at 10:38 PM Andreas Müller <
Quoted 1 line · [email protected]> wrote:
Quoted 1 line
On Fri, Aug 23, 2019 at 3:59 AM Kang Kai <[email protected]>
Quoted 4 lines · wrote:
Quoted 4 lines
Quoted 4 lines · On 2019/8/16 下午3:12, [email protected] wrote:
Quoted 3 lines
From: Kai Kang <[email protected]>
It fails to compile xfce4-datetime-setter occasionally when system
load
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
is high:
|
../git/xfce/main.c:42:10: fatal error:cc-datetime-resources.h: Nosuch file or directory
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 6 lines
| 42 | #include "cc-datetime-resources.h" | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | compilation terminated.Update
datetime_panel_depto make surecc-datetime-resources.hbe generated before including.Hi Andreas,
Any comment on this patch please? And I also sent a pull request on
github.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Regards,
KaiQuoted 6 lines
xfce4-datetime-setter depends on libxfce4ui which requires distro feature 'x11', so make it require 'x11' too.
Signed-off-by Kai Kang <[email protected]>--- .../files/fix-inner-dependency.patch | 28+++++++++++++++++++
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
.../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.patchQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
diff --git
a/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patchb/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patchQuoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
new file mode 100644
index 000000000..9cccb892f
---/dev/null
+++
b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patchQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review line 1
Quoted 2 lines
(quoted diff) +1
-0@@ -0,0 +1,28 @@ +It fails to compile xfce4-datetime-setter occasionally when systemload is high:
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review line 3
Quoted 2 lines
(quoted diff) +2
-0+ +| ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h:No such file or directory
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Review line 8
Quoted 5 lines
(quoted diff) +5
-0+| 42 | #include "cc-datetime-resources.h" +| | ^~~~~~~~~~~~~~~~~~~~~~~~~ +| compilation terminated. + +Update datetime_panel_dep to make sure cc-datetime-resources.h begenerated
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Review line 11
Quoted 3 lines
(quoted diff) +3
-0+before including. + +Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/2]
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review line 15
Quoted 4 lines
(quoted diff) +4
-0+ +Signed-off-by: Kai Kang <[email protected]> +--- +diff --git a/panels/datetime/meson.buildb/panels/datetime/meson.build
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
(quoted diff) +6
-0+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(Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Review
Quoted 8 lines
(quoted diff) +7
-0+ include_directories: [ common_inc, include_directories('.') ], +- link_with: datetime_panel_lib ++ link_with: datetime_panel_lib, ++ sources: resources + ) + + subdir('po-timezones')(quoted diff) +0
-0xfce4-datetime-setter_3.32.2.bb
b/meta-xfce/recipes-apps/xfce4-datetime-setter/
xfce4-datetime-setter_3.32.2.bbQuoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
index
d64358537..4d128ac51100644
--- a/meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
+++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/
xfce4-datetime-setter_3.32.2.bb
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review LIC_FILES_CHKSUM =
Quoted 1 line
(quoted diff) +0
-0@@ -6,13 +6,16 @@ LIC_FILES_CHKSUM ="file://COPYING;md5=75859989545e37968a99b631ef42722e"
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review LIC_FILES_CHKSUM = · line 8
Quoted 4 lines
(quoted diff) +0
-1DEPENDS = "glib-2.0-native libxfce4ui" -SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https"
Quoted 1 line
Quoted 1 line
Quoted 1 line
Review LIC_FILES_CHKSUM = · line 8
Quoted 1 line
(quoted diff) +1
-0+SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
(quoted diff) +4
-1+ 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"Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Review LIC_FILES_CHKSUM = · line 20
Quoted 2 lines
(quoted diff) +0
-0FILES_${PN} += "${datadir}/icons/hicolor"Woops I missed that completely - will check
Thanks! Did apply the patch
Hi Andreas,
Thanks.
Quoted 9 lines
Quoted 5 lines
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
Quoted 18 lines
Quoted 7 lines
Kai
Quoted 1 line
Quoted 7 lines
Quoted 2 lines
Andreas
--
Kai Kang--
Kai Kang