xfce4-session: update to 4.13.2

Change log:

4.13.2
======
- Drop splash screens
- Introduce priority-group startup for FailSafe Session
- Optionally run commands on logout, suspend etc. (Bug #10172)
- xflock4:
  - Do not override PATH with hardcoded value.
  - Add support for xfce4-screensaver to xflock4
- chooser:
  - Improve look and feel of the session chooser
  - Improve UI and add delete button (Bug #12799)
  - Add fallback theming to chooser dialogs
  - Enable keypress response to session creation
  - Update session name in xfconf after chooser
  - Fix case in session chooser buttons
- settings:
  - Show saved sessions in settings dialog
  - Move "lock screen before sleep" option to general tab
  - Fix alignment of session lock property
  - Fix PID showing in "Current Session" tab
  - Improve icon matching in "Current Session" tab
  - Add a label for the currently active session
  - Add a "delete session" button to the session list
  - Make the Autostart buttons an inline toolbar
  - Initialize the session list treeview if necessary
  - More settings dialog UI improvements
  - Add column headers to autostart list
  - In autostart some apps (e.g. xfce-polkit) have bigger icons
  - Make entries expand in add/edit app startup dialog (Bug #15321)
- logout-dialog:
  - Fix sensitivity of switch user button
  - Remove blue border from logout dialog (Bug #15284)
  - Improve default style of the logout dialog
  - Add styleclass to make logout dialog themeable
  - Set logout dialog icons from icon_name
  - Support scaling in logout dialog (Bug #14951)
  - Use a different icon for hybrid sleep when possible
  - Fix mnemonic conflict on logout dialog
- Use systemd-logind methods instead of polkit permissions (Bug #14707)
- scripts/xinitrc.in.in: use "command" shell builtin instead of
which(1)
- Use sysconf(_SC_NGROUPS_MAX) instead of #defining an arbitrary
MAX_USER_GROUPS (bug #14722)
- Don't auto start consolekit daemon if it is not running
- Added better shutdown fallback support for the BSDs (Bug #14722)
- Don't install generic icon names (Bug #11912)
- Use exec to launch xfce4-session from xinitrc
- xinitrc: Remove fallback path when xfce4-session is not installed
- Remove old unused autostart_migrate function
- Fix GVariant format string in dbus server
- Extend debug messages
- Silence compiler warnings
- Remove unused checks on configure step
- Drop unused function
- Remove useless ioprio.h check
- rollback fix of a warning (fix requires glib 2.58)
- Fixed warning "cast between incompatible function types" introduced
  in GCC 8
- replaced GList of windows with single window (not required any more)
  (triggered by previous commit a99008c8dbddc038778c8c7e1e080f42c034c3a2)
- merged identic cases (triggered by previous commit
  a99008c8dbddc038778c8c7e1e080f42c034c3a2)
- removed duplicated loop counter (triggered by previous commit
  a99008c8dbddc038778c8c7e1e080f42c034c3a2)
- replaced deprecated "gtk_display_get_screen"  - For each display
  there is only one screen (See gtk3 doc of gdk_display_get_screen). So
  we can use gdk_display_get_default_screen (display) instead of looping
  on all screens.  - The default screen is the screen of the default
  display ( no need to first get the default display if the default
  screen is required)
- bump gtk version to 3.22 and gmodule/gio to 2.42
- Remove now useless XFCE_GLADE_*_PATH variables (Bug #13945)
- Tell intltool how to extract .ui files (Bug #14582)
- fix build failure when dbus is not in the system include path (Bug
  #14386)
- Translation updates:
  Albanian, Arabic, Asturian, Basque, Belarusian, Bengali, Bulgarian,
  Catalan, Chinese (China), Chinese (Hong Kong), Chinese (Taiwan),
  Croatian, Czech, Danish, Dutch (Flemish), English (Australia), English
  (Great Britain), Finnish, French, Galician, German, Greek, Hebrew,
  Hungarian, Icelandic, Indonesian, Italian, Japanese, Kazakh, Korean,
  Latvian, Lithuanian, Malay, Norwegian Bokmål, Norwegian Nynorsk,
  Occitan, Polish, Portuguese, Portuguese (Brazilian), Romanian, Russian,
  Serbian, Slovak, Slovenian, Spanish, Swedish, Thai, Turkish, Ukrainian,
  Urdu, Urdu (Pakistan), Uyghur, Vietnamese

7 files changed, 49 insertions, 61 deletions

diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile
index 7d1aec3798c..ddfa8cb178f 100644
--- a/x11/xfce4-session/Makefile
+++ b/x11/xfce4-session/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.71 2019/01/18 14:12:29 youri Exp $
+# $NetBSD: Makefile,v 1.72 2019/05/23 02:56:07 gutteridge Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
-DISTNAME=		xfce4-session-4.13.1
+DISTNAME=		xfce4-session-4.13.2
 CATEGORIES=		x11
 MASTER_SITES+=		http://archive.xfce.org/src/xfce/xfce4-session/4.13/
 
diff --git a/x11/xfce4-session/PLIST b/x11/xfce4-session/PLIST
index e37f2796d99..171ad57ca85 100644
--- a/x11/xfce4-session/PLIST
+++ b/x11/xfce4-session/PLIST
@@ -1,18 +1,11 @@
-@comment $NetBSD: PLIST,v 1.21 2017/06/25 12:39:09 martin Exp $
+@comment $NetBSD: PLIST,v 1.22 2019/05/23 02:56:07 gutteridge Exp $
 bin/startxfce4
 bin/xfce4-session
 bin/xfce4-session-logout
 bin/xfce4-session-settings
 bin/xflock4
-include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-engine.h
-include/xfce4/xfce4-session-4.6/libxfsm/xfsm-splash-rc.h
 lib/libxfsm-4.6.la
 lib/pkgconfig/xfce4-session-2.0.pc
-lib/xfce4/session/balou-export-theme
-lib/xfce4/session/balou-install-theme
-lib/xfce4/session/splash-engines/libbalou.la
-lib/xfce4/session/splash-engines/libmice.la
-lib/xfce4/session/splash-engines/libsimple.la
 lib/xfce4/session/xfsm-shutdown-helper
 man/man1/xfce4-session-logout.1
 man/man1/xfce4-session.1
@@ -23,21 +16,13 @@ share/examples/xfce4/autostart/xscreensaver.desktop
 share/examples/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
 share/examples/xfce4/xinitrc
 share/icons/hicolor/128x128/apps/xfce4-session.png
-share/icons/hicolor/48x48/apps/system-hibernate.png
-share/icons/hicolor/48x48/apps/system-log-out.png
-share/icons/hicolor/48x48/apps/system-reboot.png
-share/icons/hicolor/48x48/apps/system-shutdown.png
-share/icons/hicolor/48x48/apps/system-suspend.png
+share/icons/hicolor/48x48/actions/xfsm-hibernate.png
+share/icons/hicolor/48x48/actions/xfsm-logout.png
+share/icons/hicolor/48x48/actions/xfsm-reboot.png
+share/icons/hicolor/48x48/actions/xfsm-shutdown.png
+share/icons/hicolor/48x48/actions/xfsm-suspend.png
 share/icons/hicolor/48x48/apps/xfce4-session.png
-share/icons/hicolor/48x48/apps/xfce4-splash.png
-share/icons/hicolor/48x48/apps/xfsm-hibernate.png
-share/icons/hicolor/48x48/apps/xfsm-logout.png
-share/icons/hicolor/48x48/apps/xfsm-reboot.png
-share/icons/hicolor/48x48/apps/xfsm-shutdown.png
-share/icons/hicolor/48x48/apps/xfsm-suspend.png
-share/icons/hicolor/scalable/apps/system-shutdown.svg
 share/icons/hicolor/scalable/apps/xfce4-session.svg
-share/icons/hicolor/scalable/apps/xfsm-shutdown.svg
 share/locale/am/LC_MESSAGES/xfce4-session.mo
 share/locale/ar/LC_MESSAGES/xfce4-session.mo
 share/locale/ast/LC_MESSAGES/xfce4-session.mo
@@ -62,6 +47,7 @@ share/locale/he/LC_MESSAGES/xfce4-session.mo
 share/locale/hr/LC_MESSAGES/xfce4-session.mo
 share/locale/hu/LC_MESSAGES/xfce4-session.mo
 share/locale/id/LC_MESSAGES/xfce4-session.mo
+share/locale/ie/LC_MESSAGES/xfce4-session.mo
 share/locale/is/LC_MESSAGES/xfce4-session.mo
 share/locale/it/LC_MESSAGES/xfce4-session.mo
 share/locale/ja/LC_MESSAGES/xfce4-session.mo
@@ -98,5 +84,3 @@ share/locale/zh_CN/LC_MESSAGES/xfce4-session.mo
 share/locale/zh_HK/LC_MESSAGES/xfce4-session.mo
 share/locale/zh_TW/LC_MESSAGES/xfce4-session.mo
 ${PLIST.polkit}share/polkit-1/actions/org.xfce.session.policy
-share/themes/Default/balou/logo.png
-share/themes/Default/balou/themerc
diff --git a/x11/xfce4-session/distinfo b/x11/xfce4-session/distinfo
index 0ab0b794710..d83eec87b13 100644
--- a/x11/xfce4-session/distinfo
+++ b/x11/xfce4-session/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.23 2019/01/18 14:12:29 youri Exp $
+$NetBSD: distinfo,v 1.24 2019/05/23 02:56:07 gutteridge Exp $
 
-SHA1 (xfce4-session-4.13.1.tar.bz2) = 6a408b8a7089af7c6893e63eb1e06af1e3d784cd
-RMD160 (xfce4-session-4.13.1.tar.bz2) = 89f9bf9ca4ade099b62a88af9ea741d76fb16122
-SHA512 (xfce4-session-4.13.1.tar.bz2) = 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
-Size (xfce4-session-4.13.1.tar.bz2) = 1322823 bytes
+SHA1 (xfce4-session-4.13.2.tar.bz2) = 86aa2ed37084bef9253ce0b7d91423b9f3308da0
+RMD160 (xfce4-session-4.13.2.tar.bz2) = 2131a0bfc9a6470c637e2ef90a45cbc83f4e80ec
+SHA512 (xfce4-session-4.13.2.tar.bz2) = cb1e63a3df9c4ac3efcb0cce20cb5528f9d1a46731ad4b32634ad5f4a53711f05b40d98464bfd562b4e3d42b2555827ece03e63c6a433e879fa0f0a4ccda6a57
+Size (xfce4-session-4.13.2.tar.bz2) = 829041 bytes
 SHA1 (patch-ac) = 6d6ecae678ef34b0435ea40fa75ce51aeea1509d
 SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b
-SHA1 (patch-configure) = 55a15e79821b89cc37f6ebedac6ad1804cdee38a
+SHA1 (patch-configure) = df44067ade00494bb45946de8e03d87ffdfa813b
+SHA1 (patch-libxfsm_xfsm-shutdown-common.h) = da51714e0924a0ab28f7da1b161659763dff81d2
 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
-SHA1 (patch-settings_xfce4-session.xml) = 86a50db54aede973d7495869e3e713a39a73446d
-SHA1 (patch-xfsm-shutdown-helper_main.c) = afe8ba4afeb55227dacbb12e225c8542ce66b9f5
+SHA1 (patch-settings_xfce4-session.xml) = 7e990e73d8dab022f3ebd2d4daa24ebc8dcf95a1
+SHA1 (patch-xfsm-shutdown-helper_main.c) = db2dc4a7ce729b72092fa2777fd178cb3b7be258
diff --git a/x11/xfce4-session/patches/patch-configure b/x11/xfce4-session/patches/patch-configure
index ae17f54a240..687620e264d 100644
--- a/x11/xfce4-session/patches/patch-configure
+++ b/x11/xfce4-session/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2017/06/22 09:40:24 youri Exp $
+$NetBSD: patch-configure,v 1.4 2019/05/23 02:56:07 gutteridge Exp $
 
 Add NetBSD backend detection.
 
---- configure.orig	2015-03-16 07:29:45.000000000 +0000
+--- configure.orig	2019-05-18 22:03:14.000000000 +0000
 +++ configure
-@@ -18208,6 +18208,8 @@ if test x$with_backend = x; then
+@@ -17795,6 +17795,8 @@ if test x$with_backend = x; then
      with_backend=freebsd ;; #(
    *-*dragonfly*) :
      with_backend=freebsd ;; #(
@@ -13,7 +13,7 @@ Add NetBSD backend detection.
    *-openbsd*) :
      with_backend=openbsd ;; #(
    *) :
-@@ -18237,6 +18239,11 @@ if test x$with_backend = xopenbsd; then
+@@ -17824,6 +17826,11 @@ if test x$with_backend = xopenbsd; then
  $as_echo "#define BACKEND_TYPE_OPENBSD 1" >>confdefs.h
  
  fi
@@ -23,5 +23,5 @@ Add NetBSD backend detection.
 +
 +fi
  
- XFCE_GLADE_CATALOG_PATH="`pkg-config --variable glade_catalogdir libxfce4ui-1`"
- XFCE_GLADE_PIXMAP_PATH="`pkg-config --variable glade_pixmapdir libxfce4ui-1`"
+ ac_config_files="$ac_config_files Makefile doc/Makefile icons/Makefile icons/48x48-actions/Makefile icons/48x48/Makefile icons/128x128/Makefile icons/scalable/Makefile libxfsm/Makefile libxfsm/xfce4-session-2.0.pc po/Makefile.in settings/Makefile scripts/Makefile scripts/xinitrc.in xfce4-session/Makefile xfce4-session-logout/Makefile xfsm-shutdown-helper/Makefile"
+ 
diff --git a/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h b/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
new file mode 100644
index 00000000000..cefe7716993
--- /dev/null
+++ b/x11/xfce4-session/patches/patch-libxfsm_xfsm-shutdown-common.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-libxfsm_xfsm-shutdown-common.h,v 1.1 2019/05/23 02:56:07 gutteridge Exp $
+
+Add NetBSD commands.
+
+--- libxfsm/xfsm-shutdown-common.h.orig	2019-05-05 22:00:21.000000000 +0000
++++ libxfsm/xfsm-shutdown-common.h
+@@ -70,4 +70,9 @@
+ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
+ #endif
+ 
++#ifdef BACKEND_TYPE_NETBSD
++#define UP_BACKEND_SUSPEND_COMMAND      "/sbin/sysctl -w hw.acpi.sleep.state=1"
++#define UP_BACKEND_HIBERNATE_COMMAND    "/sbin/sysctl -w hw.acpi.sleep.state=4"
++#endif
++
+ #endif /* __XFSM_SHUTDOWN_COMMON_H_ */
diff --git a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
index d76d3c5934d..f6833ae8648 100644
--- a/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
+++ b/x11/xfce4-session/patches/patch-settings_xfce4-session.xml
@@ -1,15 +1,15 @@
-$NetBSD: patch-settings_xfce4-session.xml,v 1.3 2017/06/22 09:40:24 youri Exp $
+$NetBSD: patch-settings_xfce4-session.xml,v 1.4 2019/05/23 02:56:07 gutteridge Exp $
 
 Look for the right thunar binary.
 
---- settings/xfce4-session.xml.orig	2014-08-28 15:50:18.000000000 +0000
+--- settings/xfce4-session.xml.orig	2019-05-17 12:46:28.000000000 +0000
 +++ settings/xfce4-session.xml
-@@ -21,7 +21,7 @@
-       </property>
+@@ -25,7 +25,7 @@
+       <property name="Client2_Priority" type="int" value="25"/>
        <property name="Client2_PerScreen" type="bool" value="false"/>
        <property name="Client3_Command" type="array">
 -        <value type="string" value="Thunar"/>
 +        <value type="string" value="thunar"/>
          <value type="string" value="--daemon"/>
        </property>
-       <property name="Client3_PerScreen" type="bool" value="false"/>
+       <property name="Client3_Priority" type="int" value="30"/>
diff --git a/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c b/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
index 635b7f780f3..4186fe627dd 100644
--- a/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
+++ b/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
@@ -1,23 +1,10 @@
-$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.3 2018/05/16 18:06:04 youri Exp $
+$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.4 2019/05/23 02:56:07 gutteridge Exp $
 
-Add NetBSD commands.
-... and be careful to only SUSPEND or HIBERNATE when defined.
+Be careful to only SUSPEND or HIBERNATE when defined.
 
---- xfsm-shutdown-helper/main.c.orig	2014-08-28 15:52:27.000000000 +0000
+--- xfsm-shutdown-helper/main.c.orig	2019-05-05 22:00:21.000000000 +0000
 +++ xfsm-shutdown-helper/main.c
-@@ -91,7 +91,10 @@
- #define UP_BACKEND_SUSPEND_COMMAND	"/usr/sbin/zzz"
- #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
- #endif
--
-+#ifdef BACKEND_TYPE_NETBSD
-+#define UP_BACKEND_SUSPEND_COMMAND      "/sbin/sysctl -w hw.acpi.sleep.state=1"
-+#define UP_BACKEND_HIBERNATE_COMMAND    "/sbin/sysctl -w hw.acpi.sleep.state=4"
-+#endif
- 
- static gboolean
- run (const gchar *command)
-@@ -217,22 +220,26 @@ main (int argc, char **argv)
+@@ -183,22 +183,26 @@ main (int argc, char **argv)
      }
    else if(suspend)
      {