From 772c94e0c4b04dd4366e66080a697ecba8b7d747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 6 Jan 2021 16:17:07 +0100 Subject: [PATCH] xfce4-screensaver: upgrade 0.1.10 -> 4.16.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix-pam-config.patch was applied upstream Release notes for 4.16.0 ======================== This release version has been bumped from 0.x to 4.16.0 to align with the new Libxfce4util and Xfconf GIR requirements. - xfce4-screensaver-configure: Use GIRepository of libxfce4util and xfconf (#11) - Change type of seconds to guint in add_lock_timer - Check dbus system_connection in add_sleep_inhibit - Cleanup GSourceFunc usage - Convert date_time_update to a timer function - Fix format specifiers in lock_timer - Fix issues connected to dbus (#66) - Fix pam_strerror usage - Pass constants to XSetScreenSaver - Plug memleak in get_x11_idle_info - Remove obsolete check for scrnsaver.h from configure.ac - Translation Updates: Czech, Japanese, Portuguese, Turkish Release notes for 0.1.11 ======================== [Please note that this is a development release.] Configuration Update: This release updates the DPMS settings used for the Blank screensaver. Timeouts are now stored in seconds instead of minutes, with the default DPMS sleep now 5 seconds after the screensaver goes active. Xfconf: /xfce4-screensaver/screensavers/xfce-blank/dpms-sleep-after Theme Update: This release uses a new icon name, org.xfce.ScreenSaver, instead of the generic preferences-desktop-screensaver. NEWS: - Builds: Move from exo-csource to xdt-csource (Bugzilla #16717) - CI: Add basic GitLab pipeline - distcheck: Add missing gs-auth-pam.c - DPMS: Change sleep settings to seconds, default after 5 seconds (#27) - Fix: Catch gs_listener_dbus_init failures - Fix: remove unused flag --no-daemon - Icons: New icons and rDNS icon name, org.xfce.ScreenSaver - Internal: Change timers from milliseconds to seconds - README.md: Note setuid requirement after install with shadow/bsdauth (#9) - xfce4-screensaver.common-auth: replace @include with standard systax (#6) Translation Updates: Albanian, Armenian (Armenia), Basque, Bulgarian, Catalan, Chinese (China), Chinese (Taiwan), Czech, Danish, Dutch, Eastern Armenian, English (Australia), Estonian, French, German, Hebrew, Hungarian, Icelandic, Italian, Japanese, Korean, Lithuanian, Malay, Norwegian Bokmål, Polish, Portuguese, Portuguese (Brazil), Russian, Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish Signed-off-by: Andreas Müller Signed-off-by: Khem Raj --- .../xfce4-screensaver/fix-pam-config.patch | 14 -------------- ...saver_0.1.10.bb => xfce4-screensaver_4.16.0.bb} | 9 +++------ 2 files changed, 3 insertions(+), 20 deletions(-) delete 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.10.bb => xfce4-screensaver_4.16.0.bb} (77%) 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"