[Pkg-telepathy-commits] [empathy] 05/07: debian/patches/*: Port to the released 0.99.1 version of geocode-glib
Laurent Bigonville
bigon at alioth.debian.org
Tue Aug 20 12:14:32 UTC 2013
This is an automated email from the git hooks/post-receive script.
bigon pushed a commit to branch debian-experimental
in repository empathy.
commit e24b77a93a7acd89a764b4e8febc9dca58127397
Author: Laurent Bigonville <bigon at bigon.be>
Date: Tue Aug 20 00:38:07 2013 +0200
debian/patches/*: Port to the released 0.99.1 version of geocode-glib
---
debian/changelog | 3 +-
...e-new-api-versioned-name-for-geocode-glib.patch | 28 ++++++++++++
...ew-GeocodeLocation-API-in-geocode-glib-0..patch | 48 ++++++++++++++++++++
debian/patches/0003-Add-missing-include.patch | 24 ++++++++++
debian/patches/series | 3 ++
5 files changed, 105 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 5454089..6a2f769 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ empathy (3.8.3-2) UNRELEASED; urgency=low
* debian/control, debian/rules: Re-enable libchamplain support
* debian/rules: Call dh-autoreconf with --as-needed option
* debian/control, debian/rules: Re-enable geoclue and geocode support
+ * debian/patches/*: Port to the released 0.99.1 version of geocode-glib
- -- Laurent Bigonville <bigon at debian.org> Tue, 20 Aug 2013 00:23:48 +0200
+ -- Laurent Bigonville <bigon at debian.org> Tue, 20 Aug 2013 00:37:29 +0200
empathy (3.8.3-1) experimental; urgency=low
diff --git a/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch b/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch
new file mode 100644
index 0000000..e0aeb83
--- /dev/null
+++ b/debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch
@@ -0,0 +1,28 @@
+commit 4682c05ce90708e89c8690d4fb395fcee73b9d71
+Author: Andreas Henriksson <andreas at fatal.se>
+Date: Wed Aug 14 20:40:48 2013 +0200
+
+ Use new api-versioned name for geocode-glib
+
+ geocode-glib has changed the name of the pkg-config file
+ to include the api version. Update configure script accordingly.
+
+ See:
+ https://git.gnome.org/browse/geocode-glib/commit/?id=1cadaa879b7d72d973880680b5f947fd5c275974
+ "pkg-config: Version the pkg-config file"
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=706020
+
+diff --git a/configure.ac b/configure.ac
+index d71de75..b0228ec 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -441,7 +441,7 @@ AC_ARG_ENABLE(geocode,
+ if test "x$enable_geocode" != "xno"; then
+ PKG_CHECK_MODULES(GEOCODE,
+ [
+- geocode-glib >= $GEOCODE_GLIB_REQUIRED
++ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED
+ ], have_geocode="yes", have_geocode="no")
+
+ if test "x$have_geocode" = "xyes"; then
diff --git a/debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch b/debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
new file mode 100644
index 0000000..872223e
--- /dev/null
+++ b/debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
@@ -0,0 +1,48 @@
+commit acaa1e4f9d2c5e746e895a7ca3e6002ac502cc2a
+Author: Andreas Henriksson <andreas at fatal.se>
+Date: Wed Aug 14 21:44:24 2013 +0200
+
+ Use new GeocodeLocation API in geocode-glib 0.99.1
+
+ Use new accessor functions. The location structure members has been hidden.
+ Use regular g_object_unref, since the geocode_location_free has been
+ removed.
+
+ See:
+ https://git.gnome.org/browse/geocode-glib/commit?id=5372f2f7ff97707dcc839bd3ed79ea9f289f7409
+ "lib: Turn GeocodeLocation into a proper GObject"
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=706020
+
+diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
+index 3561044..8f9cb16 100644
+--- a/libempathy/empathy-contact.c
++++ b/libempathy/empathy-contact.c
+@@ -1617,7 +1617,6 @@ geocode_cb (GObject *source,
+ GeocodeLocation *loc;
+ GHashTable *new_location;
+ GHashTable *resolved = NULL;
+- gdouble latitude, longitude;
+
+ if (priv->location == NULL)
+ goto out;
+@@ -1635,14 +1634,14 @@ geocode_cb (GObject *source,
+ loc = res->data;
+
+ new_location = tp_asv_new (
+- EMPATHY_LOCATION_LAT, G_TYPE_DOUBLE, loc->latitude,
+- EMPATHY_LOCATION_LON, G_TYPE_DOUBLE, loc->longitude,
++ EMPATHY_LOCATION_LAT, G_TYPE_DOUBLE, geocode_location_get_latitude (loc),
++ EMPATHY_LOCATION_LON, G_TYPE_DOUBLE, geocode_location_get_longitude (loc),
+ NULL);
+
+- DEBUG ("\t - Latitude: %f", loc->latitude);
+- DEBUG ("\t - Longitude: %f", loc->longitude);
++ DEBUG ("\t - Latitude: %f", geocode_location_get_latitude (loc));
++ DEBUG ("\t - Longitude: %f", geocode_location_get_longitude (loc));
+
+- g_list_free_full (res, (GDestroyNotify) geocode_location_free);
++ g_list_free_full (res, g_object_unref);
+
+ /* Copy remaning fields. LAT and LON were not defined so we won't overwrite
+ * the values we just set. */
diff --git a/debian/patches/0003-Add-missing-include.patch b/debian/patches/0003-Add-missing-include.patch
new file mode 100644
index 0000000..312e842
--- /dev/null
+++ b/debian/patches/0003-Add-missing-include.patch
@@ -0,0 +1,24 @@
+commit 1158a1e2814e74ce115cfa201fd8a908a79cbd7e
+Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
+Date: Fri Aug 16 13:43:00 2013 +0200
+
+ Add missing include
+
+ Needed for EMPATHY_LOCATION_*.
+
+ Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=706125
+
+diff --git a/libempathy/empathy-contact.c b/libempathy/empathy-contact.c
+index 8f9cb16..9f8e232 100644
+--- a/libempathy/empathy-contact.c
++++ b/libempathy/empathy-contact.c
+@@ -26,6 +26,7 @@
+ #include <geocode-glib/geocode-glib.h>
+ #endif
+
++#include "empathy-location.h"
+ #include "empathy-utils.h"
+ #include "empathy-enum-types.h"
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..685b82c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Use-new-api-versioned-name-for-geocode-glib.patch
+0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch
+0003-Add-missing-include.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/empathy.git
More information about the Pkg-telepathy-commits
mailing list