Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Gilles Dartiguelongue (eva)" <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gnome-control-center/files: gnome-control-center-3.5.91-optional-kerberos.patch gnome-control-center-3.5.91-gentoo-paths.patch gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch gnome-control-center-3.6.3-pulseaudio-3-fix.patch gnome-control-center-3.2.1-optional-colord.patch gnome-control-center-3.2.2-timezone-free.patch gnome-control-center-3.2.3-cups-1.6.patch gnome-control-center-3.2.2-metacity-gconf.patch gnome-control-center-3.2.3-optional-colord-goa.patch gnome-control-center-3.2.2-timezones-linguas.patch
Date: Tue, 25 Dec 2012 22:01:12
Message-Id: 20121225220101.4A5F72171D@flycatcher.gentoo.org
1 eva 12/12/25 22:01:01
2
3 Added: gnome-control-center-3.5.91-optional-kerberos.patch
4 gnome-control-center-3.5.91-gentoo-paths.patch
5 gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
6 gnome-control-center-3.6.3-pulseaudio-3-fix.patch
7 Removed: gnome-control-center-3.2.1-optional-colord.patch
8 gnome-control-center-3.2.2-timezone-free.patch
9 gnome-control-center-3.2.3-cups-1.6.patch
10 gnome-control-center-3.2.2-metacity-gconf.patch
11 gnome-control-center-3.2.3-optional-colord-goa.patch
12 gnome-control-center-3.2.2-timezones-linguas.patch
13 Log:
14 Version bump for Gnome 3.6. Switch to EAPI=5. Clean up old revisions.
15
16 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)
17
18 Revision Changes Path
19 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch
20
21 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch?rev=1.1&view=markup
22 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-kerberos.patch?rev=1.1&content-type=text/plain
23
24 Index: gnome-control-center-3.5.91-optional-kerberos.patch
25 ===================================================================
26 From 88e3f2146b0740161dc3b2095dcf05c538b67e36 Mon Sep 17 00:00:00 2001
27 From: Priit Laes <plaes@×××××.org>
28 Date: Mon, 10 Sep 2012 18:49:43 +0300
29 Subject: [PATCH] Crappy patch to allow disabling kerberos requirement
30
31 https://bugzilla.gnome.org/show_bug.cgi?id=686840
32 ---
33 configure.ac | 22 ++++++++++++++--------
34 panels/user-accounts/um-account-dialog.c | 30 ++++++++++++++++++++++++++----
35 panels/user-accounts/um-realm-manager.c | 2 ++
36 3 files changed, 42 insertions(+), 12 deletions(-)
37
38 diff --git a/configure.ac b/configure.ac
39 index fa4b12f..c1e188f 100644
40 --- a/configure.ac
41 +++ b/configure.ac
42 @@ -321,16 +321,22 @@ AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes
43 ISO_CODES=iso-codes
44
45 # Kerberos kerberos support
46 -AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
47 -if test "$KRB5_CONFIG" = "no"; then
48 - AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
49 -fi
50
51 -AC_MSG_CHECKING(for krb5 libraries and flags)
52 -KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
53 -KRB5_LIBS="`$KRB5_CONFIG --libs`"
54 -AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
55 +AC_ARG_ENABLE([kerberos],
56 + AS_HELP_STRING([--disable-kerberos], [disable kerberos support (default: enabled)]),,
57 + [enable_kerberos=yes])
58 +
59 +if test x"$enable_kerberos" != x"no" ; then
60 + AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
61 + if test "$KRB5_CONFIG" = "no"; then
62 + AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
63 + fi
64
65 + AC_MSG_CHECKING(for krb5 libraries and flags)
66 + KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
67 + KRB5_LIBS="`$KRB5_CONFIG --libs`"
68 + AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
69 +fi
70 AC_SUBST(KRB5_CFLAGS)
71 AC_SUBST(KRB5_LIBS)
72
73 diff --git a/panels/user-accounts/um-account-dialog.c b/panels/user-accounts/um-account-dialog.c
74 index 9dbda5c..6b82980 100644
75 --- a/panels/user-accounts/um-account-dialog.c
76 +++ b/panels/user-accounts/um-account-dialog.c
77 @@ -26,10 +26,13 @@
78 #include <gtk/gtk.h>
79
80 #include "um-account-dialog.h"
81 -#include "um-realm-manager.h"
82 #include "um-user-manager.h"
83 #include "um-utils.h"
84
85 +#ifdef KERBEROS
86 +#include "um-realm-manager.h"
87 +#endif
88 +
89 typedef enum {
90 UM_LOCAL,
91 UM_ENTERPRISE,
92 @@ -41,6 +44,7 @@ static void mode_change (UmAccountDialog *self,
93
94 static void dialog_validate (UmAccountDialog *self);
95
96 +#ifdef KERBEROS
97 static void on_join_login (GObject *source,
98 GAsyncResult *result,
99 gpointer user_data);
100 @@ -48,6 +52,7 @@ static void on_join_login (GObject *source,
101 static void on_realm_joined (GObject *source,
102 GAsyncResult *result,
103 gpointer user_data);
104 +#endif
105
106 #define UM_ACCOUNT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UM_TYPE_ACCOUNT_DIALOG, \
107 UmAccountDialogClass))
108 @@ -83,6 +88,7 @@ struct _UmAccountDialog {
109 gboolean enterprise_domain_chosen;
110 GtkEntry *enterprise_login;
111 GtkEntry *enterprise_password;
112 +#ifdef KERBEROS
113 UmRealmManager *realm_manager;
114 UmRealmObject *selected_realm;
115
116 @@ -92,6 +98,7 @@ struct _UmAccountDialog {
117 GtkEntry *join_name;
118 GtkEntry *join_password;
119 gboolean join_prompted;
120 +#endif
121 };
122
123 struct _UmAccountDialogClass {
124 @@ -292,6 +299,7 @@ local_prepare (UmAccountDialog *self)
125 gtk_combo_box_set_active (GTK_COMBO_BOX (self->local_account_type), 0);
126 }
127
128 +#ifdef KERBEROS
129 static gboolean
130 enterprise_validate (UmAccountDialog *self)
131 {
132 @@ -461,7 +469,6 @@ on_join_response (GtkDialog *dialog,
133 on_join_login,
134 g_object_ref (self));
135 }
136 -
137 static void
138 join_show_prompt (UmAccountDialog *self,
139 GError *error)
140 @@ -839,6 +846,7 @@ enterprise_prepare (UmAccountDialog *self)
141 gtk_entry_set_text (GTK_ENTRY (self->enterprise_login), "");
142 gtk_entry_set_text (GTK_ENTRY (self->enterprise_password), "");
143 }
144 +#endif
145
146 static void
147 dialog_validate (UmAccountDialog *self)
148 @@ -849,9 +857,11 @@ dialog_validate (UmAccountDialog *self)
149 case UM_LOCAL:
150 valid = local_validate (self);
151 break;
152 +#ifdef KERBEROS
153 case UM_ENTERPRISE:
154 valid = enterprise_validate (self);
155 break;
156 +#endif
157 default:
158 valid = FALSE;
159 break;
160 @@ -937,12 +947,14 @@ on_local_toggle (GtkToggleButton *toggle,
161 mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_LOCAL);
162 }
163
164 +#ifdef KERBEROS
165 static void
166 on_enterprise_toggle (GtkToggleButton *toggle,
167 gpointer user_data)
168 {
169 mode_toggled (UM_ACCOUNT_DIALOG (user_data), toggle, UM_ENTERPRISE);
170 }
171 +#endif
172
173 static void
174 mode_init (UmAccountDialog *self,
175 @@ -954,15 +966,18 @@ mode_init (UmAccountDialog *self,
176
177 widget = (GtkWidget *) gtk_builder_get_object (builder, "local-area");
178 self->mode_areas[UM_LOCAL] = widget;
179 +#ifdef KERBEROS
180 widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-area");
181 self->mode_areas[UM_ENTERPRISE] = widget;
182 -
183 +#endif
184 widget = (GtkWidget *) gtk_builder_get_object (builder, "local-button");
185 g_signal_connect (widget, "toggled", G_CALLBACK (on_local_toggle), self);
186 self->mode_buttons[UM_LOCAL] = widget;
187 +#ifdef KERBEROS
188 widget = (GtkWidget *) gtk_builder_get_object (builder, "enterprise-button");
189 g_signal_connect (widget, "toggled", G_CALLBACK (on_enterprise_toggle), self);
190 self->mode_buttons[UM_ENTERPRISE] = widget;
191 +#endif
192 }
193
194 static void
195 @@ -1022,8 +1037,10 @@ um_account_dialog_init (UmAccountDialog *self)
196 self->container_widget = widget;
197
198 local_init (self, builder);
199 +#ifdef KERBEROS
200 enterprise_init (self, builder);
201 join_init (self, builder);
202 +#endif
203 mode_init (self, builder);
204
205 g_object_unref (builder);
206 @@ -1041,9 +1058,11 @@ um_account_dialog_response (GtkDialog *dialog,
207 case UM_LOCAL:
208 local_create_user (self);
209 break;
210 +#ifdef KERBEROS
211 case UM_ENTERPRISE:
212 enterprise_add_user (self);
213 break;
214 +#endif
215 default:
216 g_assert_not_reached ();
217 }
218 @@ -1064,6 +1083,7 @@ um_account_dialog_dispose (GObject *obj)
219 if (self->cancellable)
220 g_cancellable_cancel (self->cancellable);
221
222 +#ifdef KERBEROS
223 if (self->realmd_watch)
224 g_bus_unwatch_name (self->realmd_watch);
225 self->realmd_watch = 0;
226 @@ -1075,7 +1095,7 @@ um_account_dialog_dispose (GObject *obj)
227 g_object_unref (self->realm_manager);
228 self->realm_manager = NULL;
229 }
230 -
231 +#endif
232 G_OBJECT_CLASS (um_account_dialog_parent_class)->dispose (obj);
233 }
234
235 @@ -1128,7 +1148,9 @@ um_account_dialog_show (UmAccountDialog *self,
236 self->cancellable = g_cancellable_new ();
237
238 local_prepare (self);
239 +#ifdef KERBEROS
240 enterprise_prepare (self);
241 +#endif
242 mode_change (self, UM_LOCAL);
243 dialog_validate (self);
244
245 diff --git a/panels/user-accounts/um-realm-manager.c b/panels/user-accounts/um-realm-manager.c
246 index 301c905..25c055c 100644
247 --- a/panels/user-accounts/um-realm-manager.c
248 +++ b/panels/user-accounts/um-realm-manager.c
249 @@ -22,6 +22,7 @@
250
251 #include "config.h"
252
253 +#ifdef KERBEROS
254 #include "um-realm-manager.h"
255
256 #include <krb5/krb5.h>
257 @@ -826,3 +827,4 @@ um_realm_login_finish (GAsyncResult *result,
258
259 return TRUE;
260 }
261 +#endif
262 --
263 1.7.12
264
265
266
267
268 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch
269
270 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch?rev=1.1&view=markup
271 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-gentoo-paths.patch?rev=1.1&content-type=text/plain
272
273 Index: gnome-control-center-3.5.91-gentoo-paths.patch
274 ===================================================================
275 Use Gentoo-appropriate absolute paths
276
277 Original author: Alexandre Rostovtsev <tetromino@g.o>
278 ---
279 --- a/panels/common/Makefile.am
280 +++ b/panels/common/Makefile.am
281 @@ -9,7 +9,7 @@
282 $(LIBLANGUAGE_CFLAGS) \
283 -DDATADIR=\""$(datadir)"\" \
284 -DUIDIR=\""$(pkgdatadir)/ui"\" \
285 - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
286 + -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
287 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
288 -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"
289
290 --- a/panels/datetime/Makefile.am
291 +++ b/panels/datetime/Makefile.am
292 @@ -72,6 +72,7 @@
293 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
294 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
295 -DDATADIR="\"$(uidir)\"" \
296 + -DREALDATADIR="\"$(datadir)\"" \
297 $(NULL)
298
299 noinst_PROGRAMS = test-timezone-gfx test-endianess test-timezone
300 --- a/panels/datetime/test-endianess.c
301 +++ b/panels/datetime/test-endianess.c
302 @@ -38,11 +38,11 @@
303 return 0;
304 }
305
306 - dir = g_dir_open ("/usr/share/i18n/locales/", 0, NULL);
307 + dir = g_dir_open (REALDATADIR "/i18n/locales/", 0, NULL);
308 if (dir == NULL) {
309 /* Try with /usr/share/locale/
310 * https://bugzilla.gnome.org/show_bug.cgi?id=646780 */
311 - dir = g_dir_open ("/usr/share/locale/", 0, NULL);
312 + dir = g_dir_open (REALDATADIR "/locale/", 0, NULL);
313 if (dir == NULL) {
314 return 1;
315 }
316 --- a/panels/datetime/test-timezone.c
317 +++ b/panels/datetime/test-timezone.c
318 @@ -1,7 +1,7 @@
319 #include <gtk/gtk.h>
320 #include "cc-timezone-map.h"
321
322 -#define TZ_DIR "/usr/share/zoneinfo/"
323 +#define TZ_DIR REALDATADIR "/zoneinfo/"
324
325 static GList *
326 get_timezone_list (GList *tzs,
327 --- a/panels/datetime/tz.h
328 +++ b/panels/datetime/tz.h
329 @@ -29,9 +29,9 @@
330 #include <glib.h>
331
332 #ifndef __sun
333 -# define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
334 +# define TZ_DATA_FILE REALDATADIR "/zoneinfo/zone.tab"
335 #else
336 -# define TZ_DATA_FILE "/usr/share/lib/zoneinfo/tab/zone_sun.tab"
337 +# define TZ_DATA_FILE REALDATADIR "/lib/zoneinfo/tab/zone_sun.tab"
338 #endif
339
340 typedef struct _TzDB TzDB;
341 --- a/panels/printers/Makefile.am
342 +++ b/panels/printers/Makefile.am
343 @@ -12,6 +12,9 @@
344 -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
345 -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
346 -DDATADIR="\"$(uidir)\"" \
347 + -DREALDATADIR="\"$(datadir)\"" \
348 + -DPREFIX="\"$(prefix)\"" \
349 + -DLIBEXECDIR="\"$(libexecdir)\"" \
350 $(NULL)
351
352 ccpanelsdir = $(PANELS_DIR)
353 --- a/panels/printers/cc-printers-panel.c
354 +++ b/panels/printers/cc-printers-panel.c
355 @@ -2199,8 +2199,8 @@
356
357 if (printer_name)
358 {
359 - const gchar *const dirs[] = { "/usr/share/cups",
360 - "/usr/local/share/cups",
361 + const gchar *const dirs[] = { REALDATADIR "/cups",
362 + PREFIX "/local/share/cups",
363 NULL };
364 const gchar *testprint[] = { "%s/data/testprint",
365 "%s/data/testprint.ps",
366 --- a/panels/printers/pp-host.c
367 +++ b/panels/printers/pp-host.c
368 @@ -251,7 +251,7 @@
369 data->devices->devices = NULL;
370
371 argv = g_new0 (gchar *, 3);
372 - argv[0] = g_strdup ("/usr/lib/cups/backend/snmp");
373 + argv[0] = g_strdup (LIBEXECDIR "/cups/backend/snmp");
374 argv[1] = g_strdup (priv->hostname);
375
376 /* Use SNMP to get printer's informations */
377 --- a/panels/user-accounts/Makefile.am
378 +++ b/panels/user-accounts/Makefile.am
379 @@ -10,7 +10,7 @@
380 AM_CPPFLAGS = \
381 -DDATADIR=\""$(datadir)"\" \
382 -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
383 - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
384 + -DLIBLOCALEDIR=\""$(libdir)/locale"\" \
385 -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
386 -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
387 -I$(srcdir)/../common/ \
388 --
389 1.7.8.6
390
391
392
393
394 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
395
396 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch?rev=1.1&view=markup
397 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch?rev=1.1&content-type=text/plain
398
399 Index: gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
400 ===================================================================
401 Make wacom, colord, goa optional
402
403 Original author: Alexandre Rostovtsev <tetromino@g.o>
404 --- configure.ac
405 +++ configure.ac
406 @@ -137,10 +137,48 @@
407 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
408 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
409 PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
410 -PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
411 +
412 +build_online_accounts=false
413 +AC_ARG_ENABLE(goa,
414 + AC_HELP_STRING([--disable-goa],
415 + [disable online accounts management panel]),
416 + [case "${enableval}" in
417 + yes) WANT_ONLINE_ACCOUNTS=yes ;;
418 + no) WANT_ONLINE_ACCOUNTS=no ;;
419 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
420 + esac],
421 + [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
422 +
423 +if test x$WANT_ONLINE_ACCOUNTS = xyes; then
424 + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
425 + build_online_accounts=true
426 +fi
427 +AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
428 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
429 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
430 +
431 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
432 gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
433 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
434 +
435 +build_color=false
436 +AC_ARG_ENABLE(color,
437 + AC_HELP_STRING([--disable-color],
438 + [disable color management panel]),
439 + [case "${enableval}" in
440 + yes) WANT_COLOR=yes ;;
441 + no) WANT_COLOR=no ;;
442 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
443 + esac],
444 + [WANT_COLOR=yes]) dnl Default value
445 +
446 +if test x$WANT_COLOR = xyes; then
447 + PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
448 + build_color=true
449 +fi
450 +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
451 +AC_SUBST(COLOR_PANEL_CFLAGS)
452 +AC_SUBST(COLOR_PANEL_LIBS)
453 +
454 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
455 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
456 PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
457 @@ -174,10 +212,24 @@
458 fi
459 AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
460
461 -# Check for gnome-bluetooth
462 -PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
463 - [have_bluetooth=yes], have_bluetooth=no)
464 -AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
465 +have_bluetooth=false
466 +AC_ARG_ENABLE(bluetooth,
467 + AC_HELP_STRING([--disable-bluetooth],
468 + [disable bluetooth management panel]),
469 + [case "${enableval}" in
470 + yes) WANT_BLUETOOTH=yes ;;
471 + no) WANT_BLUETOOTH=no ;;
472 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
473 + esac],
474 + [WANT_BLUETOOTH=yes]) dnl Default value
475 +
476 +if test x$WANT_BLUETOOTH = xyes; then
477 + # Check for gnome-bluetooth
478 + PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
479 + have_bluetooth=true
480 +fi
481 +
482 +AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
483
484 # Check for CUPS 1.4 or newer
485 AC_ARG_ENABLE([cups],
486 @@ -237,11 +289,23 @@
487 if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
488 have_wacom=no
489 else
490 - PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
491 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION
492 - xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
493 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
494 - have_wacom=yes
495 + AC_ARG_ENABLE(wacom,
496 + AC_HELP_STRING([--disable-wacom],
497 + [disable wacom management panel]),
498 + [case "${enableval}" in
499 + yes) WANT_WACOM=yes ;;
500 + no) WANT_WACOM=no ;;
501 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
502 + esac],
503 + [WANT_WACOM=yes]) dnl Default value
504 +
505 + if test x$WANT_WACOM = xyes; then
506 + PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
507 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION
508 + xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
509 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
510 + have_wacom=yes
511 + fi
512 fi
513 ;;
514 *)
515 @@ -509,6 +573,11 @@
516 else
517 AC_MSG_NOTICE([ Bluetooth panel disabled])
518 fi
519 +if test "x$build_color" = "xtrue"; then
520 + AC_MSG_NOTICE([** colord (Color panel)])
521 +else
522 + AC_MSG_NOTICE([ Color panel disabled])
523 +fi
524 if test "x$enable_cups" = "xyes"; then
525 AC_MSG_NOTICE([** CUPS (Printers panel)])
526 else
527 @@ -519,6 +588,11 @@
528 else
529 AC_MSG_NOTICE([ Users panel webcam support disabled])
530 fi
531 +if test "x$build_online_accounts" = "xtrue"; then
532 + AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
533 +else
534 + AC_MSG_NOTICE([ Online Accounts panel disabled])
535 +fi
536 if test "x$with_libsocialweb" = "xyes"; then
537 AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
538 else
539 @@ -529,6 +603,11 @@
540 else
541 AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
542 fi
543 +if test "x$build_wacom" = "xtrue"; then
544 + AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
545 +else
546 + AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
547 +fi
548 if test "x$have_wacom" = "xyes"; then
549 AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
550 else
551 --- panels/Makefile.am
552 +++ panels/Makefile.am
553 @@ -3,10 +3,8 @@
554 background \
555 screen \
556 power \
557 - color \
558 display \
559 mouse \
560 - online-accounts \
561 region \
562 info \
563 sound \
564 @@ -15,6 +13,10 @@
565 user-accounts \
566 datetime
567
568 +if BUILD_COLOR
569 +SUBDIRS += color
570 +endif
571 +
572 if BUILD_WACOM
573 SUBDIRS += wacom
574 endif
575 @@ -31,4 +33,8 @@
576 SUBDIRS += bluetooth
577 endif
578
579 +if BUILD_ONLINE_ACCOUNTS
580 +SUBDIRS += online-accounts
581 +endif
582 +
583 -include $(top_srcdir)/git.mk
584
585
586
587 1.1 gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch
588
589 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch?rev=1.1&view=markup
590 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gnome-control-center/files/gnome-control-center-3.6.3-pulseaudio-3-fix.patch?rev=1.1&content-type=text/plain
591
592 Index: gnome-control-center-3.6.3-pulseaudio-3-fix.patch
593 ===================================================================
594 From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001
595 From: David Henningsson <david.henningsson@×××××××××.com>
596 Date: Fri, 7 Dec 2012 16:22:09 +0530
597 Subject: [PATCH] sound: Fix port handling for the unknown availability case
598
599 The current code assumes that port availability transitions will be
600 between YES and NO, and doesn't account for the fact that it may also be
601 UNKNOWN. This causes spurious entries if the port availability
602 transitions between YES and UNKNOWN.
603 ---
604 panels/sound/gvc-mixer-control.c | 2 +-
605 1 file changed, 1 insertion(+), 1 deletion(-)
606
607 diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c
608 index 34ddc0c..2f6cf34 100644
609 --- a/panels/sound/gvc-mixer-control.c
610 +++ b/panels/sound/gvc-mixer-control.c
611 @@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control,
612 else {
613 for (i = 0; i < info->n_ports; i++) {
614 if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) {
615 - if (card_port->available != info->ports[i]->available) {
616 + if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) {
617 card_port->available = info->ports[i]->available;
618 g_debug ("sync port availability on card %i, card port name '%s', new available value %i",
619 gvc_mixer_card_get_index (card),
620 --
621 1.8.0
Report Message
Find on MARC Find on Google Groups