CVS commit: pkgsrc/x11/xfce4-session

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Jun  6 01:14:53 UTC 2023

Modified Files:
        pkgsrc/x11/xfce4-session: Makefile distinfo
        pkgsrc/x11/xfce4-session/patches: patch-config.h.in patch-configure
            patch-libxfsm_xfsm-shutdown-common.h

Log Message:
xfce4-session: update to 4.18.3

Change log:

4.18.3 (2023-05-29)
======
- shutdown: Do not set an error when returning TRUE
- logout-dialog: Fix use-after-free
- Use glib wrappers for memory allocation
- build: Fix build when there is no suspend/hibernate support
- build: Add suspend support for Solaris
- startxfce4: Fix xinit arguments order
- manager: Always use xfsm_manager_save_yourself_dbus() (Fixes #106)
- settings: Remove useless tooltip
- xflock4: Update fallback list
- logout-dialog: Lower warning level
- shutdown: Keep error NULL when unused
- cleanup: Remove dead polkit code
- Revert "Fallback to old method for shutdown (bug #8630)."
- Use g_critical() instead of g_error()
- Use GLib logging functions or g_printerr() instead of g_print()
- Use GLib logging functions instead of g_printerr()
- build: Fix untranslated policykit file
- Escape/unescape string list delimiter when saving/restoring session
- Replace XfceRc with GKeyFile for session file parsing
- Translation Updates:
  Albanian, Armenian (Armenia), Asturian, Azerbaijani, Basque,
  Belarusian, Belarusian (Tarask), Bulgarian, Catalan, Chinese (China),
  Chinese (Hong Kong), Chinese (Taiwan), Croatian, Czech, Danish,
  Dutch, Eastern Armenian, English (Australia), English (Canada),
  English (United Kingdom), Estonian, Finnish, French, Galician,
  German, Greek, Hebrew, Hindi, Hungarian, Icelandic, Indonesian,
  Interlingue, Italian, Japanese, Kazakh, Korean, Lithuanian, Malay,
  Norwegian Bokm��l, Norwegian Nynorsk, Occitan (post 1500), Persian
  (Iran), Polish, Portuguese, Portuguese (Brazil), Romanian, Russian,
  Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish,
  Ukrainian, Uyghur, Vietnamese


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/x11/xfce4-session/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/x11/xfce4-session/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/xfce4-session/patches/patch-config.h.in \
    pkgsrc/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
cvs rdiff -u -r1.8 -r1.9 pkgsrc/x11/xfce4-session/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-session/Makefile
diff -u pkgsrc/x11/xfce4-session/Makefile:1.105 pkgsrc/x11/xfce4-session/Makefile:1.106
--- pkgsrc/x11/xfce4-session/Makefile:1.105     Wed Apr 19 08:12:00 2023
+++ pkgsrc/x11/xfce4-session/Makefile   Tue Jun  6 01:14:52 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.105 2023/04/19 08:12:00 adam Exp $
+# $NetBSD: Makefile,v 1.106 2023/06/06 01:14:52 gutteridge Exp $
 
-PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=              xfce4-session-4.18.2
+DISTNAME=              xfce4-session-4.18.3
 CATEGORIES=            x11
 MASTER_SITES+=         https://archive.xfce.org/src/xfce/xfce4-session/${PKGVERSION_NOREV:R}/
 

Index: pkgsrc/x11/xfce4-session/distinfo
diff -u pkgsrc/x11/xfce4-session/distinfo:1.38 pkgsrc/x11/xfce4-session/distinfo:1.39
--- pkgsrc/x11/xfce4-session/distinfo:1.38      Mon Apr  3 00:38:29 2023
+++ pkgsrc/x11/xfce4-session/distinfo   Tue Jun  6 01:14:52 2023
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.38 2023/04/03 00:38:29 gutteridge Exp $
+$NetBSD: distinfo,v 1.39 2023/06/06 01:14:52 gutteridge Exp $
 
-BLAKE2s (xfce4-session-4.18.2.tar.bz2) = 2e0c7285f4fbeb2bbc74dd3aa7c155053a259b17461c5351209a21820be5c50d
-SHA512 (xfce4-session-4.18.2.tar.bz2) = 1f8ed6a2474761197f67cf12ad5dac47c0122cb384fe9d8c2ada45bd8d94ca61b9c3c1d5c088972c676b0f2edb20f66444ab3b2a0021063160daa4eaab6a2e17
-Size (xfce4-session-4.18.2.tar.bz2) = 874616 bytes
+BLAKE2s (xfce4-session-4.18.3.tar.bz2) = de2210dbb4d361adc6639c4ac937e573a3cf51310bb23475cf30a7066933cb34
+SHA512 (xfce4-session-4.18.3.tar.bz2) = 65314472049c973af4b7553ec969691dfe701af2addb8cb63aebb49ff1b61ddb9e1418b2969e5eac69fd32096dd3163b7bf28fefe1d8c130c46bd5dd2bfe126c
+Size (xfce4-session-4.18.3.tar.bz2) = 875517 bytes
 SHA1 (patch-ac) = acbb27c79b5b6f37ff106c6cbbc87d00ecfe19f5
-SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b
-SHA1 (patch-configure) = e0e117ea68ed48508b944be3f0f5b3cb0a0713d9
-SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = 4712465218a6bc9beb740203e820203d08b06c06
+SHA1 (patch-config.h.in) = d88c22147d46387494d5be929dce810a6c6d8778
+SHA1 (patch-configure) = 94ec4aa0e528ec835929def8d9d401b123982efa
+SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = 965398a21b5b37a064fb00abf7c4dcb3a4208708
 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
 SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
 SHA1 (patch-xfce4-session_xfsm-shutdown-fallback.c) = bd3133e9f1dc4a2069203d75058710fe66623c0e

Index: pkgsrc/x11/xfce4-session/patches/patch-config.h.in
diff -u pkgsrc/x11/xfce4-session/patches/patch-config.h.in:1.2 pkgsrc/x11/xfce4-session/patches/patch-config.h.in:1.3
--- pkgsrc/x11/xfce4-session/patches/patch-config.h.in:1.2      Thu Jun 22 09:40:24 2017
+++ pkgsrc/x11/xfce4-session/patches/patch-config.h.in  Tue Jun  6 01:14:53 2023
@@ -1,8 +1,8 @@
-$NetBSD: patch-config.h.in,v 1.2 2017/06/22 09:40:24 youri Exp $
+$NetBSD: patch-config.h.in,v 1.3 2023/06/06 01:14:53 gutteridge Exp $
 
 Add NetBSD backend.
 
---- config.h.in.orig   2015-03-16 07:29:52.000000000 +0000
+--- config.h.in.orig   2023-05-29 15:39:37.000000000 +0000
 +++ config.h.in
 @@ -12,6 +12,9 @@
  /* OpenBSD suspend/hibernate backend */
@@ -11,6 +11,6 @@ Add NetBSD backend.
 +/* NetBSD suspend/hibernate backend */
 +#undef BACKEND_TYPE_NETBSD
 +
- /* Define for debugging support */
- #undef DEBUG
+ /* Solaris suspend/hibernate backend */
+ #undef BACKEND_TYPE_SOLARIS
  
Index: pkgsrc/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
diff -u pkgsrc/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h:1.2 pkgsrc/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h:1.3
--- pkgsrc/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h:1.2   Sun Feb  6 17:42:47 2022
+++ pkgsrc/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h       Tue Jun  6 01:14:53 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-libxfsm_xfsm-shutdown-common.h,v 1.2 2022/02/06 17:42:47 gutteridge Exp $
+$NetBSD: patch-libxfsm_xfsm-shutdown-common.h,v 1.3 2023/06/06 01:14:53 gutteridge Exp $
 
 Add NetBSD commands.
 
---- libxfsm/xfsm-shutdown-common.h.orig        2019-05-05 22:00:21.000000000 +0000
+--- libxfsm/xfsm-shutdown-common.h.orig        2023-05-18 16:19:55.000000000 +0000
 +++ libxfsm/xfsm-shutdown-common.h
-@@ -70,4 +70,9 @@
+@@ -70,6 +70,11 @@
  #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
  #endif
  
@@ -13,4 +13,6 @@ Add NetBSD commands.
 +#define UP_BACKEND_HIBERNATE_COMMAND    "/sbin/sysctl -w hw.acpi.sleep.state=4"
 +#endif
 +
- #endif /* __XFSM_SHUTDOWN_COMMON_H_ */
+ #ifdef BACKEND_TYPE_SOLARIS
+ #define UP_BACKEND_SUSPEND_COMMAND "/usr/bin/sys-suspend"
+ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/bin/false"

Index: pkgsrc/x11/xfce4-session/patches/patch-configure
diff -u pkgsrc/x11/xfce4-session/patches/patch-configure:1.8 pkgsrc/x11/xfce4-session/patches/patch-configure:1.9
--- pkgsrc/x11/xfce4-session/patches/patch-configure:1.8        Sun Jan  1 19:19:26 2023
+++ pkgsrc/x11/xfce4-session/patches/patch-configure    Tue Jun  6 01:14:53 2023
@@ -1,13 +1,13 @@
-$NetBSD: patch-configure,v 1.8 2023/01/01 19:19:26 gutteridge Exp $
+$NetBSD: patch-configure,v 1.9 2023/06/06 01:14:53 gutteridge Exp $
 
 * Add NetBSD backend detection.
 
 * Allow Polkit to be disabled in the build while still being present in the
 underlying system.
 
---- configure.orig     2022-12-15 09:27:27.000000000 +0000
+--- configure.orig     2023-05-29 15:39:33.000000000 +0000
 +++ configure
-@@ -18012,7 +18012,7 @@ printf %s "checking for optional package
+@@ -18184,7 +18184,7 @@ printf %s "checking for optional package
  printf "%s\n" "disabled" >&6; }
    fi
  
@@ -16,7 +16,7 @@ underlying system.
    HAVE_POLKIT_TRUE=
    HAVE_POLKIT_FALSE='#'
  else
-@@ -18307,6 +18307,8 @@ if test x$with_backend = x; then
+@@ -18464,6 +18464,8 @@ if test x$with_backend = x; then
      with_backend=freebsd ;; #(
    *-*dragonfly*) :
      with_backend=freebsd ;; #(
@@ -24,8 +24,8 @@ underlying system.
 +    with_backend=netbsd ;; #(
    *-openbsd*) :
      with_backend=openbsd ;; #(
-   *) :
-@@ -18334,6 +18336,11 @@ if test x$with_backend = xopenbsd; then
+   *-solaris*) :
+@@ -18493,6 +18495,11 @@ if test x$with_backend = xopenbsd; then
  printf "%s\n" "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
  
  fi
@@ -34,6 +34,6 @@ underlying system.
 +printf "%s\n" "#define BACKEND_TYPE_NETBSD 1" >>confdefs.h
 +
 +fi
+ if test x$with_backend = xsolaris; then
  
- ac_config_files="$ac_config_files Makefile doc/Makefile icons/Makefile icons/16x16/Makefile icons/24x24/Makefile icons/24x24-actions/Makefile icons/32x32/Makefile icons/48x48-actions/Makefile 
icons/48x48/Makefile icons/128x128/Makefile icons/scalable/Makefile libxfsm/Makefile po/Makefile.in settings/Makefile scripts/Makefile scripts/xinitrc.in xfce4-session/Makefile 
xfce4-session-logout/Makefile xfsm-shutdown-helper/Makefile"
- 
+ printf "%s\n" "#define BACKEND_TYPE_SOLARIS 1" >>confdefs.h