From 64974b8779291419486338f75f229a732e450d78 Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Fri, 21 Jun 2019 05:57:08 -0400 Subject: [PATCH] xfce4-screensaver: 0.1.4 -> 0.1.5 Upgrade xfce4-screensaver from 0.1.4 to 0.1.5. * install pam config file and add a patch to remove unsupported syntax '@include' Signed-off-by: Kai Kang Signed-off-by: Khem Raj --- .../xfce4-screensaver/fix-pam-config.patch | 14 ++++++++++++++ ...ensaver_0.1.4.bb => xfce4-screensaver_0.1.5.bb} | 13 ++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch rename meta-xfce/recipes-apps/xfce4-screensaver/{xfce4-screensaver_0.1.4.bb => xfce4-screensaver_0.1.5.bb} (64%) 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 new file mode 100644 index 0000000000..94cad23f8e --- /dev/null +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch @@ -0,0 +1,14 @@ +'@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.4.bb b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb similarity index 64% rename from meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb rename to meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb index fb2be6609c..4a1aae7648 100644 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.4.bb +++ b/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.5.bb @@ -12,8 +12,15 @@ DEPENDS = "dbus-glib garcon gtk+3 libxklavier libxscrnsaver virtual/libx11 xfcon inherit xfce-app -SRC_URI_append = " file://fix-cross-compile.patch" -SRC_URI[md5sum] = "18a619849f85c24d784c7fa27279ca4b" -SRC_URI[sha256sum] = "ed04ae32034b8e13a78495ca2bd7789a20ec7f67891ab9e92826a944371eabef" +SRC_URI_append = " \ + file://fix-cross-compile.patch \ + file://fix-pam-config.patch \ +" +SRC_URI[md5sum] = "982f9a355456320933ec08313523a567" +SRC_URI[sha256sum] = "fdecf0fc432b59defba2dd706051696d47227ca0744c7971014021190126f2d5" + +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"