[patch] update gnome-control-center-3.8.0-optional.patch

update-optional.patch (text/plain), 3.81 KB, created by poncho on 2013-04-02 13:03:52 UTC

diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch
index 57bdeaa..62d8fc5 100644
--- a/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-3.8.0-optional.patch
@@ -1,6 +1,8 @@
---- configure.ac.old	2013-03-27 12:32:00.730437955 +0100
-+++ configure.ac	2013-03-27 12:45:04.380808177 +0100
-@@ -143,13 +143,51 @@
+diff --git a/configure.ac b/configure.ac
+index b3df2dd..5056d5a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -143,13 +143,51 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
                    gnome-settings-daemon >= $GSD_REQUIRED_VERSION x11)
  PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0)
  PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES libgnome-menu-3.0)
@@ -57,20 +59,14 @@
  PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
                    polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
  PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
-@@ -210,17 +248,25 @@
+@@ -210,9 +248,22 @@ else
  fi
  AM_CONDITIONAL(HAVE_MM_GLIB, test "x$have_libmm_glib" = "xyes")
  
 -# Check for gnome-bluetooth
 -PKG_CHECK_MODULES(BLUETOOTH, $COMMON_MODULES gnome-bluetooth-1.0 >= 3.5.5,
 -		  [have_bluetooth=yes], have_bluetooth=no)
--if test "x$have_bluetooth" = xyes ; then
--	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
--fi
--AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xyes])
--if test x${have_bluetooth} = xyes; then
--  AC_DEFINE(HAVE_BLUETOOTH, 1, [Define to 1 if bluetooth support is available])
-+have_bluetooth=false
++have_bluetooth=no
 +AC_ARG_ENABLE(bluetooth,
 +	AC_HELP_STRING([--disable-bluetooth],
 +		[disable bluetooth management panel]),
@@ -80,19 +76,16 @@
 +		*) 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.5.5)
-+	have_bluetooth=true
++	have_bluetooth=yes
++fi
+ if test "x$have_bluetooth" = xyes ; then
+ 	AC_DEFINE(BUILD_BLUETOOTH, 1, [Define to 1 to build the Bluetooth panel])
  fi
- 
-+AM_CONDITIONAL(BUILD_BLUETOOTH, [test x$have_bluetooth = xtrue])
-+
- # Check for smbclient
- PKG_CHECK_MODULES(SMBCLIENT, smbclient, [have_smbclient=yes], [have_smbclient=no])
- 
-@@ -289,12 +335,23 @@
+@@ -289,12 +340,23 @@ case $host_os in
      if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
        have_wacom=no
      else
@@ -122,7 +115,7 @@
      fi
      ;;
    *)
-@@ -555,6 +612,11 @@
+@@ -555,6 +617,11 @@ if test "x$have_bluetooth" = "xyes"; then
  else
  	AC_MSG_NOTICE([   Bluetooth panel disabled])
  fi
@@ -134,7 +127,7 @@
  if test "x$enable_cups" = "xyes"; then
  	AC_MSG_NOTICE([** CUPS (Printers panel)])
  else
-@@ -565,11 +627,21 @@
+@@ -565,11 +632,21 @@ if test "x$have_cheese" = "xyes"; then
  else
  	AC_MSG_NOTICE([   Users panel webcam support disabled])
  fi
@@ -156,9 +149,11 @@
  if test "x$have_wacom" = "xyes"; then
  	AC_MSG_NOTICE([** wacom (Wacom tablet panel)])
  else
---- panels/Makefile.am.old	2013-03-27 12:45:13.852761402 +0100
-+++ panels/Makefile.am	2013-03-27 12:46:26.328393242 +0100
-@@ -2,11 +2,9 @@
+diff --git a/panels/Makefile.am b/panels/Makefile.am
+index 9961c25..0c54622 100644
+--- a/panels/Makefile.am
++++ b/panels/Makefile.am
+@@ -2,11 +2,9 @@ SUBDIRS= \
  	common \
  	background \
  	power \
@@ -170,7 +165,7 @@
  	region \
  	info \
  	sound \
-@@ -18,6 +16,10 @@
+@@ -18,6 +16,10 @@ SUBDIRS= \
  	privacy \
  	sharing
  
@@ -181,7 +176,7 @@
  if BUILD_WACOM
  SUBDIRS += wacom
  endif
-@@ -34,4 +36,8 @@
+@@ -34,4 +36,8 @@ if BUILD_BLUETOOTH
  SUBDIRS += bluetooth
  endif