1 |
commit: 18beb0f3f63430489428b9a400da801ba6af43b9 |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 31 12:18:12 2016 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 1 11:18:16 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18beb0f3 |
7 |
|
8 |
gnome-base/gnome-control-center: cleanup old revisions |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
gnome-base/gnome-control-center/Manifest | 1 - |
13 |
.../gnome-control-center-3.18.0-optional.patch | 537 --------------------- |
14 |
.../gnome-control-center-3.18.2.ebuild | 155 ------ |
15 |
.../gnome-control-center-3.20.1.ebuild | 152 ------ |
16 |
4 files changed, 845 deletions(-) |
17 |
|
18 |
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest |
19 |
index 4507d9b..a2120d7 100644 |
20 |
--- a/gnome-base/gnome-control-center/Manifest |
21 |
+++ b/gnome-base/gnome-control-center/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
-DIST gnome-control-center-3.18.2.tar.xz 7113676 SHA256 36fe6157247d2b7c8a98dbb3dbcde1c3a6f9e5e8fcc9ccf357e2b2417578f8ad SHA512 fc1f1075bfd9e86bf2cd38483050895cdbeec1574aa0313245692b2c33fed2db9b92bce634a298e7309f8fc5bf230a122768be9da04f81d0ab1f1feaeaad7754 WHIRLPOOL 00a433686b4d0cb83bcf1e2b63a795bb086241d80441a997c7164476b063e07f006ef0329c7c9a57f0344cf46bb8fb69916984169143d7c455df6927a650a1ce |
24 |
DIST gnome-control-center-3.20.1.tar.xz 7160304 SHA256 ce6474fc60f78ed3cfaf555e55a52ec3ebb6437fa184e08ad6077bbec380a1ed SHA512 f730c5edc1b3995765929efce3aa59602398003949ab97d215bd261c7705eb9277762aec2296af54d1762c62df2b383838645c6b82dd233f046af7dad06ba420 WHIRLPOOL 76562946f839c1850cbc2082e467e7527f7a4b28d78dd91ad201c7f40a44a87d421ad54054ed5d6b2edc1ce3c46799a17073e4fe410bae1e42e52b409aafb05d |
25 |
DIST gnome-control-center-3.20.2.tar.xz 7103716 SHA256 ae380d9cb7a2c6f7f336718606274cd87021cbbcdf828ec67b1a420a2605776e SHA512 d68bccf16e5e854db4cd8dbb7abb64c40ad1b7370a8c71ff5e8790ef6f2eeb19cd6b2d41f5506bb4b8d956f1d65f54afb26f5d2c4c87adde6561079f1477ff41 WHIRLPOOL ccb4a35211d2fa3adca34b2897a09687bfc854f5d89a512f80d43f46d822b15f586424983df5e746771e12df36115c5b9b7eee220582c4b7042d68e48c4ccf17 |
26 |
DIST gnome-control-center-3.22.1.tar.xz 7206136 SHA256 5d69295bc43176392d65b3bdbe60eb85cdcac95b1ef76b86933f3ba9cf48091a SHA512 7c1bc17844f1b9ef2ca2b94fb36c3a64cbe88561cc2388e5fa26405dff73f3033dea49bf1aab8a85ee9d9680a8816913a0339855a5b09a8033cdaef5ebbb5c63 WHIRLPOOL 5f4cc4a6c75956a5bf05000d76a0b040b4fd9d6e0b416eaa2e12522f2dcde3506501022432ca8436e3435782ee537e560a30642d330ab66175f4ea44100f287b |
27 |
|
28 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch |
29 |
deleted file mode 100644 |
30 |
index 96b58f6..00000000 |
31 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch |
32 |
+++ /dev/null |
33 |
@@ -1,537 +0,0 @@ |
34 |
-From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001 |
35 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
36 |
-Date: Fri, 25 Apr 2014 22:17:24 +0200 |
37 |
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional |
38 |
- |
39 |
-Upstream is not interested in any part of this patch: |
40 |
- |
41 |
-https://bugzilla.gnome.org/show_bug.cgi?id=686840 |
42 |
-https://bugzilla.gnome.org/show_bug.cgi?id=697478 |
43 |
-https://bugzilla.gnome.org/show_bug.cgi?id=700145 |
44 |
- |
45 |
-Dropped mm from this revision of the patch since it appears more |
46 |
-complicated than ever to split it from the network panel. |
47 |
- |
48 |
-Signed-Off: Gilles Dartiguelongue <eva@g.o> |
49 |
---- |
50 |
- configure.ac | 157 ++++++++++++++++++++++++++------ |
51 |
- panels/Makefile.am | 10 +- |
52 |
- panels/background/Makefile.am | 8 +- |
53 |
- panels/background/bg-pictures-source.c | 20 ++++ |
54 |
- panels/user-accounts/um-realm-manager.c | 9 ++ |
55 |
- shell/Makefile.am | 10 +- |
56 |
- shell/cc-panel-loader.c | 8 ++ |
57 |
- 7 files changed, 186 insertions(+), 36 deletions(-) |
58 |
- |
59 |
-diff --git a/configure.ac b/configure.ac |
60 |
-index fe723d5..f882e23 100644 |
61 |
---- a/configure.ac |
62 |
-+++ b/configure.ac |
63 |
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) |
64 |
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) |
65 |
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) |
66 |
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
67 |
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
68 |
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
69 |
-- goa-1.0 >= $GOA_REQUIRED_VERSION |
70 |
-- grilo-0.2 >= $GRILO_REQUIRED_VERSION) |
71 |
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES |
72 |
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
73 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
74 |
-@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 |
75 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) |
76 |
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
77 |
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) |
78 |
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
79 |
-+ |
80 |
-+build_online_accounts=false |
81 |
-+background_online_accounts= |
82 |
-+AC_ARG_ENABLE(goa, |
83 |
-+ AC_HELP_STRING([--disable-goa], |
84 |
-+ [disable online accounts management panel]), |
85 |
-+ [case "${enableval}" in |
86 |
-+ yes) WANT_ONLINE_ACCOUNTS=yes ;; |
87 |
-+ no) WANT_ONLINE_ACCOUNTS=no ;; |
88 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; |
89 |
-+ esac], |
90 |
-+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value |
91 |
-+ |
92 |
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then |
93 |
-+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
94 |
-+ build_online_accounts=true |
95 |
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION" |
96 |
-+fi |
97 |
-+if test "x$build_online_accounts" = xtrue ; then |
98 |
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) |
99 |
-+fi |
100 |
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") |
101 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) |
102 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) |
103 |
-+ |
104 |
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0 |
105 |
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
106 |
-+ $background_online_accounts) |
107 |
-+ |
108 |
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 |
109 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION) |
110 |
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
111 |
-- colord >= $COLORD_REQUIRED_VERSION |
112 |
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
113 |
-- libsoup-2.4 |
114 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
115 |
-+ |
116 |
-+build_color=false |
117 |
-+AC_ARG_ENABLE(color, |
118 |
-+ AC_HELP_STRING([--disable-color], |
119 |
-+ [disable color management panel]), |
120 |
-+ [case "${enableval}" in |
121 |
-+ yes) WANT_COLOR=yes ;; |
122 |
-+ no) WANT_COLOR=no ;; |
123 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
124 |
-+ esac], |
125 |
-+ [WANT_COLOR=yes]) dnl Default value |
126 |
-+ |
127 |
-+if test x$WANT_COLOR = xyes; then |
128 |
-+ |
129 |
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
130 |
-+ colord >= $COLORD_REQUIRED_VERSION |
131 |
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
132 |
-+ libsoup-2.4 |
133 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
134 |
-+ build_color=true |
135 |
-+fi |
136 |
-+if test "x$build_color" = xtrue ; then |
137 |
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
138 |
-+fi |
139 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
140 |
-+AC_SUBST(COLOR_PANEL_CFLAGS) |
141 |
-+AC_SUBST(COLOR_PANEL_LIBS) |
142 |
-+ |
143 |
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
144 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
145 |
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
146 |
-@@ -206,8 +253,25 @@ fi |
147 |
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) |
148 |
- |
149 |
- # Check for gnome-bluetooth |
150 |
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0, |
151 |
-- [have_bluetooth=yes], have_bluetooth=no) |
152 |
-+have_bluetooth=no |
153 |
-+AC_ARG_ENABLE(bluetooth, |
154 |
-+ AC_HELP_STRING([--disable-bluetooth], |
155 |
-+ [disable bluetooth management panel]), |
156 |
-+ [case "${enableval}" in |
157 |
-+ yes) WANT_BLUETOOTH=yes ;; |
158 |
-+ no) WANT_BLUETOOTH=no ;; |
159 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
160 |
-+ esac], |
161 |
-+ [WANT_BLUETOOTH=yes]) dnl Default value |
162 |
-+ |
163 |
-+if test x$WANT_BLUETOOTH = xyes; then |
164 |
-+ # Check for gnome-bluetooth |
165 |
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0, |
166 |
-+ [have_bluetooth=yes], have_bluetooth=no) |
167 |
-+ have_bluetooth=yes |
168 |
-+fi |
169 |
-+ |
170 |
-+ |
171 |
- if test "x$have_bluetooth" = xyes ; then |
172 |
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
173 |
- fi |
174 |
-@@ -292,15 +356,27 @@ case $host_os in |
175 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
176 |
- have_wacom=no |
177 |
- else |
178 |
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
179 |
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
180 |
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
181 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
182 |
-- clutter-gtk-1.0 |
183 |
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
184 |
-- have_wacom=yes |
185 |
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
186 |
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
187 |
-+ AC_ARG_ENABLE(wacom, |
188 |
-+ AC_HELP_STRING([--disable-wacom], |
189 |
-+ [disable wacom management panel]), |
190 |
-+ [case "${enableval}" in |
191 |
-+ yes) WANT_WACOM=yes ;; |
192 |
-+ no) WANT_WACOM=no ;; |
193 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; |
194 |
-+ esac], |
195 |
-+ [WANT_WACOM=yes]) dnl Default value |
196 |
-+ |
197 |
-+ if test x$WANT_WACOM = xyes; then |
198 |
-+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
199 |
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
200 |
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
201 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
202 |
-+ clutter-gtk-1.0 |
203 |
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
204 |
-+ have_wacom=yes |
205 |
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
206 |
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
207 |
-+ fi |
208 |
- fi |
209 |
- ;; |
210 |
- *) |
211 |
-@@ -310,16 +386,22 @@ esac |
212 |
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) |
213 |
- |
214 |
- # Kerberos kerberos support |
215 |
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
216 |
--if test "$KRB5_CONFIG" = "no"; then |
217 |
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
218 |
--fi |
219 |
-- |
220 |
--AC_MSG_CHECKING(for krb5 libraries and flags) |
221 |
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
222 |
--KRB5_LIBS="`$KRB5_CONFIG --libs`" |
223 |
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
224 |
-+AC_ARG_ENABLE([kerberos], |
225 |
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, |
226 |
-+ [enable_kerberos=yes]) |
227 |
-+ |
228 |
-+if test x"$enable_kerberos" != x"no" ; then |
229 |
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
230 |
-+ if test "$KRB5_CONFIG" = "no"; then |
231 |
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
232 |
-+ fi |
233 |
- |
234 |
-+ AC_MSG_CHECKING(for krb5 libraries and flags) |
235 |
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
236 |
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`" |
237 |
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
238 |
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) |
239 |
-+fi |
240 |
- AC_SUBST(KRB5_CFLAGS) |
241 |
- AC_SUBST(KRB5_LIBS) |
242 |
- |
243 |
-@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then |
244 |
- else |
245 |
- AC_MSG_NOTICE([ Bluetooth panel disabled]) |
246 |
- fi |
247 |
-+if test "x$build_color" = "xtrue"; then |
248 |
-+ AC_MSG_NOTICE([** colord (Color panel)]) |
249 |
-+else |
250 |
-+ AC_MSG_NOTICE([ Color panel disabled]) |
251 |
-+fi |
252 |
- if test "x$enable_cups" = "xyes"; then |
253 |
- AC_MSG_NOTICE([** CUPS (Printers panel)]) |
254 |
- else |
255 |
-@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then |
256 |
- else |
257 |
- AC_MSG_NOTICE([ Users panel webcam support disabled]) |
258 |
- fi |
259 |
-+if test "x$build_online_accounts" = "xtrue"; then |
260 |
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) |
261 |
-+else |
262 |
-+ AC_MSG_NOTICE([ Online Accounts panel disabled]) |
263 |
-+fi |
264 |
-+if test "x$build_wacom" = "xtrue"; then |
265 |
-+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) |
266 |
-+else |
267 |
-+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) |
268 |
-+fi |
269 |
- if test "x$have_wacom" = "xyes"; then |
270 |
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
271 |
- else |
272 |
-diff --git a/panels/Makefile.am b/panels/Makefile.am |
273 |
-index 9961c25..0c54622 100644 |
274 |
---- a/panels/Makefile.am |
275 |
-+++ b/panels/Makefile.am |
276 |
-@@ -2,11 +2,9 @@ SUBDIRS= \ |
277 |
- common \ |
278 |
- background \ |
279 |
- power \ |
280 |
-- color \ |
281 |
- display \ |
282 |
- mouse \ |
283 |
- notifications \ |
284 |
-- online-accounts \ |
285 |
- region \ |
286 |
- info \ |
287 |
- sound \ |
288 |
-@@ -18,6 +16,10 @@ SUBDIRS= \ |
289 |
- privacy \ |
290 |
- sharing |
291 |
- |
292 |
-+if BUILD_COLOR |
293 |
-+SUBDIRS += color |
294 |
-+endif |
295 |
-+ |
296 |
- if BUILD_WACOM |
297 |
- SUBDIRS += wacom |
298 |
- endif |
299 |
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH |
300 |
- SUBDIRS += bluetooth |
301 |
- endif |
302 |
- |
303 |
-+if BUILD_ONLINE_ACCOUNTS |
304 |
-+SUBDIRS += online-accounts |
305 |
-+endif |
306 |
-+ |
307 |
- -include $(top_srcdir)/git.mk |
308 |
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am |
309 |
-index ccb8017..bde4cdf 100644 |
310 |
---- a/panels/background/Makefile.am |
311 |
-+++ b/panels/background/Makefile.am |
312 |
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ |
313 |
- $(BUILT_SOURCES) \ |
314 |
- cc-background-chooser-dialog.c \ |
315 |
- cc-background-chooser-dialog.h \ |
316 |
-- cc-background-grilo-miner.c \ |
317 |
-- cc-background-grilo-miner.h \ |
318 |
- cc-background-item.c \ |
319 |
- cc-background-item.h \ |
320 |
- cc-background-xml.c \ |
321 |
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ |
322 |
- bg-colors-source.c \ |
323 |
- bg-colors-source.h |
324 |
- |
325 |
-+if BUILD_ONLINE_ACCOUNTS |
326 |
-+libbackground_chooser_la_SOURCES += \ |
327 |
-+ cc-background-grilo-miner.c \ |
328 |
-+ cc-background-grilo-miner.h |
329 |
-+endif |
330 |
-+ |
331 |
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) |
332 |
- |
333 |
- libbackground_la_SOURCES = \ |
334 |
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c |
335 |
-index c165fa3..78ef4a5 100644 |
336 |
---- a/panels/background/bg-pictures-source.c |
337 |
-+++ b/panels/background/bg-pictures-source.c |
338 |
-@@ -23,13 +23,17 @@ |
339 |
- |
340 |
- #include "bg-pictures-source.h" |
341 |
- |
342 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
343 |
- #include "cc-background-grilo-miner.h" |
344 |
-+#endif |
345 |
- #include "cc-background-item.h" |
346 |
- |
347 |
- #include <string.h> |
348 |
- #include <cairo-gobject.h> |
349 |
- #include <gio/gio.h> |
350 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
351 |
- #include <grilo.h> |
352 |
-+#endif |
353 |
- #include <libgnome-desktop/gnome-desktop-thumbnail.h> |
354 |
- #include <gdesktop-enums.h> |
355 |
- |
356 |
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate |
357 |
- { |
358 |
- GCancellable *cancellable; |
359 |
- |
360 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
361 |
- CcBackgroundGriloMiner *grl_miner; |
362 |
-+#endif |
363 |
- |
364 |
- GnomeDesktopThumbnailFactory *thumb_factory; |
365 |
- |
366 |
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) |
367 |
- g_clear_object (&priv->cancellable); |
368 |
- } |
369 |
- |
370 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
371 |
- g_clear_object (&priv->grl_miner); |
372 |
-+#endif |
373 |
- g_clear_object (&priv->thumb_factory); |
374 |
- |
375 |
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); |
376 |
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, |
377 |
- gboolean needs_download; |
378 |
- gboolean retval = FALSE; |
379 |
- GFile *pictures_dir, *cache_dir; |
380 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
381 |
- GrlMedia *media; |
382 |
-+#else |
383 |
-+ gpointer media = NULL; |
384 |
-+#endif |
385 |
- |
386 |
- /* find png and jpeg files */ |
387 |
- if (!content_type) |
388 |
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, |
389 |
- |
390 |
- read_file: |
391 |
- |
392 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
393 |
- media = g_object_get_data (G_OBJECT (file), "grl-media"); |
394 |
-+#endif |
395 |
- if (media == NULL) |
396 |
- { |
397 |
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); |
398 |
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, |
399 |
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); |
400 |
- } |
401 |
- |
402 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
403 |
- static gboolean |
404 |
- add_single_file_from_media (BgPicturesSource *bg_source, |
405 |
- GFile *file, |
406 |
-@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, |
407 |
- |
408 |
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); |
409 |
- } |
410 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
411 |
- |
412 |
- gboolean |
413 |
- bg_pictures_source_add (BgPicturesSource *bg_source, |
414 |
-@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor, |
415 |
- } |
416 |
- } |
417 |
- |
418 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
419 |
- static void |
420 |
- media_found_cb (BgPicturesSource *self, GrlMedia *media) |
421 |
- { |
422 |
-@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) |
423 |
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); |
424 |
- add_single_file_from_media (self, file, media); |
425 |
- } |
426 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
427 |
- |
428 |
- static void |
429 |
- bg_pictures_source_init (BgPicturesSource *self) |
430 |
-@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self) |
431 |
- |
432 |
- g_object_unref (dir); |
433 |
- |
434 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
435 |
- priv->grl_miner = cc_background_grilo_miner_new (); |
436 |
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); |
437 |
- cc_background_grilo_miner_start (priv->grl_miner); |
438 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
439 |
- |
440 |
- priv->thumb_factory = |
441 |
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); |
442 |
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c |
443 |
-index 0849160..58d50a6 100644 |
444 |
---- a/panels/user-accounts/um-realm-manager.c |
445 |
-+++ b/panels/user-accounts/um-realm-manager.c |
446 |
-@@ -22,7 +22,9 @@ |
447 |
- |
448 |
- #include "um-realm-manager.h" |
449 |
- |
450 |
-+#ifdef HAVE_KERBEROS |
451 |
- #include <krb5/krb5.h> |
452 |
-+#endif |
453 |
- |
454 |
- #include <glib.h> |
455 |
- #include <glib/gi18n.h> |
456 |
-@@ -696,6 +698,7 @@ login_closure_free (gpointer data) |
457 |
- g_slice_free (LoginClosure, login); |
458 |
- } |
459 |
- |
460 |
-+#ifdef HAVE_KERBEROS |
461 |
- static krb5_error_code |
462 |
- login_perform_kinit (krb5_context k5, |
463 |
- const gchar *realm, |
464 |
-@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, |
465 |
- |
466 |
- return code; |
467 |
- } |
468 |
-+#endif /* HAVE_KERBEROS */ |
469 |
- |
470 |
- static void |
471 |
- kinit_thread_func (GSimpleAsyncResult *async, |
472 |
- GObject *object, |
473 |
- GCancellable *cancellable) |
474 |
- { |
475 |
-+#ifdef HAVE_KERBEROS |
476 |
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); |
477 |
- krb5_context k5 = NULL; |
478 |
- krb5_error_code code; |
479 |
-@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, |
480 |
- |
481 |
- if (k5) |
482 |
- krb5_free_context (k5); |
483 |
-+#else /* HAVE_KERBEROS */ |
484 |
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, |
485 |
-+ _("gnome-control-center was built without kerberos support")); |
486 |
-+#endif |
487 |
- } |
488 |
- |
489 |
- void |
490 |
-diff --git a/shell/Makefile.am b/shell/Makefile.am |
491 |
-index c0cb91a..0b820fd 100644 |
492 |
---- a/shell/Makefile.am |
493 |
-+++ b/shell/Makefile.am |
494 |
-@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \ |
495 |
- $(top_builddir)/libgd/libgd.la \ |
496 |
- $(top_builddir)/panels/common/liblanguage.la \ |
497 |
- $(top_builddir)/panels/background/libbackground.la \ |
498 |
-- $(top_builddir)/panels/color/libcolor.la \ |
499 |
- $(top_builddir)/panels/datetime/libdate_time.la \ |
500 |
- $(top_builddir)/panels/display/libdisplay.la \ |
501 |
- $(top_builddir)/panels/info/libinfo.la \ |
502 |
- $(top_builddir)/panels/keyboard/libkeyboard.la \ |
503 |
- $(top_builddir)/panels/mouse/libmouse-properties.la \ |
504 |
- $(top_builddir)/panels/notifications/libnotifications.la \ |
505 |
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ |
506 |
- $(top_builddir)/panels/power/libpower.la \ |
507 |
- $(top_builddir)/panels/privacy/libprivacy.la \ |
508 |
- $(top_builddir)/panels/region/libregion.la \ |
509 |
-@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH |
510 |
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
511 |
- endif |
512 |
- |
513 |
-+if BUILD_COLOR |
514 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la |
515 |
-+endif |
516 |
-+ |
517 |
-+if BUILD_ONLINE_ACCOUNTS |
518 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la |
519 |
-+endif |
520 |
-+ |
521 |
- # Dbus service file |
522 |
- servicefiledir = $(datadir)/dbus-1/services |
523 |
- servicefile_in_files = org.gnome.ControlCenter.service.in |
524 |
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c |
525 |
-index 26576dc..8a92f95 100644 |
526 |
---- a/shell/cc-panel-loader.c |
527 |
-+++ b/shell/cc-panel-loader.c |
528 |
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); |
529 |
- #ifdef BUILD_BLUETOOTH |
530 |
- extern GType cc_bluetooth_panel_get_type (void); |
531 |
- #endif /* BUILD_BLUETOOTH */ |
532 |
-+#ifdef BUILD_COLOR |
533 |
- extern GType cc_color_panel_get_type (void); |
534 |
-+#endif /* BUILD_COLOR */ |
535 |
- extern GType cc_date_time_panel_get_type (void); |
536 |
- extern GType cc_display_panel_get_type (void); |
537 |
- extern GType cc_info_panel_get_type (void); |
538 |
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); |
539 |
- extern GType cc_network_panel_get_type (void); |
540 |
- #endif /* BUILD_NETWORK */ |
541 |
- extern GType cc_notifications_panel_get_type (void); |
542 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
543 |
- extern GType cc_goa_panel_get_type (void); |
544 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
545 |
- extern GType cc_power_panel_get_type (void); |
546 |
- #ifdef BUILD_PRINTERS |
547 |
- extern GType cc_printers_panel_get_type (void); |
548 |
-@@ -77,7 +81,9 @@ static struct { |
549 |
- #ifdef BUILD_BLUETOOTH |
550 |
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), |
551 |
- #endif |
552 |
-+#ifdef BUILD_COLOR |
553 |
- PANEL_TYPE("color", cc_color_panel_get_type ), |
554 |
-+#endif |
555 |
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ), |
556 |
- PANEL_TYPE("display", cc_display_panel_get_type ), |
557 |
- PANEL_TYPE("info", cc_info_panel_get_type ), |
558 |
-@@ -87,7 +93,9 @@ static struct { |
559 |
- PANEL_TYPE("network", cc_network_panel_get_type ), |
560 |
- #endif |
561 |
- PANEL_TYPE("notifications", cc_notifications_panel_get_type), |
562 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
563 |
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), |
564 |
-+#endif |
565 |
- PANEL_TYPE("power", cc_power_panel_get_type ), |
566 |
- #ifdef BUILD_PRINTERS |
567 |
- PANEL_TYPE("printers", cc_printers_panel_get_type ), |
568 |
--- |
569 |
-2.1.2 |
570 |
- |
571 |
|
572 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild |
573 |
deleted file mode 100644 |
574 |
index 8af818f..00000000 |
575 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.18.2.ebuild |
576 |
+++ /dev/null |
577 |
@@ -1,155 +0,0 @@ |
578 |
-# Copyright 1999-2015 Gentoo Foundation |
579 |
-# Distributed under the terms of the GNU General Public License v2 |
580 |
-# $Id$ |
581 |
- |
582 |
-EAPI="5" |
583 |
-GCONF_DEBUG="yes" |
584 |
-GNOME2_LA_PUNT="yes" |
585 |
- |
586 |
-inherit autotools bash-completion-r1 eutils gnome2 |
587 |
- |
588 |
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" |
589 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" |
590 |
- |
591 |
-LICENSE="GPL-2+" |
592 |
-SLOT="2" |
593 |
-IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland" |
594 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
595 |
- |
596 |
-# False positives caused by nested configure scripts |
597 |
-QA_CONFIGURE_OPTIONS=".*" |
598 |
- |
599 |
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login |
600 |
-# g-s-d[policykit] needed for bug #403527 |
601 |
-# kerberos unfortunately means mit-krb5; build fails with heimdal |
602 |
-# udev could be made optional, only conditions gsd-device-panel |
603 |
-# (mouse, keyboards, touchscreen, etc) |
604 |
-COMMON_DEPEND=" |
605 |
- >=dev-libs/glib-2.39.91:2[dbus] |
606 |
- >=x11-libs/gdk-pixbuf-2.23.0:2 |
607 |
- >=x11-libs/gtk+-3.15:3[X,wayland?] |
608 |
- >=gnome-base/gsettings-desktop-schemas-3.15.4 |
609 |
- >=gnome-base/gnome-desktop-3.17.4:3= |
610 |
- >=gnome-base/gnome-settings-daemon-3.8.3[colord?,policykit] |
611 |
- |
612 |
- >=dev-libs/libpwquality-1.2.2 |
613 |
- dev-libs/libxml2:2 |
614 |
- gnome-base/libgtop:2= |
615 |
- media-libs/fontconfig |
616 |
- |
617 |
- >=media-libs/libcanberra-0.13[gtk3] |
618 |
- >=media-sound/pulseaudio-2[glib] |
619 |
- >=sys-auth/polkit-0.97 |
620 |
- >=sys-power/upower-0.99:= |
621 |
- >=x11-libs/libnotify-0.7.3:0= |
622 |
- |
623 |
- virtual/libgudev |
624 |
- virtual/opengl |
625 |
- x11-apps/xmodmap |
626 |
- x11-libs/cairo |
627 |
- x11-libs/libX11 |
628 |
- x11-libs/libXxf86misc |
629 |
- >=x11-libs/libXi-1.2 |
630 |
- |
631 |
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.0:= ) |
632 |
- colord? ( |
633 |
- net-libs/libsoup:2.4 |
634 |
- >=x11-misc/colord-0.1.34:0= |
635 |
- >=x11-libs/colord-gtk-0.1.24 ) |
636 |
- cups? ( |
637 |
- >=net-print/cups-1.4[dbus] |
638 |
- || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) |
639 |
- gnome-online-accounts? ( |
640 |
- >=media-libs/grilo-0.2.12:0.2 |
641 |
- >=net-libs/gnome-online-accounts-3.15.1 ) |
642 |
- i18n? ( >=app-i18n/ibus-1.5.2 ) |
643 |
- kerberos? ( app-crypt/mit-krb5 ) |
644 |
- networkmanager? ( |
645 |
- >=gnome-extra/nm-applet-0.9.7.995 |
646 |
- >=net-misc/networkmanager-0.9.8[modemmanager] |
647 |
- >=net-misc/modemmanager-0.7.990 ) |
648 |
- v4l? ( |
649 |
- media-libs/gstreamer:1.0 |
650 |
- media-libs/clutter-gtk:1.0 |
651 |
- >=media-video/cheese-3.5.91 ) |
652 |
- input_devices_wacom? ( |
653 |
- >=dev-libs/libwacom-0.7 |
654 |
- >=media-libs/clutter-1.11.3:1.0 |
655 |
- media-libs/clutter-gtk:1.0 |
656 |
- >=x11-libs/libXi-1.2 ) |
657 |
-" |
658 |
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x |
659 |
-# libgnomekbd needed only for gkbd-keyboard-display tool |
660 |
-RDEPEND="${COMMON_DEPEND} |
661 |
- || ( ( app-admin/openrc-settingsd sys-auth/consolekit ) >=sys-apps/systemd-31 ) |
662 |
- >=sys-apps/accountsservice-0.6.39 |
663 |
- x11-themes/gnome-icon-theme-symbolic |
664 |
- colord? ( >=gnome-extra/gnome-color-manager-3 ) |
665 |
- cups? ( |
666 |
- app-admin/system-config-printer |
667 |
- net-print/cups-pk-helper ) |
668 |
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) |
669 |
- i18n? ( >=gnome-base/libgnomekbd-3 ) |
670 |
- |
671 |
- !<gnome-base/gdm-2.91.94 |
672 |
- !<gnome-extra/gnome-color-manager-3.1.2 |
673 |
- !gnome-extra/gnome-media[pulseaudio] |
674 |
- !<gnome-extra/gnome-media-2.32.0-r300 |
675 |
- !<net-wireless/gnome-bluetooth-3.3.2 |
676 |
-" |
677 |
-# PDEPEND to avoid circular dependency |
678 |
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" |
679 |
- |
680 |
-DEPEND="${COMMON_DEPEND} |
681 |
- x11-proto/xproto |
682 |
- x11-proto/xf86miscproto |
683 |
- x11-proto/kbproto |
684 |
- |
685 |
- dev-libs/libxml2:2 |
686 |
- dev-libs/libxslt |
687 |
- >=dev-util/intltool-0.40.1 |
688 |
- >=sys-devel/gettext-0.17 |
689 |
- virtual/pkgconfig |
690 |
- |
691 |
- gnome-base/gnome-common |
692 |
-" |
693 |
-# Needed for autoreconf |
694 |
-# gnome-base/gnome-common |
695 |
- |
696 |
-src_prepare() { |
697 |
- # Make some panels and dependencies optional; requires eautoreconf |
698 |
- # https://bugzilla.gnome.org/686840, 697478, 700145 |
699 |
- epatch "${FILESDIR}"/${PN}-3.18.0-optional.patch |
700 |
- epatch "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch |
701 |
- epatch "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch |
702 |
- epatch "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch |
703 |
- |
704 |
- # Fix some absolute paths to be appropriate for Gentoo |
705 |
- epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch |
706 |
- |
707 |
- epatch_user |
708 |
- |
709 |
- eautoreconf |
710 |
- gnome2_src_prepare |
711 |
-} |
712 |
- |
713 |
-src_configure() { |
714 |
- gnome2_src_configure \ |
715 |
- --disable-update-mimedb \ |
716 |
- --disable-static \ |
717 |
- --enable-documentation \ |
718 |
- $(use_enable bluetooth) \ |
719 |
- $(use_enable colord color) \ |
720 |
- $(use_enable cups) \ |
721 |
- $(use_enable gnome-online-accounts goa) \ |
722 |
- $(use_enable i18n ibus) \ |
723 |
- $(use_enable kerberos) \ |
724 |
- $(use_enable networkmanager) \ |
725 |
- $(use_with v4l cheese) \ |
726 |
- $(use_enable input_devices_wacom wacom) \ |
727 |
- $(use_enable wayland) |
728 |
-} |
729 |
- |
730 |
-src_install() { |
731 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
732 |
-} |
733 |
|
734 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild |
735 |
deleted file mode 100644 |
736 |
index 970bb54..00000000 |
737 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.20.1.ebuild |
738 |
+++ /dev/null |
739 |
@@ -1,152 +0,0 @@ |
740 |
-# Copyright 1999-2016 Gentoo Foundation |
741 |
-# Distributed under the terms of the GNU General Public License v2 |
742 |
-# $Id$ |
743 |
- |
744 |
-EAPI=6 |
745 |
-GNOME2_LA_PUNT="yes" |
746 |
- |
747 |
-inherit autotools bash-completion-r1 gnome2 |
748 |
- |
749 |
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" |
750 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" |
751 |
- |
752 |
-LICENSE="GPL-2+" |
753 |
-SLOT="2" |
754 |
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland" |
755 |
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" |
756 |
- |
757 |
-# False positives caused by nested configure scripts |
758 |
-QA_CONFIGURE_OPTIONS=".*" |
759 |
- |
760 |
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login |
761 |
-# g-s-d[policykit] needed for bug #403527 |
762 |
-# kerberos unfortunately means mit-krb5; build fails with heimdal |
763 |
-# udev could be made optional, only conditions gsd-device-panel |
764 |
-# (mouse, keyboards, touchscreen, etc) |
765 |
-COMMON_DEPEND=" |
766 |
- >=dev-libs/glib-2.44.0:2[dbus] |
767 |
- >=x11-libs/gdk-pixbuf-2.23.0:2 |
768 |
- >=x11-libs/gtk+-3.20.3:3[X,wayland?] |
769 |
- >=gnome-base/gsettings-desktop-schemas-3.19.3 |
770 |
- >=gnome-base/gnome-desktop-3.19.93:3= |
771 |
- >=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] |
772 |
- |
773 |
- >=dev-libs/libpwquality-1.2.2 |
774 |
- dev-libs/libxml2:2 |
775 |
- gnome-base/libgtop:2= |
776 |
- media-libs/fontconfig |
777 |
- |
778 |
- >=media-libs/libcanberra-0.13[gtk3] |
779 |
- >=media-sound/pulseaudio-2[glib] |
780 |
- >=sys-auth/polkit-0.97 |
781 |
- >=sys-power/upower-0.99:= |
782 |
- >=x11-libs/libnotify-0.7.3:0= |
783 |
- |
784 |
- virtual/libgudev |
785 |
- virtual/opengl |
786 |
- x11-apps/xmodmap |
787 |
- x11-libs/cairo |
788 |
- x11-libs/libX11 |
789 |
- x11-libs/libXxf86misc |
790 |
- >=x11-libs/libXi-1.2 |
791 |
- |
792 |
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) |
793 |
- colord? ( |
794 |
- net-libs/libsoup:2.4 |
795 |
- >=x11-misc/colord-0.1.34:0= |
796 |
- >=x11-libs/colord-gtk-0.1.24 ) |
797 |
- cups? ( |
798 |
- >=net-print/cups-1.4[dbus] |
799 |
- || ( >=net-fs/samba-3.6.14-r1[smbclient] >=net-fs/samba-4.0.0[client] ) ) |
800 |
- gnome-online-accounts? ( |
801 |
- >=media-libs/grilo-0.3.0:0.3= |
802 |
- >=net-libs/gnome-online-accounts-3.15.1:= ) |
803 |
- i18n? ( >=app-i18n/ibus-1.5.2 ) |
804 |
- kerberos? ( app-crypt/mit-krb5 ) |
805 |
- networkmanager? ( |
806 |
- >=gnome-extra/nm-applet-0.9.7.995 |
807 |
- >=net-misc/networkmanager-0.9.8:=[modemmanager] |
808 |
- >=net-misc/modemmanager-0.7.990 ) |
809 |
- v4l? ( |
810 |
- media-libs/clutter-gtk:1.0 |
811 |
- >=media-video/cheese-3.5.91 ) |
812 |
- input_devices_wacom? ( |
813 |
- >=dev-libs/libwacom-0.7 |
814 |
- >=media-libs/clutter-1.11.3:1.0 |
815 |
- media-libs/clutter-gtk:1.0 |
816 |
- >=x11-libs/libXi-1.2 ) |
817 |
-" |
818 |
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x |
819 |
-# libgnomekbd needed only for gkbd-keyboard-display tool |
820 |
-RDEPEND="${COMMON_DEPEND} |
821 |
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) |
822 |
- >=sys-apps/accountsservice-0.6.39 |
823 |
- x11-themes/adwaita-icon-theme |
824 |
- colord? ( >=gnome-extra/gnome-color-manager-3 ) |
825 |
- cups? ( |
826 |
- app-admin/system-config-printer |
827 |
- net-print/cups-pk-helper ) |
828 |
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) |
829 |
- i18n? ( >=gnome-base/libgnomekbd-3 ) |
830 |
- |
831 |
- !<gnome-base/gdm-2.91.94 |
832 |
- !<gnome-extra/gnome-color-manager-3.1.2 |
833 |
- !gnome-extra/gnome-media[pulseaudio] |
834 |
- !<gnome-extra/gnome-media-2.32.0-r300 |
835 |
- !<net-wireless/gnome-bluetooth-3.3.2 |
836 |
-" |
837 |
-# PDEPEND to avoid circular dependency |
838 |
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" |
839 |
- |
840 |
-DEPEND="${COMMON_DEPEND} |
841 |
- x11-proto/xproto |
842 |
- x11-proto/xf86miscproto |
843 |
- x11-proto/kbproto |
844 |
- |
845 |
- dev-libs/libxml2:2 |
846 |
- dev-libs/libxslt |
847 |
- >=dev-util/intltool-0.40.1 |
848 |
- >=sys-devel/gettext-0.17 |
849 |
- virtual/pkgconfig |
850 |
- |
851 |
- gnome-base/gnome-common |
852 |
-" |
853 |
-# Needed for autoreconf |
854 |
-# gnome-base/gnome-common |
855 |
- |
856 |
-src_prepare() { |
857 |
- # Make some panels and dependencies optional; requires eautoreconf |
858 |
- # https://bugzilla.gnome.org/686840, 697478, 700145 |
859 |
- eapply "${FILESDIR}"/${PN}-3.20.0-optional.patch |
860 |
- eapply "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch |
861 |
- eapply "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch |
862 |
- eapply "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch |
863 |
- |
864 |
- # Fix some absolute paths to be appropriate for Gentoo |
865 |
- eapply "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch |
866 |
- |
867 |
- eautoreconf |
868 |
- gnome2_src_prepare |
869 |
-} |
870 |
- |
871 |
-src_configure() { |
872 |
- gnome2_src_configure \ |
873 |
- --disable-update-mimedb \ |
874 |
- --disable-static \ |
875 |
- --enable-documentation \ |
876 |
- $(use_enable bluetooth) \ |
877 |
- $(use_enable colord color) \ |
878 |
- $(use_enable cups) \ |
879 |
- $(usex debug --enable-debug=yes ' ') \ |
880 |
- $(use_enable gnome-online-accounts goa) \ |
881 |
- $(use_enable i18n ibus) \ |
882 |
- $(use_enable kerberos) \ |
883 |
- $(use_enable networkmanager) \ |
884 |
- $(use_with v4l cheese) \ |
885 |
- $(use_enable input_devices_wacom wacom) \ |
886 |
- $(use_enable wayland) |
887 |
-} |
888 |
- |
889 |
-src_install() { |
890 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
891 |
-} |