/[gentoo-x86]/gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch
Gentoo

Contents of /gnome-base/gnome-control-center/files/gnome-control-center-3.5.91-optional-bt-colord-goa-wacom.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Dec 25 22:01:01 2012 UTC (23 months, 3 weeks ago) by eva
Branch: MAIN
Version bump for Gnome 3.6. Switch to EAPI=5. Clean up old revisions.

(Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C6085806)

1 Make wacom, colord, goa optional
2
3 Original author: Alexandre Rostovtsev <tetromino@gentoo.org>
4 --- configure.ac
5 +++ configure.ac
6 @@ -137,10 +137,48 @@
7 PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
8 gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
9 PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES)
10 -PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
11 +
12 +build_online_accounts=false
13 +AC_ARG_ENABLE(goa,
14 + AC_HELP_STRING([--disable-goa],
15 + [disable online accounts management panel]),
16 + [case "${enableval}" in
17 + yes) WANT_ONLINE_ACCOUNTS=yes ;;
18 + no) WANT_ONLINE_ACCOUNTS=no ;;
19 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;;
20 + esac],
21 + [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value
22 +
23 +if test x$WANT_ONLINE_ACCOUNTS = xyes; then
24 + PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
25 + build_online_accounts=true
26 +fi
27 +AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue")
28 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS)
29 +AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS)
30 +
31 PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1
32 gnome-settings-daemon >= $GSD_REQUIRED_VERSION)
33 -PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8)
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 colord >= 0.1.8)
48 + build_color=true
49 +fi
50 +AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue")
51 +AC_SUBST(COLOR_PANEL_CFLAGS)
52 +AC_SUBST(COLOR_PANEL_LIBS)
53 +
54 PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
55 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
56 PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
57 @@ -174,10 +212,24 @@
58 fi
59 AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes])
60
61 -# Check for gnome-bluetooth
62 -PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
63 - [have_bluetooth=yes], have_bluetooth=no)
64 -AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
65 +have_bluetooth=false
66 +AC_ARG_ENABLE(bluetooth,
67 + AC_HELP_STRING([--disable-bluetooth],
68 + [disable bluetooth management panel]),
69 + [case "${enableval}" in
70 + yes) WANT_BLUETOOTH=yes ;;
71 + no) WANT_BLUETOOTH=no ;;
72 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;;
73 + esac],
74 + [WANT_BLUETOOTH=yes]) dnl Default value
75 +
76 +if test x$WANT_BLUETOOTH = xyes; then
77 + # Check for gnome-bluetooth
78 + PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5)
79 + have_bluetooth=true
80 +fi
81 +
82 +AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
83
84 # Check for CUPS 1.4 or newer
85 AC_ARG_ENABLE([cups],
86 @@ -237,11 +289,23 @@
87 if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
88 have_wacom=no
89 else
90 - PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
91 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION
92 - xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
93 - gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
94 - have_wacom=yes
95 + AC_ARG_ENABLE(wacom,
96 + AC_HELP_STRING([--disable-wacom],
97 + [disable wacom management panel]),
98 + [case "${enableval}" in
99 + yes) WANT_WACOM=yes ;;
100 + no) WANT_WACOM=no ;;
101 + *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;;
102 + esac],
103 + [WANT_WACOM=yes]) dnl Default value
104 +
105 + if test x$WANT_WACOM = xyes; then
106 + PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES
107 + gnome-settings-daemon >= $GSD_REQUIRED_VERSION
108 + xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION
109 + gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
110 + have_wacom=yes
111 + fi
112 fi
113 ;;
114 *)
115 @@ -509,6 +573,11 @@
116 else
117 AC_MSG_NOTICE([ Bluetooth panel disabled])
118 fi
119 +if test "x$build_color" = "xtrue"; then
120 + AC_MSG_NOTICE([** colord (Color panel)])
121 +else
122 + AC_MSG_NOTICE([ Color panel disabled])
123 +fi
124 if test "x$enable_cups" = "xyes"; then
125 AC_MSG_NOTICE([** CUPS (Printers panel)])
126 else
127 @@ -519,6 +588,11 @@
128 else
129 AC_MSG_NOTICE([ Users panel webcam support disabled])
130 fi
131 +if test "x$build_online_accounts" = "xtrue"; then
132 + AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)])
133 +else
134 + AC_MSG_NOTICE([ Online Accounts panel disabled])
135 +fi
136 if test "x$with_libsocialweb" = "xyes"; then
137 AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)])
138 else
139 @@ -529,6 +603,11 @@
140 else
141 AC_MSG_NOTICE([ Using ConsoleKit for session tracking])
142 fi
143 +if test "x$build_wacom" = "xtrue"; then
144 + AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)])
145 +else
146 + AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled])
147 +fi
148 if test "x$have_wacom" = "xyes"; then
149 AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
150 else
151 --- panels/Makefile.am
152 +++ panels/Makefile.am
153 @@ -3,10 +3,8 @@
154 background \
155 screen \
156 power \
157 - color \
158 display \
159 mouse \
160 - online-accounts \
161 region \
162 info \
163 sound \
164 @@ -15,6 +13,10 @@
165 user-accounts \
166 datetime
167
168 +if BUILD_COLOR
169 +SUBDIRS += color
170 +endif
171 +
172 if BUILD_WACOM
173 SUBDIRS += wacom
174 endif
175 @@ -31,4 +33,8 @@
176 SUBDIRS += bluetooth
177 endif
178
179 +if BUILD_ONLINE_ACCOUNTS
180 +SUBDIRS += online-accounts
181 +endif
182 +
183 -include $(top_srcdir)/git.mk

  ViewVC Help
Powered by ViewVC 1.1.20