Merge lp:~darkxst/ubuntu/utopic/gnome-settings-daemon/lp1372346-nodatetime into lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu

[Tim Lunn]

don't build the new datetime plugin since it requires geoclue-2.0.

A seperate patch for g-c-c will be required to hide the "Automatic Timezone" setting, since that won't work without the datetime plugin.

[Robert Ancell (robert-ancell)]

Makes sense.

review: Needs Fixing

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-30 12:36:34 +0000
+++ debian/changelog	2014-09-30 23:09:07 +0000
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.12.2-1ubuntu2) utopic; urgency=medium
+
+  * debian/patches/geoclue-build-fixes.patch: disable build of new
+    datetime plugin since geoclue-2.0 is not currently in main.
+
+ -- Tim Lunn <[e-mail]>  Wed, 01 Oct 2014 07:45:02 +1000
+
 gnome-settings-daemon (3.12.2-1ubuntu1) utopic; urgency=medium
 
   * New Upstream Release (LP: #1372346)
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-09-23 23:33:37 +0000
+++ debian/control.in	2014-09-30 23:09:07 +0000
@@ -38,8 +38,8 @@
                xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
                librsvg2-dev (>= 2.36.2),
                libgweather-3-dev (>= 3.9.5),
-               libgeocode-glib-dev (>= 3.10.0),
-               geoclue-2.0 (>= 2.1.2),
+#               libgeocode-glib-dev (>= 3.10.0),
+#               geoclue-2.0 (>= 2.1.2),
                xkb-data,
                libxkbfile-dev,
 Standards-Version: 3.9.5
 
=== added file 'debian/patches/geoclue-build-fixes.patch'
--- debian/patches/geoclue-build-fixes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/geoclue-build-fixes.patch	2014-09-30 23:09:07 +0000
@@ -0,0 +1,78 @@
+From 4faa5581f6bb568fa5d60bea533f0df4eaf5c5ed Mon Sep 17 00:00:00 2001
+From: Tim Lunn <[e-mail]>
+Date: Wed, 1 Oct 2014 07:42:06 +1000
+Subject: [PATCH] disable build of new datetime panel if geoclue-2.0 is not
+ available
+
+---
+ configure.ac        | 25 +++++++++++++++----------
+ plugins/Makefile.am |  7 ++++++-
+ 2 files changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c42ea8b..a52ace8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,18 +234,23 @@ dnl ---------------------------------------------------------------------------
+ AC_CHECK_LIBM
+ AC_SUBST(LIBM)
+ 
+-PKG_CHECK_MODULES(DATETIME,
+-        geoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+-	geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+-	gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+-	polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
+-)
++PKG_CHECK_MODULES(GEOCLUE2, geoclue-2.0,  have_geoclue="yes", have_geoclue="no")
++if test "x$have_geoclue" = "xyes"; then
+ 
+-GEOCLUE_DBUS_INTERFACE_XML=`pkg-config --variable=dbus_interface geoclue-2.0`
+-if test "x$GEOCLUE_DBUS_INTERFACE_XML" = "x"; then
+-	AC_MSG_ERROR([Cannot find dbus_interface variable in geoclue-2.0.pc])
++    PKG_CHECK_MODULES(DATETIME,
++        geoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
++        geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
++        gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
++        polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
++    )
++
++    GEOCLUE_DBUS_INTERFACE_XML=`pkg-config --variable=dbus_interface geoclue-2.0`
++    if test "x$GEOCLUE_DBUS_INTERFACE_XML" = "x"; then
++	    AC_MSG_ERROR([Cannot find dbus_interface variable in geoclue-2.0.pc])
++    fi
++    AC_SUBST(GEOCLUE_DBUS_INTERFACE_XML)
+ fi
+-AC_SUBST(GEOCLUE_DBUS_INTERFACE_XML)
++AM_CONDITIONAL(HAVE_GEOCLUE2, test x$have_geoclue = xyes)
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - wacom (disabled for s390/s390x and non Linux platforms)
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 7bb01f0..7bd261d 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -6,7 +6,6 @@ enabled_plugins =	\
+ 	clipboard	\
+ 	color		\
+ 	cursor		\
+-	datetime	\
+ 	dummy		\
+ 	power		\
+ 	housekeeping    \
+@@ -28,6 +27,12 @@ else
+ disabled_plugins += smartcard
+ endif
+ 
++if HAVE_GEOCLUE2
++enabled_plugins += datetime
++else
++disabled_plugins += datetime
++endif
++
+ if HAVE_GUDEV
+ enabled_plugins += orientation
+ else
+-- 
+2.1.0
+
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-09-23 23:33:37 +0000
+++ debian/patches/series	2014-09-30 23:09:07 +0000
@@ -12,3 +12,4 @@
 revert_background_dropping.patch
 revert-gsettings-removals.patch
 revert_media-keys_fix_battery_key.patch
+geoclue-build-fixes.patch