CVS commit: pkgsrc/x11/xfce4-session

["Youri Mouton" <youri%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   youri
Date:           Wed May 16 18:06:04 UTC 2018

Modified Files:
        pkgsrc/x11/xfce4-session: Makefile distinfo
        pkgsrc/x11/xfce4-session/patches: patch-xfsm-shutdown-helper_main.c
Added Files:
        pkgsrc/x11/xfce4-session/patches: patch-settings_xfae-dialog.c

Log Message:
Runtime fix for xfce4-session: don't segfault when trying to add a new
startup service in xfce4-session-settings.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/x11/xfce4-session/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/xfce4-session/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xfce4-session/patches/patch-settings_xfae-dialog.c
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c

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.65 pkgsrc/x11/xfce4-session/Makefile:1.66
--- pkgsrc/x11/xfce4-session/Makefile:1.65      Mon Apr 16 14:35:27 2018
+++ pkgsrc/x11/xfce4-session/Makefile   Wed May 16 18:06:04 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.65 2018/04/16 14:35:27 wiz Exp $
+# $NetBSD: Makefile,v 1.66 2018/05/16 18:06:04 youri Exp $
 
-PKGREVISION= 3
+PKGREVISION= 4
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=              xfce4-session-4.13.0

Index: pkgsrc/x11/xfce4-session/distinfo
diff -u pkgsrc/x11/xfce4-session/distinfo:1.21 pkgsrc/x11/xfce4-session/distinfo:1.22
--- pkgsrc/x11/xfce4-session/distinfo:1.21      Thu Jun 22 09:40:24 2017
+++ pkgsrc/x11/xfce4-session/distinfo   Wed May 16 18:06:04 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2017/06/22 09:40:24 youri Exp $
+$NetBSD: distinfo,v 1.22 2018/05/16 18:06:04 youri Exp $
 
 SHA1 (xfce4-session-4.13.0.tar.bz2) = 23d93a524870c0402c83ab23650a63bcaeaeb234
 RMD160 (xfce4-session-4.13.0.tar.bz2) = ab9fda8e31891ce9e244e9d7d15fc865d5a6f6c1
@@ -8,5 +8,6 @@ SHA1 (patch-ac) = 6d6ecae678ef34b0435ea4
 SHA1 (patch-config.h.in) = 30e2ae1ea70a99a83f11523e940081b661add69b
 SHA1 (patch-configure) = 55a15e79821b89cc37f6ebedac6ad1804cdee38a
 SHA1 (patch-scripts_Makefile.in) = 042c3d9c632a57f9acfc8dab43aa6bca8ec69097
+SHA1 (patch-settings_xfae-dialog.c) = 11e981e02dc573525ce1801c20a4cd437fdf8e3c
 SHA1 (patch-settings_xfce4-session.xml) = 86a50db54aede973d7495869e3e713a39a73446d
-SHA1 (patch-xfsm-shutdown-helper_main.c) = 6f885efe31597360bb9534007daffa46df41c831
+SHA1 (patch-xfsm-shutdown-helper_main.c) = afe8ba4afeb55227dacbb12e225c8542ce66b9f5

Index: pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c
diff -u pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c:1.2 pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c:1.3
--- pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c:1.2      Mon Jul  6 10:39:35 2015
+++ pkgsrc/x11/xfce4-session/patches/patch-xfsm-shutdown-helper_main.c  Wed May 16 18:06:04 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.2 2015/07/06 10:39:35 richard Exp $
+$NetBSD: patch-xfsm-shutdown-helper_main.c,v 1.3 2018/05/16 18:06:04 youri Exp $
 
 Add NetBSD commands.
 ... and be careful to only SUSPEND or HIBERNATE when defined.
@@ -11,8 +11,8 @@ Add NetBSD commands.
  #endif
 -
 +#ifdef BACKEND_TYPE_NETBSD
-+#define UP_BACKEND_SUSPEND_COMMAND      "/usr/sbin/zzz"
-+#define UP_BACKEND_HIBERNATE_COMMAND    "/usr/sbin/zzz"
++#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

Added files:

Index: pkgsrc/x11/xfce4-session/patches/patch-settings_xfae-dialog.c
diff -u /dev/null pkgsrc/x11/xfce4-session/patches/patch-settings_xfae-dialog.c:1.1
--- /dev/null   Wed May 16 18:06:04 2018
+++ pkgsrc/x11/xfce4-session/patches/patch-settings_xfae-dialog.c       Wed May 16 18:06:04 2018
@@ -0,0 +1,47 @@
+
+With xfce4-session built from git (after the gtk3
+migration work), trying to add or edit an application
+autostart entry results in a segmentation fault after a
+"(xfce4-session-settings:9094): Gtk-CRITICAL **:
+gtk_entry_get_text: assertion 'GTK_IS_ENTRY (entry)'
+failed" message.
+
+It appears that when the "notify::text" signal callbacks
+for the "command_entry" and "name_entry" GtkEntry objects
+are created, they are called immediately, before the second
+GtkEntry object is created resulting in a failure in the
+xfae_dialog_update() function to properly process the objects.
+Thanks to ToZ for reporting and providing the fix.
+
+diff --git a/settings/xfae-dialog.c b/settings/xfae-dialog.c
+index af860b9..7442634 100644
+--- settings/xfae-dialog.c
++++ settings/xfae-dialog.c
+@@ -98,8 +98,7 @@ xfae_dialog_init (XfaeDialog *dialog)
+   dialog->name_entry = g_object_new (GTK_TYPE_ENTRY,
+                                      "activates-default", TRUE,
+                                      NULL);
+-  g_signal_connect_swapped (G_OBJECT (dialog->name_entry), "notify::text",
+-                            G_CALLBACK (xfae_dialog_update), dialog);
++
+   gtk_grid_attach (GTK_GRID (grid), dialog->name_entry, 1, 0, 1, 1);
+   gtk_widget_show (dialog->name_entry);
+ 
+@@ -132,11 +131,15 @@ xfae_dialog_init (XfaeDialog *dialog)
+   dialog->command_entry = g_object_new (GTK_TYPE_ENTRY,
+                                         "activates-default", TRUE,
+                                         NULL);
+-  g_signal_connect_swapped (G_OBJECT (dialog->command_entry), "notify::text",
+-                            G_CALLBACK (xfae_dialog_update), dialog);
++
+   gtk_box_pack_start (GTK_BOX (hbox), dialog->command_entry, TRUE, TRUE, 0);
+   gtk_widget_show (dialog->command_entry);
+ 
++  g_signal_connect_swapped (G_OBJECT (dialog->name_entry), "notify::text",
++                            G_CALLBACK (xfae_dialog_update), dialog);
++  g_signal_connect_swapped (G_OBJECT (dialog->command_entry), "notify::text",
++                            G_CALLBACK (xfae_dialog_update), dialog);
++
+   button = g_object_new (GTK_TYPE_BUTTON,
+                          "can-default", FALSE,
+                          NULL);