diff options
author | Kai Kang <kai.kang@windriver.com> | 2019-05-25 08:41:57 -0400 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-05-25 10:28:38 -0700 |
commit | 3f9c37252bfc4c8a6e40810863fa46300be0a2b8 (patch) | |
tree | 8060d627b2c86dda45a74883ab81fc6e67120798 | |
parent | 88ece05eb513650efe42f90a3d84970cb85b777c (diff) | |
download | meta-openembedded-3f9c37252bfc4c8a6e40810863fa46300be0a2b8.tar.gz |
xfce4-screensaver: add recipe
xfce4-screensaver is a screen saver and locker which used by Xfce module
'actions' when click 'Lock Screen'.
* add a patch to fix configure QA issue for cross compile
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch | 60 | ||||
-rw-r--r-- | meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb | 19 |
2 files changed, 79 insertions, 0 deletions
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch new file mode 100644 index 0000000000..f726064e21 --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch | |||
@@ -0,0 +1,60 @@ | |||
1 | It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in | ||
2 | configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross | ||
3 | compile to avoid the QA issues. | ||
4 | |||
5 | Upstream-Status: Inappropriate [cross compile specific] | ||
6 | |||
7 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | |||
9 | diff --git a/configure.ac b/configure.ac | ||
10 | index f0ec537..05c393d 100644 | ||
11 | --- a/configure.ac | ||
12 | +++ b/configure.ac | ||
13 | @@ -230,9 +230,9 @@ dnl --------------------------------------------------------------------------- | ||
14 | # | ||
15 | AC_DEFUN([AC_CHECK_X_HEADER], [ | ||
16 | ac_save_CPPFLAGS="$CPPFLAGS" | ||
17 | - if test \! -z "$includedir" ; then | ||
18 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
19 | - fi | ||
20 | +# if test \! -z "$includedir" ; then | ||
21 | +# CPPFLAGS="$CPPFLAGS -I$includedir" | ||
22 | +# fi | ||
23 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
24 | AC_CHECK_HEADER([$1],[$2],[$3],[$4]) | ||
25 | CPPFLAGS="$ac_save_CPPFLAGS"]) | ||
26 | @@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [ | ||
27 | # | ||
28 | AC_DEFUN([AC_TRY_X_COMPILE], [ | ||
29 | ac_save_CPPFLAGS="$CPPFLAGS" | ||
30 | - if test \! -z "$includedir" ; then | ||
31 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
32 | - fi | ||
33 | +# if test \! -z "$includedir" ; then | ||
34 | +# CPPFLAGS="$CPPFLAGS -I$includedir" | ||
35 | +# fi | ||
36 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
37 | AC_TRY_COMPILE([$1], [$2], [$3], [$4]) | ||
38 | CPPFLAGS="$ac_save_CPPFLAGS"]) | ||
39 | @@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [ | ||
40 | ac_save_LDFLAGS="$LDFLAGS" | ||
41 | # ac_save_LIBS="$LIBS" | ||
42 | |||
43 | - if test \! -z "$includedir" ; then | ||
44 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
45 | - fi | ||
46 | +# if test \! -z "$includedir" ; then | ||
47 | +# CPPFLAGS="$CPPFLAGS -I$includedir" | ||
48 | +# fi | ||
49 | # note: $X_CFLAGS includes $x_includes | ||
50 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
51 | |||
52 | - if test \! -z "$libdir" ; then | ||
53 | - LDFLAGS="$LDFLAGS -L$libdir" | ||
54 | - fi | ||
55 | +# if test \! -z "$libdir" ; then | ||
56 | +# LDFLAGS="$LDFLAGS -L$libdir" | ||
57 | +# fi | ||
58 | # note: $X_LIBS includes $x_libraries | ||
59 | LDFLAGS="$LDFLAGS $ALL_X_LIBS" | ||
60 | |||
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb new file mode 100644 index 0000000000..fb2be6609c --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb | |||
@@ -0,0 +1,19 @@ | |||
1 | SUMMARY = "Xfce screensaver Application" | ||
2 | DESCRIPTION = "Xfce screensaver is a screen saver and locker that aims to have simple, sane, secure defaults and be well integrated with the desktop." | ||
3 | HOMEPAGE = "https://git.xfce.org/apps/xfce4-screensaver/about/" | ||
4 | SECTION = "x11/application" | ||
5 | |||
6 | LICENSE = "GPLv2+ & LGPLv2+ " | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
8 | file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ | ||
9 | " | ||
10 | |||
11 | DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf" | ||
12 | |||
13 | inherit xfce-app | ||
14 | |||
15 | SRC_URI_append = " file://fix-cross-compile.patch" | ||
16 | SRC_URI[md5sum] = "18a619849f85c24d784c7fa27279ca4b" | ||
17 | SRC_URI[sha256sum] = "ed04ae32034b8e13a78495ca2bd7789a20ec7f67891ab9e92826a944371eabef" | ||
18 | |||
19 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" | ||