1 |
commit: 0fb28074d8bb9a3bd8407231dc627a04f0fb239c |
2 |
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Nov 2 23:37:56 2016 +0000 |
4 |
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Nov 2 23:39:03 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fb28074 |
7 |
|
8 |
gnome-base/gnome-control-center: refresh patch stack against 3.22 |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
.../gnome-control-center-3.22.0-gentoo-paths.patch | 120 +++++ |
13 |
...ontrol-center-3.22.0-keep-panels-optional.patch | 40 ++ |
14 |
...enter-3.22.0-make-networkmanager-optional.patch | 67 +++ |
15 |
...ntrol-center-3.22.0-make-wayland-optional.patch | 45 ++ |
16 |
.../gnome-control-center-3.22.0-optional.patch | 569 +++++++++++++++++++++ |
17 |
.../gnome-control-center-3.22.1.ebuild | 12 +- |
18 |
6 files changed, 847 insertions(+), 6 deletions(-) |
19 |
|
20 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch |
21 |
new file mode 100644 |
22 |
index 00000000..5d5af0d |
23 |
--- /dev/null |
24 |
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-gentoo-paths.patch |
25 |
@@ -0,0 +1,120 @@ |
26 |
+From c093ce404bf9868980fe7b83d6aa2ab3ec7831e2 Mon Sep 17 00:00:00 2001 |
27 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
28 |
+Date: Sun, 8 Dec 2013 23:44:56 +0100 |
29 |
+Subject: [PATCH 5/5] Fix some absolute paths to be appropriate for Gentoo |
30 |
+ |
31 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
32 |
+--- |
33 |
+ panels/datetime/Makefile.am | 1 + |
34 |
+ panels/datetime/test-endianess.c | 4 ++-- |
35 |
+ panels/datetime/test-timezone.c | 2 +- |
36 |
+ panels/datetime/tz.h | 4 ++-- |
37 |
+ panels/printers/Makefile.am | 3 +++ |
38 |
+ panels/printers/cc-printers-panel.c | 4 ++-- |
39 |
+ panels/printers/pp-host.c | 2 +- |
40 |
+ 7 files changed, 12 insertions(+), 8 deletions(-) |
41 |
+ |
42 |
+diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am |
43 |
+index 43523a6..d8d677d 100644 |
44 |
+--- a/panels/datetime/Makefile.am |
45 |
++++ b/panels/datetime/Makefile.am |
46 |
+@@ -23,6 +23,7 @@ AM_CPPFLAGS = \ |
47 |
+ $(DATETIME_PANEL_CFLAGS) \ |
48 |
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ |
49 |
+ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ |
50 |
++ -DREALDATADIR="\"$(datadir)\"" \ |
51 |
+ $(NULL) |
52 |
+ |
53 |
+ # test-timezone is still too noisy |
54 |
+diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c |
55 |
+index 06b2613..eb52bb6 100644 |
56 |
+--- a/panels/datetime/test-endianess.c |
57 |
++++ b/panels/datetime/test-endianess.c |
58 |
+@@ -26,11 +26,11 @@ test_endianess (void) |
59 |
+ GDir *dir; |
60 |
+ const char *name; |
61 |
+ |
62 |
+- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); |
63 |
++ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL); |
64 |
+ if (dir == NULL) { |
65 |
+ /* Try with /usr/share/locale/ |
66 |
+ * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ |
67 |
+- dir = g_dir_open ("/usr/share/locale/", 0, NULL); |
68 |
++ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL); |
69 |
+ if (dir == NULL) { |
70 |
+ g_assert_not_reached (); |
71 |
+ } |
72 |
+diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c |
73 |
+index db5c030..7ef5cef 100644 |
74 |
+--- a/panels/datetime/test-timezone.c |
75 |
++++ b/panels/datetime/test-timezone.c |
76 |
+@@ -2,7 +2,7 @@ |
77 |
+ #include <gtk/gtk.h> |
78 |
+ #include "cc-timezone-map.h" |
79 |
+ |
80 |
+-#define TZ_DIR "/usr/share/zoneinfo/" |
81 |
++#define TZ_DIR REALDATADIR "/zoneinfo/" |
82 |
+ |
83 |
+ static GList * |
84 |
+ get_timezone_list (GList *tzs, |
85 |
+diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h |
86 |
+index 93905b3..1ba918c 100644 |
87 |
+--- a/panels/datetime/tz.h |
88 |
++++ b/panels/datetime/tz.h |
89 |
+@@ -28,9 +28,9 @@ |
90 |
+ #include <glib.h> |
91 |
+ |
92 |
+ #ifndef __sun |
93 |
+-# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" |
94 |
++# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab" |
95 |
+ #else |
96 |
+-# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" |
97 |
++# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab" |
98 |
+ #endif |
99 |
+ |
100 |
+ typedef struct _TzDB TzDB; |
101 |
+diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am |
102 |
+index 512cda5..87726dd 100644 |
103 |
+--- a/panels/printers/Makefile.am |
104 |
++++ b/panels/printers/Makefile.am |
105 |
+@@ -10,6 +10,9 @@ AM_CPPFLAGS = \ |
106 |
+ -I$(top_srcdir)/shell/ \ |
107 |
+ -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ |
108 |
+ -DTEST_SRCDIR=\""$(srcdir)/"\" \ |
109 |
++ -DREALDATADIR="\"$(datadir)\"" \ |
110 |
++ -DPREFIX="\"$(prefix)\"" \ |
111 |
++ -DLIBEXECDIR="\"$(libexecdir)\"" \ |
112 |
+ $(NULL) |
113 |
+ |
114 |
+ noinst_LTLIBRARIES = libprinters.la |
115 |
+diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c |
116 |
+index fb55608..a6dfb90 100644 |
117 |
+--- a/panels/printers/cc-printers-panel.c |
118 |
++++ b/panels/printers/cc-printers-panel.c |
119 |
+@@ -2590,8 +2590,8 @@ test_page_cb (GtkButton *button, |
120 |
+ |
121 |
+ if (printer_name) |
122 |
+ { |
123 |
+- const gchar *const dirs[] = { "/usr/share/cups", |
124 |
+- "/usr/local/share/cups", |
125 |
++ const gchar *const dirs[] = { REALDATADIR "/cups", |
126 |
++ PREFIX "/local/share/cups", |
127 |
+ NULL }; |
128 |
+ const gchar *datadir = NULL; |
129 |
+ http_t *http = NULL; |
130 |
+diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c |
131 |
+index fbfb434..bd00518 100644 |
132 |
+--- a/panels/printers/pp-host.c |
133 |
++++ b/panels/printers/pp-host.c |
134 |
+@@ -254,7 +254,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res, |
135 |
+ data->devices->devices = NULL; |
136 |
+ |
137 |
+ argv = g_new0 (gchar *, 3); |
138 |
+- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); |
139 |
++ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp"); |
140 |
+ argv[1] = g_strdup (priv->hostname); |
141 |
+ |
142 |
+ /* Use SNMP to get printer's informations */ |
143 |
+-- |
144 |
+2.10.1 |
145 |
+ |
146 |
|
147 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch |
148 |
new file mode 100644 |
149 |
index 00000000..2bd4e0e |
150 |
--- /dev/null |
151 |
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-keep-panels-optional.patch |
152 |
@@ -0,0 +1,40 @@ |
153 |
+From 0ee5e7191e62e6df9067fa5b0886d09952d4e315 Mon Sep 17 00:00:00 2001 |
154 |
+From: Gilles Dartiguelongue <eva@g.o> |
155 |
+Date: Mon, 11 May 2015 23:59:03 +0200 |
156 |
+Subject: [PATCH 3/5] Optional gotta be optional |
157 |
+ |
158 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
159 |
+--- |
160 |
+ configure.ac | 16 ---------------- |
161 |
+ 1 file changed, 16 deletions(-) |
162 |
+ |
163 |
+diff --git a/configure.ac b/configure.ac |
164 |
+index 140459c..fe947d7 100644 |
165 |
+--- a/configure.ac |
166 |
++++ b/configure.ac |
167 |
+@@ -512,22 +512,6 @@ else |
168 |
+ AC_MSG_RESULT(no) |
169 |
+ fi |
170 |
+ |
171 |
+-case $host_os in |
172 |
+- linux*) |
173 |
+- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
174 |
+- # Nothing |
175 |
+- echo "USB-related panels disabled on S390" |
176 |
+- else |
177 |
+- if test "x$have_networkmanager" != "xyes" -o \ |
178 |
+- "x$have_bluetooth" != "xyes" -o \ |
179 |
+- "x$enable_cups" != "xyes" -o \ |
180 |
+- "x$have_wacom" != "xyes"; then |
181 |
+- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems]) |
182 |
+- fi |
183 |
+- fi |
184 |
+- ;; |
185 |
+-esac |
186 |
+- |
187 |
+ AC_CONFIG_FILES([ |
188 |
+ Makefile |
189 |
+ panels/Makefile |
190 |
+-- |
191 |
+2.10.1 |
192 |
+ |
193 |
|
194 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch |
195 |
new file mode 100644 |
196 |
index 00000000..f4a7d3b |
197 |
--- /dev/null |
198 |
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-networkmanager-optional.patch |
199 |
@@ -0,0 +1,67 @@ |
200 |
+From 1ad9510963dc634cb1805ca9e4726004130fc7e3 Mon Sep 17 00:00:00 2001 |
201 |
+From: Gilles Dartiguelongue <eva@g.o> |
202 |
+Date: Tue, 12 May 2015 00:32:11 +0200 |
203 |
+Subject: [PATCH 4/5] Make network panel optional |
204 |
+ |
205 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
206 |
+--- |
207 |
+ configure.ac | 43 +++++++++++++++++++++++++------------------ |
208 |
+ 1 file changed, 25 insertions(+), 18 deletions(-) |
209 |
+ |
210 |
+diff --git a/configure.ac b/configure.ac |
211 |
+index fe947d7..6ecda91 100644 |
212 |
+--- a/configure.ac |
213 |
++++ b/configure.ac |
214 |
+@@ -241,24 +241,31 @@ AS_IF([test "$enable_wayland" != "no"], |
215 |
+ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) |
216 |
+ ]) |
217 |
+ |
218 |
+-PKG_CHECK_MODULES(NETWORK_MANAGER, |
219 |
+- libnm >= $NETWORK_MANAGER_REQUIRED_VERSION |
220 |
+- libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION |
221 |
+- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, |
222 |
+- [have_networkmanager=yes], have_networkmanager=no) |
223 |
+-if test "x$have_networkmanager" = xno ; then |
224 |
+- AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***) |
225 |
+-else |
226 |
+- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) |
227 |
+-fi |
228 |
+-AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) |
229 |
+-if test x${have_networkmanager} = xyes; then |
230 |
+- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) |
231 |
+- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN |
232 |
+- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` |
233 |
+- AC_SUBST(NM_VPN_CONFIG_DIR) |
234 |
+- AC_SUBST(NM_VPN_MODULE_DIR) |
235 |
+-fi |
236 |
++AC_ARG_ENABLE([networkmanager], |
237 |
++ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]), |
238 |
++ [], |
239 |
++ [enable_networkmanager=auto]) |
240 |
++AS_IF([test "$enable_networkmanager" != "no"], |
241 |
++ [ |
242 |
++ PKG_CHECK_MODULES(NETWORK_MANAGER, |
243 |
++ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION |
244 |
++ libnma >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION |
245 |
++ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, |
246 |
++ [have_networkmanager=yes], [have_networkmanager=no]) |
247 |
++ |
248 |
++ AS_IF([test "$have_networkmanager" = "no"], |
249 |
++ [ |
250 |
++ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***]) |
251 |
++ ], [ |
252 |
++ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) |
253 |
++ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) |
254 |
++ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN |
255 |
++ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` |
256 |
++ AC_SUBST([NM_VPN_CONFIG_DIR]) |
257 |
++ AC_SUBST([NM_VPN_MODULE_DIR]) |
258 |
++ ]) |
259 |
++ ]) |
260 |
++AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"]) |
261 |
+ |
262 |
+ # Check for power panel |
263 |
+ if test x${have_networkmanager} = xyes; then |
264 |
+-- |
265 |
+2.10.1 |
266 |
+ |
267 |
|
268 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch |
269 |
new file mode 100644 |
270 |
index 00000000..2c06408 |
271 |
--- /dev/null |
272 |
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-make-wayland-optional.patch |
273 |
@@ -0,0 +1,45 @@ |
274 |
+From 09d1f1a057268a6acdfb42e7dcb2843c0066f542 Mon Sep 17 00:00:00 2001 |
275 |
+From: Ole Reifschneider <tranquility@g.o> |
276 |
+Date: Sat, 25 Apr 2015 22:22:09 +0200 |
277 |
+Subject: [PATCH 2/5] Make wayland support optional |
278 |
+ |
279 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
280 |
+--- |
281 |
+ configure.ac | 21 +++++++++++++++------ |
282 |
+ 1 file changed, 15 insertions(+), 6 deletions(-) |
283 |
+ |
284 |
+diff --git a/configure.ac b/configure.ac |
285 |
+index 19096f5..140459c 100644 |
286 |
+--- a/configure.ac |
287 |
++++ b/configure.ac |
288 |
+@@ -225,12 +225,21 @@ if test "x$have_udev" = xyes ; then |
289 |
+ fi |
290 |
+ AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"]) |
291 |
+ |
292 |
+-PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no) |
293 |
+-if test "x$have_wayland" = xyes ; then |
294 |
+- if test "x$have_udev" != xyes ; then |
295 |
+- AC_MSG_ERROR([udev is required for Wayland support]) |
296 |
+- fi |
297 |
+-fi |
298 |
++AC_ARG_ENABLE( |
299 |
++ [wayland], |
300 |
++ AS_HELP_STRING([--disable-wayland], [disable wayland support]), |
301 |
++ [], |
302 |
++ enable_wayland=auto |
303 |
++) |
304 |
++ |
305 |
++AS_IF([test "$enable_wayland" != "no"], |
306 |
++ [ |
307 |
++ AS_IF([test "x$have_udev" = xno], |
308 |
++ [AC_MSG_ERROR([udev is required for Wayland support])], |
309 |
++ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])]) |
310 |
++ |
311 |
++ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) |
312 |
++]) |
313 |
+ |
314 |
+ PKG_CHECK_MODULES(NETWORK_MANAGER, |
315 |
+ libnm >= $NETWORK_MANAGER_REQUIRED_VERSION |
316 |
+-- |
317 |
+2.10.1 |
318 |
+ |
319 |
|
320 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch |
321 |
new file mode 100644 |
322 |
index 00000000..fd1226c |
323 |
--- /dev/null |
324 |
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.22.0-optional.patch |
325 |
@@ -0,0 +1,569 @@ |
326 |
+From 108d79460d42d5e8167ad52747628f9dfd21058d Mon Sep 17 00:00:00 2001 |
327 |
+From: Alexandre Rostovtsev <tetromino@g.o> |
328 |
+Date: Wed, 2 Nov 2016 23:40:52 +0100 |
329 |
+Subject: [PATCH 1/5] Make bluetooth/colord/goa/kerberos/wacom optional |
330 |
+ |
331 |
+Upstream is not interested in any part of this patch: |
332 |
+ |
333 |
+https://bugzilla.gnome.org/show_bug.cgi?id=686840 |
334 |
+https://bugzilla.gnome.org/show_bug.cgi?id=697478 |
335 |
+https://bugzilla.gnome.org/show_bug.cgi?id=700145 |
336 |
+ |
337 |
+Signed-off-by: Ole Reifschneider <tranquility@g.o> |
338 |
+Signed-off-by: Gilles Dartiguelongue <eva@g.o> |
339 |
+--- |
340 |
+ configure.ac | 185 +++++++++++++++++++++++--------- |
341 |
+ panels/Makefile.am | 10 +- |
342 |
+ panels/background/Makefile.am | 8 +- |
343 |
+ panels/background/bg-pictures-source.c | 20 ++++ |
344 |
+ panels/power/cc-power-panel.c | 2 +- |
345 |
+ panels/user-accounts/um-realm-manager.c | 9 ++ |
346 |
+ shell/Makefile.am | 10 +- |
347 |
+ shell/cc-panel-loader.c | 8 ++ |
348 |
+ 8 files changed, 196 insertions(+), 56 deletions(-) |
349 |
+ |
350 |
+diff --git a/configure.ac b/configure.ac |
351 |
+index 1e07acd..19096f5 100644 |
352 |
+--- a/configure.ac |
353 |
++++ b/configure.ac |
354 |
+@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) |
355 |
+ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) |
356 |
+ PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) |
357 |
+ PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
358 |
+-PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
359 |
+- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
360 |
+- goa-1.0 >= $GOA_REQUIRED_VERSION |
361 |
+- grilo-0.3 >= $GRILO_REQUIRED_VERSION) |
362 |
+ PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES |
363 |
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
364 |
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
365 |
+@@ -140,12 +136,58 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 |
366 |
+ PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0 |
367 |
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
368 |
+ PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) |
369 |
+-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
370 |
+-PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
371 |
+- colord >= $COLORD_REQUIRED_VERSION |
372 |
+- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
373 |
+- libsoup-2.4 |
374 |
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
375 |
++ |
376 |
++build_online_accounts=no |
377 |
++background_online_accounts= |
378 |
++AC_ARG_ENABLE([goa], |
379 |
++ AS_HELP_STRING([--disable-goa], |
380 |
++ [disable online accounts management panel]), |
381 |
++ [], |
382 |
++ [enable_goa=auto]) |
383 |
++ |
384 |
++AS_IF([test "$enable_goa" != "no"], |
385 |
++ [PKG_CHECK_MODULES([ONLINE_ACCOUNTS_PANEL], |
386 |
++ [$COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION], |
387 |
++ [ |
388 |
++ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) |
389 |
++ build_online_accounts=yes |
390 |
++ background_goa_dependencies="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION" |
391 |
++ ], [ |
392 |
++ AS_IF([test "$enable_goa" = "yes"], |
393 |
++ [AC_MSG_ERROR([gnome-online-accounts support requested but not found])]) |
394 |
++ ]) |
395 |
++ ]) |
396 |
++AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "$build_online_accounts" = "yes") |
397 |
++ |
398 |
++PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
399 |
++ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
400 |
++ $background_goa_dependencies) |
401 |
++ |
402 |
++build_color=no |
403 |
++AC_ARG_ENABLE([color], |
404 |
++ AS_HELP_STRING([--disable-color], |
405 |
++ [disable color management panel]), |
406 |
++ [] |
407 |
++ [enable_color=auto]) |
408 |
++ |
409 |
++AS_IF([test "$enable_color" != "no"], |
410 |
++ [PKG_CHECK_MODULES([COLOR_PANEL], |
411 |
++ [ |
412 |
++ $COMMON_MODULES |
413 |
++ colord >= $COLORD_REQUIRED_VERSION |
414 |
++ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
415 |
++ libsoup-2.4 |
416 |
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
417 |
++ ], [ |
418 |
++ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
419 |
++ build_color=yes |
420 |
++ ], [ |
421 |
++ AS_IF([test "$enable_goa" = "yes"], |
422 |
++ [AC_MSG_ERROR([colord support requested but not found])]) |
423 |
++ ]) |
424 |
++ ]) |
425 |
++AM_CONDITIONAL(BUILD_COLOR, test "$build_color" = "yes") |
426 |
++ |
427 |
+ PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
428 |
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
429 |
+ PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
430 |
+@@ -220,15 +262,27 @@ else |
431 |
+ fi |
432 |
+ |
433 |
+ # Check for gnome-bluetooth |
434 |
+-PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2, |
435 |
+- [have_bluetooth=yes], have_bluetooth=no) |
436 |
+-if test "x$have_bluetooth" = xyes ; then |
437 |
+- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
438 |
+-fi |
439 |
+-AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) |
440 |
+-if test x${have_bluetooth} = xyes; then |
441 |
+- AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available]) |
442 |
+-fi |
443 |
++have_bluetooth=no |
444 |
++AC_ARG_ENABLE([bluetooth], |
445 |
++ AS_HELP_STRING([--disable-bluetooth], |
446 |
++ [disable bluetooth management panel]), |
447 |
++ [], |
448 |
++ [enable_bluetooth=auto]) |
449 |
++ |
450 |
++AS_IF([test "$enable_bluetooth" = "yes"], |
451 |
++ [PKG_CHECK_MODULES([BLUETOOTH], |
452 |
++ [$COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2], |
453 |
++ [ |
454 |
++ AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
455 |
++ have_bluetooth=yes |
456 |
++ ], |
457 |
++ [ |
458 |
++ have_bluetooth=no |
459 |
++ AS_IF([test "$enable_bluetooth" = "yes"], |
460 |
++ [AC_MSG_ERROR([bluetooth support requested but not found])]) |
461 |
++ ]) |
462 |
++ ]) |
463 |
++AM_CONDITIONAL(BUILD_BLUETOOTH, [test "$have_bluetooth" = "yes"]) |
464 |
+ |
465 |
+ # Check for smbclient |
466 |
+ PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no]) |
467 |
+@@ -301,38 +355,61 @@ fi |
468 |
+ AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes) |
469 |
+ |
470 |
+ # wacom is disabled for s390/s390x and non Linux platforms (needs udev) |
471 |
+-case $host_os in |
472 |
+- linux*) |
473 |
+- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
474 |
+- have_wacom=no |
475 |
+- else |
476 |
+- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
477 |
+- gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
478 |
+- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
479 |
+- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
480 |
+- clutter-gtk-1.0 |
481 |
+- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
482 |
+- have_wacom=yes |
483 |
+- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
484 |
+- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
485 |
+- fi |
486 |
+- ;; |
487 |
+- *) |
488 |
+- have_wacom=no |
489 |
+- ;; |
490 |
+-esac |
491 |
+-AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) |
492 |
++have_wacom=no |
493 |
++AS_CASE([$host_os], |
494 |
++ [linux*], |
495 |
++ [AS_IF([test "$host_cpu" = "s390" -o "$host_cpu" = "s390x"], |
496 |
++ [have_wacom=no], |
497 |
++ [ |
498 |
++ AC_ARG_ENABLE([wacom], |
499 |
++ AS_HELP_STRING([--disable-wacom], |
500 |
++ [disable wacom management panel]), |
501 |
++ [], |
502 |
++ [enable_wacom=yes]) |
503 |
++ AS_IF([test "$enable_wacom" = "yes"], |
504 |
++ [PKG_CHECK_MODULES([WACOM_PANEL], |
505 |
++ [ |
506 |
++ $COMMON_MODULES |
507 |
++ gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
508 |
++ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
509 |
++ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
510 |
++ clutter-gtk-1.0 |
511 |
++ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION |
512 |
++ ], [ |
513 |
++ have_wacom=yes |
514 |
++ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
515 |
++ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
516 |
++ ], [ |
517 |
++ have_wacom=no |
518 |
++ AS_IF([test "$enable_wacom" = "yes"], |
519 |
++ [AC_MSG_ERROR([wacom support requested but not found])]) |
520 |
++ ]) |
521 |
++ ]) |
522 |
++ ]) |
523 |
++ ], |
524 |
++ [have_wacom=no]) |
525 |
++AM_CONDITIONAL(BUILD_WACOM, [test "$have_wacom" = "yes"]) |
526 |
+ |
527 |
+ # Kerberos kerberos support |
528 |
+-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
529 |
+-if test "$KRB5_CONFIG" = "no"; then |
530 |
+- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
531 |
+-fi |
532 |
+- |
533 |
+-AC_MSG_CHECKING(for krb5 libraries and flags) |
534 |
+-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
535 |
+-KRB5_LIBS="`$KRB5_CONFIG --libs`" |
536 |
+-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
537 |
++AC_ARG_ENABLE([kerberos], |
538 |
++ AS_HELP_STRING([--disable-kerberos], |
539 |
++ [disable kerberos support (default: enabled)]), |
540 |
++ [], |
541 |
++ [enable_kerberos=yes]) |
542 |
++ |
543 |
++AS_IF([test "$enable_kerberos" != "no"], |
544 |
++ [ |
545 |
++ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
546 |
++ |
547 |
++ AS_IF([test "$KRB5_CONFIG" = "no"], |
548 |
++ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])) |
549 |
++ |
550 |
++ AC_MSG_CHECKING([for krb5 libraries and flags]) |
551 |
++ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
552 |
++ KRB5_LIBS="`$KRB5_CONFIG --libs`" |
553 |
++ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
554 |
++ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) |
555 |
++ ]) |
556 |
+ |
557 |
+ AC_SUBST(KRB5_CFLAGS) |
558 |
+ AC_SUBST(KRB5_LIBS) |
559 |
+@@ -569,6 +646,11 @@ if test "x$have_bluetooth" = "xyes"; then |
560 |
+ else |
561 |
+ AC_MSG_NOTICE([ Bluetooth panel disabled]) |
562 |
+ fi |
563 |
++if test "x$build_color" = "xyes"; then |
564 |
++ AC_MSG_NOTICE([** colord (Color panel)]) |
565 |
++else |
566 |
++ AC_MSG_NOTICE([ Color panel disabled]) |
567 |
++fi |
568 |
+ if test "x$enable_cups" = "xyes"; then |
569 |
+ AC_MSG_NOTICE([** CUPS (Printers panel)]) |
570 |
+ else |
571 |
+@@ -579,6 +661,11 @@ if test "x$have_cheese" = "xyes"; then |
572 |
+ else |
573 |
+ AC_MSG_NOTICE([ Users panel webcam support disabled]) |
574 |
+ fi |
575 |
++if test "x$build_online_accounts" = "xyes"; then |
576 |
++ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) |
577 |
++else |
578 |
++ AC_MSG_NOTICE([ Online Accounts panel disabled]) |
579 |
++fi |
580 |
+ if test "x$have_wacom" = "xyes"; then |
581 |
+ AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
582 |
+ else |
583 |
+diff --git a/panels/Makefile.am b/panels/Makefile.am |
584 |
+index 9961c25..0c54622 100644 |
585 |
+--- a/panels/Makefile.am |
586 |
++++ b/panels/Makefile.am |
587 |
+@@ -2,11 +2,9 @@ SUBDIRS= \ |
588 |
+ common \ |
589 |
+ background \ |
590 |
+ power \ |
591 |
+- color \ |
592 |
+ display \ |
593 |
+ mouse \ |
594 |
+ notifications \ |
595 |
+- online-accounts \ |
596 |
+ region \ |
597 |
+ info \ |
598 |
+ sound \ |
599 |
+@@ -18,6 +16,10 @@ SUBDIRS= \ |
600 |
+ privacy \ |
601 |
+ sharing |
602 |
+ |
603 |
++if BUILD_COLOR |
604 |
++SUBDIRS += color |
605 |
++endif |
606 |
++ |
607 |
+ if BUILD_WACOM |
608 |
+ SUBDIRS += wacom |
609 |
+ endif |
610 |
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH |
611 |
+ SUBDIRS += bluetooth |
612 |
+ endif |
613 |
+ |
614 |
++if BUILD_ONLINE_ACCOUNTS |
615 |
++SUBDIRS += online-accounts |
616 |
++endif |
617 |
++ |
618 |
+ -include $(top_srcdir)/git.mk |
619 |
+diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am |
620 |
+index ccb8017..bde4cdf 100644 |
621 |
+--- a/panels/background/Makefile.am |
622 |
++++ b/panels/background/Makefile.am |
623 |
+@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ |
624 |
+ $(BUILT_SOURCES) \ |
625 |
+ cc-background-chooser-dialog.c \ |
626 |
+ cc-background-chooser-dialog.h \ |
627 |
+- cc-background-grilo-miner.c \ |
628 |
+- cc-background-grilo-miner.h \ |
629 |
+ cc-background-item.c \ |
630 |
+ cc-background-item.h \ |
631 |
+ cc-background-xml.c \ |
632 |
+@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ |
633 |
+ bg-colors-source.c \ |
634 |
+ bg-colors-source.h |
635 |
+ |
636 |
++if BUILD_ONLINE_ACCOUNTS |
637 |
++libbackground_chooser_la_SOURCES += \ |
638 |
++ cc-background-grilo-miner.c \ |
639 |
++ cc-background-grilo-miner.h |
640 |
++endif |
641 |
++ |
642 |
+ libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) |
643 |
+ |
644 |
+ libbackground_la_SOURCES = \ |
645 |
+diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c |
646 |
+index a33cee7..408359c 100644 |
647 |
+--- a/panels/background/bg-pictures-source.c |
648 |
++++ b/panels/background/bg-pictures-source.c |
649 |
+@@ -23,13 +23,17 @@ |
650 |
+ |
651 |
+ #include "bg-pictures-source.h" |
652 |
+ |
653 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
654 |
+ #include "cc-background-grilo-miner.h" |
655 |
++#endif |
656 |
+ #include "cc-background-item.h" |
657 |
+ |
658 |
+ #include <string.h> |
659 |
+ #include <cairo-gobject.h> |
660 |
+ #include <gio/gio.h> |
661 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
662 |
+ #include <grilo.h> |
663 |
++#endif |
664 |
+ #include <libgnome-desktop/gnome-desktop-thumbnail.h> |
665 |
+ #include <gdesktop-enums.h> |
666 |
+ |
667 |
+@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate |
668 |
+ { |
669 |
+ GCancellable *cancellable; |
670 |
+ |
671 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
672 |
+ CcBackgroundGriloMiner *grl_miner; |
673 |
++#endif |
674 |
+ |
675 |
+ GnomeDesktopThumbnailFactory *thumb_factory; |
676 |
+ |
677 |
+@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) |
678 |
+ g_clear_object (&priv->cancellable); |
679 |
+ } |
680 |
+ |
681 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
682 |
+ g_clear_object (&priv->grl_miner); |
683 |
++#endif |
684 |
+ g_clear_object (&priv->thumb_factory); |
685 |
+ |
686 |
+ G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); |
687 |
+@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, |
688 |
+ gboolean needs_download; |
689 |
+ gboolean retval = FALSE; |
690 |
+ GFile *pictures_dir, *cache_dir; |
691 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
692 |
+ GrlMedia *media; |
693 |
++#else |
694 |
++ gpointer media = NULL; |
695 |
++#endif |
696 |
+ |
697 |
+ /* find png and jpeg files */ |
698 |
+ if (!content_type) |
699 |
+@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, |
700 |
+ |
701 |
+ read_file: |
702 |
+ |
703 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
704 |
+ media = g_object_get_data (G_OBJECT (file), "grl-media"); |
705 |
++#endif |
706 |
+ if (media == NULL) |
707 |
+ { |
708 |
+ g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); |
709 |
+@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, |
710 |
+ return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); |
711 |
+ } |
712 |
+ |
713 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
714 |
+ static gboolean |
715 |
+ add_single_file_from_media (BgPicturesSource *bg_source, |
716 |
+ GFile *file, |
717 |
+@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, |
718 |
+ |
719 |
+ return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); |
720 |
+ } |
721 |
++#endif /* BUILD_ONLINE_ACCOUNTS */ |
722 |
+ |
723 |
+ gboolean |
724 |
+ bg_pictures_source_add (BgPicturesSource *bg_source, |
725 |
+@@ -923,6 +939,7 @@ monitor_path (BgPicturesSource *self, |
726 |
+ return monitor; |
727 |
+ } |
728 |
+ |
729 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
730 |
+ static void |
731 |
+ media_found_cb (BgPicturesSource *self, GrlMedia *media) |
732 |
+ { |
733 |
+@@ -934,6 +951,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) |
734 |
+ g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); |
735 |
+ add_single_file_from_media (self, file, media); |
736 |
+ } |
737 |
++#endif /* BUILD_ONLINE_ACCOUNTS */ |
738 |
+ |
739 |
+ static void |
740 |
+ bg_pictures_source_init (BgPicturesSource *self) |
741 |
+@@ -961,9 +979,11 @@ bg_pictures_source_init (BgPicturesSource *self) |
742 |
+ priv->cache_dir_monitor = monitor_path (self, cache_path); |
743 |
+ g_free (cache_path); |
744 |
+ |
745 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
746 |
+ priv->grl_miner = cc_background_grilo_miner_new (); |
747 |
+ g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); |
748 |
+ cc_background_grilo_miner_start (priv->grl_miner); |
749 |
++#endif /* BUILD_ONLINE_ACCOUNTS */ |
750 |
+ |
751 |
+ priv->thumb_factory = |
752 |
+ gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); |
753 |
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c |
754 |
+index db4e69a..7677b58 100644 |
755 |
+--- a/panels/power/cc-power-panel.c |
756 |
++++ b/panels/power/cc-power-panel.c |
757 |
+@@ -1882,7 +1882,7 @@ add_power_saving_section (CcPowerPanel *self) |
758 |
+ G_CALLBACK (wifi_switch_changed), self); |
759 |
+ #endif |
760 |
+ |
761 |
+-#ifdef HAVE_BLUETOOTH |
762 |
++#ifdef BUILD_BLUETOOTH |
763 |
+ priv->bt_rfkill = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SESSION, |
764 |
+ G_DBUS_PROXY_FLAGS_NONE, |
765 |
+ NULL, |
766 |
+diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c |
767 |
+index 8a0a0e6..22c6b94 100644 |
768 |
+--- a/panels/user-accounts/um-realm-manager.c |
769 |
++++ b/panels/user-accounts/um-realm-manager.c |
770 |
+@@ -22,7 +22,9 @@ |
771 |
+ |
772 |
+ #include "um-realm-manager.h" |
773 |
+ |
774 |
++#ifdef HAVE_KERBEROS |
775 |
+ #include <krb5/krb5.h> |
776 |
++#endif |
777 |
+ |
778 |
+ #include <glib.h> |
779 |
+ #include <glib/gi18n.h> |
780 |
+@@ -698,6 +700,7 @@ login_closure_free (gpointer data) |
781 |
+ g_slice_free (LoginClosure, login); |
782 |
+ } |
783 |
+ |
784 |
++#ifdef HAVE_KERBEROS |
785 |
+ static krb5_error_code |
786 |
+ login_perform_kinit (krb5_context k5, |
787 |
+ const gchar *realm, |
788 |
+@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5, |
789 |
+ |
790 |
+ return code; |
791 |
+ } |
792 |
++#endif /* HAVE_KERBEROS */ |
793 |
+ |
794 |
+ static void |
795 |
+ kinit_thread_func (GSimpleAsyncResult *async, |
796 |
+ GObject *object, |
797 |
+ GCancellable *cancellable) |
798 |
+ { |
799 |
++#ifdef HAVE_KERBEROS |
800 |
+ LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); |
801 |
+ krb5_context k5 = NULL; |
802 |
+ krb5_error_code code; |
803 |
+@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async, |
804 |
+ |
805 |
+ if (k5) |
806 |
+ krb5_free_context (k5); |
807 |
++#else /* HAVE_KERBEROS */ |
808 |
++ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, |
809 |
++ _("gnome-control-center was built without kerberos support")); |
810 |
++#endif |
811 |
+ } |
812 |
+ |
813 |
+ void |
814 |
+diff --git a/shell/Makefile.am b/shell/Makefile.am |
815 |
+index 45f6363..b76f343 100644 |
816 |
+--- a/shell/Makefile.am |
817 |
++++ b/shell/Makefile.am |
818 |
+@@ -78,14 +78,12 @@ gnome_control_center_LDADD = \ |
819 |
+ $(top_builddir)/panels/common/liblanguage.la \ |
820 |
+ $(top_builddir)/panels/common/libdevice.la \ |
821 |
+ $(top_builddir)/panels/background/libbackground.la \ |
822 |
+- $(top_builddir)/panels/color/libcolor.la \ |
823 |
+ $(top_builddir)/panels/datetime/libdate_time.la \ |
824 |
+ $(top_builddir)/panels/display/libdisplay.la \ |
825 |
+ $(top_builddir)/panels/info/libinfo.la \ |
826 |
+ $(top_builddir)/panels/keyboard/libkeyboard.la \ |
827 |
+ $(top_builddir)/panels/mouse/libmouse-properties.la \ |
828 |
+ $(top_builddir)/panels/notifications/libnotifications.la \ |
829 |
+- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ |
830 |
+ $(top_builddir)/panels/power/libpower.la \ |
831 |
+ $(top_builddir)/panels/privacy/libprivacy.la \ |
832 |
+ $(top_builddir)/panels/region/libregion.la \ |
833 |
+@@ -111,6 +109,14 @@ if BUILD_BLUETOOTH |
834 |
+ gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
835 |
+ endif |
836 |
+ |
837 |
++if BUILD_COLOR |
838 |
++gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la |
839 |
++endif |
840 |
++ |
841 |
++if BUILD_ONLINE_ACCOUNTS |
842 |
++gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la |
843 |
++endif |
844 |
++ |
845 |
+ gnome_control_center_alt_LDADD = \ |
846 |
+ $(gnome_control_center_LDADD) \ |
847 |
+ alt/libshell_alt.la |
848 |
+diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c |
849 |
+index 03dbfb1..a713079 100644 |
850 |
+--- a/shell/cc-panel-loader.c |
851 |
++++ b/shell/cc-panel-loader.c |
852 |
+@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); |
853 |
+ #ifdef BUILD_BLUETOOTH |
854 |
+ extern GType cc_bluetooth_panel_get_type (void); |
855 |
+ #endif /* BUILD_BLUETOOTH */ |
856 |
++#ifdef BUILD_COLOR |
857 |
+ extern GType cc_color_panel_get_type (void); |
858 |
++#endif /* BUILD_COLOR */ |
859 |
+ extern GType cc_date_time_panel_get_type (void); |
860 |
+ extern GType cc_display_panel_get_type (void); |
861 |
+ extern GType cc_info_panel_get_type (void); |
862 |
+@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); |
863 |
+ extern GType cc_network_panel_get_type (void); |
864 |
+ #endif /* BUILD_NETWORK */ |
865 |
+ extern GType cc_notifications_panel_get_type (void); |
866 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
867 |
+ extern GType cc_goa_panel_get_type (void); |
868 |
++#endif /* BUILD_ONLINE_ACCOUNTS */ |
869 |
+ extern GType cc_power_panel_get_type (void); |
870 |
+ #ifdef BUILD_PRINTERS |
871 |
+ extern GType cc_printers_panel_get_type (void); |
872 |
+@@ -77,7 +81,9 @@ static struct { |
873 |
+ #ifdef BUILD_BLUETOOTH |
874 |
+ PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), |
875 |
+ #endif |
876 |
++#ifdef BUILD_COLOR |
877 |
+ PANEL_TYPE("color", cc_color_panel_get_type ), |
878 |
++#endif |
879 |
+ PANEL_TYPE("datetime", cc_date_time_panel_get_type ), |
880 |
+ PANEL_TYPE("display", cc_display_panel_get_type ), |
881 |
+ PANEL_TYPE("info", cc_info_panel_get_type ), |
882 |
+@@ -87,7 +93,9 @@ static struct { |
883 |
+ PANEL_TYPE("network", cc_network_panel_get_type ), |
884 |
+ #endif |
885 |
+ PANEL_TYPE("notifications", cc_notifications_panel_get_type), |
886 |
++#ifdef BUILD_ONLINE_ACCOUNTS |
887 |
+ PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), |
888 |
++#endif |
889 |
+ PANEL_TYPE("power", cc_power_panel_get_type ), |
890 |
+ #ifdef BUILD_PRINTERS |
891 |
+ PANEL_TYPE("printers", cc_printers_panel_get_type ), |
892 |
+-- |
893 |
+2.10.1 |
894 |
+ |
895 |
|
896 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild |
897 |
index 77c52d4..c190e73 100644 |
898 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild |
899 |
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.22.1.ebuild |
900 |
@@ -27,7 +27,7 @@ COMMON_DEPEND=" |
901 |
>=dev-libs/glib-2.44.0:2[dbus] |
902 |
>=x11-libs/gdk-pixbuf-2.23.0:2 |
903 |
>=x11-libs/gtk+-3.22.0:3[X,wayland?] |
904 |
- >=gnome-base/gsettings-desktop-schemas-3.19.3 |
905 |
+ >=gnome-base/gsettings-desktop-schemas-3.21.4 |
906 |
>=gnome-base/gnome-desktop-3.21.2:3= |
907 |
>=gnome-base/gnome-settings-daemon-3.19.1[colord?,policykit] |
908 |
|
909 |
@@ -127,13 +127,13 @@ DEPEND="${COMMON_DEPEND} |
910 |
src_prepare() { |
911 |
# Make some panels and dependencies optional; requires eautoreconf |
912 |
# https://bugzilla.gnome.org/686840, 697478, 700145 |
913 |
- eapply "${FILESDIR}"/${PN}-3.20.0-optional.patch |
914 |
- eapply "${FILESDIR}"/${PN}-3.16.0-make-wayland-optional.patch |
915 |
- eapply "${FILESDIR}"/${PN}-3.18.0-keep-panels-optional.patch |
916 |
- eapply "${FILESDIR}"/${PN}-3.16.0-networkmanager.patch |
917 |
+ eapply "${FILESDIR}"/${PN}-3.22.0-optional.patch |
918 |
+ eapply "${FILESDIR}"/${PN}-3.22.0-make-wayland-optional.patch |
919 |
+ eapply "${FILESDIR}"/${PN}-3.22.0-keep-panels-optional.patch |
920 |
+ eapply "${FILESDIR}"/${PN}-3.22.0-make-networkmanager-optional.patch |
921 |
|
922 |
# Fix some absolute paths to be appropriate for Gentoo |
923 |
- eapply "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch |
924 |
+ eapply "${FILESDIR}"/${PN}-3.22.0-gentoo-paths.patch |
925 |
|
926 |
eautoreconf |
927 |
gnome2_src_prepare |