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

Proposed by Tim Lunn on 2014-09-30
Status: Merged
Approved by: Robert Ancell on 2014-10-01
Approved revision: 477
Merged at revision: 477
Proposed branch: lp:~darkxst/ubuntu/utopic/gnome-settings-daemon/lp1372346-nodatetime
Merge into: lp:~ubuntu-desktop/gnome-settings-daemon/ubuntu
Diff against target: 121 lines (+88/-2)
4 files modified
debian/changelog (+7/-0)
debian/control.in (+2/-2)
debian/patches/geoclue-build-fixes.patch (+78/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~darkxst/ubuntu/utopic/gnome-settings-daemon/lp1372346-nodatetime
Reviewer Review Type Date Requested Status
Robert Ancell 2014-09-30 Approve on 2014-10-01
Review via email: mp+236639@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Makes sense.

review: Needs Fixing
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-09-30 12:36:34 +0000
3+++ debian/changelog 2014-09-30 23:09:07 +0000
4@@ -1,3 +1,10 @@
5+gnome-settings-daemon (3.12.2-1ubuntu2) utopic; urgency=medium
6+
7+ * debian/patches/geoclue-build-fixes.patch: disable build of new
8+ datetime plugin since geoclue-2.0 is not currently in main.
9+
10+ -- Tim Lunn <tim@feathertop.org> Wed, 01 Oct 2014 07:45:02 +1000
11+
12 gnome-settings-daemon (3.12.2-1ubuntu1) utopic; urgency=medium
13
14 * New Upstream Release (LP: #1372346)
15
16=== modified file 'debian/control.in'
17--- debian/control.in 2014-09-23 23:33:37 +0000
18+++ debian/control.in 2014-09-30 23:09:07 +0000
19@@ -38,8 +38,8 @@
20 xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
21 librsvg2-dev (>= 2.36.2),
22 libgweather-3-dev (>= 3.9.5),
23- libgeocode-glib-dev (>= 3.10.0),
24- geoclue-2.0 (>= 2.1.2),
25+# libgeocode-glib-dev (>= 3.10.0),
26+# geoclue-2.0 (>= 2.1.2),
27 xkb-data,
28 libxkbfile-dev,
29 Standards-Version: 3.9.5
30
31=== added file 'debian/patches/geoclue-build-fixes.patch'
32--- debian/patches/geoclue-build-fixes.patch 1970-01-01 00:00:00 +0000
33+++ debian/patches/geoclue-build-fixes.patch 2014-09-30 23:09:07 +0000
34@@ -0,0 +1,78 @@
35+From 4faa5581f6bb568fa5d60bea533f0df4eaf5c5ed Mon Sep 17 00:00:00 2001
36+From: Tim Lunn <tim@feathertop.org>
37+Date: Wed, 1 Oct 2014 07:42:06 +1000
38+Subject: [PATCH] disable build of new datetime panel if geoclue-2.0 is not
39+ available
40+
41+---
42+ configure.ac | 25 +++++++++++++++----------
43+ plugins/Makefile.am | 7 ++++++-
44+ 2 files changed, 21 insertions(+), 11 deletions(-)
45+
46+diff --git a/configure.ac b/configure.ac
47+index c42ea8b..a52ace8 100644
48+--- a/configure.ac
49++++ b/configure.ac
50+@@ -234,18 +234,23 @@ dnl ---------------------------------------------------------------------------
51+ AC_CHECK_LIBM
52+ AC_SUBST(LIBM)
53+
54+-PKG_CHECK_MODULES(DATETIME,
55+- geoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
56+- geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
57+- gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
58+- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
59+-)
60++PKG_CHECK_MODULES(GEOCLUE2, geoclue-2.0, have_geoclue="yes", have_geoclue="no")
61++if test "x$have_geoclue" = "xyes"; then
62+
63+-GEOCLUE_DBUS_INTERFACE_XML=`pkg-config --variable=dbus_interface geoclue-2.0`
64+-if test "x$GEOCLUE_DBUS_INTERFACE_XML" = "x"; then
65+- AC_MSG_ERROR([Cannot find dbus_interface variable in geoclue-2.0.pc])
66++ PKG_CHECK_MODULES(DATETIME,
67++ geoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
68++ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
69++ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
70++ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
71++ )
72++
73++ GEOCLUE_DBUS_INTERFACE_XML=`pkg-config --variable=dbus_interface geoclue-2.0`
74++ if test "x$GEOCLUE_DBUS_INTERFACE_XML" = "x"; then
75++ AC_MSG_ERROR([Cannot find dbus_interface variable in geoclue-2.0.pc])
76++ fi
77++ AC_SUBST(GEOCLUE_DBUS_INTERFACE_XML)
78+ fi
79+-AC_SUBST(GEOCLUE_DBUS_INTERFACE_XML)
80++AM_CONDITIONAL(HAVE_GEOCLUE2, test x$have_geoclue = xyes)
81+
82+ dnl ---------------------------------------------------------------------------
83+ dnl - wacom (disabled for s390/s390x and non Linux platforms)
84+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
85+index 7bb01f0..7bd261d 100644
86+--- a/plugins/Makefile.am
87++++ b/plugins/Makefile.am
88+@@ -6,7 +6,6 @@ enabled_plugins = \
89+ clipboard \
90+ color \
91+ cursor \
92+- datetime \
93+ dummy \
94+ power \
95+ housekeeping \
96+@@ -28,6 +27,12 @@ else
97+ disabled_plugins += smartcard
98+ endif
99+
100++if HAVE_GEOCLUE2
101++enabled_plugins += datetime
102++else
103++disabled_plugins += datetime
104++endif
105++
106+ if HAVE_GUDEV
107+ enabled_plugins += orientation
108+ else
109+--
110+2.1.0
111+
112+
113
114=== modified file 'debian/patches/series'
115--- debian/patches/series 2014-09-23 23:33:37 +0000
116+++ debian/patches/series 2014-09-30 23:09:07 +0000
117@@ -12,3 +12,4 @@
118 revert_background_dropping.patch
119 revert-gsettings-removals.patch
120 revert_media-keys_fix_battery_key.patch
121+geoclue-build-fixes.patch

Subscribers

People subscribed via source and target branches

to all changes: