1 |
commit: 132fa488b79248c227fa7146519e751f2e814999 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Sep 25 17:50:48 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Sep 25 17:50:48 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=132fa488 |
7 |
|
8 |
gnome-base/gnome-settings-daemon: revbump with full patchset |
9 |
|
10 |
Include full patchset with upstream gnome-3-26 bug and test fixes. |
11 |
Don't depend on dev-libs/glib USE=dbus - if this is really needed, |
12 |
then dconf should be depended on directly. |
13 |
Remove ancient blockers. Fix gnome-session blocker to be technically |
14 |
correct, but inconsequential (no-one has inbetween 3.25 versions |
15 |
anymore). Add explanation about it. |
16 |
|
17 |
The full patchset includes the 3 Gentoo specific commits. |
18 |
This is maintained here: |
19 |
https://github.com/EvaSDK/gnome-settings-daemon/tree/gentoo-3.26.2 |
20 |
|
21 |
TODO: Retry with tests enabled, as the patchset has a huge set of |
22 |
fixes to it. Tests are currently p.use.masked in main tree. |
23 |
|
24 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
25 |
|
26 |
.../gnome-settings-daemon-3.26.2-r1.ebuild | 147 +++++++++++++++++++++ |
27 |
1 file changed, 147 insertions(+) |
28 |
|
29 |
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 |
30 |
new file mode 100644 |
31 |
index 00000000..f4bef258 |
32 |
--- /dev/null |
33 |
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.26.2-r1.ebuild |
34 |
@@ -0,0 +1,147 @@ |
35 |
+# Copyright 1999-2018 Gentoo Authors |
36 |
+# Distributed under the terms of the GNU General Public License v2 |
37 |
+ |
38 |
+EAPI=6 |
39 |
+GNOME2_EAUTORECONF="yes" |
40 |
+GNOME2_LA_PUNT="yes" |
41 |
+#PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) # https://bugzilla.gnome.org/show_bug.cgi?id=783186 |
42 |
+PYTHON_COMPAT=( python2_7 ) |
43 |
+ |
44 |
+inherit gnome2 python-any-r1 systemd udev virtualx |
45 |
+ |
46 |
+DESCRIPTION="Gnome Settings Daemon" |
47 |
+HOMEPAGE="https://git.gnome.org/browse/gnome-settings-daemon" |
48 |
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" |
49 |
+ |
50 |
+LICENSE="GPL-2+" |
51 |
+SLOT="0" |
52 |
+IUSE="+colord +cups debug input_devices_wacom -openrc-force networkmanager policykit smartcard test +udev wayland" |
53 |
+REQUIRED_USE=" |
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 |
+# systemd 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 |
+ !openrc-force? ( sys-apps/systemd ) |
108 |
+ !<gnome-base/gnome-session-3.25.4 |
109 |
+" |
110 |
+DEPEND="${COMMON_DEPEND} |
111 |
+ cups? ( sys-apps/sed ) |
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 |
+ sys-devel/gettext |
119 |
+ >=dev-util/intltool-0.40 |
120 |
+ virtual/pkgconfig |
121 |
+ x11-base/xorg-proto |
122 |
+" |
123 |
+ |
124 |
+# TypeErrors with python3; weird test errors with python2; all in power component that was made required now |
125 |
+RESTRICT="!test? ( test )" |
126 |
+ |
127 |
+PATCHES=( |
128 |
+ # upstream gnome-3-26 branch up to its abandonment in February 2018 (many unreleased fixes); requires eautoreconf |
129 |
+ # Make colord and wacom optional; requires eautoreconf |
130 |
+ # Allow specifying udevrulesdir via configure, bug 509484; requires eautoreconf |
131 |
+ # Fix build system to require gudev with wayland, bug #627966; requires eautoreconf |
132 |
+ "${WORKDIR}"/patches/ |
133 |
+) |
134 |
+ |
135 |
+python_check_deps() { |
136 |
+ if use test; then |
137 |
+ has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" && |
138 |
+ has_version "dev-python/dbusmock[${PYTHON_USEDEP}]" |
139 |
+ fi |
140 |
+} |
141 |
+ |
142 |
+pkg_setup() { |
143 |
+ use test && python-any-r1_pkg_setup |
144 |
+} |
145 |
+ |
146 |
+src_configure() { |
147 |
+ gnome2_src_configure \ |
148 |
+ --disable-static \ |
149 |
+ --with-udevrulesdir="$(get_udevdir)"/rules.d \ |
150 |
+ $(use_enable colord color) \ |
151 |
+ $(use_enable cups) \ |
152 |
+ $(use_enable debug) \ |
153 |
+ $(use_enable debug more-warnings) \ |
154 |
+ $(use_enable networkmanager network-manager) \ |
155 |
+ $(use_enable smartcard smartcard-support) \ |
156 |
+ $(use_enable udev gudev) \ |
157 |
+ $(use_enable input_devices_wacom wacom) \ |
158 |
+ $(use_enable wayland) |
159 |
+} |
160 |
+ |
161 |
+src_test() { |
162 |
+ virtx emake check |
163 |
+} |
164 |
+ |
165 |
+pkg_postinst() { |
166 |
+ gnome2_pkg_postinst |
167 |
+ |
168 |
+ if ! systemd_is_booted; then |
169 |
+ ewarn "${PN} needs Systemd to be *running* for working" |
170 |
+ ewarn "properly. Please follow the this guide to migrate:" |
171 |
+ ewarn "https://wiki.gentoo.org/wiki/Systemd" |
172 |
+ fi |
173 |
+ |
174 |
+ if use openrc-force; then |
175 |
+ ewarn "You are enabling 'openrc-force' USE flag to skip systemd requirement," |
176 |
+ ewarn "this can lead to unexpected problems and is not supported neither by" |
177 |
+ ewarn "upstream neither by Gnome Gentoo maintainers. If you suffer any problem," |
178 |
+ ewarn "you will need to disable this USE flag system wide and retest before" |
179 |
+ ewarn "opening any bug report." |
180 |
+ fi |
181 |
+} |