diff options
Diffstat (limited to 'gnome-base/gnome-control-center/files/gnome-control-center-3.5.1-optional-bt-colord-goa-wacom.patch')
| -rw-r--r-- | gnome-base/gnome-control-center/files/gnome-control-center-3.5.1-optional-bt-colord-goa-wacom.patch | 193 |
1 files changed, 0 insertions, 193 deletions
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.1-optional-bt-colord-goa-wacom.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.5.1-optional-bt-colord-goa-wacom.patch deleted file mode 100644 index 92423a9..0000000 --- a/gnome-base/gnome-control-center/files/gnome-control-center-3.5.1-optional-bt-colord-goa-wacom.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 93d009037aa3321e2eea86ef2e70cde959c5a250 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sun, 13 May 2012 19:53:13 -0400 -Subject: [PATCH] Make bluetooth, colord, gnome-online-accounts, wacom - optional - ---- - configure.ac | 101 ++++++++++++++++++++++++++++++++++++++++++++++------ - panels/Makefile.am | 17 +++++++-- - 2 files changed, 103 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d496365..2d2d15e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -106,10 +106,44 @@ PKG_CHECK_MODULES(MEDIA_PANEL, $COMMON_MODULES) - PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11) - PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES) --PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0) -+build_online_accounts=false -+AC_ARG_ENABLE(goa, -+ AC_HELP_STRING([--disable-goa], -+ [disable online accounts management panel]), -+ [case "${enableval}" in -+ yes) WANT_ONLINE_ACCOUNTS=yes ;; -+ no) WANT_ONLINE_ACCOUNTS=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-goa) ;; -+ esac], -+ [WANT_ONLINE_ACCOUNTS=yes]) dnl Default value -+ -+if test x$WANT_ONLINE_ACCOUNTS = xyes; then -+ PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0) -+ build_online_accounts=true -+fi -+AM_CONDITIONAL(BUILD_ONLINE_ACCOUNTS, test "x$build_online_accounts" = "xtrue") -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_CFLAGS) -+AC_SUBST(ONLINE_ACCOUNTS_PANEL_LIBS) - PKG_CHECK_MODULES(POWER_PANEL, $COMMON_MODULES upower-glib >= 0.9.1 - gnome-settings-daemon >= $GSD_REQUIRED_VERSION) --PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+build_color=false -+AC_ARG_ENABLE(color, -+ AC_HELP_STRING([--disable-color], -+ [disable color management panel]), -+ [case "${enableval}" in -+ yes) WANT_COLOR=yes ;; -+ no) WANT_COLOR=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-color) ;; -+ esac], -+ [WANT_COLOR=yes]) dnl Default value -+ -+if test x$WANT_COLOR = xyes; then -+ PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES colord >= 0.1.8) -+ build_color=true -+fi -+AM_CONDITIONAL(BUILD_COLOR, test "x$build_color" = "xtrue") -+AC_SUBST(COLOR_PANEL_CFLAGS) -+AC_SUBST(COLOR_PANEL_LIBS) - PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES libgnomekbd >= 2.91.91 -@@ -145,10 +145,24 @@ - fi - AM_CONDITIONAL(BUILD_NETWORK, [test x$have_networkmanager = xyes]) - --# Check for gnome-bluetooth --PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.4, -- [have_bluetooth=yes], have_bluetooth=no) --AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes]) -+build_bluetooth=false -+AC_ARG_ENABLE(bluetooth, -+ AC_HELP_STRING([--disable-bluetooth], -+ [disable bluetooth management panel]), -+ [case "${enableval}" in -+ yes) WANT_BLUETOOTH=yes ;; -+ no) WANT_BLUETOOTH=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-bluetooth) ;; -+ esac], -+ [WANT_BLUETOOTH=yes]) dnl Default value -+ -+if test x$WANT_BLUETOOTH = xyes; then -+ # Check for gnome-bluetooth -+ PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.3.4) -+ build_bluetooth=true -+fi -+ -+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$build_bluetooth = xtrue]) - - # Check for CUPS 1.4 or newer - AC_ARG_ENABLE([cups], -@@ -205,11 +205,25 @@ - if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then - have_wacom=no - else -- PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -- gnome-settings-daemon >= $GSD_REQUIRED_VERSION -- xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -- gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -- have_wacom=yes -+ build_wacom=false -+ AC_ARG_ENABLE(wacom, -+ AC_HELP_STRING([--disable-wacom], -+ [disable wacom management panel]), -+ [case "${enableval}" in -+ yes) WANT_WACOM=yes ;; -+ no) WANT_WACOM=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --disable-wacom) ;; -+ esac], -+ [WANT_WACOM=yes]) dnl Default value -+ -+ if test x$WANT_WACOM = xyes; then -+ PKG_CHECK_MODULES(WACOM_PANEL, $COMMON_MODULES -+ gnome-settings-daemon >= $GSD_REQUIRED_VERSION -+ xi >= 1.2 x11 libwacom >= $LIBWACOM_REQUIRED_VERSION -+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION) -+ build_wacom=true -+ fi -+ AM_CONDITIONAL(BUILD_WACOM, test "x$build_wacom" = "xtrue") - fi - ;; - *) -@@ -423,11 +487,16 @@ if test "x$have_networkmanager" = "xyes"; then - else - AC_MSG_NOTICE([ Network panel disabled]) - fi --if test "x$have_bluetooth" = "xyes"; then -+if test "x$build_bluetooth" = "xtrue"; then - AC_MSG_NOTICE([** gnome-bluetooth (Bluetooth panel)]) - else - AC_MSG_NOTICE([ Bluetooth panel disabled]) - fi -+if test "x$build_color" = "xtrue"; then -+ AC_MSG_NOTICE([** colord (Color panel)]) -+else -+ AC_MSG_NOTICE([ Color panel disabled]) -+fi - if test "x$enable_cups" = "xyes"; then - AC_MSG_NOTICE([** CUPS (Printers panel)]) - else -@@ -438,6 +507,11 @@ if test "x$have_cheese" = "xyes"; then - else - AC_MSG_NOTICE([ Users panel webcam support disabled]) - fi -+if test "x$build_online_accounts" = "xtrue"; then -+ AC_MSG_NOTICE([** gnome-online-accounts (Online Accounts panel)]) -+else -+ AC_MSG_NOTICE([ Online Accounts panel disabled]) -+fi - if test "x$with_libsocialweb" = "xyes"; then - AC_MSG_NOTICE([** libsocialweb (Background panel Flickr support)]) - else -@@ -448,4 +522,9 @@ if test "x$with_systemd" = "xyes"; then - else - AC_MSG_NOTICE([ Using ConsoleKit for session tracking]) - fi -+if test "x$build_wacom" = "xtrue"; then -+ AC_MSG_NOTICE([** libwacom (Wacom Graphics Tablet panel)]) -+else -+ AC_MSG_NOTICE([ Wacom Graphics Tablet panel disabled]) -+fi - AC_MSG_NOTICE([End options]) -diff --git a/panels/Makefile.am b/panels/Makefile.am -index 172dd06..134b0c8 100644 ---- a/panels/Makefile.am -+++ b/panels/Makefile.am -@@ -3,10 +3,8 @@ - background \ - screen \ - power \ -- color \ - display \ - mouse \ -- online-accounts \ - region \ - info \ - sound \ -@@ -31,4 +29,12 @@ - SUBDIRS += bluetooth - endif - -+if BUILD_COLOR -+SUBDIRS += color -+endif -+ -+if BUILD_ONLINE_ACCOUNTS -+SUBDIRS += online-accounts -+endif -+ - -include $(top_srcdir)/git.mk --- -1.7.8.6 - |