2 files changed, 3 insertions, 66 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
deleted file mode 100644
index eabcaaae69..0000000000
--- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-cross-compile.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-It adds '-I$includedir' to CPPFLAGS and adds '-L$libdir' to LDFLAGS in
-configure.ac which causes 'configure-unsafe' QA error. Don't add them for cross
-compile to avoid the QA issues.
-
-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 6f149bb..3890677 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -237,9 +237,9 @@ dnl ---------------------------------------------------------------------------
- #
- AC_DEFUN([AC_CHECK_X_HEADER], [
-   ac_save_CPPFLAGS="$CPPFLAGS"
--  if test \! -z "$includedir" ; then
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-+#  if test \! -z "$includedir" ; then
-+#    CPPFLAGS="$CPPFLAGS -I$includedir"
-+#  fi
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_CHECK_HEADER([$1],[$2],[$3],[$4])
-   CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -248,9 +248,9 @@ AC_DEFUN([AC_CHECK_X_HEADER], [
- #
- AC_DEFUN([AC_TRY_X_COMPILE], [
-   ac_save_CPPFLAGS="$CPPFLAGS"
--  if test \! -z "$includedir" ; then
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-+#  if test \! -z "$includedir" ; then
-+#    CPPFLAGS="$CPPFLAGS -I$includedir"
-+#  fi
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$1]], [[$2]])], [$3], [$4])
-   CPPFLAGS="$ac_save_CPPFLAGS"])
-@@ -264,15 +264,15 @@ AC_DEFUN([AC_CHECK_X_LIB], [
-   ac_save_LDFLAGS="$LDFLAGS"
- #  ac_save_LIBS="$LIBS"
- 
--  if test \! -z "$includedir" ; then
--    CPPFLAGS="$CPPFLAGS -I$includedir"
--  fi
-+#  if test \! -z "$includedir" ; then
-+#    CPPFLAGS="$CPPFLAGS -I$includedir"
-+#  fi
-   # note: $X_CFLAGS includes $x_includes
-   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
- 
--  if test \! -z "$libdir" ; then
--    LDFLAGS="$LDFLAGS -L$libdir"
--  fi
-+#  if test \! -z "$libdir" ; then
-+#    LDFLAGS="$LDFLAGS -L$libdir"
-+#  fi
-   # note: $X_LIBS includes $x_libraries
-   LDFLAGS="$LDFLAGS $ALL_X_LIBS"
- 
diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.4.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb
index 7322dedc29..2033eb082f 100644
--- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.18.4.bb
+++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.20.2.bb
@@ -7,13 +7,14 @@ LICENSE = "GPL-2.0-or-later & LGPL-2.0-or-later "
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
                     file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
                     "
+XFCE_COMPRESS_TYPE = "xz"
+XFCEBASEBUILDCLASS = "meson"
 
 DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfconf libwnck3"
 
 inherit xfce-app
 
-SRC_URI:append = " file://fix-cross-compile.patch"
-SRC_URI[sha256sum] = "cf717d032d2d0555978c479299da992af6dc3363ae7e758af9515c7166eac170"
+SRC_URI[sha256sum] = "5032f60a31df5e50a80512e301b595be5ea6a6bd762cdd95cacc24cbd29a01d7"
 
 do_install:append() {
     install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver