1 |
commit: 4045336f08c2902791659d44a87312be39165373 |
2 |
Author: Denis Dupeyron <calchan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 2 18:36:28 2016 +0000 |
4 |
Commit: Denis Dupeyron <calchan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 2 18:43:22 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4045336f |
7 |
|
8 |
xfce-base/xfce4-session: screensaver fixes |
9 |
|
10 |
Add x11-misc/light-locker as one of the possible backends for locking |
11 |
the screen. Add the corresponding command to the xflock4 script. |
12 |
|
13 |
Remove gnome-extra/gnome-screensaver as one of the possible backends for |
14 |
locking the screen. This silences repoman. Gnome 3 does not use it and |
15 |
Gnome 2 no longer exists in portage, thus the package has disappeared. |
16 |
Leave the corresponding command in the xflock4 script just in case some |
17 |
of our users are still using gnome-screensaver from an overlay. |
18 |
|
19 |
...on-4.12.1-light-locker_support_to_xflock4.patch | 17 +++++ |
20 |
.../xfce4-session/xfce4-session-4.12.1-r1.ebuild | 74 ++++++++++++++++++++++ |
21 |
2 files changed, 91 insertions(+) |
22 |
|
23 |
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 |
24 |
new file mode 100644 |
25 |
index 0000000..cb472ed |
26 |
--- /dev/null |
27 |
+++ b/xfce-base/xfce4-session/files/xfce4-session-4.12.1-light-locker_support_to_xflock4.patch |
28 |
@@ -0,0 +1,17 @@ |
29 |
+--- scripts/xflock4.orig 2016-02-02 10:40:15.726495183 -0700 |
30 |
++++ scripts/xflock4 2016-02-02 10:43:17.548061336 -0700 |
31 |
+@@ -24,10 +24,12 @@ |
32 |
+ PATH=/bin:/usr/bin |
33 |
+ export PATH |
34 |
+ |
35 |
+-# Lock by xscreensaver or gnome-screensaver, if a respective daemon is running |
36 |
++# Lock by xscreensaver, gnome-screensaver or light-locker, if a respective |
37 |
++# daemon is running |
38 |
+ for lock_cmd in \ |
39 |
+ "xscreensaver-command -lock" \ |
40 |
+- "gnome-screensaver-command --lock" |
41 |
++ "gnome-screensaver-command --lock" \ |
42 |
++ "light-locker-command --lock" |
43 |
+ do |
44 |
+ $lock_cmd >/dev/null 2>&1 && exit |
45 |
+ done |
46 |
|
47 |
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 |
48 |
new file mode 100644 |
49 |
index 0000000..a5bed38 |
50 |
--- /dev/null |
51 |
+++ b/xfce-base/xfce4-session/xfce4-session-4.12.1-r1.ebuild |
52 |
@@ -0,0 +1,74 @@ |
53 |
+# Copyright 1999-2016 Gentoo Foundation |
54 |
+# Distributed under the terms of the GNU General Public License v2 |
55 |
+# $Id$ |
56 |
+ |
57 |
+EAPI=5 |
58 |
+EAUTORECONF=1 |
59 |
+inherit xfconf |
60 |
+ |
61 |
+DESCRIPTION="A session manager for the Xfce desktop environment" |
62 |
+HOMEPAGE="http://docs.xfce.org/xfce/xfce4-session/start" |
63 |
+SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" |
64 |
+ |
65 |
+LICENSE="GPL-2" |
66 |
+SLOT="0" |
67 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" |
68 |
+IUSE="debug nls policykit systemd upower +xscreensaver" |
69 |
+ |
70 |
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.100:= |
71 |
+ x11-apps/iceauth |
72 |
+ x11-libs/libSM:= |
73 |
+ >=x11-libs/libwnck-2.30:1= |
74 |
+ x11-libs/libX11:= |
75 |
+ >=xfce-base/libxfce4util-4.11:= |
76 |
+ >=xfce-base/libxfce4ui-4.12.1:= |
77 |
+ >=xfce-base/xfconf-4.10:= |
78 |
+ !xfce-base/xfce-utils |
79 |
+ !=xfce-base/libxfce4ui-4.12.0 |
80 |
+ policykit? ( >=sys-auth/polkit-0.102:= ) |
81 |
+ upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) )" |
82 |
+RDEPEND="${COMMON_DEPEND} |
83 |
+ x11-apps/xrdb |
84 |
+ nls? ( x11-misc/xdg-user-dirs ) |
85 |
+ !systemd? ( upower? ( sys-power/pm-utils ) ) |
86 |
+ xscreensaver? ( || ( |
87 |
+ >=x11-misc/xscreensaver-5.26 |
88 |
+ x11-misc/light-locker |
89 |
+ >=x11-misc/xlockmore-5.43 |
90 |
+ x11-misc/slock |
91 |
+ x11-misc/alock[pam] |
92 |
+ ) )" |
93 |
+DEPEND="${COMMON_DEPEND} |
94 |
+ dev-util/intltool |
95 |
+ sys-devel/gettext |
96 |
+ virtual/pkgconfig" |
97 |
+ |
98 |
+REQUIRED_USE="systemd? ( policykit )" |
99 |
+ |
100 |
+pkg_setup() { |
101 |
+ PATCHES=( |
102 |
+ "${FILESDIR}"/${PN}-4.10.1-alock_support_to_xflock4.patch |
103 |
+ "${FILESDIR}"/${PN}-4.12.1-light-locker_support_to_xflock4.patch |
104 |
+ ) |
105 |
+ |
106 |
+ XFCONF=( |
107 |
+ --docdir="${EPREFIX}"/usr/share/doc/${PF} |
108 |
+ $(use_enable policykit polkit) |
109 |
+ --with-xsession-prefix="${EPREFIX}"/usr |
110 |
+ $(xfconf_use_debug) |
111 |
+ ) |
112 |
+ |
113 |
+ use upower && XFCONF+=( --enable-upower ) |
114 |
+ |
115 |
+ DOCS=( AUTHORS BUGS ChangeLog NEWS README TODO ) |
116 |
+} |
117 |
+ |
118 |
+src_install() { |
119 |
+ xfconf_src_install |
120 |
+ |
121 |
+ local sessiondir=/etc/X11/Sessions |
122 |
+ echo startxfce4 > "${T}"/Xfce4 |
123 |
+ exeinto ${sessiondir} |
124 |
+ doexe "${T}"/Xfce4 |
125 |
+ dosym Xfce4 ${sessiondir}/Xfce |
126 |
+} |