1 |
commit: f3a92632a712fbf023df787fdf31bb43926ac5bc |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 25 20:54:50 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 13:49:01 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a92632 |
7 |
|
8 |
gnome-base/gnome-session: bump to 3.26.1; wayland default if USE enabled |
9 |
|
10 |
Defaults to wayland session if built with USE=wayland, as the reverts have |
11 |
been removed. We are targeting wayland default enabled in gnome profiles |
12 |
for next stable (3.28 or 3.30). |
13 |
|
14 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
15 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
16 |
|
17 |
gnome-base/gnome-session/Manifest | 1 + |
18 |
.../gnome-session/gnome-session-3.26.1.ebuild | 126 +++++++++++++++++++++ |
19 |
2 files changed, 127 insertions(+) |
20 |
|
21 |
diff --git a/gnome-base/gnome-session/Manifest b/gnome-base/gnome-session/Manifest |
22 |
index 673d207a12a..d01e504c898 100644 |
23 |
--- a/gnome-base/gnome-session/Manifest |
24 |
+++ b/gnome-base/gnome-session/Manifest |
25 |
@@ -1,2 +1,3 @@ |
26 |
DIST gnome-session-3.24.2-xorg-default-translations.patch.xz 3392 BLAKE2B afe0e04c6218377e91508fc67add8ec0894dc75d47c039c44a8c47635c0418986e0949f916d6269995c1c8853c3dfaab21a3db86c427d966029ed747d4106aa8 SHA512 0af7d4025647c6dd2c78243d91ec8a61fd171b78904ac28ce48c4f3f7cafb9fd28263410d31d08431e73417ff7910e9bdfc1ea4de0a3290cd5229a96bffc56dc |
27 |
DIST gnome-session-3.24.2.tar.xz 783288 BLAKE2B 24b06404b9206a53f394db86a90f9c22c2774432bcb33f136eedd333e813139ded8b9445b4e597f3270ec0b2ef167ce3c2dca2c5b75d5fba977ebcfc4c1bb8ea SHA512 52a609d60303e7d733567cc81698fe4a4042ac17d0260aadb334ab8ad2c355086f8f87c2bcac05f659c28f8f3290128f9ca8875806d199ee27ff84d972333e27 |
28 |
+DIST gnome-session-3.26.1.tar.xz 782676 BLAKE2B 68ffae002910f827dca372402b8e014298b12fc892d6e6c477ff8ba0f793c98cd28f4a974c5665ac8bf7d61f485e4c662ba2f96cb3fd9bdec4a6218e86a797db SHA512 a4c2e82306ae044c56b857c8f7347dc5d5235231e702d2ac38c8c433e21efc75ca3911ee029af01754685f64000a0e6f5d17408192208b19d7dc367079ee7b0a |
29 |
|
30 |
diff --git a/gnome-base/gnome-session/gnome-session-3.26.1.ebuild b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild |
31 |
new file mode 100644 |
32 |
index 00000000000..b7c49fd1645 |
33 |
--- /dev/null |
34 |
+++ b/gnome-base/gnome-session/gnome-session-3.26.1.ebuild |
35 |
@@ -0,0 +1,126 @@ |
36 |
+# Copyright 1999-2018 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=6 |
40 |
+GNOME2_EAUTORECONF="yes" |
41 |
+inherit gnome2 |
42 |
+ |
43 |
+DESCRIPTION="Gnome session manager" |
44 |
+HOMEPAGE="https://git.gnome.org/browse/gnome-session" |
45 |
+ |
46 |
+LICENSE="GPL-2 LGPL-2 FDL-1.1" |
47 |
+SLOT="0" |
48 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
49 |
+IUSE="doc elibc_FreeBSD ipv6 systemd" |
50 |
+ |
51 |
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and |
52 |
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_* |
53 |
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below). |
54 |
+# gdk-pixbuf used in the inhibit dialog |
55 |
+COMMON_DEPEND=" |
56 |
+ >=dev-libs/glib-2.46.0:2 |
57 |
+ x11-libs/gdk-pixbuf:2 |
58 |
+ >=x11-libs/gtk+-3.18.0:3 |
59 |
+ >=dev-libs/json-glib-0.10 |
60 |
+ >=gnome-base/gnome-desktop-3.18:3= |
61 |
+ elibc_FreeBSD? ( || ( dev-libs/libexecinfo >=sys-freebsd/freebsd-lib-10.0 ) ) |
62 |
+ |
63 |
+ media-libs/mesa[egl,gles2] |
64 |
+ |
65 |
+ media-libs/libepoxy |
66 |
+ x11-libs/libSM |
67 |
+ x11-libs/libICE |
68 |
+ x11-libs/libXau |
69 |
+ x11-libs/libX11 |
70 |
+ x11-libs/libXcomposite |
71 |
+ x11-libs/libXext |
72 |
+ x11-libs/libXrender |
73 |
+ x11-libs/libXtst |
74 |
+ x11-misc/xdg-user-dirs |
75 |
+ x11-misc/xdg-user-dirs-gtk |
76 |
+ x11-apps/xdpyinfo |
77 |
+ |
78 |
+ systemd? ( >=sys-apps/systemd-183:0= ) |
79 |
+" |
80 |
+# Pure-runtime deps from the session files should *NOT* be added here |
81 |
+# Otherwise, things like gdm pull in gnome-shell |
82 |
+# gnome-themes-standard is needed for the failwhale dialog themeing |
83 |
+# sys-apps/dbus[X] is needed for session management. |
84 |
+# gnome-settings-daemon is assumed to be >3.25.4, but this is about |
85 |
+# removed components, so no need to strictly require it (older just |
86 |
+# won't have those daemons loaded by gnome-session) |
87 |
+RDEPEND="${COMMON_DEPEND} |
88 |
+ >=gnome-base/gnome-settings-daemon-3.23.2 |
89 |
+ >=gnome-base/gsettings-desktop-schemas-0.1.7 |
90 |
+ x11-themes/adwaita-icon-theme |
91 |
+ sys-apps/dbus[X] |
92 |
+ !systemd? ( |
93 |
+ sys-auth/consolekit |
94 |
+ >=dev-libs/dbus-glib-0.76 |
95 |
+ ) |
96 |
+" |
97 |
+DEPEND="${COMMON_DEPEND} |
98 |
+ dev-libs/libxslt |
99 |
+ >=dev-util/intltool-0.40.6 |
100 |
+ >=sys-devel/gettext-0.10.40 |
101 |
+ virtual/pkgconfig |
102 |
+ !<gnome-base/gdm-2.20.4 |
103 |
+ doc? ( |
104 |
+ app-text/xmlto |
105 |
+ dev-libs/libxslt ) |
106 |
+ gnome-base/gnome-common |
107 |
+" |
108 |
+# gnome-common needed for eautoreconf |
109 |
+# gnome-base/gdm does not provide gnome.desktop anymore |
110 |
+ |
111 |
+src_configure() { |
112 |
+ # 1. Avoid automagic on old upower releases |
113 |
+ # 2. xsltproc is always checked due to man configure |
114 |
+ # switch, even if USE=-doc |
115 |
+ # 3. Disable old gconf support as other distributions did long time |
116 |
+ # ago |
117 |
+ gnome2_src_configure \ |
118 |
+ --disable-deprecation-flags \ |
119 |
+ --disable-gconf \ |
120 |
+ --enable-session-selector \ |
121 |
+ $(use_enable doc docbook-docs) \ |
122 |
+ $(use_enable ipv6) \ |
123 |
+ $(use_enable systemd) \ |
124 |
+ $(use_enable !systemd consolekit) \ |
125 |
+ UPOWER_CFLAGS="" \ |
126 |
+ UPOWER_LIBS="" |
127 |
+ # gnome-session-selector pre-generated man page is missing |
128 |
+ #$(usex !doc XSLTPROC=$(type -P true)) |
129 |
+} |
130 |
+ |
131 |
+src_install() { |
132 |
+ gnome2_src_install |
133 |
+ |
134 |
+ dodir /etc/X11/Sessions |
135 |
+ exeinto /etc/X11/Sessions |
136 |
+ doexe "${FILESDIR}/Gnome" |
137 |
+ |
138 |
+ insinto /usr/share/applications |
139 |
+ newins "${FILESDIR}/defaults.list-r3" gnome-mimeapps.list |
140 |
+ |
141 |
+ dodir /etc/X11/xinit/xinitrc.d/ |
142 |
+ exeinto /etc/X11/xinit/xinitrc.d/ |
143 |
+ newexe "${FILESDIR}/15-xdg-data-gnome-r1" 15-xdg-data-gnome |
144 |
+ |
145 |
+ # This should be done here as discussed in bug #270852 |
146 |
+ newexe "${FILESDIR}/10-user-dirs-update-gnome-r1" 10-user-dirs-update-gnome |
147 |
+ |
148 |
+ # Set XCURSOR_THEME from current dconf setting instead of installing |
149 |
+ # default cursor symlink globally and affecting other DEs (bug #543488) |
150 |
+ # https://bugzilla.gnome.org/show_bug.cgi?id=711703 |
151 |
+ newexe "${FILESDIR}/90-xcursor-theme-gnome" 90-xcursor-theme-gnome |
152 |
+} |
153 |
+ |
154 |
+pkg_postinst() { |
155 |
+ gnome2_pkg_postinst |
156 |
+ |
157 |
+ if ! has_version gnome-base/gdm && ! has_version x11-misc/sddm; then |
158 |
+ ewarn "If you use a custom .xinitrc for your X session," |
159 |
+ ewarn "make sure that the commands in the xinitrc.d scripts are run." |
160 |
+ fi |
161 |
+} |