CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-04 16:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

xfce4-datetime-setter: fix compile error and requires distro feature x11

Browse Source 
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Kai Kang 2019-08-16 03:12:46 -04:00 committed by Khem Raj
parent 585b1eac77
commit 815739a161
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
meta-xfce/recipes-apps/xfce4-datetime-setter/files/fix-inner-dependency.patch Normal file
View File

@ -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')

7
meta-xfce/recipes-apps/xfce4-datetime-setter/xfce4-datetime-setter_3.32.2.bb
View File

@ -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"