xfce4-screensaver: 4.16.0 -> 4.18.1

Update xfce4-screensaver from 4.16.0 to 4.18.1

* rebase fix-cross-compile.patch

Release notes for 4.18.1
========================
This release is to fix a build issue on BSD systems

- Refactor spawn_make_environment_for_display()

Release notes for 4.18.0
========================
- Add copyright notice to configure.ac
- Make missing GNOME Keyring PAM module warning quiet (Fixes #46)
- build: Fix --disable-locking (Fixes #83)
- Remove duplicated lines in README (Fixes #109)
- savers: Fix critical warnings on exit
- savers: Fix critical warnings from GSThemeWindow on "realize"
- Do not redirect stderr for our own commands
- Round the user picture on lock dialog.
- build: Do not warn if PAM prefix is correct
- Improve lightdm detection (Fixes #39)
- build: Fix -Wunused-value compiler warning
- build: Fix -Wdeclaration-after-statement compiler warning
- build: Fix -Wsign-compare compiler warning
- build: Use XDT_FEATURE_DEBUG
- Fix use-after-free crash in xfce4-screensaver-dialog
- Fix D-Bus sleep inhibit when screen locker is disabled
- Complete previous commit
- Fix Xfconf memory management
- build: Set GLib macros via XDT_CHECK_PACKAGE
- autogen.sh: Do not `mkdir m4`
- Fix crash when XDG_PICTURES_DIR is not set (Fixes #86)
- Fix build warning from Clang
- --with-password-helper expects full pathname of password helper
- Add missing zeroing of timeout_id in dialog_timed_out() timer handler
- Fix wrong signal name for GtkSpinButton
- Remove ENABLE_NLS ifdefs and use xfce_textdomain()
- build: Fix intltool lock file problem during make distcheck
- Fix compilation warnings
- autoconf: Some updates
- Translation Updates:
  Albanian, Armenian (Armenia), Basque, Belarusian, Bulgarian, Catalan,
  Chinese (China), Chinese (Taiwan), Danish, Dutch, Eastern Armenian,
  English (Australia), Estonian, Finnish, French, Galician, German,
  Hebrew, Hungarian, Icelandic, Indonesian, Italian, Japanese, Kabyle,
  Korean, Lithuanian, Malay, Norwegian Bokmål, Polish, Portuguese,
  Portuguese (Brazil), Russian, Serbian, Slovak, Slovenian, Spanish,
  Swedish, Thai, Ukrainian

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 10 insertions, 6 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
index f726064e21..eabcaaae69 100644
--- 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
@@ -6,11 +6,15 @@ Upstream-Status: Inappropriate [cross compile specific]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
 
+---
+ configure.ac | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
 diff --git a/configure.ac b/configure.ac
-index f0ec537..05c393d 100644
+index 6f149bb..3890677 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -230,9 +230,9 @@ dnl ---------------------------------------------------------------------------
+@@ -237,9 +237,9 @@ dnl ---------------------------------------------------------------------------
  #
  AC_DEFUN([AC_CHECK_X_HEADER], [
    ac_save_CPPFLAGS="$CPPFLAGS"
@@ -23,7 +27,7 @@ index f0ec537..05c393d 100644
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
    AC_CHECK_HEADER([$1],[$2],[$3],[$4])
    CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -241,9 +241,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
+@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
  #
  AC_DEFUN([AC_TRY_X_COMPILE], [
    ac_save_CPPFLAGS="$CPPFLAGS"
@@ -34,9 +38,9 @@ index f0ec537..05c393d 100644
 +#    CPPFLAGS="$CPPFLAGS -I$includedir"
 +#  fi
    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])
    CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -257,15 +257,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [
+@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [
    ac_save_LDFLAGS="$LDFLAGS"
  #  ac_save_LIBS="$LIBS"
  
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb
index 685c4c1f65..2c5cba0d8f 100644
--- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb
+++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.1.bb
@@ -13,7 +13,7 @@ DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfcon
 inherit xfce-app
 
 SRC_URI:append = " file://fix-cross-compile.patch"
-SRC_URI[sha256sum] = "6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d"
+SRC_URI[sha256sum] = "b731e8abd68a18cc5d3b523351aa8f9f293c9f63290c1781c9155259deb04a5c"
 
 do_install:append() {
     install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver