1 |
commit: 98ccaaea982625885c6efbce135ace0e200960f7 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 26 20:27:20 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 26 20:27:20 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=98ccaaea |
7 |
|
8 |
gnome-base/gnome-control-center: remove old |
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-control-center-3.10.2-gentoo-paths.patch | 119 ----- |
14 |
.../gnome-control-center-3.14.0-optional.patch | 537 --------------------- |
15 |
...ontrol-center-3.16.0-keep-panels-optional.patch | 39 -- |
16 |
...ntrol-center-3.16.0-make-wayland-optional.patch | 44 -- |
17 |
...nome-control-center-3.16.0-networkmanager.patch | 83 ---- |
18 |
...ontrol-center-3.18.0-keep-panels-optional.patch | 39 -- |
19 |
.../gnome-control-center-3.18.0-optional.patch | 537 --------------------- |
20 |
.../gnome-control-center-3.20.0-optional.patch | 533 -------------------- |
21 |
.../gnome-control-center-3.26.2.ebuild | 161 ------ |
22 |
9 files changed, 2092 deletions(-) |
23 |
|
24 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch |
25 |
deleted file mode 100644 |
26 |
index 8ef40334..00000000 |
27 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.10.2-gentoo-paths.patch |
28 |
+++ /dev/null |
29 |
@@ -1,119 +0,0 @@ |
30 |
-From 6ce180eace2bb3b9954d0b9ca74c7108e772ad68 Mon Sep 17 00:00:00 2001 |
31 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
32 |
-Date: Sun, 8 Dec 2013 23:44:56 +0100 |
33 |
-Subject: [PATCH 2/2] Fix some absolute paths to be appropriate for Gentoo |
34 |
- |
35 |
---- |
36 |
- panels/datetime/Makefile.am | 1 + |
37 |
- panels/datetime/test-endianess.c | 4 ++-- |
38 |
- panels/datetime/test-timezone.c | 2 +- |
39 |
- panels/datetime/tz.h | 4 ++-- |
40 |
- panels/printers/Makefile.am | 3 +++ |
41 |
- panels/printers/cc-printers-panel.c | 4 ++-- |
42 |
- panels/printers/pp-host.c | 2 +- |
43 |
- 7 files changed, 12 insertions(+), 8 deletions(-) |
44 |
- |
45 |
-diff --git a/panels/datetime/Makefile.am b/panels/datetime/Makefile.am |
46 |
-index fc85592..133845f 100644 |
47 |
---- a/panels/datetime/Makefile.am |
48 |
-+++ b/panels/datetime/Makefile.am |
49 |
-@@ -24,6 +24,7 @@ AM_CPPFLAGS = \ |
50 |
- $(DATETIME_PANEL_CFLAGS) \ |
51 |
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ |
52 |
- -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ |
53 |
-+ -DREALDATADIR="\"$(datadir)\"" \ |
54 |
- $(NULL) |
55 |
- |
56 |
- noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone |
57 |
-diff --git a/panels/datetime/test-endianess.c b/panels/datetime/test-endianess.c |
58 |
-index 490df17..b43fc87 100644 |
59 |
---- a/panels/datetime/test-endianess.c |
60 |
-+++ b/panels/datetime/test-endianess.c |
61 |
-@@ -38,11 +38,11 @@ int main (int argc, char **argv) |
62 |
- return 0; |
63 |
- } |
64 |
- |
65 |
-- dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL); |
66 |
-+ dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL); |
67 |
- if (dir == NULL) { |
68 |
- /* Try with /usr/share/locale/ |
69 |
- * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */ |
70 |
-- dir = g_dir_open ("/usr/share/locale/", 0, NULL); |
71 |
-+ dir = g_dir_open (REALDATADIR "/locale/", 0, NULL); |
72 |
- if (dir == NULL) { |
73 |
- return 1; |
74 |
- } |
75 |
-diff --git a/panels/datetime/test-timezone.c b/panels/datetime/test-timezone.c |
76 |
-index 5667657..8483b87 100644 |
77 |
---- a/panels/datetime/test-timezone.c |
78 |
-+++ b/panels/datetime/test-timezone.c |
79 |
-@@ -1,7 +1,7 @@ |
80 |
- #include <gtk/gtk.h> |
81 |
- #include "cc-timezone-map.h" |
82 |
- |
83 |
--#define TZ_DIR "/usr/share/zoneinfo/" |
84 |
-+#define TZ_DIR REALDATADIR "/zoneinfo/" |
85 |
- |
86 |
- static GList * |
87 |
- get_timezone_list (GList *tzs, |
88 |
-diff --git a/panels/datetime/tz.h b/panels/datetime/tz.h |
89 |
-index 71c1c23..ca4b3c4 100644 |
90 |
---- a/panels/datetime/tz.h |
91 |
-+++ b/panels/datetime/tz.h |
92 |
-@@ -29,9 +29,9 @@ |
93 |
- #include <glib.h> |
94 |
- |
95 |
- #ifndef __sun |
96 |
--# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab" |
97 |
-+# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab" |
98 |
- #else |
99 |
--# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab" |
100 |
-+# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab" |
101 |
- #endif |
102 |
- |
103 |
- typedef struct _TzDB TzDB; |
104 |
-diff --git a/panels/printers/Makefile.am b/panels/printers/Makefile.am |
105 |
-index 63a33b4..12e2e45 100644 |
106 |
---- a/panels/printers/Makefile.am |
107 |
-+++ b/panels/printers/Makefile.am |
108 |
-@@ -7,6 +7,9 @@ INCLUDES = \ |
109 |
- $(SMBCLIENT_CFLAGS) \ |
110 |
- -I$(top_srcdir)/shell/ \ |
111 |
- -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ |
112 |
-+ -DREALDATADIR="\"$(datadir)\"" \ |
113 |
-+ -DPREFIX="\"$(prefix)\"" \ |
114 |
-+ -DLIBEXECDIR="\"$(libexecdir)\"" \ |
115 |
- $(NULL) |
116 |
- |
117 |
- noinst_LTLIBRARIES = libprinters.la |
118 |
-diff --git a/panels/printers/cc-printers-panel.c b/panels/printers/cc-printers-panel.c |
119 |
-index 29b8173..24bcdf8 100644 |
120 |
---- a/panels/printers/cc-printers-panel.c |
121 |
-+++ b/panels/printers/cc-printers-panel.c |
122 |
-@@ -2428,8 +2428,8 @@ test_page_cb (GtkButton *button, |
123 |
- |
124 |
- if (printer_name) |
125 |
- { |
126 |
-- const gchar *const dirs[] = { "/usr/share/cups", |
127 |
-- "/usr/local/share/cups", |
128 |
-+ const gchar *const dirs[] = { REALDATADIR "/cups", |
129 |
-+ PREFIX "/local/share/cups", |
130 |
- NULL }; |
131 |
- const gchar *testprint[] = { "%s/data/testprint", |
132 |
- "%s/data/testprint.ps", |
133 |
-diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c |
134 |
-index a994a61..51efe50 100644 |
135 |
---- a/panels/printers/pp-host.c |
136 |
-+++ b/panels/printers/pp-host.c |
137 |
-@@ -251,7 +251,7 @@ _pp_host_get_snmp_devices_thread (GSimpleAsyncResult *res, |
138 |
- data->devices->devices = NULL; |
139 |
- |
140 |
- argv = g_new0 (gchar *, 3); |
141 |
-- argv[0] = g_strdup ("/usr/lib/cups/backend/snmp"); |
142 |
-+ argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp"); |
143 |
- argv[1] = g_strdup (priv->hostname); |
144 |
- |
145 |
- /* Use SNMP to get printer's informations */ |
146 |
--- |
147 |
-1.8.3.2 |
148 |
- |
149 |
|
150 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch |
151 |
deleted file mode 100644 |
152 |
index a1616588..00000000 |
153 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.14.0-optional.patch |
154 |
+++ /dev/null |
155 |
@@ -1,537 +0,0 @@ |
156 |
-From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001 |
157 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
158 |
-Date: Fri, 25 Apr 2014 22:17:24 +0200 |
159 |
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional |
160 |
- |
161 |
-Upstream is not interested in any part of this patch: |
162 |
- |
163 |
-https://bugzilla.gnome.org/show_bug.cgi?id=686840 |
164 |
-https://bugzilla.gnome.org/show_bug.cgi?id=697478 |
165 |
-https://bugzilla.gnome.org/show_bug.cgi?id=700145 |
166 |
- |
167 |
-Dropped mm from this revision of the patch since it appears more |
168 |
-complicated than ever to split it from the network panel. |
169 |
- |
170 |
-Signed-Off: Gilles Dartiguelongue <eva@g.o> |
171 |
---- |
172 |
- configure.ac | 157 ++++++++++++++++++++++++++------ |
173 |
- panels/Makefile.am | 10 +- |
174 |
- panels/background/Makefile.am | 8 +- |
175 |
- panels/background/bg-pictures-source.c | 20 ++++ |
176 |
- panels/user-accounts/um-realm-manager.c | 9 ++ |
177 |
- shell/Makefile.am | 10 +- |
178 |
- shell/cc-panel-loader.c | 8 ++ |
179 |
- 7 files changed, 186 insertions(+), 36 deletions(-) |
180 |
- |
181 |
-diff --git a/configure.ac b/configure.ac |
182 |
-index fe723d5..f882e23 100644 |
183 |
---- a/configure.ac |
184 |
-+++ b/configure.ac |
185 |
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) |
186 |
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) |
187 |
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) |
188 |
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
189 |
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
190 |
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
191 |
-- goa-1.0 >= $GOA_REQUIRED_VERSION |
192 |
-- grilo-0.2 >= $GRILO_REQUIRED_VERSION) |
193 |
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES |
194 |
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
195 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
196 |
-@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 |
197 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) |
198 |
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
199 |
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) |
200 |
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
201 |
-+ |
202 |
-+build_online_accounts=false |
203 |
-+background_online_accounts= |
204 |
-+AC_ARG_ENABLE(goa, |
205 |
-+ AC_HELP_STRING([--disable-goa], |
206 |
-+ [disable online accounts management panel]), |
207 |
-+ [case "${enableval}" in |
208 |
-+ yes) WANT_ONLINE_ACCOUNTS=yes ;; |
209 |
-+ no) WANT_ONLINE_ACCOUNTS=no ;; |
210 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; |
211 |
-+ esac], |
212 |
-+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value |
213 |
-+ |
214 |
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then |
215 |
-+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
216 |
-+ build_online_accounts=true |
217 |
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION" |
218 |
-+fi |
219 |
-+if test "x$build_online_accounts" = xtrue ; then |
220 |
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) |
221 |
-+fi |
222 |
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") |
223 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) |
224 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) |
225 |
-+ |
226 |
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0 |
227 |
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
228 |
-+ $background_online_accounts) |
229 |
-+ |
230 |
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 |
231 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION) |
232 |
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
233 |
-- colord >= $COLORD_REQUIRED_VERSION |
234 |
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
235 |
-- libsoup-2.4 |
236 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
237 |
-+ |
238 |
-+build_color=false |
239 |
-+AC_ARG_ENABLE(color, |
240 |
-+ AC_HELP_STRING([--disable-color], |
241 |
-+ [disable color management panel]), |
242 |
-+ [case "${enableval}" in |
243 |
-+ yes) WANT_COLOR=yes ;; |
244 |
-+ no) WANT_COLOR=no ;; |
245 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
246 |
-+ esac], |
247 |
-+ [WANT_COLOR=yes]) dnl Default value |
248 |
-+ |
249 |
-+if test x$WANT_COLOR = xyes; then |
250 |
-+ |
251 |
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
252 |
-+ colord >= $COLORD_REQUIRED_VERSION |
253 |
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
254 |
-+ libsoup-2.4 |
255 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
256 |
-+ build_color=true |
257 |
-+fi |
258 |
-+if test "x$build_color" = xtrue ; then |
259 |
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
260 |
-+fi |
261 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
262 |
-+AC_SUBST(COLOR_PANEL_CFLAGS) |
263 |
-+AC_SUBST(COLOR_PANEL_LIBS) |
264 |
-+ |
265 |
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
266 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
267 |
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
268 |
-@@ -206,8 +253,25 @@ fi |
269 |
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) |
270 |
- |
271 |
- # Check for gnome-bluetooth |
272 |
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, |
273 |
-- [have_bluetooth=yes], have_bluetooth=no) |
274 |
-+have_bluetooth=no |
275 |
-+AC_ARG_ENABLE(bluetooth, |
276 |
-+ AC_HELP_STRING([--disable-bluetooth], |
277 |
-+ [disable bluetooth management panel]), |
278 |
-+ [case "${enableval}" in |
279 |
-+ yes) WANT_BLUETOOTH=yes ;; |
280 |
-+ no) WANT_BLUETOOTH=no ;; |
281 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
282 |
-+ esac], |
283 |
-+ [WANT_BLUETOOTH=yes]) dnl Default value |
284 |
-+ |
285 |
-+if test x$WANT_BLUETOOTH = xyes; then |
286 |
-+ # Check for gnome-bluetooth |
287 |
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.11.1, |
288 |
-+ [have_bluetooth=yes], have_bluetooth=no) |
289 |
-+ have_bluetooth=yes |
290 |
-+fi |
291 |
-+ |
292 |
-+ |
293 |
- if test "x$have_bluetooth" = xyes ; then |
294 |
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
295 |
- fi |
296 |
-@@ -292,15 +356,27 @@ case $host_os in |
297 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
298 |
- have_wacom=no |
299 |
- else |
300 |
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
301 |
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
302 |
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
303 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
304 |
-- clutter-gtk-1.0 |
305 |
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
306 |
-- have_wacom=yes |
307 |
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
308 |
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
309 |
-+ AC_ARG_ENABLE(wacom, |
310 |
-+ AC_HELP_STRING([--disable-wacom], |
311 |
-+ [disable wacom management panel]), |
312 |
-+ [case "${enableval}" in |
313 |
-+ yes) WANT_WACOM=yes ;; |
314 |
-+ no) WANT_WACOM=no ;; |
315 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; |
316 |
-+ esac], |
317 |
-+ [WANT_WACOM=yes]) dnl Default value |
318 |
-+ |
319 |
-+ if test x$WANT_WACOM = xyes; then |
320 |
-+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
321 |
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
322 |
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
323 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
324 |
-+ clutter-gtk-1.0 |
325 |
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
326 |
-+ have_wacom=yes |
327 |
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
328 |
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
329 |
-+ fi |
330 |
- fi |
331 |
- ;; |
332 |
- *) |
333 |
-@@ -310,16 +386,22 @@ esac |
334 |
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) |
335 |
- |
336 |
- # Kerberos kerberos support |
337 |
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
338 |
--if test "$KRB5_CONFIG" = "no"; then |
339 |
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
340 |
--fi |
341 |
-- |
342 |
--AC_MSG_CHECKING(for krb5 libraries and flags) |
343 |
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
344 |
--KRB5_LIBS="`$KRB5_CONFIG --libs`" |
345 |
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
346 |
-+AC_ARG_ENABLE([kerberos], |
347 |
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, |
348 |
-+ [enable_kerberos=yes]) |
349 |
-+ |
350 |
-+if test x"$enable_kerberos" != x"no" ; then |
351 |
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
352 |
-+ if test "$KRB5_CONFIG" = "no"; then |
353 |
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
354 |
-+ fi |
355 |
- |
356 |
-+ AC_MSG_CHECKING(for krb5 libraries and flags) |
357 |
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
358 |
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`" |
359 |
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
360 |
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) |
361 |
-+fi |
362 |
- AC_SUBST(KRB5_CFLAGS) |
363 |
- AC_SUBST(KRB5_LIBS) |
364 |
- |
365 |
-@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then |
366 |
- else |
367 |
- AC_MSG_NOTICE([ Bluetooth panel disabled]) |
368 |
- fi |
369 |
-+if test "x$build_color" = "xtrue"; then |
370 |
-+ AC_MSG_NOTICE([** colord (Color panel)]) |
371 |
-+else |
372 |
-+ AC_MSG_NOTICE([ Color panel disabled]) |
373 |
-+fi |
374 |
- if test "x$enable_cups" = "xyes"; then |
375 |
- AC_MSG_NOTICE([** CUPS (Printers panel)]) |
376 |
- else |
377 |
-@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then |
378 |
- else |
379 |
- AC_MSG_NOTICE([ Users panel webcam support disabled]) |
380 |
- fi |
381 |
-+if test "x$build_online_accounts" = "xtrue"; then |
382 |
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) |
383 |
-+else |
384 |
-+ AC_MSG_NOTICE([ Online Accounts panel disabled]) |
385 |
-+fi |
386 |
-+if test "x$build_wacom" = "xtrue"; then |
387 |
-+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) |
388 |
-+else |
389 |
-+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) |
390 |
-+fi |
391 |
- if test "x$have_wacom" = "xyes"; then |
392 |
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
393 |
- else |
394 |
-diff --git a/panels/Makefile.am b/panels/Makefile.am |
395 |
-index 9961c25..0c54622 100644 |
396 |
---- a/panels/Makefile.am |
397 |
-+++ b/panels/Makefile.am |
398 |
-@@ -2,11 +2,9 @@ SUBDIRS= \ |
399 |
- common \ |
400 |
- background \ |
401 |
- power \ |
402 |
-- color \ |
403 |
- display \ |
404 |
- mouse \ |
405 |
- notifications \ |
406 |
-- online-accounts \ |
407 |
- region \ |
408 |
- info \ |
409 |
- sound \ |
410 |
-@@ -18,6 +16,10 @@ SUBDIRS= \ |
411 |
- privacy \ |
412 |
- sharing |
413 |
- |
414 |
-+if BUILD_COLOR |
415 |
-+SUBDIRS += color |
416 |
-+endif |
417 |
-+ |
418 |
- if BUILD_WACOM |
419 |
- SUBDIRS += wacom |
420 |
- endif |
421 |
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH |
422 |
- SUBDIRS += bluetooth |
423 |
- endif |
424 |
- |
425 |
-+if BUILD_ONLINE_ACCOUNTS |
426 |
-+SUBDIRS += online-accounts |
427 |
-+endif |
428 |
-+ |
429 |
- -include $(top_srcdir)/git.mk |
430 |
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am |
431 |
-index ccb8017..bde4cdf 100644 |
432 |
---- a/panels/background/Makefile.am |
433 |
-+++ b/panels/background/Makefile.am |
434 |
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ |
435 |
- $(BUILT_SOURCES) \ |
436 |
- cc-background-chooser-dialog.c \ |
437 |
- cc-background-chooser-dialog.h \ |
438 |
-- cc-background-grilo-miner.c \ |
439 |
-- cc-background-grilo-miner.h \ |
440 |
- cc-background-item.c \ |
441 |
- cc-background-item.h \ |
442 |
- cc-background-xml.c \ |
443 |
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ |
444 |
- bg-colors-source.c \ |
445 |
- bg-colors-source.h |
446 |
- |
447 |
-+if BUILD_ONLINE_ACCOUNTS |
448 |
-+libbackground_chooser_la_SOURCES += \ |
449 |
-+ cc-background-grilo-miner.c \ |
450 |
-+ cc-background-grilo-miner.h |
451 |
-+endif |
452 |
-+ |
453 |
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) |
454 |
- |
455 |
- libbackground_la_SOURCES = \ |
456 |
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c |
457 |
-index c165fa3..78ef4a5 100644 |
458 |
---- a/panels/background/bg-pictures-source.c |
459 |
-+++ b/panels/background/bg-pictures-source.c |
460 |
-@@ -23,13 +23,17 @@ |
461 |
- |
462 |
- #include "bg-pictures-source.h" |
463 |
- |
464 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
465 |
- #include "cc-background-grilo-miner.h" |
466 |
-+#endif |
467 |
- #include "cc-background-item.h" |
468 |
- |
469 |
- #include <string.h> |
470 |
- #include <cairo-gobject.h> |
471 |
- #include <gio/gio.h> |
472 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
473 |
- #include <grilo.h> |
474 |
-+#endif |
475 |
- #include <libgnome-desktop/gnome-desktop-thumbnail.h> |
476 |
- #include <gdesktop-enums.h> |
477 |
- |
478 |
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate |
479 |
- { |
480 |
- GCancellable *cancellable; |
481 |
- |
482 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
483 |
- CcBackgroundGriloMiner *grl_miner; |
484 |
-+#endif |
485 |
- |
486 |
- GnomeDesktopThumbnailFactory *thumb_factory; |
487 |
- |
488 |
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) |
489 |
- g_clear_object (&priv->cancellable); |
490 |
- } |
491 |
- |
492 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
493 |
- g_clear_object (&priv->grl_miner); |
494 |
-+#endif |
495 |
- g_clear_object (&priv->thumb_factory); |
496 |
- |
497 |
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); |
498 |
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, |
499 |
- gboolean needs_download; |
500 |
- gboolean retval = FALSE; |
501 |
- GFile *pictures_dir, *cache_dir; |
502 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
503 |
- GrlMedia *media; |
504 |
-+#else |
505 |
-+ gpointer media = NULL; |
506 |
-+#endif |
507 |
- |
508 |
- /* find png and jpeg files */ |
509 |
- if (!content_type) |
510 |
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, |
511 |
- |
512 |
- read_file: |
513 |
- |
514 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
515 |
- media = g_object_get_data (G_OBJECT (file), "grl-media"); |
516 |
-+#endif |
517 |
- if (media == NULL) |
518 |
- { |
519 |
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); |
520 |
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, |
521 |
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); |
522 |
- } |
523 |
- |
524 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
525 |
- static gboolean |
526 |
- add_single_file_from_media (BgPicturesSource *bg_source, |
527 |
- GFile *file, |
528 |
-@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, |
529 |
- |
530 |
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); |
531 |
- } |
532 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
533 |
- |
534 |
- gboolean |
535 |
- bg_pictures_source_add (BgPicturesSource *bg_source, |
536 |
-@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor, |
537 |
- } |
538 |
- } |
539 |
- |
540 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
541 |
- static void |
542 |
- media_found_cb (BgPicturesSource *self, GrlMedia *media) |
543 |
- { |
544 |
-@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) |
545 |
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); |
546 |
- add_single_file_from_media (self, file, media); |
547 |
- } |
548 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
549 |
- |
550 |
- static void |
551 |
- bg_pictures_source_init (BgPicturesSource *self) |
552 |
-@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self) |
553 |
- |
554 |
- g_object_unref (dir); |
555 |
- |
556 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
557 |
- priv->grl_miner = cc_background_grilo_miner_new (); |
558 |
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); |
559 |
- cc_background_grilo_miner_start (priv->grl_miner); |
560 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
561 |
- |
562 |
- priv->thumb_factory = |
563 |
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); |
564 |
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c |
565 |
-index 0849160..58d50a6 100644 |
566 |
---- a/panels/user-accounts/um-realm-manager.c |
567 |
-+++ b/panels/user-accounts/um-realm-manager.c |
568 |
-@@ -22,7 +22,9 @@ |
569 |
- |
570 |
- #include "um-realm-manager.h" |
571 |
- |
572 |
-+#ifdef HAVE_KERBEROS |
573 |
- #include <krb5/krb5.h> |
574 |
-+#endif |
575 |
- |
576 |
- #include <glib.h> |
577 |
- #include <glib/gi18n.h> |
578 |
-@@ -696,6 +698,7 @@ login_closure_free (gpointer data) |
579 |
- g_slice_free (LoginClosure, login); |
580 |
- } |
581 |
- |
582 |
-+#ifdef HAVE_KERBEROS |
583 |
- static krb5_error_code |
584 |
- login_perform_kinit (krb5_context k5, |
585 |
- const gchar *realm, |
586 |
-@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, |
587 |
- |
588 |
- return code; |
589 |
- } |
590 |
-+#endif /* HAVE_KERBEROS */ |
591 |
- |
592 |
- static void |
593 |
- kinit_thread_func (GSimpleAsyncResult *async, |
594 |
- GObject *object, |
595 |
- GCancellable *cancellable) |
596 |
- { |
597 |
-+#ifdef HAVE_KERBEROS |
598 |
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); |
599 |
- krb5_context k5 = NULL; |
600 |
- krb5_error_code code; |
601 |
-@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, |
602 |
- |
603 |
- if (k5) |
604 |
- krb5_free_context (k5); |
605 |
-+#else /* HAVE_KERBEROS */ |
606 |
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, |
607 |
-+ _("gnome-control-center was built without kerberos support")); |
608 |
-+#endif |
609 |
- } |
610 |
- |
611 |
- void |
612 |
-diff --git a/shell/Makefile.am b/shell/Makefile.am |
613 |
-index c0cb91a..0b820fd 100644 |
614 |
---- a/shell/Makefile.am |
615 |
-+++ b/shell/Makefile.am |
616 |
-@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \ |
617 |
- $(top_builddir)/libgd/libgd.la \ |
618 |
- $(top_builddir)/panels/common/liblanguage.la \ |
619 |
- $(top_builddir)/panels/background/libbackground.la \ |
620 |
-- $(top_builddir)/panels/color/libcolor.la \ |
621 |
- $(top_builddir)/panels/datetime/libdate_time.la \ |
622 |
- $(top_builddir)/panels/display/libdisplay.la \ |
623 |
- $(top_builddir)/panels/info/libinfo.la \ |
624 |
- $(top_builddir)/panels/keyboard/libkeyboard.la \ |
625 |
- $(top_builddir)/panels/mouse/libmouse-properties.la \ |
626 |
- $(top_builddir)/panels/notifications/libnotifications.la \ |
627 |
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ |
628 |
- $(top_builddir)/panels/power/libpower.la \ |
629 |
- $(top_builddir)/panels/privacy/libprivacy.la \ |
630 |
- $(top_builddir)/panels/region/libregion.la \ |
631 |
-@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH |
632 |
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
633 |
- endif |
634 |
- |
635 |
-+if BUILD_COLOR |
636 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la |
637 |
-+endif |
638 |
-+ |
639 |
-+if BUILD_ONLINE_ACCOUNTS |
640 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la |
641 |
-+endif |
642 |
-+ |
643 |
- # Dbus service file |
644 |
- servicefiledir = $(datadir)/dbus-1/services |
645 |
- servicefile_in_files = org.gnome.ControlCenter.service.in |
646 |
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c |
647 |
-index 26576dc..8a92f95 100644 |
648 |
---- a/shell/cc-panel-loader.c |
649 |
-+++ b/shell/cc-panel-loader.c |
650 |
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); |
651 |
- #ifdef BUILD_BLUETOOTH |
652 |
- extern GType cc_bluetooth_panel_get_type (void); |
653 |
- #endif /* BUILD_BLUETOOTH */ |
654 |
-+#ifdef BUILD_COLOR |
655 |
- extern GType cc_color_panel_get_type (void); |
656 |
-+#endif /* BUILD_COLOR */ |
657 |
- extern GType cc_date_time_panel_get_type (void); |
658 |
- extern GType cc_display_panel_get_type (void); |
659 |
- extern GType cc_info_panel_get_type (void); |
660 |
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); |
661 |
- extern GType cc_network_panel_get_type (void); |
662 |
- #endif /* BUILD_NETWORK */ |
663 |
- extern GType cc_notifications_panel_get_type (void); |
664 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
665 |
- extern GType cc_goa_panel_get_type (void); |
666 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
667 |
- extern GType cc_power_panel_get_type (void); |
668 |
- #ifdef BUILD_PRINTERS |
669 |
- extern GType cc_printers_panel_get_type (void); |
670 |
-@@ -77,7 +81,9 @@ static struct { |
671 |
- #ifdef BUILD_BLUETOOTH |
672 |
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), |
673 |
- #endif |
674 |
-+#ifdef BUILD_COLOR |
675 |
- PANEL_TYPE("color", cc_color_panel_get_type ), |
676 |
-+#endif |
677 |
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ), |
678 |
- PANEL_TYPE("display", cc_display_panel_get_type ), |
679 |
- PANEL_TYPE("info", cc_info_panel_get_type ), |
680 |
-@@ -87,7 +93,9 @@ static struct { |
681 |
- PANEL_TYPE("network", cc_network_panel_get_type ), |
682 |
- #endif |
683 |
- PANEL_TYPE("notifications", cc_notifications_panel_get_type), |
684 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
685 |
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), |
686 |
-+#endif |
687 |
- PANEL_TYPE("power", cc_power_panel_get_type ), |
688 |
- #ifdef BUILD_PRINTERS |
689 |
- PANEL_TYPE("printers", cc_printers_panel_get_type ), |
690 |
--- |
691 |
-2.1.2 |
692 |
- |
693 |
|
694 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch |
695 |
deleted file mode 100644 |
696 |
index c991dc61..00000000 |
697 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-keep-panels-optional.patch |
698 |
+++ /dev/null |
699 |
@@ -1,39 +0,0 @@ |
700 |
-From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001 |
701 |
-From: Gilles Dartiguelongue <eva@g.o> |
702 |
-Date: Mon, 11 May 2015 23:59:03 +0200 |
703 |
-Subject: [PATCH 1/3] Optional gotta be optional |
704 |
- |
705 |
---- |
706 |
- configure.ac | 16 ---------------- |
707 |
- 1 file changed, 16 deletions(-) |
708 |
- |
709 |
-diff --git a/configure.ac b/configure.ac |
710 |
-index 9713256..bc239de 100644 |
711 |
---- a/configure.ac |
712 |
-+++ b/configure.ac |
713 |
-@@ -508,22 +508,6 @@ else |
714 |
- AC_MSG_RESULT(no) |
715 |
- fi |
716 |
- |
717 |
--case $host_os in |
718 |
-- linux*) |
719 |
-- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
720 |
-- # Nothing |
721 |
-- echo "USB-related panels disabled on S390" |
722 |
-- else |
723 |
-- if test "x$have_networkmanager" != "xyes" -o |
724 |
-- "x$have_bluetooth" != "xyes" -o |
725 |
-- "x$enable_cups" != "xyes" -o |
726 |
-- "x$have_wacom" != "xyes"; then |
727 |
-- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems]) |
728 |
-- fi |
729 |
-- fi |
730 |
-- ;; |
731 |
--esac |
732 |
-- |
733 |
- AC_CONFIG_FILES([ |
734 |
- Makefile |
735 |
- panels/Makefile |
736 |
--- |
737 |
-2.3.6 |
738 |
- |
739 |
|
740 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch |
741 |
deleted file mode 100644 |
742 |
index 38d4ccd3..00000000 |
743 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-make-wayland-optional.patch |
744 |
+++ /dev/null |
745 |
@@ -1,44 +0,0 @@ |
746 |
-From 95420469407223898564425b7622ac66e7ed70d5 Mon Sep 17 00:00:00 2001 |
747 |
-From: Ole Reifschneider <tranquility@g.o> |
748 |
-Date: Sat, 25 Apr 2015 22:22:09 +0200 |
749 |
-Subject: [PATCH] Make wayland support optional |
750 |
- |
751 |
---- |
752 |
- configure.ac | 21 +++++++++++++++------ |
753 |
- 1 file changed, 15 insertions(+), 6 deletions(-) |
754 |
- |
755 |
-diff --git a/configure.ac b/configure.ac |
756 |
-index 9713256..6b34962 100644 |
757 |
---- a/configure.ac |
758 |
-+++ b/configure.ac |
759 |
-@@ -231,12 +231,21 @@ if test "x$have_udev" = xyes ; then |
760 |
- fi |
761 |
- AM_CONDITIONAL(HAVE_UDEV, [test "x$have_udev" = "xyes"]) |
762 |
- |
763 |
--PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0, have_wayland=yes, have_wayland=no) |
764 |
--if test "x$have_wayland" = xyes ; then |
765 |
-- if test "x$have_udev" != xyes ; then |
766 |
-- AC_MSG_ERROR([udev is required for Wayland support]) |
767 |
-- fi |
768 |
--fi |
769 |
-+AC_ARG_ENABLE( |
770 |
-+ [wayland], |
771 |
-+ AS_HELP_STRING([--disable-wayland], [disable wayland support]), |
772 |
-+ [], |
773 |
-+ enable_wayland=auto |
774 |
-+) |
775 |
-+ |
776 |
-+AS_IF([test "$enable_wayland" != "no"], |
777 |
-+ [ |
778 |
-+ AS_IF([test "x$have_udev" = xno], |
779 |
-+ [AC_MSG_ERROR([udev is required for Wayland support])], |
780 |
-+ [AC_DEFINE(HAVE_UDEV, 1, [System has udev])]) |
781 |
-+ |
782 |
-+ PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) |
783 |
-+]) |
784 |
- |
785 |
- PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION |
786 |
- libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION |
787 |
--- |
788 |
-2.0.5 |
789 |
- |
790 |
|
791 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch |
792 |
deleted file mode 100644 |
793 |
index 8f704ac9..00000000 |
794 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.16.0-networkmanager.patch |
795 |
+++ /dev/null |
796 |
@@ -1,83 +0,0 @@ |
797 |
-From 763cc368b529c879050ffb98340779148e152b29 Mon Sep 17 00:00:00 2001 |
798 |
-From: Gilles Dartiguelongue <eva@g.o> |
799 |
-Date: Tue, 12 May 2015 00:32:11 +0200 |
800 |
-Subject: [PATCH 3/3] Make network panel optional |
801 |
- |
802 |
---- |
803 |
- configure.ac | 60 ++++++++++++++++++++++++++++++++++-------------------------- |
804 |
- 1 file changed, 34 insertions(+), 26 deletions(-) |
805 |
- |
806 |
-diff --git a/configure.ac b/configure.ac |
807 |
-index 7816942..13e8f45 100644 |
808 |
---- a/configure.ac |
809 |
-+++ b/configure.ac |
810 |
-@@ -247,32 +247,40 @@ AS_IF([test "$enable_wayland" != "no"], |
811 |
- PKG_CHECK_MODULES(WAYLAND, gdk-wayland-3.0) |
812 |
- ]) |
813 |
- |
814 |
--PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION |
815 |
-- libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION |
816 |
-- libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION |
817 |
-- libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION |
818 |
-- libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION |
819 |
-- mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, |
820 |
-- [have_networkmanager=yes], have_networkmanager=no) |
821 |
--if test "x$have_networkmanager" = xno ; then |
822 |
-- AC_MSG_WARN(*** Network panel will not be built (NetworkManager or ModemManager not found) ***) |
823 |
--else |
824 |
-- AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) |
825 |
--fi |
826 |
--AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) |
827 |
--if test x${have_networkmanager} = xyes; then |
828 |
-- AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) |
829 |
-- NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN |
830 |
-- NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` |
831 |
-- AC_SUBST(NM_VPN_CONFIG_DIR) |
832 |
-- AC_SUBST(NM_VPN_MODULE_DIR) |
833 |
--fi |
834 |
-- |
835 |
--# Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 |
836 |
--PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, libnm-util >= 0.9.9.0, nm_unstable=yes, nm_unstable=no) |
837 |
--if test x$nm_unstable = xyes; then |
838 |
-- AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available]) |
839 |
--fi |
840 |
-+AC_ARG_ENABLE([networkmanager], |
841 |
-+ AS_HELP_STRING([--disable-networkmanager], [Disable network panel]), |
842 |
-+ [], [enable_networkmanager=auto]) |
843 |
-+AS_IF([test "$enable_networkmanager" != "no"], |
844 |
-+ [ |
845 |
-+ PKG_CHECK_MODULES(NETWORK_MANAGER, NetworkManager >= $NETWORK_MANAGER_REQUIRED_VERSION |
846 |
-+ libnm-glib >= $NETWORK_MANAGER_REQUIRED_VERSION |
847 |
-+ libnm-glib-vpn >= $NETWORK_MANAGER_REQUIRED_VERSION |
848 |
-+ libnm-util >= $NETWORK_MANAGER_REQUIRED_VERSION |
849 |
-+ libnm-gtk >= $NETWORK_MANAGER_APPLET_REQUIRED_VERSION |
850 |
-+ mm-glib >= $MODEM_MANAGER_REQUIRED_VERSION, |
851 |
-+ [have_networkmanager=yes], have_networkmanager=no) |
852 |
-+ |
853 |
-+ AS_IF([test "$have_networkmanager" = "no"], |
854 |
-+ [ |
855 |
-+ AC_MSG_WARN([*** Network panel will not be built (NetworkManager or ModemManager not found) ***]) |
856 |
-+ ], [ |
857 |
-+ AC_DEFINE(BUILD_NETWORK, 1, [Define to 1 to build the Network panel]) |
858 |
-+ AC_DEFINE(HAVE_NETWORK_MANAGER, 1, [Define to 1 if NetworkManager is available]) |
859 |
-+ NM_VPN_CONFIG_DIR=`$PKG_CONFIG --variable configdir NetworkManager`/VPN |
860 |
-+ NM_VPN_MODULE_DIR=`$PKG_CONFIG --variable plugindir NetworkManager` |
861 |
-+ AC_SUBST([NM_VPN_CONFIG_DIR]) |
862 |
-+ AC_SUBST([NM_VPN_MODULE_DIR]) |
863 |
-+ ]) |
864 |
-+ |
865 |
-+ # Work-around for https://bugzilla.gnome.org/show_bug.cgi?id=723769 |
866 |
-+ PKG_CHECK_MODULES(NM_UNSTABLE_CHECK, [libnm-util >= 0.9.9.0], |
867 |
-+ [ |
868 |
-+ nm_unstable=yes |
869 |
-+ AC_DEFINE(HAVE_NM_UNSTABLE, 1, [Define to 1 if NetworkManager is available]) |
870 |
-+ ], |
871 |
-+ [nm_unstable=no]) |
872 |
-+ ]) |
873 |
-+AM_CONDITIONAL(BUILD_NETWORK, [test "$have_networkmanager" = "yes"]) |
874 |
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) |
875 |
- |
876 |
- # Check for gnome-bluetooth |
877 |
--- |
878 |
-2.3.6 |
879 |
- |
880 |
|
881 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch |
882 |
deleted file mode 100644 |
883 |
index 23141e44..00000000 |
884 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-keep-panels-optional.patch |
885 |
+++ /dev/null |
886 |
@@ -1,39 +0,0 @@ |
887 |
-From 3b51af7de7bfe7b69bbb1a96dbbc184311281704 Mon Sep 17 00:00:00 2001 |
888 |
-From: Gilles Dartiguelongue <eva@g.o> |
889 |
-Date: Mon, 11 May 2015 23:59:03 +0200 |
890 |
-Subject: [PATCH 1/3] Optional gotta be optional |
891 |
- |
892 |
---- |
893 |
- configure.ac | 16 ---------------- |
894 |
- 1 file changed, 16 deletions(-) |
895 |
- |
896 |
-diff --git a/configure.ac b/configure.ac |
897 |
-index 9713256..bc239de 100644 |
898 |
---- a/configure.ac |
899 |
-+++ b/configure.ac |
900 |
-@@ -508,22 +508,6 @@ else |
901 |
- AC_MSG_RESULT(no) |
902 |
- fi |
903 |
- |
904 |
--case $host_os in |
905 |
-- linux*) |
906 |
-- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
907 |
-- # Nothing |
908 |
-- echo "USB-related panels disabled on S390" |
909 |
-- else |
910 |
-- if test "x$have_networkmanager" != "xyes" -o \ |
911 |
-- "x$have_bluetooth" != "xyes" -o \ |
912 |
-- "x$enable_cups" != "xyes" -o \ |
913 |
-- "x$have_wacom" != "xyes"; then |
914 |
-- AC_MSG_ERROR([The Network, Bluetooth, Printers and Wacom panels are not optional on Linux systems]) |
915 |
-- fi |
916 |
-- fi |
917 |
-- ;; |
918 |
--esac |
919 |
-- |
920 |
- AC_CONFIG_FILES([ |
921 |
- Makefile |
922 |
- panels/Makefile |
923 |
--- |
924 |
-2.3.6 |
925 |
- |
926 |
|
927 |
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 |
928 |
deleted file mode 100644 |
929 |
index 96b58f65..00000000 |
930 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.18.0-optional.patch |
931 |
+++ /dev/null |
932 |
@@ -1,537 +0,0 @@ |
933 |
-From af4a143d8e0ee51b1a81807d82598101663b1034 Mon Sep 17 00:00:00 2001 |
934 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
935 |
-Date: Fri, 25 Apr 2014 22:17:24 +0200 |
936 |
-Subject: [PATCH 1/2] Make bluetooth/colord/goa/kerberos/wacom optional |
937 |
- |
938 |
-Upstream is not interested in any part of this patch: |
939 |
- |
940 |
-https://bugzilla.gnome.org/show_bug.cgi?id=686840 |
941 |
-https://bugzilla.gnome.org/show_bug.cgi?id=697478 |
942 |
-https://bugzilla.gnome.org/show_bug.cgi?id=700145 |
943 |
- |
944 |
-Dropped mm from this revision of the patch since it appears more |
945 |
-complicated than ever to split it from the network panel. |
946 |
- |
947 |
-Signed-Off: Gilles Dartiguelongue <eva@g.o> |
948 |
---- |
949 |
- configure.ac | 157 ++++++++++++++++++++++++++------ |
950 |
- panels/Makefile.am | 10 +- |
951 |
- panels/background/Makefile.am | 8 +- |
952 |
- panels/background/bg-pictures-source.c | 20 ++++ |
953 |
- panels/user-accounts/um-realm-manager.c | 9 ++ |
954 |
- shell/Makefile.am | 10 +- |
955 |
- shell/cc-panel-loader.c | 8 ++ |
956 |
- 7 files changed, 186 insertions(+), 36 deletions(-) |
957 |
- |
958 |
-diff --git a/configure.ac b/configure.ac |
959 |
-index fe723d5..f882e23 100644 |
960 |
---- a/configure.ac |
961 |
-+++ b/configure.ac |
962 |
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) |
963 |
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) |
964 |
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) |
965 |
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
966 |
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
967 |
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
968 |
-- goa-1.0 >= $GOA_REQUIRED_VERSION |
969 |
-- grilo-0.2 >= $GRILO_REQUIRED_VERSION) |
970 |
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES |
971 |
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
972 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
973 |
-@@ -139,14 +135,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 |
974 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) |
975 |
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0) |
976 |
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) |
977 |
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
978 |
-+ |
979 |
-+build_online_accounts=false |
980 |
-+background_online_accounts= |
981 |
-+AC_ARG_ENABLE(goa, |
982 |
-+ AC_HELP_STRING([--disable-goa], |
983 |
-+ [disable online accounts management panel]), |
984 |
-+ [case "${enableval}" in |
985 |
-+ yes) WANT_ONLINE_ACCOUNTS=yes ;; |
986 |
-+ no) WANT_ONLINE_ACCOUNTS=no ;; |
987 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; |
988 |
-+ esac], |
989 |
-+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value |
990 |
-+ |
991 |
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then |
992 |
-+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
993 |
-+ build_online_accounts=true |
994 |
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.2 >= $GRILO_REQUIRED_VERSION" |
995 |
-+fi |
996 |
-+if test "x$build_online_accounts" = xtrue ; then |
997 |
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) |
998 |
-+fi |
999 |
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") |
1000 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) |
1001 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) |
1002 |
-+ |
1003 |
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES libxml-2.0 gnome-desktop-3.0 |
1004 |
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
1005 |
-+ $background_online_accounts) |
1006 |
-+ |
1007 |
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 |
1008 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION) |
1009 |
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
1010 |
-- colord >= $COLORD_REQUIRED_VERSION |
1011 |
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
1012 |
-- libsoup-2.4 |
1013 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
1014 |
-+ |
1015 |
-+build_color=false |
1016 |
-+AC_ARG_ENABLE(color, |
1017 |
-+ AC_HELP_STRING([--disable-color], |
1018 |
-+ [disable color management panel]), |
1019 |
-+ [case "${enableval}" in |
1020 |
-+ yes) WANT_COLOR=yes ;; |
1021 |
-+ no) WANT_COLOR=no ;; |
1022 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
1023 |
-+ esac], |
1024 |
-+ [WANT_COLOR=yes]) dnl Default value |
1025 |
-+ |
1026 |
-+if test x$WANT_COLOR = xyes; then |
1027 |
-+ |
1028 |
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
1029 |
-+ colord >= $COLORD_REQUIRED_VERSION |
1030 |
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
1031 |
-+ libsoup-2.4 |
1032 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
1033 |
-+ build_color=true |
1034 |
-+fi |
1035 |
-+if test "x$build_color" = xtrue ; then |
1036 |
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
1037 |
-+fi |
1038 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
1039 |
-+AC_SUBST(COLOR_PANEL_CFLAGS) |
1040 |
-+AC_SUBST(COLOR_PANEL_LIBS) |
1041 |
-+ |
1042 |
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
1043 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
1044 |
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
1045 |
-@@ -206,8 +253,25 @@ fi |
1046 |
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) |
1047 |
- |
1048 |
- # Check for gnome-bluetooth |
1049 |
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0, |
1050 |
-- [have_bluetooth=yes], have_bluetooth=no) |
1051 |
-+have_bluetooth=no |
1052 |
-+AC_ARG_ENABLE(bluetooth, |
1053 |
-+ AC_HELP_STRING([--disable-bluetooth], |
1054 |
-+ [disable bluetooth management panel]), |
1055 |
-+ [case "${enableval}" in |
1056 |
-+ yes) WANT_BLUETOOTH=yes ;; |
1057 |
-+ no) WANT_BLUETOOTH=no ;; |
1058 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
1059 |
-+ esac], |
1060 |
-+ [WANT_BLUETOOTH=yes]) dnl Default value |
1061 |
-+ |
1062 |
-+if test x$WANT_BLUETOOTH = xyes; then |
1063 |
-+ # Check for gnome-bluetooth |
1064 |
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.0, |
1065 |
-+ [have_bluetooth=yes], have_bluetooth=no) |
1066 |
-+ have_bluetooth=yes |
1067 |
-+fi |
1068 |
-+ |
1069 |
-+ |
1070 |
- if test "x$have_bluetooth" = xyes ; then |
1071 |
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
1072 |
- fi |
1073 |
-@@ -292,15 +356,27 @@ case $host_os in |
1074 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
1075 |
- have_wacom=no |
1076 |
- else |
1077 |
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
1078 |
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
1079 |
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
1080 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
1081 |
-- clutter-gtk-1.0 |
1082 |
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
1083 |
-- have_wacom=yes |
1084 |
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
1085 |
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
1086 |
-+ AC_ARG_ENABLE(wacom, |
1087 |
-+ AC_HELP_STRING([--disable-wacom], |
1088 |
-+ [disable wacom management panel]), |
1089 |
-+ [case "${enableval}" in |
1090 |
-+ yes) WANT_WACOM=yes ;; |
1091 |
-+ no) WANT_WACOM=no ;; |
1092 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; |
1093 |
-+ esac], |
1094 |
-+ [WANT_WACOM=yes]) dnl Default value |
1095 |
-+ |
1096 |
-+ if test x$WANT_WACOM = xyes; then |
1097 |
-+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
1098 |
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
1099 |
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
1100 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
1101 |
-+ clutter-gtk-1.0 |
1102 |
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
1103 |
-+ have_wacom=yes |
1104 |
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
1105 |
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
1106 |
-+ fi |
1107 |
- fi |
1108 |
- ;; |
1109 |
- *) |
1110 |
-@@ -310,16 +386,22 @@ esac |
1111 |
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) |
1112 |
- |
1113 |
- # Kerberos kerberos support |
1114 |
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
1115 |
--if test "$KRB5_CONFIG" = "no"; then |
1116 |
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
1117 |
--fi |
1118 |
-- |
1119 |
--AC_MSG_CHECKING(for krb5 libraries and flags) |
1120 |
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
1121 |
--KRB5_LIBS="`$KRB5_CONFIG --libs`" |
1122 |
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
1123 |
-+AC_ARG_ENABLE([kerberos], |
1124 |
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, |
1125 |
-+ [enable_kerberos=yes]) |
1126 |
-+ |
1127 |
-+if test x"$enable_kerberos" != x"no" ; then |
1128 |
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
1129 |
-+ if test "$KRB5_CONFIG" = "no"; then |
1130 |
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
1131 |
-+ fi |
1132 |
- |
1133 |
-+ AC_MSG_CHECKING(for krb5 libraries and flags) |
1134 |
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
1135 |
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`" |
1136 |
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
1137 |
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) |
1138 |
-+fi |
1139 |
- AC_SUBST(KRB5_CFLAGS) |
1140 |
- AC_SUBST(KRB5_LIBS) |
1141 |
- |
1142 |
-@@ -538,6 +620,11 @@ if test "x$have_bluetooth" = "xyes"; then |
1143 |
- else |
1144 |
- AC_MSG_NOTICE([ Bluetooth panel disabled]) |
1145 |
- fi |
1146 |
-+if test "x$build_color" = "xtrue"; then |
1147 |
-+ AC_MSG_NOTICE([** colord (Color panel)]) |
1148 |
-+else |
1149 |
-+ AC_MSG_NOTICE([ Color panel disabled]) |
1150 |
-+fi |
1151 |
- if test "x$enable_cups" = "xyes"; then |
1152 |
- AC_MSG_NOTICE([** CUPS (Printers panel)]) |
1153 |
- else |
1154 |
-@@ -548,6 +635,16 @@ if test "x$have_cheese" = "xyes"; then |
1155 |
- else |
1156 |
- AC_MSG_NOTICE([ Users panel webcam support disabled]) |
1157 |
- fi |
1158 |
-+if test "x$build_online_accounts" = "xtrue"; then |
1159 |
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) |
1160 |
-+else |
1161 |
-+ AC_MSG_NOTICE([ Online Accounts panel disabled]) |
1162 |
-+fi |
1163 |
-+if test "x$build_wacom" = "xtrue"; then |
1164 |
-+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) |
1165 |
-+else |
1166 |
-+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) |
1167 |
-+fi |
1168 |
- if test "x$have_wacom" = "xyes"; then |
1169 |
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
1170 |
- else |
1171 |
-diff --git a/panels/Makefile.am b/panels/Makefile.am |
1172 |
-index 9961c25..0c54622 100644 |
1173 |
---- a/panels/Makefile.am |
1174 |
-+++ b/panels/Makefile.am |
1175 |
-@@ -2,11 +2,9 @@ SUBDIRS= \ |
1176 |
- common \ |
1177 |
- background \ |
1178 |
- power \ |
1179 |
-- color \ |
1180 |
- display \ |
1181 |
- mouse \ |
1182 |
- notifications \ |
1183 |
-- online-accounts \ |
1184 |
- region \ |
1185 |
- info \ |
1186 |
- sound \ |
1187 |
-@@ -18,6 +16,10 @@ SUBDIRS= \ |
1188 |
- privacy \ |
1189 |
- sharing |
1190 |
- |
1191 |
-+if BUILD_COLOR |
1192 |
-+SUBDIRS += color |
1193 |
-+endif |
1194 |
-+ |
1195 |
- if BUILD_WACOM |
1196 |
- SUBDIRS += wacom |
1197 |
- endif |
1198 |
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH |
1199 |
- SUBDIRS += bluetooth |
1200 |
- endif |
1201 |
- |
1202 |
-+if BUILD_ONLINE_ACCOUNTS |
1203 |
-+SUBDIRS += online-accounts |
1204 |
-+endif |
1205 |
-+ |
1206 |
- -include $(top_srcdir)/git.mk |
1207 |
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am |
1208 |
-index ccb8017..bde4cdf 100644 |
1209 |
---- a/panels/background/Makefile.am |
1210 |
-+++ b/panels/background/Makefile.am |
1211 |
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ |
1212 |
- $(BUILT_SOURCES) \ |
1213 |
- cc-background-chooser-dialog.c \ |
1214 |
- cc-background-chooser-dialog.h \ |
1215 |
-- cc-background-grilo-miner.c \ |
1216 |
-- cc-background-grilo-miner.h \ |
1217 |
- cc-background-item.c \ |
1218 |
- cc-background-item.h \ |
1219 |
- cc-background-xml.c \ |
1220 |
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ |
1221 |
- bg-colors-source.c \ |
1222 |
- bg-colors-source.h |
1223 |
- |
1224 |
-+if BUILD_ONLINE_ACCOUNTS |
1225 |
-+libbackground_chooser_la_SOURCES += \ |
1226 |
-+ cc-background-grilo-miner.c \ |
1227 |
-+ cc-background-grilo-miner.h |
1228 |
-+endif |
1229 |
-+ |
1230 |
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) |
1231 |
- |
1232 |
- libbackground_la_SOURCES = \ |
1233 |
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c |
1234 |
-index c165fa3..78ef4a5 100644 |
1235 |
---- a/panels/background/bg-pictures-source.c |
1236 |
-+++ b/panels/background/bg-pictures-source.c |
1237 |
-@@ -23,13 +23,17 @@ |
1238 |
- |
1239 |
- #include "bg-pictures-source.h" |
1240 |
- |
1241 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1242 |
- #include "cc-background-grilo-miner.h" |
1243 |
-+#endif |
1244 |
- #include "cc-background-item.h" |
1245 |
- |
1246 |
- #include <string.h> |
1247 |
- #include <cairo-gobject.h> |
1248 |
- #include <gio/gio.h> |
1249 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1250 |
- #include <grilo.h> |
1251 |
-+#endif |
1252 |
- #include <libgnome-desktop/gnome-desktop-thumbnail.h> |
1253 |
- #include <gdesktop-enums.h> |
1254 |
- |
1255 |
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate |
1256 |
- { |
1257 |
- GCancellable *cancellable; |
1258 |
- |
1259 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1260 |
- CcBackgroundGriloMiner *grl_miner; |
1261 |
-+#endif |
1262 |
- |
1263 |
- GnomeDesktopThumbnailFactory *thumb_factory; |
1264 |
- |
1265 |
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) |
1266 |
- g_clear_object (&priv->cancellable); |
1267 |
- } |
1268 |
- |
1269 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1270 |
- g_clear_object (&priv->grl_miner); |
1271 |
-+#endif |
1272 |
- g_clear_object (&priv->thumb_factory); |
1273 |
- |
1274 |
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); |
1275 |
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, |
1276 |
- gboolean needs_download; |
1277 |
- gboolean retval = FALSE; |
1278 |
- GFile *pictures_dir, *cache_dir; |
1279 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1280 |
- GrlMedia *media; |
1281 |
-+#else |
1282 |
-+ gpointer media = NULL; |
1283 |
-+#endif |
1284 |
- |
1285 |
- /* find png and jpeg files */ |
1286 |
- if (!content_type) |
1287 |
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, |
1288 |
- |
1289 |
- read_file: |
1290 |
- |
1291 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1292 |
- media = g_object_get_data (G_OBJECT (file), "grl-media"); |
1293 |
-+#endif |
1294 |
- if (media == NULL) |
1295 |
- { |
1296 |
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); |
1297 |
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, |
1298 |
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); |
1299 |
- } |
1300 |
- |
1301 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1302 |
- static gboolean |
1303 |
- add_single_file_from_media (BgPicturesSource *bg_source, |
1304 |
- GFile *file, |
1305 |
-@@ -575,6 +590,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, |
1306 |
- |
1307 |
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); |
1308 |
- } |
1309 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1310 |
- |
1311 |
- gboolean |
1312 |
- bg_pictures_source_add (BgPicturesSource *bg_source, |
1313 |
-@@ -885,6 +901,7 @@ files_changed_cb (GFileMonitor *monitor, |
1314 |
- } |
1315 |
- } |
1316 |
- |
1317 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1318 |
- static void |
1319 |
- media_found_cb (BgPicturesSource *self, GrlMedia *media) |
1320 |
- { |
1321 |
-@@ -896,6 +913,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) |
1322 |
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); |
1323 |
- add_single_file_from_media (self, file, media); |
1324 |
- } |
1325 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1326 |
- |
1327 |
- static void |
1328 |
- bg_pictures_source_init (BgPicturesSource *self) |
1329 |
-@@ -962,9 +980,11 @@ bg_pictures_source_init (BgPicturesSource *self) |
1330 |
- |
1331 |
- g_object_unref (dir); |
1332 |
- |
1333 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1334 |
- priv->grl_miner = cc_background_grilo_miner_new (); |
1335 |
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); |
1336 |
- cc_background_grilo_miner_start (priv->grl_miner); |
1337 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1338 |
- |
1339 |
- priv->thumb_factory = |
1340 |
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); |
1341 |
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c |
1342 |
-index 0849160..58d50a6 100644 |
1343 |
---- a/panels/user-accounts/um-realm-manager.c |
1344 |
-+++ b/panels/user-accounts/um-realm-manager.c |
1345 |
-@@ -22,7 +22,9 @@ |
1346 |
- |
1347 |
- #include "um-realm-manager.h" |
1348 |
- |
1349 |
-+#ifdef HAVE_KERBEROS |
1350 |
- #include <krb5/krb5.h> |
1351 |
-+#endif |
1352 |
- |
1353 |
- #include <glib.h> |
1354 |
- #include <glib/gi18n.h> |
1355 |
-@@ -696,6 +698,7 @@ login_closure_free (gpointer data) |
1356 |
- g_slice_free (LoginClosure, login); |
1357 |
- } |
1358 |
- |
1359 |
-+#ifdef HAVE_KERBEROS |
1360 |
- static krb5_error_code |
1361 |
- login_perform_kinit (krb5_context k5, |
1362 |
- const gchar *realm, |
1363 |
-@@ -759,12 +762,14 @@ login_perform_kinit (krb5_context k5, |
1364 |
- |
1365 |
- return code; |
1366 |
- } |
1367 |
-+#endif /* HAVE_KERBEROS */ |
1368 |
- |
1369 |
- static void |
1370 |
- kinit_thread_func (GSimpleAsyncResult *async, |
1371 |
- GObject *object, |
1372 |
- GCancellable *cancellable) |
1373 |
- { |
1374 |
-+#ifdef HAVE_KERBEROS |
1375 |
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); |
1376 |
- krb5_context k5 = NULL; |
1377 |
- krb5_error_code code; |
1378 |
-@@ -842,6 +847,10 @@ kinit_thread_func (GSimpleAsyncResult *async, |
1379 |
- |
1380 |
- if (k5) |
1381 |
- krb5_free_context (k5); |
1382 |
-+#else /* HAVE_KERBEROS */ |
1383 |
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, |
1384 |
-+ _("gnome-control-center was built without kerberos support")); |
1385 |
-+#endif |
1386 |
- } |
1387 |
- |
1388 |
- void |
1389 |
-diff --git a/shell/Makefile.am b/shell/Makefile.am |
1390 |
-index c0cb91a..0b820fd 100644 |
1391 |
---- a/shell/Makefile.am |
1392 |
-+++ b/shell/Makefile.am |
1393 |
-@@ -55,14 +55,12 @@ gnome_control_center_LDADD = \ |
1394 |
- $(top_builddir)/libgd/libgd.la \ |
1395 |
- $(top_builddir)/panels/common/liblanguage.la \ |
1396 |
- $(top_builddir)/panels/background/libbackground.la \ |
1397 |
-- $(top_builddir)/panels/color/libcolor.la \ |
1398 |
- $(top_builddir)/panels/datetime/libdate_time.la \ |
1399 |
- $(top_builddir)/panels/display/libdisplay.la \ |
1400 |
- $(top_builddir)/panels/info/libinfo.la \ |
1401 |
- $(top_builddir)/panels/keyboard/libkeyboard.la \ |
1402 |
- $(top_builddir)/panels/mouse/libmouse-properties.la \ |
1403 |
- $(top_builddir)/panels/notifications/libnotifications.la \ |
1404 |
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ |
1405 |
- $(top_builddir)/panels/power/libpower.la \ |
1406 |
- $(top_builddir)/panels/privacy/libprivacy.la \ |
1407 |
- $(top_builddir)/panels/region/libregion.la \ |
1408 |
-@@ -88,6 +86,14 @@ if BUILD_BLUETOOTH |
1409 |
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
1410 |
- endif |
1411 |
- |
1412 |
-+if BUILD_COLOR |
1413 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la |
1414 |
-+endif |
1415 |
-+ |
1416 |
-+if BUILD_ONLINE_ACCOUNTS |
1417 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la |
1418 |
-+endif |
1419 |
-+ |
1420 |
- # Dbus service file |
1421 |
- servicefiledir = $(datadir)/dbus-1/services |
1422 |
- servicefile_in_files = org.gnome.ControlCenter.service.in |
1423 |
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c |
1424 |
-index 26576dc..8a92f95 100644 |
1425 |
---- a/shell/cc-panel-loader.c |
1426 |
-+++ b/shell/cc-panel-loader.c |
1427 |
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); |
1428 |
- #ifdef BUILD_BLUETOOTH |
1429 |
- extern GType cc_bluetooth_panel_get_type (void); |
1430 |
- #endif /* BUILD_BLUETOOTH */ |
1431 |
-+#ifdef BUILD_COLOR |
1432 |
- extern GType cc_color_panel_get_type (void); |
1433 |
-+#endif /* BUILD_COLOR */ |
1434 |
- extern GType cc_date_time_panel_get_type (void); |
1435 |
- extern GType cc_display_panel_get_type (void); |
1436 |
- extern GType cc_info_panel_get_type (void); |
1437 |
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); |
1438 |
- extern GType cc_network_panel_get_type (void); |
1439 |
- #endif /* BUILD_NETWORK */ |
1440 |
- extern GType cc_notifications_panel_get_type (void); |
1441 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1442 |
- extern GType cc_goa_panel_get_type (void); |
1443 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1444 |
- extern GType cc_power_panel_get_type (void); |
1445 |
- #ifdef BUILD_PRINTERS |
1446 |
- extern GType cc_printers_panel_get_type (void); |
1447 |
-@@ -77,7 +81,9 @@ static struct { |
1448 |
- #ifdef BUILD_BLUETOOTH |
1449 |
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), |
1450 |
- #endif |
1451 |
-+#ifdef BUILD_COLOR |
1452 |
- PANEL_TYPE("color", cc_color_panel_get_type ), |
1453 |
-+#endif |
1454 |
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ), |
1455 |
- PANEL_TYPE("display", cc_display_panel_get_type ), |
1456 |
- PANEL_TYPE("info", cc_info_panel_get_type ), |
1457 |
-@@ -87,7 +93,9 @@ static struct { |
1458 |
- PANEL_TYPE("network", cc_network_panel_get_type ), |
1459 |
- #endif |
1460 |
- PANEL_TYPE("notifications", cc_notifications_panel_get_type), |
1461 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1462 |
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), |
1463 |
-+#endif |
1464 |
- PANEL_TYPE("power", cc_power_panel_get_type ), |
1465 |
- #ifdef BUILD_PRINTERS |
1466 |
- PANEL_TYPE("printers", cc_printers_panel_get_type ), |
1467 |
--- |
1468 |
-2.1.2 |
1469 |
- |
1470 |
|
1471 |
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch |
1472 |
deleted file mode 100644 |
1473 |
index 59379a53..00000000 |
1474 |
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.20.0-optional.patch |
1475 |
+++ /dev/null |
1476 |
@@ -1,533 +0,0 @@ |
1477 |
-From dc62978815a12d0d0fbd97e975a612a13aff0cdc Mon Sep 17 00:00:00 2001 |
1478 |
-From: Alexandre Rostovtsev <tetromino@g.o> |
1479 |
-Date: Fri, 25 Apr 2014 22:17:24 +0200 |
1480 |
-Subject: [PATCH] Make bluetooth/colord/goa/kerberos/wacom optional |
1481 |
- |
1482 |
-Upstream is not interested in any part of this patch: |
1483 |
- |
1484 |
-https://bugzilla.gnome.org/show_bug.cgi?id=686840 |
1485 |
-https://bugzilla.gnome.org/show_bug.cgi?id=697478 |
1486 |
-https://bugzilla.gnome.org/show_bug.cgi?id=700145 |
1487 |
- |
1488 |
-Signed-Off: Ole Reifschneider <tranquility@g.o> |
1489 |
---- |
1490 |
- configure.ac | 156 ++++++++++++++++++++++++++------ |
1491 |
- panels/Makefile.am | 10 +- |
1492 |
- panels/background/Makefile.am | 8 +- |
1493 |
- panels/background/bg-pictures-source.c | 20 ++++ |
1494 |
- panels/user-accounts/um-realm-manager.c | 9 ++ |
1495 |
- shell/Makefile.am | 10 +- |
1496 |
- shell/cc-panel-loader.c | 8 ++ |
1497 |
- 7 files changed, 186 insertions(+), 35 deletions(-) |
1498 |
- |
1499 |
-diff --git a/configure.ac b/configure.ac |
1500 |
-index 0c2a779..4dfff18 100644 |
1501 |
---- a/configure.ac |
1502 |
-+++ b/configure.ac |
1503 |
-@@ -119,10 +119,6 @@ LIBGD_INIT([_view-common notification static]) |
1504 |
- PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig) |
1505 |
- PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11) |
1506 |
- PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
1507 |
--PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
1508 |
-- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
1509 |
-- goa-1.0 >= $GOA_REQUIRED_VERSION |
1510 |
-- grilo-0.3 >= $GRILO_REQUIRED_VERSION) |
1511 |
- PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES |
1512 |
- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
1513 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION |
1514 |
-@@ -140,14 +136,65 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 |
1515 |
- PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0 |
1516 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
1517 |
- PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES) |
1518 |
--PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
1519 |
-+ |
1520 |
-+build_online_accounts=false |
1521 |
-+background_online_accounts= |
1522 |
-+AC_ARG_ENABLE(goa, |
1523 |
-+ AC_HELP_STRING([--disable-goa], |
1524 |
-+ [disable online accounts management panel]), |
1525 |
-+ [case "${enableval}" in |
1526 |
-+ yes) WANT_ONLINE_ACCOUNTS=yes ;; |
1527 |
-+ no) WANT_ONLINE_ACCOUNTS=no ;; |
1528 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; |
1529 |
-+ esac], |
1530 |
-+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value |
1531 |
-+ |
1532 |
-+if test x$WANT_ONLINE_ACCOUNTS = xyes; then |
1533 |
-+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION) |
1534 |
-+ build_online_accounts=true |
1535 |
-+ background_online_accounts="goa-1.0 >= $GOA_REQUIRED_VERSION grilo-0.3 >= $GRILO_REQUIRED_VERSION" |
1536 |
-+fi |
1537 |
-+if test "x$build_online_accounts" = xtrue ; then |
1538 |
-+ AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel]) |
1539 |
-+fi |
1540 |
-+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") |
1541 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) |
1542 |
-+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) |
1543 |
-+ |
1544 |
-+PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0 |
1545 |
-+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION |
1546 |
-+ $background_online_accounts) |
1547 |
-+ |
1548 |
- PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.99.0 |
1549 |
- gnome-settings-daemon >= $GSD_REQUIRED_VERSION) |
1550 |
--PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
1551 |
-- colord >= $COLORD_REQUIRED_VERSION |
1552 |
-- colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
1553 |
-- libsoup-2.4 |
1554 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
1555 |
-+ |
1556 |
-+build_color=false |
1557 |
-+AC_ARG_ENABLE(color, |
1558 |
-+ AC_HELP_STRING([--disable-color], |
1559 |
-+ [disable color management panel]), |
1560 |
-+ [case "${enableval}" in |
1561 |
-+ yes) WANT_COLOR=yes ;; |
1562 |
-+ no) WANT_COLOR=no ;; |
1563 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; |
1564 |
-+ esac], |
1565 |
-+ [WANT_COLOR=yes]) dnl Default value |
1566 |
-+ |
1567 |
-+if test x$WANT_COLOR = xyes; then |
1568 |
-+ |
1569 |
-+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES |
1570 |
-+ colord >= $COLORD_REQUIRED_VERSION |
1571 |
-+ colord-gtk >= $COLORD_GTK_REQUIRED_VERSION |
1572 |
-+ libsoup-2.4 |
1573 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) |
1574 |
-+ build_color=true |
1575 |
-+fi |
1576 |
-+if test "x$build_color" = xtrue ; then |
1577 |
-+ AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel]) |
1578 |
-+fi |
1579 |
-+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") |
1580 |
-+AC_SUBST(COLOR_PANEL_CFLAGS) |
1581 |
-+AC_SUBST(COLOR_PANEL_LIBS) |
1582 |
-+ |
1583 |
- PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES |
1584 |
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) |
1585 |
- PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES) |
1586 |
-@@ -221,8 +268,25 @@ fi |
1587 |
- AM_CONDITIONAL(HAVE_NM_UNSTABLE, [test x$nm_unstable = xyes]) |
1588 |
- |
1589 |
- # Check for gnome-bluetooth |
1590 |
--PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2, |
1591 |
-- [have_bluetooth=yes], have_bluetooth=no) |
1592 |
-+have_bluetooth=no |
1593 |
-+AC_ARG_ENABLE(bluetooth, |
1594 |
-+ AC_HELP_STRING([--disable-bluetooth], |
1595 |
-+ [disable bluetooth management panel]), |
1596 |
-+ [case "${enableval}" in |
1597 |
-+ yes) WANT_BLUETOOTH=yes ;; |
1598 |
-+ no) WANT_BLUETOOTH=no ;; |
1599 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; |
1600 |
-+ esac], |
1601 |
-+ [WANT_BLUETOOTH=yes]) dnl Default value |
1602 |
-+ |
1603 |
-+if test x$WANT_BLUETOOTH = xyes; then |
1604 |
-+ # Check for gnome-bluetooth |
1605 |
-+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.18.2, |
1606 |
-+ [have_bluetooth=yes], have_bluetooth=no) |
1607 |
-+ have_bluetooth=yes |
1608 |
-+fi |
1609 |
-+ |
1610 |
-+ |
1611 |
- if test "x$have_bluetooth" = xyes ; then |
1612 |
- AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel]) |
1613 |
- fi |
1614 |
-@@ -307,15 +371,27 @@ case $host_os in |
1615 |
- if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then |
1616 |
- have_wacom=no |
1617 |
- else |
1618 |
-- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
1619 |
-- gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
1620 |
-- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
1621 |
-- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
1622 |
-- clutter-gtk-1.0 |
1623 |
-- clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
1624 |
-- have_wacom=yes |
1625 |
-- AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
1626 |
-- AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
1627 |
-+ AC_ARG_ENABLE(wacom, |
1628 |
-+ AC_HELP_STRING([--disable-wacom], |
1629 |
-+ [disable wacom management panel]), |
1630 |
-+ [case "${enableval}" in |
1631 |
-+ yes) WANT_WACOM=yes ;; |
1632 |
-+ no) WANT_WACOM=no ;; |
1633 |
-+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; |
1634 |
-+ esac], |
1635 |
-+ [WANT_WACOM=yes]) dnl Default value |
1636 |
-+ |
1637 |
-+ if test x$WANT_WACOM = xyes; then |
1638 |
-+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES |
1639 |
-+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION |
1640 |
-+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION |
1641 |
-+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION |
1642 |
-+ clutter-gtk-1.0 |
1643 |
-+ clutter-1.0 >= $CLUTTER_REQUIRED_VERSION) |
1644 |
-+ have_wacom=yes |
1645 |
-+ AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel]) |
1646 |
-+ AC_DEFINE(HAVE_WACOM, 1, [Define to 1 is Wacom is supportted]) |
1647 |
-+ fi |
1648 |
- fi |
1649 |
- ;; |
1650 |
- *) |
1651 |
-@@ -325,15 +401,22 @@ esac |
1652 |
- AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes]) |
1653 |
- |
1654 |
- # Kerberos kerberos support |
1655 |
--AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
1656 |
--if test "$KRB5_CONFIG" = "no"; then |
1657 |
-- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
1658 |
--fi |
1659 |
-+AC_ARG_ENABLE([kerberos], |
1660 |
-+ AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),, |
1661 |
-+ [enable_kerberos=yes]) |
1662 |
-+ |
1663 |
-+if test x"$enable_kerberos" != x"no" ; then |
1664 |
-+ AC_PATH_PROG(KRB5_CONFIG, krb5-config, no) |
1665 |
-+ if test "$KRB5_CONFIG" = "no"; then |
1666 |
-+ AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries]) |
1667 |
-+ fi |
1668 |
- |
1669 |
--AC_MSG_CHECKING(for krb5 libraries and flags) |
1670 |
--KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
1671 |
--KRB5_LIBS="`$KRB5_CONFIG --libs`" |
1672 |
--AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
1673 |
-+ AC_MSG_CHECKING(for krb5 libraries and flags) |
1674 |
-+ KRB5_CFLAGS="`$KRB5_CONFIG --cflags`" |
1675 |
-+ KRB5_LIBS="`$KRB5_CONFIG --libs`" |
1676 |
-+ AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS) |
1677 |
-+ AC_DEFINE(HAVE_KERBEROS, 1, [defined if krb5 is available]) |
1678 |
-+fi |
1679 |
- |
1680 |
- AC_SUBST(KRB5_CFLAGS) |
1681 |
- AC_SUBST(KRB5_LIBS) |
1682 |
-@@ -569,6 +652,11 @@ if test "x$have_bluetooth" = "xyes"; then |
1683 |
- else |
1684 |
- AC_MSG_NOTICE([ Bluetooth panel disabled]) |
1685 |
- fi |
1686 |
-+if test "x$build_color" = "xtrue"; then |
1687 |
-+ AC_MSG_NOTICE([** colord (Color panel)]) |
1688 |
-+else |
1689 |
-+ AC_MSG_NOTICE([ Color panel disabled]) |
1690 |
-+fi |
1691 |
- if test "x$enable_cups" = "xyes"; then |
1692 |
- AC_MSG_NOTICE([** CUPS (Printers panel)]) |
1693 |
- else |
1694 |
-@@ -579,6 +667,16 @@ if test "x$have_cheese" = "xyes"; then |
1695 |
- else |
1696 |
- AC_MSG_NOTICE([ Users panel webcam support disabled]) |
1697 |
- fi |
1698 |
-+if test "x$build_online_accounts" = "xtrue"; then |
1699 |
-+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) |
1700 |
-+else |
1701 |
-+ AC_MSG_NOTICE([ Online Accounts panel disabled]) |
1702 |
-+fi |
1703 |
-+if test "x$build_wacom" = "xtrue"; then |
1704 |
-+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) |
1705 |
-+else |
1706 |
-+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) |
1707 |
-+fi |
1708 |
- if test "x$have_wacom" = "xyes"; then |
1709 |
- AC_MSG_NOTICE([** wacom (Wacom tablet panel)]) |
1710 |
- else |
1711 |
-diff --git a/panels/Makefile.am b/panels/Makefile.am |
1712 |
-index 9961c25..0c54622 100644 |
1713 |
---- a/panels/Makefile.am |
1714 |
-+++ b/panels/Makefile.am |
1715 |
-@@ -2,11 +2,9 @@ SUBDIRS= \ |
1716 |
- common \ |
1717 |
- background \ |
1718 |
- power \ |
1719 |
-- color \ |
1720 |
- display \ |
1721 |
- mouse \ |
1722 |
- notifications \ |
1723 |
-- online-accounts \ |
1724 |
- region \ |
1725 |
- info \ |
1726 |
- sound \ |
1727 |
-@@ -18,6 +16,10 @@ SUBDIRS= \ |
1728 |
- privacy \ |
1729 |
- sharing |
1730 |
- |
1731 |
-+if BUILD_COLOR |
1732 |
-+SUBDIRS += color |
1733 |
-+endif |
1734 |
-+ |
1735 |
- if BUILD_WACOM |
1736 |
- SUBDIRS += wacom |
1737 |
- endif |
1738 |
-@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH |
1739 |
- SUBDIRS += bluetooth |
1740 |
- endif |
1741 |
- |
1742 |
-+if BUILD_ONLINE_ACCOUNTS |
1743 |
-+SUBDIRS += online-accounts |
1744 |
-+endif |
1745 |
-+ |
1746 |
- -include $(top_srcdir)/git.mk |
1747 |
-diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am |
1748 |
-index ccb8017..bde4cdf 100644 |
1749 |
---- a/panels/background/Makefile.am |
1750 |
-+++ b/panels/background/Makefile.am |
1751 |
-@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \ |
1752 |
- $(BUILT_SOURCES) \ |
1753 |
- cc-background-chooser-dialog.c \ |
1754 |
- cc-background-chooser-dialog.h \ |
1755 |
-- cc-background-grilo-miner.c \ |
1756 |
-- cc-background-grilo-miner.h \ |
1757 |
- cc-background-item.c \ |
1758 |
- cc-background-item.h \ |
1759 |
- cc-background-xml.c \ |
1760 |
-@@ -42,6 +40,12 @@ libbackground_chooser_la_SOURCES = \ |
1761 |
- bg-colors-source.c \ |
1762 |
- bg-colors-source.h |
1763 |
- |
1764 |
-+if BUILD_ONLINE_ACCOUNTS |
1765 |
-+libbackground_chooser_la_SOURCES += \ |
1766 |
-+ cc-background-grilo-miner.c \ |
1767 |
-+ cc-background-grilo-miner.h |
1768 |
-+endif |
1769 |
-+ |
1770 |
- libbackground_chooser_la_LIBADD = $(PANEL_LIBS) $(BACKGROUND_PANEL_LIBS) |
1771 |
- |
1772 |
- libbackground_la_SOURCES = \ |
1773 |
-diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c |
1774 |
-index de5f189..c41267d 100644 |
1775 |
---- a/panels/background/bg-pictures-source.c |
1776 |
-+++ b/panels/background/bg-pictures-source.c |
1777 |
-@@ -23,13 +23,17 @@ |
1778 |
- |
1779 |
- #include "bg-pictures-source.h" |
1780 |
- |
1781 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1782 |
- #include "cc-background-grilo-miner.h" |
1783 |
-+#endif |
1784 |
- #include "cc-background-item.h" |
1785 |
- |
1786 |
- #include <string.h> |
1787 |
- #include <cairo-gobject.h> |
1788 |
- #include <gio/gio.h> |
1789 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1790 |
- #include <grilo.h> |
1791 |
-+#endif |
1792 |
- #include <libgnome-desktop/gnome-desktop-thumbnail.h> |
1793 |
- #include <gdesktop-enums.h> |
1794 |
- |
1795 |
-@@ -46,7 +50,9 @@ struct _BgPicturesSourcePrivate |
1796 |
- { |
1797 |
- GCancellable *cancellable; |
1798 |
- |
1799 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1800 |
- CcBackgroundGriloMiner *grl_miner; |
1801 |
-+#endif |
1802 |
- |
1803 |
- GnomeDesktopThumbnailFactory *thumb_factory; |
1804 |
- |
1805 |
-@@ -84,7 +90,9 @@ bg_pictures_source_dispose (GObject *object) |
1806 |
- g_clear_object (&priv->cancellable); |
1807 |
- } |
1808 |
- |
1809 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1810 |
- g_clear_object (&priv->grl_miner); |
1811 |
-+#endif |
1812 |
- g_clear_object (&priv->thumb_factory); |
1813 |
- |
1814 |
- G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object); |
1815 |
-@@ -414,7 +422,11 @@ add_single_file (BgPicturesSource *bg_source, |
1816 |
- gboolean needs_download; |
1817 |
- gboolean retval = FALSE; |
1818 |
- GFile *pictures_dir, *cache_dir; |
1819 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1820 |
- GrlMedia *media; |
1821 |
-+#else |
1822 |
-+ gpointer media = NULL; |
1823 |
-+#endif |
1824 |
- |
1825 |
- /* find png and jpeg files */ |
1826 |
- if (!content_type) |
1827 |
-@@ -473,7 +485,9 @@ add_single_file (BgPicturesSource *bg_source, |
1828 |
- |
1829 |
- read_file: |
1830 |
- |
1831 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1832 |
- media = g_object_get_data (G_OBJECT (file), "grl-media"); |
1833 |
-+#endif |
1834 |
- if (media == NULL) |
1835 |
- { |
1836 |
- g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref); |
1837 |
-@@ -556,6 +570,7 @@ add_single_file_from_info (BgPicturesSource *bg_source, |
1838 |
- return add_single_file (bg_source, file, content_type, mtime, ret_row_ref); |
1839 |
- } |
1840 |
- |
1841 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1842 |
- static gboolean |
1843 |
- add_single_file_from_media (BgPicturesSource *bg_source, |
1844 |
- GFile *file, |
1845 |
-@@ -580,6 +595,7 @@ add_single_file_from_media (BgPicturesSource *bg_source, |
1846 |
- |
1847 |
- return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL); |
1848 |
- } |
1849 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1850 |
- |
1851 |
- gboolean |
1852 |
- bg_pictures_source_add (BgPicturesSource *bg_source, |
1853 |
-@@ -891,6 +907,7 @@ files_changed_cb (GFileMonitor *monitor, |
1854 |
- } |
1855 |
- } |
1856 |
- |
1857 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1858 |
- static void |
1859 |
- media_found_cb (BgPicturesSource *self, GrlMedia *media) |
1860 |
- { |
1861 |
-@@ -902,6 +919,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media) |
1862 |
- g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref); |
1863 |
- add_single_file_from_media (self, file, media); |
1864 |
- } |
1865 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1866 |
- |
1867 |
- static void |
1868 |
- bg_pictures_source_init (BgPicturesSource *self) |
1869 |
-@@ -969,9 +987,11 @@ bg_pictures_source_init (BgPicturesSource *self) |
1870 |
- |
1871 |
- g_object_unref (dir); |
1872 |
- |
1873 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1874 |
- priv->grl_miner = cc_background_grilo_miner_new (); |
1875 |
- g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self); |
1876 |
- cc_background_grilo_miner_start (priv->grl_miner); |
1877 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1878 |
- |
1879 |
- priv->thumb_factory = |
1880 |
- gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); |
1881 |
-diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c |
1882 |
-index 8a0a0e6..22c6b94 100644 |
1883 |
---- a/panels/user-accounts/um-realm-manager.c |
1884 |
-+++ b/panels/user-accounts/um-realm-manager.c |
1885 |
-@@ -22,7 +22,9 @@ |
1886 |
- |
1887 |
- #include "um-realm-manager.h" |
1888 |
- |
1889 |
-+#ifdef HAVE_KERBEROS |
1890 |
- #include <krb5/krb5.h> |
1891 |
-+#endif |
1892 |
- |
1893 |
- #include <glib.h> |
1894 |
- #include <glib/gi18n.h> |
1895 |
-@@ -698,6 +700,7 @@ login_closure_free (gpointer data) |
1896 |
- g_slice_free (LoginClosure, login); |
1897 |
- } |
1898 |
- |
1899 |
-+#ifdef HAVE_KERBEROS |
1900 |
- static krb5_error_code |
1901 |
- login_perform_kinit (krb5_context k5, |
1902 |
- const gchar *realm, |
1903 |
-@@ -761,12 +764,14 @@ login_perform_kinit (krb5_context k5, |
1904 |
- |
1905 |
- return code; |
1906 |
- } |
1907 |
-+#endif /* HAVE_KERBEROS */ |
1908 |
- |
1909 |
- static void |
1910 |
- kinit_thread_func (GSimpleAsyncResult *async, |
1911 |
- GObject *object, |
1912 |
- GCancellable *cancellable) |
1913 |
- { |
1914 |
-+#ifdef HAVE_KERBEROS |
1915 |
- LoginClosure *login = g_simple_async_result_get_op_res_gpointer (async); |
1916 |
- krb5_context k5 = NULL; |
1917 |
- krb5_error_code code; |
1918 |
-@@ -844,6 +849,10 @@ kinit_thread_func (GSimpleAsyncResult *async, |
1919 |
- |
1920 |
- if (k5) |
1921 |
- krb5_free_context (k5); |
1922 |
-+#else /* HAVE_KERBEROS */ |
1923 |
-+ g_simple_async_result_set_error (async, UM_REALM_ERROR, UM_REALM_ERROR_GENERIC, |
1924 |
-+ _("gnome-control-center was built without kerberos support")); |
1925 |
-+#endif |
1926 |
- } |
1927 |
- |
1928 |
- void |
1929 |
-diff --git a/shell/Makefile.am b/shell/Makefile.am |
1930 |
-index e9cac8b..7706437 100644 |
1931 |
---- a/shell/Makefile.am |
1932 |
-+++ b/shell/Makefile.am |
1933 |
-@@ -58,14 +58,12 @@ gnome_control_center_LDADD = \ |
1934 |
- $(top_builddir)/panels/common/liblanguage.la \ |
1935 |
- $(top_builddir)/panels/common/libdevice.la \ |
1936 |
- $(top_builddir)/panels/background/libbackground.la \ |
1937 |
-- $(top_builddir)/panels/color/libcolor.la \ |
1938 |
- $(top_builddir)/panels/datetime/libdate_time.la \ |
1939 |
- $(top_builddir)/panels/display/libdisplay.la \ |
1940 |
- $(top_builddir)/panels/info/libinfo.la \ |
1941 |
- $(top_builddir)/panels/keyboard/libkeyboard.la \ |
1942 |
- $(top_builddir)/panels/mouse/libmouse-properties.la \ |
1943 |
- $(top_builddir)/panels/notifications/libnotifications.la \ |
1944 |
-- $(top_builddir)/panels/online-accounts/libonline-accounts.la \ |
1945 |
- $(top_builddir)/panels/power/libpower.la \ |
1946 |
- $(top_builddir)/panels/privacy/libprivacy.la \ |
1947 |
- $(top_builddir)/panels/region/libregion.la \ |
1948 |
-@@ -91,6 +89,14 @@ if BUILD_BLUETOOTH |
1949 |
- gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la |
1950 |
- endif |
1951 |
- |
1952 |
-+if BUILD_COLOR |
1953 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la |
1954 |
-+endif |
1955 |
-+ |
1956 |
-+if BUILD_ONLINE_ACCOUNTS |
1957 |
-+gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la |
1958 |
-+endif |
1959 |
-+ |
1960 |
- # Dbus service file |
1961 |
- servicefiledir = $(datadir)/dbus-1/services |
1962 |
- servicefile_in_files = org.gnome.ControlCenter.service.in |
1963 |
-diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c |
1964 |
-index de9c5df..17503fe 100644 |
1965 |
---- a/shell/cc-panel-loader.c |
1966 |
-+++ b/shell/cc-panel-loader.c |
1967 |
-@@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void); |
1968 |
- #ifdef BUILD_BLUETOOTH |
1969 |
- extern GType cc_bluetooth_panel_get_type (void); |
1970 |
- #endif /* BUILD_BLUETOOTH */ |
1971 |
-+#ifdef BUILD_COLOR |
1972 |
- extern GType cc_color_panel_get_type (void); |
1973 |
-+#endif /* BUILD_COLOR */ |
1974 |
- extern GType cc_date_time_panel_get_type (void); |
1975 |
- extern GType cc_display_panel_get_type (void); |
1976 |
- extern GType cc_info_panel_get_type (void); |
1977 |
-@@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void); |
1978 |
- extern GType cc_network_panel_get_type (void); |
1979 |
- #endif /* BUILD_NETWORK */ |
1980 |
- extern GType cc_notifications_panel_get_type (void); |
1981 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
1982 |
- extern GType cc_goa_panel_get_type (void); |
1983 |
-+#endif /* BUILD_ONLINE_ACCOUNTS */ |
1984 |
- extern GType cc_power_panel_get_type (void); |
1985 |
- #ifdef BUILD_PRINTERS |
1986 |
- extern GType cc_printers_panel_get_type (void); |
1987 |
-@@ -77,7 +81,9 @@ static struct { |
1988 |
- #ifdef BUILD_BLUETOOTH |
1989 |
- PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ), |
1990 |
- #endif |
1991 |
-+#ifdef BUILD_COLOR |
1992 |
- PANEL_TYPE("color", cc_color_panel_get_type ), |
1993 |
-+#endif |
1994 |
- PANEL_TYPE("datetime", cc_date_time_panel_get_type ), |
1995 |
- PANEL_TYPE("display", cc_display_panel_get_type ), |
1996 |
- PANEL_TYPE("info", cc_info_panel_get_type ), |
1997 |
-@@ -87,7 +93,9 @@ static struct { |
1998 |
- PANEL_TYPE("network", cc_network_panel_get_type ), |
1999 |
- #endif |
2000 |
- PANEL_TYPE("notifications", cc_notifications_panel_get_type), |
2001 |
-+#ifdef BUILD_ONLINE_ACCOUNTS |
2002 |
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ), |
2003 |
-+#endif |
2004 |
- PANEL_TYPE("power", cc_power_panel_get_type ), |
2005 |
- #ifdef BUILD_PRINTERS |
2006 |
- PANEL_TYPE("printers", cc_printers_panel_get_type ), |
2007 |
--- |
2008 |
-2.7.4 |
2009 |
- |
2010 |
|
2011 |
diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild |
2012 |
deleted file mode 100644 |
2013 |
index cbf8f1dc..00000000 |
2014 |
--- a/gnome-base/gnome-control-center/gnome-control-center-3.26.2.ebuild |
2015 |
+++ /dev/null |
2016 |
@@ -1,161 +0,0 @@ |
2017 |
-# Copyright 1999-2018 Gentoo Foundation |
2018 |
-# Distributed under the terms of the GNU General Public License v2 |
2019 |
- |
2020 |
-EAPI=6 |
2021 |
-GNOME2_LA_PUNT="yes" |
2022 |
-GNOME2_EAUTORECONF="yes" |
2023 |
- |
2024 |
-inherit bash-completion-r1 gnome2 |
2025 |
- |
2026 |
-DESCRIPTION="GNOME's main interface to configure various aspects of the desktop" |
2027 |
-HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/" |
2028 |
-SRC_URI+=" https://dev.gentoo.org/~mgorny/dist/${PN}-3.24.2-patchset.tar.xz" |
2029 |
- |
2030 |
-LICENSE="GPL-2+" |
2031 |
-SLOT="2" |
2032 |
-IUSE="+bluetooth +colord +cups debug +gnome-online-accounts +ibus input_devices_wacom kerberos networkmanager v4l wayland" |
2033 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" |
2034 |
- |
2035 |
-# gnome-session-2.91.6-r1 is needed so that 10-user-dirs-update is run at login |
2036 |
-# g-s-d[policykit] needed for bug #403527 |
2037 |
-# kerberos unfortunately means mit-krb5; build fails with heimdal |
2038 |
-# udev could be made optional, only conditions gsd-device-panel |
2039 |
-# (mouse, keyboards, touchscreen, etc) |
2040 |
-# display panel requires colord and gnome-settings-daemon[colord] |
2041 |
-# printer panel requires cups and smbclient (the latter is not patch yet to be separately optional) |
2042 |
-COMMON_DEPEND=" |
2043 |
- >=dev-libs/glib-2.53.0:2[dbus] |
2044 |
- >=x11-libs/gdk-pixbuf-2.23.0:2 |
2045 |
- >=x11-libs/gtk+-3.22.0:3[X,wayland?] |
2046 |
- >=gnome-base/gsettings-desktop-schemas-3.21.4 |
2047 |
- >=gnome-base/gnome-desktop-3.21.2:3= |
2048 |
- >=gnome-base/gnome-settings-daemon-3.25.90[colord,policykit] |
2049 |
- >=x11-misc/colord-0.1.34:0= |
2050 |
- |
2051 |
- >=dev-libs/libpwquality-1.2.2 |
2052 |
- dev-libs/libxml2:2 |
2053 |
- gnome-base/libgtop:2= |
2054 |
- media-libs/fontconfig |
2055 |
- >=sys-apps/accountsservice-0.6.39 |
2056 |
- |
2057 |
- >=media-libs/libcanberra-0.13[gtk3] |
2058 |
- >=media-sound/pulseaudio-2[glib] |
2059 |
- >=sys-auth/polkit-0.97 |
2060 |
- >=sys-power/upower-0.99:= |
2061 |
- |
2062 |
- virtual/libgudev |
2063 |
- x11-apps/xmodmap |
2064 |
- x11-libs/cairo |
2065 |
- x11-libs/libX11 |
2066 |
- x11-libs/libXxf86misc |
2067 |
- >=x11-libs/libXi-1.2 |
2068 |
- |
2069 |
- bluetooth? ( >=net-wireless/gnome-bluetooth-3.18.2:= ) |
2070 |
- colord? ( |
2071 |
- net-libs/libsoup:2.4 |
2072 |
- >=x11-misc/colord-0.1.34:0= |
2073 |
- >=x11-libs/colord-gtk-0.1.24 ) |
2074 |
- cups? ( |
2075 |
- >=net-print/cups-1.7[dbus] |
2076 |
- >=net-fs/samba-4.0.0[client] |
2077 |
- ) |
2078 |
- gnome-online-accounts? ( |
2079 |
- >=media-libs/grilo-0.3.0:0.3= |
2080 |
- >=net-libs/gnome-online-accounts-3.25.3:= ) |
2081 |
- ibus? ( >=app-i18n/ibus-1.5.2 ) |
2082 |
- kerberos? ( app-crypt/mit-krb5 ) |
2083 |
- networkmanager? ( |
2084 |
- >=gnome-extra/nm-applet-1.2.0 |
2085 |
- >=net-misc/networkmanager-1.2.0:=[modemmanager] |
2086 |
- >=net-misc/modemmanager-0.7.990 ) |
2087 |
- v4l? ( |
2088 |
- media-libs/clutter-gtk:1.0 |
2089 |
- >=media-video/cheese-3.5.91 ) |
2090 |
- input_devices_wacom? ( |
2091 |
- >=dev-libs/libwacom-0.7 |
2092 |
- >=media-libs/clutter-1.11.3:1.0 |
2093 |
- media-libs/clutter-gtk:1.0 |
2094 |
- >=x11-libs/libXi-1.2 ) |
2095 |
-" |
2096 |
-# <gnome-color-manager-3.1.2 has file collisions with g-c-c-3.1.x |
2097 |
-# libgnomekbd needed only for gkbd-keyboard-display tool |
2098 |
-# |
2099 |
-# mouse panel needs a concrete set of X11 drivers at runtime, bug #580474 |
2100 |
-# Also we need newer driver versions to allow wacom and libinput drivers to |
2101 |
-# not collide |
2102 |
-# |
2103 |
-# system-config-printer provides org.fedoraproject.Config.Printing service and interface |
2104 |
-# cups-pk-helper provides org.opensuse.cupspkhelper.mechanism.all-edit policykit helper policy |
2105 |
-RDEPEND="${COMMON_DEPEND} |
2106 |
- || ( >=sys-apps/systemd-31 ( app-admin/openrc-settingsd sys-auth/consolekit ) ) |
2107 |
- x11-themes/adwaita-icon-theme |
2108 |
- colord? ( >=gnome-extra/gnome-color-manager-3 ) |
2109 |
- cups? ( |
2110 |
- app-admin/system-config-printer |
2111 |
- net-print/cups-pk-helper ) |
2112 |
- input_devices_wacom? ( gnome-base/gnome-settings-daemon[input_devices_wacom] ) |
2113 |
- >=gnome-base/libgnomekbd-3 |
2114 |
- wayland? ( dev-libs/libinput ) |
2115 |
- !wayland? ( |
2116 |
- >=x11-drivers/xf86-input-libinput-0.19.0 |
2117 |
- input_devices_wacom? ( >=x11-drivers/xf86-input-wacom-0.33.0 ) ) |
2118 |
- |
2119 |
- !<gnome-base/gdm-2.91.94 |
2120 |
- !<gnome-extra/gnome-color-manager-3.1.2 |
2121 |
- !gnome-extra/gnome-media[pulseaudio] |
2122 |
- !<gnome-extra/gnome-media-2.32.0-r300 |
2123 |
- !<net-wireless/gnome-bluetooth-3.3.2 |
2124 |
-" |
2125 |
-# PDEPEND to avoid circular dependency |
2126 |
-PDEPEND=">=gnome-base/gnome-session-2.91.6-r1" |
2127 |
- |
2128 |
-DEPEND="${COMMON_DEPEND} |
2129 |
- x11-base/xorg-proto |
2130 |
- |
2131 |
- dev-libs/libxml2:2 |
2132 |
- dev-libs/libxslt |
2133 |
- >=dev-util/intltool-0.40.1 |
2134 |
- >=sys-devel/gettext-0.17 |
2135 |
- virtual/pkgconfig |
2136 |
- |
2137 |
- gnome-base/gnome-common |
2138 |
- sys-devel/autoconf-archive |
2139 |
-" |
2140 |
-# Needed for autoreconf |
2141 |
-# gnome-base/gnome-common |
2142 |
-# sys-devel/autoconf-archive |
2143 |
- |
2144 |
-PATCHES=( |
2145 |
- # Make some panels and dependencies optional; requires eautoreconf |
2146 |
- # https://bugzilla.gnome.org/686840, 697478, 700145 |
2147 |
- "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional.patch |
2148 |
- "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-wayland.patch |
2149 |
- "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-networkmanager.patch |
2150 |
- "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-optional-cups.patch |
2151 |
- # Fix some absolute paths to be appropriate for Gentoo |
2152 |
- "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-gentoo-paths.patch |
2153 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=780544 |
2154 |
- "${WORKDIR}"/${PN}-3.24.2-patchset/3.24.2-fix-without-gdkwayland.patch |
2155 |
-) |
2156 |
- |
2157 |
-src_configure() { |
2158 |
- gnome2_src_configure \ |
2159 |
- --disable-update-mimedb \ |
2160 |
- --disable-static \ |
2161 |
- --enable-documentation \ |
2162 |
- $(use_enable bluetooth) \ |
2163 |
- $(use_enable colord color) \ |
2164 |
- $(use_enable cups) \ |
2165 |
- $(usex debug --enable-debug=yes ' ') \ |
2166 |
- $(use_enable gnome-online-accounts goa) \ |
2167 |
- $(use_enable ibus) \ |
2168 |
- $(use_enable kerberos) \ |
2169 |
- $(use_enable networkmanager) \ |
2170 |
- $(use_with v4l cheese) \ |
2171 |
- $(use_enable input_devices_wacom wacom) \ |
2172 |
- $(use_enable wayland) |
2173 |
-} |
2174 |
- |
2175 |
-src_install() { |
2176 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
2177 |
-} |