Hello community, here is the log from the commit of package geoclue for openSUSE:Factory checked in at 2012-02-01 13:16:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geoclue (Old) and /work/SRC/openSUSE:Factory/.geoclue.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "geoclue", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/geoclue/geoclue.changes 2011-10-03 09:19:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geoclue.new/geoclue.changes 2012-02-01 13:16:04.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 31 10:02:26 UTC 2012 - [email protected] + +- Add geoclue-glib-2.31.patch: fix build with glib 2.31. + +------------------------------------------------------------------- New: ---- geoclue-glib-2.31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geoclue.spec ++++++ --- /var/tmp/diff_new_pack.pmlQsJ/_old 2012-02-01 13:16:08.000000000 +0100 +++ /var/tmp/diff_new_pack.pmlQsJ/_new 2012-02-01 13:16:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package geoclue # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,15 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - Name: geoclue Version: 0.12.0 -Release: 6 -License: LGPL-2.0 +Release: 0 Summary: Modular Geoinformation Service -Url: http://geoclue.freedesktop.org/ +License: LGPL-2.0 Group: Development/Libraries/Other +Url: http://geoclue.freedesktop.org/ Source0: %{name}-%{version}.tar.bz2 Source1: baselibs.conf # PATCH-FIX-UPSTREAM geoclue-nm08.patch [email protected] -- Taken from Fedora, to build against NM 0.8 @@ -32,10 +30,12 @@ Patch1: geoclue-use-libnm-glib.patch # PATCH-FIX-UPSTREAM geoclue-0.12.0-gcc46.patch [email protected] -- Fix compilation with gcc 4.6 Patch2: geoclue-0.12.0-gcc46.patch +# PATCH-FIX-UPSTREAM geoclue-glib-2.31.patch fdo#45431 [email protected] -- Do not call g_thread_init() if not needed +Patch3: geoclue-glib-2.31.patch BuildRequires: NetworkManager-devel BuildRequires: dbus-1-glib-devel -BuildRequires: glib2-devel BuildRequires: gconf2-devel +BuildRequires: glib2-devel BuildRequires: gtk2-devel BuildRequires: libgypsy-devel BuildRequires: libsoup-devel @@ -54,7 +54,6 @@ %package recommended Summary: Modular Geoinformation Service - Recommended providers -License: LGPL-2.0 Group: Development/Libraries/Other %description recommended @@ -67,7 +66,6 @@ %package example Summary: Modular Geoinformation Service - Example backend -License: LGPL-2.0 Group: Development/Libraries/Other %description example @@ -79,7 +77,6 @@ %package gsmloc Summary: Modular Geoinformation Service - GSM backend -License: LGPL-2.0 Group: Development/Libraries/Other %description gsmloc @@ -92,7 +89,6 @@ %package gypsy Summary: Modular Geoinformation Service - GPS (gypsy) backend -License: LGPL-2.0 Group: Development/Libraries/Other Supplements: packageand(libgeoclue0:gypsy) @@ -106,7 +102,6 @@ %package -n libgeoclue0 Summary: Modular Geoinformation Service - Library -License: LGPL-2.0 Group: Development/Libraries/Other %description -n libgeoclue0 @@ -116,7 +111,6 @@ %package -n libgeoclue-devel Summary: Modular Geoinformation Service - Development Files -License: LGPL-2.0 Group: Development/Libraries/Other Requires: libgeoclue0 = %{version} Requires: dbus-1-glib-devel @@ -133,6 +127,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %endif %build ++++++ geoclue-glib-2.31.patch ++++++ >From a3807892767cd6d058462464bca790c97d7e9b7a Mon Sep 17 00:00:00 2001 From: Vincent Untz <[email protected]> Date: Tue, 31 Jan 2012 11:00:03 +0100 Subject: [PATCH] skyhook: Only call g_thread_init on glib < 2.31.0 g_thread_init() is not needed anymore starting with glib 2.31, and it makes the build fail because of -Werror and deprecations. --- providers/skyhook/geoclue-skyhook.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/providers/skyhook/geoclue-skyhook.c b/providers/skyhook/geoclue-skyhook.c index 5af7b45..0f675a1 100644 --- a/providers/skyhook/geoclue-skyhook.c +++ b/providers/skyhook/geoclue-skyhook.c @@ -289,7 +289,9 @@ int main() { g_type_init(); +#if !GLIB_CHECK_VERSION(2,31,0) g_thread_init (NULL); +#endif GeoclueSkyhook *o = g_object_new (GEOCLUE_TYPE_SKYHOOK, NULL); o->loop = g_main_loop_new (NULL, TRUE); -- 1.7.8.3 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
