diff options
-rw-r--r-- | meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch | 28 | ||||
-rw-r--r-- | meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb | 7 |
2 files changed, 33 insertions, 2 deletions
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 0000000000..9cccb892fa --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | It fails to compile xfce4-datetime-setter occasionally when system load is high: | ||
2 | |||
3 | | ../git/xfce/main.c:42:10: fatal error: cc-datetime-resources.h: No such file or directory | ||
4 | | 42 | #include "cc-datetime-resources.h" | ||
5 | | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | ||
6 | | compilation terminated. | ||
7 | |||
8 | Update datetime_panel_dep to make sure cc-datetime-resources.h be generated | ||
9 | before including. | ||
10 | |||
11 | Upstream-Status: Submitted [https://github.com/schnitzeltony/xfce4-datetime-setter/pull/2] | ||
12 | |||
13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
14 | --- | ||
15 | diff --git a/panels/datetime/meson.build b/panels/datetime/meson.build | ||
16 | index c5bf39c..241e177 100644 | ||
17 | --- a/panels/datetime/meson.build | ||
18 | +++ b/panels/datetime/meson.build | ||
19 | @@ -175,7 +175,8 @@ datetime_panel_lib = static_library( | ||
20 | |||
21 | datetime_panel_dep = declare_dependency( | ||
22 | include_directories: [ common_inc, include_directories('.') ], | ||
23 | - link_with: datetime_panel_lib | ||
24 | + link_with: datetime_panel_lib, | ||
25 | + sources: resources | ||
26 | ) | ||
27 | |||
28 | 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 d643585370..4d128ac512 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" | |||
6 | 6 | ||
7 | DEPENDS = "glib-2.0-native libxfce4ui" | 7 | DEPENDS = "glib-2.0-native libxfce4ui" |
8 | 8 | ||
9 | SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https" | 9 | SRC_URI = "git://github.com/schnitzeltony/xfce4-datetime-setter.git;protocol=https \ |
10 | file://fix-inner-dependency.patch \ | ||
11 | " | ||
10 | SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" | 12 | SRCREV = "5c7a73a3824b03b91719e05e2604b97c7a72d50f" |
11 | 13 | ||
12 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
13 | 15 | ||
14 | inherit gettext meson distro_features_check | 16 | inherit gettext meson distro_features_check |
15 | REQUIRED_DISTRO_FEATURES = "systemd" | 17 | |
18 | REQUIRED_DISTRO_FEATURES = "systemd x11" | ||
16 | 19 | ||
17 | FILES_${PN} += "${datadir}/icons/hicolor" | 20 | FILES_${PN} += "${datadir}/icons/hicolor" |
18 | 21 | ||