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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Mar 28 23:08:07 2013 UTC (20 months, 3 weeks ago) by pacho
Branch: MAIN
Version bump for Gnome 3.8

(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

1 --- configure.ac.old 2013-03-27 12:32:00.730437955 +0100
2 +++ configure.ac 2013-03-27 12:45:04.380808177 +0100
3 @@ -143,13 +143,51 @@
4 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
5 PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
6 PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
7 -PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
8 +
9 +build_online_accounts=false
10 +AC_ARG_ENABLE(goa,
11 + AC_HELP_STRING([--disable-goa],
12 + [disable online accounts management panel]),
13 + [case "${enableval}" in
14 + yes) WANT_ONLINE_ACCOUNTS=yes ;;
15 + no) WANT_ONLINE_ACCOUNTS=no ;;
16 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
17 + esac],
18 + [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
19 +
20 +if test x$WANT_ONLINE_ACCOUNTS = xyes; then
21 + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
22 + build_online_accounts=true
23 +fi
24 +AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
25 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
26 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
27 +
28 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
29 gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
30 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
31 - colord >= $COLORD_REQUIRED_VERSION
32 - colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
33 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
34 +
35 +build_color=false
36 +AC_ARG_ENABLE(color,
37 + AC_HELP_STRING([--disable-color],
38 + [disable color management panel]),
39 + [case "${enableval}" in
40 + yes) WANT_COLOR=yes ;;
41 + no) WANT_COLOR=no ;;
42 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;;
43 + esac],
44 + [WANT_COLOR=yes]) dnl Default value
45 +
46 +if test x$WANT_COLOR = xyes; then
47 + PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
48 + colord >= $COLORD_REQUIRED_VERSION
49 + colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
50 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
51 + build_color=true
52 +fi
53 +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
54 +AC_SUBST(COLOR_PANEL_CFLAGS)
55 +AC_SUBST(COLOR_PANEL_LIBS)
56 +
57 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
58 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
59 PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
60 @@ -210,17 +248,25 @@
61 fi
62 AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
63
64 -# Check for gnome-bluetooth
65 -PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
66 - [have_bluetooth=yes], have_bluetooth=no)
67 -if test "x$have_bluetooth" = xyes ; then
68 - AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
69 -fi
70 -AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
71 -if test x${have_bluetooth} = xyes; then
72 - AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
73 +have_bluetooth=false
74 +AC_ARG_ENABLE(bluetooth,
75 + AC_HELP_STRING([--disable-bluetooth],
76 + [disable bluetooth management panel]),
77 + [case "${enableval}" in
78 + yes) WANT_BLUETOOTH=yes ;;
79 + no) WANT_BLUETOOTH=no ;;
80 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
81 + esac],
82 + [WANT_BLUETOOTH=yes]) dnl Default value
83 +
84 +if test x$WANT_BLUETOOTH = xyes; then
85 + # Check for gnome-bluetooth
86 + PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
87 + have_bluetooth=true
88 fi
89
90 +AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
91 +
92 # Check for smbclient
93 PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
94
95 @@ -289,12 +335,23 @@
96 if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
97 have_wacom=no
98 else
99 - PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
100 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION
101 - xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
102 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
103 - AC_DEFINE(BUILD_WACOM, 1, [Define to 1 to build the Wacom panel])
104 - have_wacom=yes
105 + AC_ARG_ENABLE(wacom,
106 + AC_HELP_STRING([--disable-wacom],
107 + [disable wacom management panel]),
108 + [case "${enableval}" in
109 + yes) WANT_WACOM=yes ;;
110 + no) WANT_WACOM=no ;;
111 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
112 + esac],
113 + [WANT_WACOM=yes]) dnl Default value
114 +
115 + if test x$WANT_WACOM = xyes; then
116 + PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
117 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION
118 + xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
119 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
120 + have_wacom=yes
121 + fi
122 fi
123 ;;
124 *)
125 @@ -555,6 +612,11 @@
126 else
127 AC_MSG_NOTICE([ Bluetooth panel disabled])
128 fi
129 +if test "x$build_color" = "xtrue"; then
130 + AC_MSG_NOTICE([** colord (Color panel)])
131 +else
132 + AC_MSG_NOTICE([ Color panel disabled])
133 +fi
134 if test "x$enable_cups" = "xyes"; then
135 AC_MSG_NOTICE([** CUPS (Printers panel)])
136 else
137 @@ -565,11 +627,21 @@
138 else
139 AC_MSG_NOTICE([ Users panel webcam support disabled])
140 fi
141 +if test "x$build_online_accounts" = "xtrue"; then
142 + AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
143 +else
144 + AC_MSG_NOTICE([ Online Accounts panel disabled])
145 +fi
146 if test "x$with_libsocialweb" = "xyes"; then
147 AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
148 else
149 AC_MSG_NOTICE([ Background panel Flickr support disabled])
150 fi
151 +if test "x$build_wacom" = "xtrue"; then
152 + AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
153 +else
154 + AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
155 +fi
156 if test "x$have_wacom" = "xyes"; then
157 AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
158 else
159 --- panels/Makefile.am.old 2013-03-27 12:45:13.852761402 +0100
160 +++ panels/Makefile.am 2013-03-27 12:46:26.328393242 +0100
161 @@ -2,11 +2,9 @@
162 common \
163 background \
164 power \
165 - color \
166 display \
167 mouse \
168 notifications \
169 - online-accounts \
170 region \
171 info \
172 sound \
173 @@ -18,6 +16,10 @@
174 privacy \
175 sharing
176
177 +if BUILD_COLOR
178 +SUBDIRS += color
179 +endif
180 +
181 if BUILD_WACOM
182 SUBDIRS += wacom
183 endif
184 @@ -34,4 +36,8 @@
185 SUBDIRS += bluetooth
186 endif
187
188 +if BUILD_ONLINE_ACCOUNTS
189 +SUBDIRS += online-accounts
190 +endif
191 +
192 -include $(top_srcdir)/git.mk

  ViewVC Help
Powered by ViewVC 1.1.20