[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/, xfce-base/xfce4-session/files/

2018-10-05 Thread Michał Górny 
commit: 40c1832fb0d2b37861ed4dbdc2cd2876a53f90cd
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct  5 19:09:53 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct  5 19:09:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c1832f

xfce-base/xfce4-session: Fix relying on implicit dbus header paths

Backport an upstream patch removing unnecessary use of dbus headers.
This causes the package to implicitly rely on dbus include paths being
added by pkg-config, and causes build failure in the rare case when
xfce4-session dependencies do not require dbus.

Closes: https://bugs.gentoo.org/667440
Signed-off-by: Michał Górny  gentoo.org>

 .../xfce4-session-4.13.1-kill-dbus-includes.patch  | 43 ++
 .../xfce4-session/xfce4-session-4.13.1.ebuild  |  4 ++
 2 files changed, 47 insertions(+)

diff --git 
a/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch 
b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch
new file mode 100644
index 000..cc5bb9d653e
--- /dev/null
+++ 
b/xfce-base/xfce4-session/files/xfce4-session-4.13.1-kill-dbus-includes.patch
@@ -0,0 +1,43 @@
+From 3bddf152b902d8a1e0f674b792577b2cca635c4b Mon Sep 17 00:00:00 2001
+From: Brandon Bergren 
+Date: Sun, 26 Aug 2018 10:28:05 -0400
+Subject: [PATCH] fix build failure when dbus is not in the system include path
+ (Bug #14386)
+
+The d-bus direct depenencies were taken out in 91860af3a38080,
+but the #include  in xfce4-session/xfsm-global.h
+and the #include  line in xfsm-error.c got left
+in accidentally.
+---
+ xfce4-session/xfsm-error.c  | 2 --
+ xfce4-session/xfsm-global.h | 1 -
+ 2 files changed, 3 deletions(-)
+
+diff --git a/xfce4-session/xfsm-error.c b/xfce4-session/xfsm-error.c
+index 2b7f6c04..f0766f5f 100644
+--- a/xfce4-session/xfsm-error.c
 b/xfce4-session/xfsm-error.c
+@@ -20,8 +20,6 @@
+ #include 
+ #endif
+ 
+-#include 
+-
+ #include 
+ 
+ #define XFSM_DBUS_NAME "org.xfce.SessionManager"
+diff --git a/xfce4-session/xfsm-global.h b/xfce4-session/xfsm-global.h
+index d4587123..610d5bf7 100644
+--- a/xfce4-session/xfsm-global.h
 b/xfce4-session/xfsm-global.h
+@@ -27,7 +27,6 @@
+ #include 
+ 
+ #include 
+-#include 
+ 
+ typedef struct _FailsafeClient FailsafeClient;
+ struct _FailsafeClient
+-- 
+2.19.0
+

diff --git a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild 
b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
index 7819b1d8883..d0df74cf881 100644
--- a/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
+++ b/xfce-base/xfce4-session/xfce4-session-4.13.1.ebuild
@@ -44,6 +44,10 @@ PATCHES=(
 # TODO: this patch needs updating for the new version, and finding
 # upstream bug.
 #  "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+
+   # fix building with no dbus dependency
+   # https://bugs.gentoo.org/667440
+   "${FILESDIR}"/xfce4-session-4.13.1-kill-dbus-includes.patch
 )
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/, xfce-base/xfce4-session/files/

2018-01-10 Thread Michał Górny 
commit: b3ce9a81ab6ed752bfd0a50dd3daf9b920e0
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jan 10 09:01:51 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jan 10 09:02:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ce9a81

xfce-base/xfce4-session: Backport autostart dialog segv fix

Closes: https://bugs.gentoo.org/628324

 ...e4-session-4.13.0-add-edit-autostart-segv.patch | 57 
 .../xfce4-session/xfce4-session-4.13.0-r1.ebuild   | 78 ++
 2 files changed, 135 insertions(+)

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 000..ff5b805d322
--- /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 
+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 000..2d045a1e7c0
--- /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
+

[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-session/, xfce-base/xfce4-session/files/

2016-02-02 Thread Denis Dupeyron 
commit: 4045336f08c2902791659d44a87312be39165373
Author: Denis Dupeyron  gentoo  org>
AuthorDate: Tue Feb  2 18:36:28 2016 +
Commit: Denis Dupeyron  gentoo  org>
CommitDate: Tue Feb  2 18:43:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4045336f

xfce-base/xfce4-session: screensaver fixes

Add x11-misc/light-locker as one of the possible backends for locking
the screen. Add the corresponding command to the xflock4 script.

Remove gnome-extra/gnome-screensaver as one of the possible backends for
locking the screen. This silences repoman. Gnome 3 does not use it and
Gnome 2 no longer exists in portage, thus the package has disappeared.
Leave the corresponding command in the xflock4 script just in case some
of our users are still using gnome-screensaver from an overlay.

 ...on-4.12.1-light-locker_support_to_xflock4.patch | 17 +
 .../xfce4-session/xfce4-session-4.12.1-r1.ebuild   | 74 ++
 2 files changed, 91 insertions(+)

diff --git 
a/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
 
b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
new file mode 100644
index 000..cb472ed
--- /dev/null
+++ 
b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch
@@ -0,0 +1,17 @@
+--- scripts/xflock4.orig   2016-02-02 10:40:15.726495183 -0700
 scripts/xflock42016-02-02 10:43:17.548061336 -0700
+@@ -24,10 +24,12 @@
+ PATH=/bin:/usr/bin
+ export PATH
+ 
+-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running
++# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective
++# daemon is running
+ for lock_cmd in \
+ "xscreensaver-command -lock" \
+-"gnome-screensaver-command --lock"
++"gnome-screensaver-command --lock" \
++"light-locker-command --lock"
+ do
+ $lock_cmd >/dev/null 2>&1 && exit
+ done

diff --git a/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild 
b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
new file mode 100644
index 000..a5bed38
--- /dev/null
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EAUTORECONF=1
+inherit xfconf
+
+DESCRIPTION="A session manager for the Xfce desktop environment"
+HOMEPAGE="http://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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 
~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="debug nls policykit systemd upower +xscreensaver"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:=
+   x11-apps/iceauth
+   x11-libs/libSM:=
+   >=x11-libs/libwnck-2.30:1=
+   x11-libs/libX11:=
+   >=xfce-base/libxfce4util-4.11:=
+   >=xfce-base/libxfce4ui-4.12.1:=
+   >=xfce-base/xfconf-4.10:=
+   !xfce-base/xfce-utils
+   !=xfce-base/libxfce4ui-4.12.0
+   policykit? ( >=sys-auth/polkit-0.102:= )
+   upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )"
+RDEPEND="${COMMON_DEPEND}
+   x11-apps/xrdb
+   nls? ( x11-misc/xdg-user-dirs )
+   !systemd? ( upower? ( sys-power/pm-utils ) )
+   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 )"
+
+pkg_setup() {
+   PATCHES=(
+   
"${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch
+   
"${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch
+   )
+
+   XFCONF=(
+   --docdir="${EPREFIX}"/usr/share/doc/${PF}
+   $(use_enable policykit polkit)
+   --with-xsession-prefix="${EPREFIX}"/usr
+   $(xfconf_use_debug)
+   )
+
+   use upower && XFCONF+=( --enable-upower )
+
+   DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO )
+}
+
+src_install() {
+   xfconf_src_install
+
+   local sessiondir=/etc/X11/Sessions
+   echo startxfce4 > "${T}"/Xfce4
+   exeinto ${sessiondir}
+   doexe "${T}"/Xfce4
+   dosym Xfce4 ${sessiondir}/Xfce
+}