/[gentoo-x86]/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch
Gentoo

Contents of /gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional-r1.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Apr 7 09:19:11 2013 UTC (20 months, 1 week ago) by pacho
Branch: MAIN
Fix optional patch (#464346 by poncho), this also solves bugs #463858 and #463856. NetworkManager is not really optional now.

(Portage version: 2.1.11.60/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key A188FBD4)

1 diff --git a/configure.ac b/configure.ac
2 index b3df2dd..6b10ce4 100644
3 --- a/configure.ac
4 +++ b/configure.ac
5 @@ -143,13 +143,57 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
6 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
7 PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
8 PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
9 -PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
10 +
11 +build_online_accounts=false
12 +AC_ARG_ENABLE(goa,
13 + AC_HELP_STRING([--disable-goa],
14 + [disable online accounts management panel]),
15 + [case "${enableval}" in
16 + yes) WANT_ONLINE_ACCOUNTS=yes ;;
17 + no) WANT_ONLINE_ACCOUNTS=no ;;
18 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
19 + esac],
20 + [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
21 +
22 +if test x$WANT_ONLINE_ACCOUNTS = xyes; then
23 + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
24 + build_online_accounts=true
25 +fi
26 +if test "x$build_online_accounts" = xtrue ; then
27 + AC_DEFINE(BUILD_ONLINE_ACCOUNTS, 1, [Define to 1 to build the Online Accounts panel])
28 +fi
29 +AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
30 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
31 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
32 +
33 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
34 gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
35 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
36 - colord >= $COLORD_REQUIRED_VERSION
37 - colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
38 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
39 +
40 +build_color=false
41 +AC_ARG_ENABLE(color,
42 + AC_HELP_STRING([--disable-color],
43 + [disable color management panel]),
44 + [case "${enableval}" in
45 + yes) WANT_COLOR=yes ;;
46 + no) WANT_COLOR=no ;;
47 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
48 + esac],
49 + [WANT_COLOR=yes]) dnl Default value
50 +
51 +if test x$WANT_COLOR = xyes; then
52 + PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
53 + colord >= $COLORD_REQUIRED_VERSION
54 + colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
55 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
56 + build_color=true
57 +fi
58 +if test "x$build_color" = xtrue ; then
59 + AC_DEFINE(BUILD_COLOR, 1, [Define to 1 to build the Color panel])
60 +fi
61 +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
62 +AC_SUBST(COLOR_PANEL_CFLAGS)
63 +AC_SUBST(COLOR_PANEL_LIBS)
64 +
65 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
66 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
67 PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
68 @@ -210,9 +254,22 @@ else
69 fi
70 AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
71
72 -# Check for gnome-bluetooth
73 -PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
74 - [have_bluetooth=yes], have_bluetooth=no)
75 +have_bluetooth=no
76 +AC_ARG_ENABLE(bluetooth,
77 + AC_HELP_STRING([--disable-bluetooth],
78 + [disable bluetooth management panel]),
79 + [case "${enableval}" in
80 + yes) WANT_BLUETOOTH=yes ;;
81 + no) WANT_BLUETOOTH=no ;;
82 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
83 + esac],
84 + [WANT_BLUETOOTH=yes]) dnl Default value
85 +
86 +if test x$WANT_BLUETOOTH = xyes; then
87 + # Check for gnome-bluetooth
88 + PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
89 + have_bluetooth=yes
90 +fi
91 if test "x$have_bluetooth" = xyes ; then
92 AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
93 fi
94 @@ -289,12 +346,23 @@ case $host_os in
95 if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
96 have_wacom=no
97 else
98 - PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
99 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION
100 - xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
101 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
102 - AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
103 - have_wacom=yes
104 + AC_ARG_ENABLE(wacom,
105 + AC_HELP_STRING([--disable-wacom],
106 + [disable wacom management panel]),
107 + [case "${enableval}" in
108 + yes) WANT_WACOM=yes ;;
109 + no) WANT_WACOM=no ;;
110 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
111 + esac],
112 + [WANT_WACOM=yes]) dnl Default value
113 +
114 + if test x$WANT_WACOM = xyes; then
115 + PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
116 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION
117 + xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
118 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
119 + have_wacom=yes
120 + fi
121 fi
122 ;;
123 *)
124 @@ -555,6 +623,11 @@ if test "x$have_bluetooth" = "xyes"; then
125 else
126 AC_MSG_NOTICE([ Bluetooth panel disabled])
127 fi
128 +if test "x$build_color" = "xtrue"; then
129 + AC_MSG_NOTICE([** colord (Color panel)])
130 +else
131 + AC_MSG_NOTICE([ Color panel disabled])
132 +fi
133 if test "x$enable_cups" = "xyes"; then
134 AC_MSG_NOTICE([** CUPS (Printers panel)])
135 else
136 @@ -565,11 +638,21 @@ if test "x$have_cheese" = "xyes"; then
137 else
138 AC_MSG_NOTICE([ Users panel webcam support disabled])
139 fi
140 +if test "x$build_online_accounts" = "xtrue"; then
141 + AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
142 +else
143 + AC_MSG_NOTICE([ Online Accounts panel disabled])
144 +fi
145 if test "x$with_libsocialweb" = "xyes"; then
146 AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
147 else
148 AC_MSG_NOTICE([ Background panel Flickr support disabled])
149 fi
150 +if test "x$build_wacom" = "xtrue"; then
151 + AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
152 +else
153 + AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
154 +fi
155 if test "x$have_wacom" = "xyes"; then
156 AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
157 else
158 diff --git a/panels/Makefile.am b/panels/Makefile.am
159 index 9961c25..0c54622 100644
160 --- a/panels/Makefile.am
161 +++ b/panels/Makefile.am
162 @@ -2,11 +2,9 @@ SUBDIRS= \
163 common \
164 background \
165 power \
166 - color \
167 display \
168 mouse \
169 notifications \
170 - online-accounts \
171 region \
172 info \
173 sound \
174 @@ -18,6 +16,10 @@ SUBDIRS= \
175 privacy \
176 sharing
177
178 +if BUILD_COLOR
179 +SUBDIRS += color
180 +endif
181 +
182 if BUILD_WACOM
183 SUBDIRS += wacom
184 endif
185 @@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
186 SUBDIRS += bluetooth
187 endif
188
189 +if BUILD_ONLINE_ACCOUNTS
190 +SUBDIRS += online-accounts
191 +endif
192 +
193 -include $(top_srcdir)/git.mk
194 diff --git a/shell/Makefile.am b/shell/Makefile.am
195 index f9f9070..094aca1 100644
196 --- a/shell/Makefile.am
197 +++ b/shell/Makefile.am
198 @@ -51,14 +51,12 @@ gnome_control_center_LDADD = \
199 $(top_builddir)/libgd/libgd.la \
200 $(top_builddir)/panels/common/liblanguage.la \
201 $(top_builddir)/panels/background/libbackground.la \
202 - $(top_builddir)/panels/color/libcolor.la \
203 $(top_builddir)/panels/datetime/libdate_time.la \
204 $(top_builddir)/panels/display/libdisplay.la \
205 $(top_builddir)/panels/info/libinfo.la \
206 $(top_builddir)/panels/keyboard/libkeyboard.la \
207 $(top_builddir)/panels/mouse/libmouse-properties.la \
208 $(top_builddir)/panels/notifications/libnotifications.la \
209 - $(top_builddir)/panels/online-accounts/libonline-accounts.la \
210 $(top_builddir)/panels/power/libpower.la \
211 $(top_builddir)/panels/privacy/libprivacy.la \
212 $(top_builddir)/panels/region/libregion.la \
213 @@ -84,6 +82,14 @@ if BUILD_BLUETOOTH
214 gnome_control_center_LDADD += $(top_builddir)/panels/bluetooth/libbluetooth.la
215 endif
216
217 +if BUILD_COLOR
218 +gnome_control_center_LDADD += $(top_builddir)/panels/color/libcolor.la
219 +endif
220 +
221 +if BUILD_ONLINE_ACCOUNTS
222 +gnome_control_center_LDADD += $(top_builddir)/panels/online-accounts/libonline-accounts.la
223 +endif
224 +
225 AM_CPPFLAGS = -DGNOMELOCALEDIR="\"$(datadir)/locale\""
226
227 sysdir = $(datadir)/applications
228 diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
229 index 20a5262..1cef85d 100644
230 --- a/shell/cc-panel-loader.c
231 +++ b/shell/cc-panel-loader.c
232 @@ -33,7 +33,9 @@ extern GType cc_background_panel_get_type (void);
233 #ifdef BUILD_BLUETOOTH
234 extern GType cc_bluetooth_panel_get_type (void);
235 #endif /* BUILD_BLUETOOTH */
236 +#ifdef BUILD_COLOR
237 extern GType cc_color_panel_get_type (void);
238 +#endif /* BUILD_COLOR */
239 extern GType cc_date_time_panel_get_type (void);
240 extern GType cc_display_panel_get_type (void);
241 extern GType cc_info_panel_get_type (void);
242 @@ -43,7 +45,9 @@ extern GType cc_mouse_panel_get_type (void);
243 extern GType cc_network_panel_get_type (void);
244 #endif /* BUILD_NETWORK */
245 extern GType cc_notifications_panel_get_type (void);
246 +#ifdef BUILD_ONLINE_ACCOUNTS
247 extern GType cc_goa_panel_get_type (void);
248 +#endif /* BUILD_ONLINE_ACCOUNTS */
249 extern GType cc_power_panel_get_type (void);
250 #ifdef BUILD_PRINTERS
251 extern GType cc_printers_panel_get_type (void);
252 @@ -77,7 +81,9 @@ static struct {
253 #ifdef BUILD_BLUETOOTH
254 PANEL_TYPE("bluetooth", cc_bluetooth_panel_get_type ),
255 #endif
256 +#ifdef BUILD_COLOR
257 PANEL_TYPE("color", cc_color_panel_get_type ),
258 +#endif
259 PANEL_TYPE("datetime", cc_date_time_panel_get_type ),
260 PANEL_TYPE("display", cc_display_panel_get_type ),
261 PANEL_TYPE("info", cc_info_panel_get_type ),
262 @@ -87,7 +93,9 @@ static struct {
263 PANEL_TYPE("network", cc_network_panel_get_type ),
264 #endif
265 PANEL_TYPE("notifications", cc_notifications_panel_get_type),
266 +#ifdef BUILD_ONLINE_ACCOUNTS
267 PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
268 +#endif
269 PANEL_TYPE("power", cc_power_panel_get_type ),
270 #ifdef BUILD_PRINTERS
271 PANEL_TYPE("printers", cc_printers_panel_get_type ),

  ViewVC Help
Powered by ViewVC 1.1.20