gentoo resync : 19.03.2019

2 files changed, 0 insertions, 58 deletions

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 811ec7102d17..06d6535201ce 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,6 +1,5 @@
 AUX xfce4-session-4.10.1-alock_support_to_xflock4.patch 371 BLAKE2B 7737f95e5ce5ad9d421b8d39e577899b145d12ce4faebc135eaa052a6637508dfd4d5a8d9c6bcbe987026cedbedb5a396b294edadfc7241a607c7b0ef9a218b8 SHA512 85914b96def54a504f5dbaecc57f47f3529be0bd2efc8dae8529c56bd764ff9a644e17e14599b947aef4a7311a32a3e0b2ef5aa6dea45287cdc09b01bfcfcc48
 AUX xfce4-session-4.12.1-light-locker_support_to_xflock4.patch 569 BLAKE2B f05f03f7ee891fe286d4cb2781393d1a836e89c5ab6b2f7e0bfdba3582549d054cc6beaefb805d83d12ff1fafc8581ce12d2e284314ac14ef6b3fd9cd1c724f1 SHA512 da3b4fcc3cd059db267807fc46db6b484a2cf9d27e457850adc71e465300eb3d776ae8f10c204f0d419dbfbb135fce60ee5a89a75aad8d3644c7ba749f0a2c83
-AUX xfce4-session-4.13.0-add-edit-autostart-segv.patch 2511 BLAKE2B 028e1b05cd830f6eec9e2668414e94e792569811eccc9bf9ccbec300d80fcab300e8039538e11fb371ca2c5cc7c8c3816267751aa32d1d843d5b0850a4dbea99 SHA512 96e4ee3fe66c02775efc2d3222e9c668c9f422a303e0bc5837e2fb1dba5e07d4fda2c420c37e35da73731597b922f995c1e30dd40dfcd903081d566fc5a569ea
 AUX xfce4-session-4.13.1-kill-dbus-includes.patch 1279 BLAKE2B 3c446b5dcadc9f68dcfd9b2fd9d8ebd1b94e54fc6f3815ff7ee5d01f9be9fbefd1b2b269344bcff148a4c5199bb3dc58d4e1253450c541f4f996e6d4c55ad64d SHA512 8d5265737db4ade8fe59b7b051b741ca5b1a90a7d2abcdf5a48e658c04b3fc25f304555116009e58125662b243cf3dae1822c7ab387c7fe6ac6e0fb661b2d6b3
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.1.tar.bz2 1322823 BLAKE2B e50cc2628a068bed39d2aa6344eab7676e6464c84e3cf11d79518f78db54ea01316bd098a541b6f0897f3decbed2eb37e55009d4bf89d460e136d7a44d31c26a SHA512 5845e3591919e23ca176199e81075a097ef9d65cbcf23b34d84afc649a307bfa8c6492e3a01855cacff9328da809725213ec1fa9d76024c0a0c25cce3c51da1b
diff --git a/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch b/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch
deleted file mode 100644
index ff5b805d3225..000000000000
--- a/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 193b09a9c159d1d16ad69e4298f48c2b531e9392 Mon Sep 17 00:00:00 2001
-From: Eric Koegel <eric.koegel@gmail.com>
-Date: Mon, 1 May 2017 06:55:05 +0300
-Subject: Add/Edit Application Autostart Entries (Bug #13271)
-
-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.
----
- settings/xfae-dialog.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/settings/xfae-dialog.c b/settings/xfae-dialog.c
-index af860b9..7442634 100644
---- a/settings/xfae-dialog.c
-+++ b/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);
--- 
-cgit v1.1
-