diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch deleted file mode 100644 index 94cad23f8ee..00000000000 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch +++ /dev/null @@ -1,14 +0,0 @@ -'@include' is not a standard sysntax and not supported by oe. - -Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=15626] - -Signed-off-by: Kai Kang ---- -diff --git a/data/xfce4-screensaver.common-auth b/data/xfce4-screensaver.common-auth -index a9fd9ce..3bfea70 100644 ---- a/data/xfce4-screensaver.common-auth -+++ b/data/xfce4-screensaver.common-auth -@@ -1,2 +1,2 @@ --@include common-auth -+auth include common-auth - auth optional pam_gnome_keyring.so diff --git a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb similarity index 77% rename from meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb rename to meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb index 62f0640f09e..d4ea43ce1c7 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb @@ -12,16 +12,13 @@ DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfcon inherit xfce-app -SRC_URI_append = " \ - file://fix-cross-compile.patch \ - file://fix-pam-config.patch \ -" -SRC_URI[md5sum] = "1f093cde5af09e9fd9be017774e032ef" -SRC_URI[sha256sum] = "586f1c78dd6745a20e9ce9f12d0117189d597ba7ad0c8ffcfcd25c9bb05f1d57" +SRC_URI_append = " file://fix-cross-compile.patch" +SRC_URI[sha256sum] = "6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d" do_install_append() { install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver } FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" + RDEPENDS_${PN} += "python3-core"