[geoclue] Add patch to fix build with glib threading changes

Kalev Lember kalev at fedoraproject.org
Thu Mar 1 16:42:12 UTC 2012


commit 761fa0c6a754d9a334fc41d8e3d747381865a415
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Thu Mar 1 18:25:15 2012 +0200

    Add patch to fix build with glib threading changes

 geoclue-0.12.0-g_thread_init.patch |   10 ++++++++++
 geoclue.spec                       |    8 +++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/geoclue-0.12.0-g_thread_init.patch b/geoclue-0.12.0-g_thread_init.patch
new file mode 100644
index 0000000..caf5a38
--- /dev/null
+++ b/geoclue-0.12.0-g_thread_init.patch
@@ -0,0 +1,10 @@
+--- geoclue-0.12.0/providers/skyhook/geoclue-skyhook.c.g_thread_init	2012-03-01 18:19:48.259700437 +0200
++++ geoclue-0.12.0/providers/skyhook/geoclue-skyhook.c	2012-03-01 18:19:54.226555593 +0200
+@@ -307,7 +307,6 @@
+ main()
+ {
+ 	g_type_init();
+-	g_thread_init (NULL);
+ 
+ 	GeoclueSkyhook *o = g_object_new (GEOCLUE_TYPE_SKYHOOK, NULL);
+ 	o->loop = g_main_loop_new (NULL, TRUE);
diff --git a/geoclue.spec b/geoclue.spec
index 67cc734..bda6f27 100644
--- a/geoclue.spec
+++ b/geoclue.spec
@@ -1,6 +1,6 @@
 Name:          geoclue
 Version:       0.12.0
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       A modular geoinformation service
 
 Group:         System Environment/Libraries
@@ -10,6 +10,8 @@ Source0:       http://folks.o-hand.com/jku/geoclue-releases/%{name}-%{version}.t
 Patch0:        geoclue-nm08.patch
 Patch1:        geoclue-use-libnm-glib.patch
 Patch2:        geoclue-unused-var.patch
+# Remove call to deprecated g_thread_init, fixes build with glib 2.31
+Patch3:        geoclue-0.12.0-g_thread_init.patch
 
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
@@ -84,6 +86,7 @@ A gsmloc provider for geoclue
 %patch0 -p1 -b .nm08
 %patch1 -p1 -b .use-libnm-glib
 %patch2 -p1 -b .unused-var
+%patch3 -p1 -b .g_thread_init
 
 # Need this for the NM-0.8 patch
 libtoolize
@@ -175,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/dbus-1/services/org.freedesktop.Geoclue.Providers.Gsmloc.service
 
 %changelog
+* Thu Mar 01 2012 Kalev Lember <kalevlember at gmail.com> - 0.12.0-10
+- Add patch to fix build with glib threading changes
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.12.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list