1 |
commit: c5c91467a2d67ef958be90a482e1410f454e1ea1 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 25 21:02:06 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 28 13:49:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5c91467 |
7 |
|
8 |
gnome-base/gnome-settings-daemon: bump to 3.26.2, try to support elogind |
9 |
|
10 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
12 |
|
13 |
gnome-base/gnome-settings-daemon/Manifest | 2 + |
14 |
.../gnome-settings-daemon-3.26.2-r1.ebuild | 131 +++++++++++++++++++++ |
15 |
gnome-base/gnome-settings-daemon/metadata.xml | 5 +- |
16 |
3 files changed, 136 insertions(+), 2 deletions(-) |
17 |
|
18 |
diff --git a/gnome-base/gnome-settings-daemon/Manifest b/gnome-base/gnome-settings-daemon/Manifest |
19 |
index 9bde0ee5da1..41b217ebda9 100644 |
20 |
--- a/gnome-base/gnome-settings-daemon/Manifest |
21 |
+++ b/gnome-base/gnome-settings-daemon/Manifest |
22 |
@@ -1,2 +1,4 @@ |
23 |
DIST gnome-settings-daemon-3.24.4-patchset.tar.xz 5224 BLAKE2B f01db03ce3980a74324972871643e573bc51a184fe12e7a40796b7ca1bbfac37ecad1fae2f8a62fba0038a672dc4958b242316dc3dc97a59b37a2e4e4f5e9973 SHA512 fe5bf846774b126e8ed89bc8043e8c02b567cc55d602c5becd84a14c7a414fc663ae1767a552b585defb462ffe88b4838f87445c9599fda37f197e8f2eaad8cb |
24 |
DIST gnome-settings-daemon-3.24.4.tar.xz 1632700 BLAKE2B 616aad6984df726c438117ab98e8c5a35bd02a6ebbc3c24fc46b50e8b3ca3f3d5bede0588cfe9bbdfcaccc70ff5799feeabf020ec4beb03d653ae81abc6325f8 SHA512 4a3b1069d80263a92ae2c2a420f7dc70a1ff92346d5cbeb1e7dd4af0419e039ebe958550594d87929c0333c19aa9a3ef7ca9b9751109a9da64a40d81ba067cc0 |
25 |
+DIST gnome-settings-daemon-3.26.2-patchset.tar.xz 42408 BLAKE2B 3b54dd1b161f4137eeb7c110be70444e3b8eb602a7d1c12ec6aaa32d887d46c3e1dc61df2a04895b7c6e2d67a68edeced5f758f688533caa9900deace7b6d542 SHA512 3ab36a03e2892ad193f420722025753990158ac450c686b9fba490cda4e7e1be69574dd4d3b9c8ed5e238f23933065abc28aee480ff1e2e5dad28e364c04fc0b |
26 |
+DIST gnome-settings-daemon-3.26.2.tar.xz 1589696 BLAKE2B f1fd18e80caf5badb0da1f07cbe994b73a99ace004bf3b568114d6cd6110ebd092ee3a023a1ec818f3946f6f7cdb7ee21417782e271c8aa9ebd9d1d4c35ea286 SHA512 7785ebcb7df466c50557b75a3092f568e375adcf5a40f73e31d5cc69fa63bc556a4447a96e6e612c3bf523735e67168afae0b9c1fab32912d41014436d33b7ff |
27 |
|
28 |
diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..fc862199ab3 |
31 |
--- /dev/null |
32 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild |
33 |
@@ -0,0 +1,131 @@ |
34 |
+# Copyright 1999-2018 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=6 |
38 |
+GNOME2_EAUTORECONF="yes" |
39 |
+GNOME2_LA_PUNT="yes" |
40 |
+#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 |
41 |
+PYTHON_COMPAT=( python2_7 ) |
42 |
+ |
43 |
+inherit gnome2 python-any-r1 udev virtualx |
44 |
+ |
45 |
+DESCRIPTION="Gnome Settings Daemon" |
46 |
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
47 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
48 |
+ |
49 |
+LICENSE="GPL-2+" |
50 |
+SLOT="0" |
51 |
+IUSE="+colord +cups debug elogind input_devices_wacom networkmanager policykit smartcard systemd test +udev wayland" |
52 |
+REQUIRED_USE=" |
53 |
+ ^^ ( elogind systemd ) |
54 |
+ input_devices_wacom? ( udev ) |
55 |
+ smartcard? ( udev ) |
56 |
+ wayland? ( udev ) |
57 |
+" |
58 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
59 |
+ |
60 |
+COMMON_DEPEND=" |
61 |
+ >=dev-libs/glib-2.53.0:2 |
62 |
+ >=x11-libs/gtk+-3.15.3:3[X,wayland?] |
63 |
+ >=gnome-base/gnome-desktop-3.11.1:3= |
64 |
+ >=gnome-base/gsettings-desktop-schemas-3.23.3 |
65 |
+ >=gnome-base/librsvg-2.36.2:2 |
66 |
+ media-fonts/cantarell |
67 |
+ media-libs/alsa-lib |
68 |
+ media-libs/fontconfig |
69 |
+ media-libs/libcanberra[gtk3] |
70 |
+ >=media-sound/pulseaudio-2 |
71 |
+ >=sys-power/upower-0.99:= |
72 |
+ x11-libs/cairo |
73 |
+ x11-libs/gdk-pixbuf:2 |
74 |
+ >=x11-libs/libnotify-0.7.3:= |
75 |
+ x11-libs/libX11 |
76 |
+ x11-libs/libxkbfile |
77 |
+ x11-libs/libXi |
78 |
+ x11-libs/libXext |
79 |
+ x11-libs/libXfixes |
80 |
+ x11-libs/libXtst |
81 |
+ x11-libs/libXxf86misc |
82 |
+ x11-misc/xkeyboard-config |
83 |
+ |
84 |
+ >=app-misc/geoclue-2.3.1:2.0 |
85 |
+ >=dev-libs/libgweather-3.9.5:2= |
86 |
+ >=sci-geosciences/geocode-glib-3.10 |
87 |
+ >=sys-auth/polkit-0.103 |
88 |
+ |
89 |
+ colord? ( |
90 |
+ >=media-libs/lcms-2.2:2 |
91 |
+ >=x11-misc/colord-1.0.2:= ) |
92 |
+ cups? ( >=net-print/cups-1.4[dbus] ) |
93 |
+ input_devices_wacom? ( |
94 |
+ >=dev-libs/libwacom-0.7 |
95 |
+ >=x11-libs/pango-1.20 |
96 |
+ x11-drivers/xf86-input-wacom |
97 |
+ virtual/libgudev:= ) |
98 |
+ networkmanager? ( >=net-misc/networkmanager-1.0 ) |
99 |
+ smartcard? ( >=dev-libs/nss-3.11.2 ) |
100 |
+ udev? ( virtual/libgudev:= ) |
101 |
+ wayland? ( dev-libs/wayland ) |
102 |
+" |
103 |
+# logind needed for power and session management, bug #464944 |
104 |
+# gnome-session-3.25.4 adapts to Orientation and XRANDR components removal (moved to mutter) |
105 |
+RDEPEND="${COMMON_DEPEND} |
106 |
+ gnome-base/dconf |
107 |
+ elogind? ( sys-auth/elogind ) |
108 |
+ systemd? ( sys-apps/systemd ) |
109 |
+ !<gnome-base/gnome-session-3.25.4 |
110 |
+" |
111 |
+DEPEND="${COMMON_DEPEND} |
112 |
+ test? ( |
113 |
+ ${PYTHON_DEPS} |
114 |
+ $(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]') |
115 |
+ $(python_gen_any_dep 'dev-python/dbusmock[${PYTHON_USEDEP}]') |
116 |
+ gnome-base/gnome-session ) |
117 |
+ dev-libs/libxml2:2 |
118 |
+ dev-util/glib-utils |
119 |
+ sys-devel/gettext |
120 |
+ >=dev-util/intltool-0.40 |
121 |
+ virtual/pkgconfig |
122 |
+ x11-base/xorg-proto |
123 |
+" |
124 |
+ |
125 |
+# Tests go a bit better in 3.26, but still fail some for me; revisit with 3.28+ |
126 |
+RESTRICT="!test? ( test )" |
127 |
+ |
128 |
+PATCHES=( |
129 |
+ # upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf |
130 |
+ # Make colord and wacom optional; requires eautoreconf |
131 |
+ # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
132 |
+ # Fix build system to require gudev with wayland, bug #627966; requires eautoreconf |
133 |
+ "${WORKDIR}"/patches/ |
134 |
+) |
135 |
+ |
136 |
+python_check_deps() { |
137 |
+ if use test; then |
138 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
139 |
+ has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
140 |
+ fi |
141 |
+} |
142 |
+ |
143 |
+pkg_setup() { |
144 |
+ use test && python-any-r1_pkg_setup |
145 |
+} |
146 |
+ |
147 |
+src_configure() { |
148 |
+ gnome2_src_configure \ |
149 |
+ --disable-static \ |
150 |
+ --with-udevrulesdir="$(get_udevdir)"/rules.d \ |
151 |
+ $(use_enable colord color) \ |
152 |
+ $(use_enable cups) \ |
153 |
+ $(use_enable debug) \ |
154 |
+ $(use_enable debug more-warnings) \ |
155 |
+ $(use_enable networkmanager network-manager) \ |
156 |
+ $(use_enable smartcard smartcard-support) \ |
157 |
+ $(use_enable udev gudev) \ |
158 |
+ $(use_enable input_devices_wacom wacom) \ |
159 |
+ $(use_enable wayland) |
160 |
+} |
161 |
+ |
162 |
+src_test() { |
163 |
+ virtx emake check |
164 |
+} |
165 |
|
166 |
diff --git a/gnome-base/gnome-settings-daemon/metadata.xml b/gnome-base/gnome-settings-daemon/metadata.xml |
167 |
index 7ddc604ee2f..3b84b19df41 100644 |
168 |
--- a/gnome-base/gnome-settings-daemon/metadata.xml |
169 |
+++ b/gnome-base/gnome-settings-daemon/metadata.xml |
170 |
@@ -6,8 +6,9 @@ |
171 |
<name>Gentoo GNOME Desktop</name> |
172 |
</maintainer> |
173 |
<use> |
174 |
- <flag name="colord">Support color management using |
175 |
- <pkg>x11-misc/colord</pkg></flag> |
176 |
+ <flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag> |
177 |
+ <flag name="elogind">Rely on <pkg>sys-auth/elogind</pkg> as runtime logind provider</flag> |
178 |
+ <flag name="systemd">Rely on <pkg>sys-apps/systemd</pkg> as runtime logind provider</flag> |
179 |
<flag name="openrc-force">Skip systemd dependency (#480336), |
180 |
enabling this flag will become your setup to be fully |
181 |
unsupported by upstream and downstream Gnome team. Do not |