diff options
| -rw-r--r-- | meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch | 14 | ||||
| -rw-r--r-- | meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_4.16.0.bb (renamed from meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver_0.1.10.bb) | 9 |
2 files changed, 3 insertions, 20 deletions
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 94cad23f8e..0000000000 --- a/meta-xfce/recipes-apps/xfce4-screensaver/xfce4-screensaver/fix-pam-config.patch +++ /dev/null | |||
| @@ -1,14 +0,0 @@ | |||
| 1 | '@include' is not a standard sysntax and not supported by oe. | ||
| 2 | |||
| 3 | Upstream-Status: Submitted [https://bugzilla.xfce.org/show_bug.cgi?id=15626] | ||
| 4 | |||
| 5 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
| 6 | --- | ||
| 7 | diff --git a/data/xfce4-screensaver.common-auth b/data/xfce4-screensaver.common-auth | ||
| 8 | index a9fd9ce..3bfea70 100644 | ||
| 9 | --- a/data/xfce4-screensaver.common-auth | ||
| 10 | +++ b/data/xfce4-screensaver.common-auth | ||
| 11 | @@ -1,2 +1,2 @@ | ||
| 12 | -@include common-auth | ||
| 13 | +auth include common-auth | ||
| 14 | 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 index 62f0640f09..d4ea43ce1c 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 | |||
| 12 | 12 | ||
| 13 | inherit xfce-app | 13 | inherit xfce-app |
| 14 | 14 | ||
| 15 | SRC_URI_append = " \ | 15 | SRC_URI_append = " file://fix-cross-compile.patch" |
| 16 | file://fix-cross-compile.patch \ | 16 | SRC_URI[sha256sum] = "6d4d143e3e62db679ce83ce7da97903390773ee0a8ceb05ff4c3dac36616268d" |
| 17 | file://fix-pam-config.patch \ | ||
| 18 | " | ||
| 19 | SRC_URI[md5sum] = "1f093cde5af09e9fd9be017774e032ef" | ||
| 20 | SRC_URI[sha256sum] = "586f1c78dd6745a20e9ce9f12d0117189d597ba7ad0c8ffcfcd25c9bb05f1d57" | ||
| 21 | 17 | ||
| 22 | do_install_append() { | 18 | do_install_append() { |
| 23 | install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver | 19 | install -D -m 0644 ${S}/data/xfce4-screensaver.common-auth ${D}${sysconfdir}/pam.d/xfce4-screensaver |
| 24 | } | 20 | } |
| 25 | 21 | ||
| 26 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" | 22 | FILES_${PN} += "${datadir}/dbus-1 ${datadir}/desktop-directories" |
| 23 | |||
| 27 | RDEPENDS_${PN} += "python3-core" | 24 | RDEPENDS_${PN} += "python3-core" |
