gentoo resync : 11.01.2018

3 files changed, 137 insertions, 0 deletions

diff --git a/xfce-base/xfce4-session/Manifest b/xfce-base/xfce4-session/Manifest
index 747889e56e1c..3ea5403f031c 100644
--- a/xfce-base/xfce4-session/Manifest
+++ b/xfce-base/xfce4-session/Manifest
@@ -1,7 +1,9 @@
 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
 DIST xfce4-session-4.12.1.tar.bz2 1289284 BLAKE2B 00af274ac1160a413c9e2c8b308dfc84248f0078e8c294528614bb642988468f9dadaae906b4a8e2179d2beef0a48ebf5e2eedcb2ed3ad7ea73a8f7a9b90e224 SHA512 d7f37dbff59acb316965ab2224674ac3b5b7cfd7262acd4426b582001cee313945acb8883be21553dd6d7a046934bbbe116f451e6d5fd35b6fa5444da94605df
 DIST xfce4-session-4.13.0.tar.bz2 1314715 BLAKE2B 7ab5bf645feaf9862e9cc4f36f26cfd614e7c66aa32cdb41ded8b0067e3aa23a6897beb6c362685f84c5b2a0f3d91462ab3dc7fed5a15875eff49107719c6c1c SHA512 61f9a547b03eb109a1a0fc83feaac743ea2119360f2f7208e589feb3e8f1db016ffe85cf1c8e20633ec399f263dcbccd35c431bde6f6f1482658688096da5cb0
 EBUILD xfce4-session-4.12.1-r1.ebuild 1906 BLAKE2B e2ed3718c176ae8ee61e3ee2d3b79a5b4cf1dda252a8e76e8808eaf063e959d7f58a23dc5058f4db09705bcc03e57dd299db1ef6299dc4b1b5d9a33b49a506e5 SHA512 5d6bd2d39c26b21d21942ce5c247e559d1cefa69903e998e2a20432eb257c27d84a75ca9edf3bf46f5e486f4720308c131cfcc67a66ee0b12a1caf6da078aae4
+EBUILD xfce4-session-4.13.0-r1.ebuild 1833 BLAKE2B dd046f6f515a107bfc74fe19403c57f91f7db6e8a7e9a5a93fda610052e1f6943b3123ab723adbbb3965846257f44dd870d958dad96cfd8feda3582adaeb01e5 SHA512 92a5933023c5f6a3243f7cd845a1c4f14c6da4fa1aaae4a6f9fdd52eaca9d10226744ae4b5679c2c824b6d57f895c7add1c2dc1e32fd4a57340a05f856d95c33
 EBUILD xfce4-session-4.13.0.ebuild 1932 BLAKE2B ce1a32ff354d930b8029f58d54f8481261d2b7cbc1fee01da66f85029930abd8f0e13afa675e1c33fbfaf336c4cffba4a824fea3227101d2656f43fd3a0566b4 SHA512 91b8b8e241bfafe3a14d50691b1d197a8442206f5e5804bcf270319af3d04f0ad8ffe382424d97319f3df0a3eddf6dbeecb6056f873d8f25f431e48132ca4fca
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
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
new file mode 100644
index 000000000000..ff5b805d3225
--- /dev/null
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.13.0-add-edit-autostart-segv.patch
@@ -0,0 +1,57 @@
+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
+
diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
new file mode 100644
index 000000000000..2d045a1e7c0e
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="https://docs.xfce.org/xfce/xfce4-session/start"
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="nls policykit systemd +xscreensaver"
+
+COMMON_DEPEND="x11-apps/iceauth
+	x11-libs/gtk+:3=
+	x11-libs/libSM:=
+	x11-libs/libwnck:3=
+	x11-libs/libX11:=
+	>=xfce-base/libxfce4util-4.12:=
+	>=xfce-base/libxfce4ui-4.12.1:=[gtk3(+)]
+	>=xfce-base/xfconf-4.12:=
+	policykit? ( >=sys-auth/polkit-0.102:= )"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xrdb
+	nls? ( x11-misc/xdg-user-dirs )
+	xscreensaver? ( || (
+		>=x11-misc/xscreensaver-5.26
+		x11-misc/light-locker
+		>=x11-misc/xlockmore-5.43
+		x11-misc/slock
+		x11-misc/alock[pam]
+	) )"
+DEPEND="${COMMON_DEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+REQUIRED_USE="systemd? ( policykit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
+# TODO: this patch needs updating for the new version, and finding
+# upstream bug.
+#	"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+
+	"${FILESDIR}"/${P}-add-edit-autostart-segv.patch
+)
+
+src_configure() {
+	local myconf=(
+		$(use_enable policykit polkit)
+		--with-xsession-prefix="${EPREFIX}"/usr
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	local sessiondir=/etc/X11/Sessions
+	echo startxfce4 > "${T}"/Xfce4 || die
+	exeinto ${sessiondir}
+	doexe "${T}"/Xfce4
+	dosym Xfce4 ${sessiondir}/Xfce
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}