[packages/gypsy] - gypsy 0.9 + fix for building with glib >= 2.35

[hawk]

commit 3bc51c06f27065f33183191ba4dd47ba21c3dc49
Author: Marcin Krol <hawk at tld-linux.org>
Date:   Mon Apr 8 12:15:08 2013 +0000

    - gypsy 0.9 + fix for building with glib >= 2.35

 gypsy-glib.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 gypsy.spec       |  7 ++++--
 2 files changed, 70 insertions(+), 2 deletions(-)
---
diff --git a/gypsy.spec b/gypsy.spec
index a94fc5d..208b565 100644
--- a/gypsy.spec
+++ b/gypsy.spec
@@ -3,14 +3,15 @@
 Summary:	Gypsy - a GPS multiplexing daemon
 Summary(pl.UTF-8):	Gypsy - demon przełączający dostęp do GPS
 Name:		gypsy
-Version:	0.8
+Version:	0.9
 Release:	1
 License:	LGPL v2+ (library), GPL v2+ (daemon)
 Group:		Daemons
 Source0:	http://gypsy.freedesktop.org/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	32b8db24db86d2dac87b391dd255f4bf
+# Source0-md5:	e2d186df9c2cc3b70a027043e22acf1a
 Patch0:		%{name}-link.patch
 Patch1:		gypsy-0.8-unusedvar.patch
+Patch2:		%{name}-glib.patch
 URL:		http://gypsy.freedesktop.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.9
@@ -87,6 +88,7 @@ Dokumentacja programisty do gypsy.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -115,6 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/gypsy-daemon
 /etc/dbus-1/system.d/Gypsy.conf
+/etc/gypsy.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.Gypsy.service
 
 %files libs
diff --git a/gypsy-glib.patch b/gypsy-glib.patch
new file mode 100644
index 0000000..e8f5b49
--- /dev/null
+++ b/gypsy-glib.patch
@@ -0,0 +1,65 @@
+diff -ur gypsy-0.9.orig/examples/list-known-gps-devices.c gypsy-0.9/examples/list-known-gps-devices.c
+--- gypsy-0.9.orig/examples/list-known-gps-devices.c	2011-10-17 16:32:37.000000000 +0000
++++ gypsy-0.9/examples/list-known-gps-devices.c	2013-04-08 12:09:17.748509337 +0000
+@@ -21,7 +21,9 @@
+     GPtrArray *known_devices;
+     int i;
+ 
++#if !GLIB_CHECK_VERSION(2,35,0)
+     g_type_init ();
++#endif
+ 
+     discovery = gypsy_discovery_new ();
+     known_devices = gypsy_discovery_list_devices (discovery, &error);
+diff -ur gypsy-0.9.orig/examples/simple-gps-dbus.c gypsy-0.9/examples/simple-gps-dbus.c
+--- gypsy-0.9.orig/examples/simple-gps-dbus.c	2011-08-09 11:20:15.000000000 +0000
++++ gypsy-0.9/examples/simple-gps-dbus.c	2013-04-08 12:09:30.940509402 +0000
+@@ -122,7 +122,9 @@
+ 	DBusError error;
+ 	GMainLoop *mainloop;
+ 
++#if !GLIB_CHECK_VERSION(2,35,0)
+ 	g_type_init ();
++#endif
+ 	conn = get_connection ();
+ 
+ 	dbus_error_init (&error);
+diff -ur gypsy-0.9.orig/examples/simple-gps-gypsy.c gypsy-0.9/examples/simple-gps-gypsy.c
+--- gypsy-0.9.orig/examples/simple-gps-gypsy.c	2011-08-09 11:20:15.000000000 +0000
++++ gypsy-0.9/examples/simple-gps-gypsy.c	2013-04-08 12:09:11.387634358 +0000
+@@ -68,7 +68,9 @@
+ 		return 0;
+ 	}
+ 
++#if !GLIB_CHECK_VERSION(2,35,0)
+ 	g_type_init ();
++#endif
+ 
+ 	control = gypsy_control_get_default ();
+ 	path = gypsy_control_create (control, argv[1], &error);
+diff -ur gypsy-0.9.orig/examples/simple-gps-satellites.c gypsy-0.9/examples/simple-gps-satellites.c
+--- gypsy-0.9.orig/examples/simple-gps-satellites.c	2011-08-09 11:20:15.000000000 +0000
++++ gypsy-0.9/examples/simple-gps-satellites.c	2013-04-08 12:09:24.149509548 +0000
+@@ -43,7 +43,9 @@
+ 		return 0;
+ 	}
+ 
++#if !GLIB_CHECK_VERSION(2,35,0)
+ 	g_type_init ();
++#endif
+ 
+ 	control = gypsy_control_get_default ();
+ 	path = gypsy_control_create (control, argv[1], &error);
+diff -ur gypsy-0.9.orig/src/main.c gypsy-0.9/src/main.c
+--- gypsy-0.9.orig/src/main.c	2011-10-13 15:44:12.000000000 +0000
++++ gypsy-0.9/src/main.c	2013-04-08 12:09:37.357634465 +0000
+@@ -188,7 +188,9 @@
+ 
+ 	umask (022);
+ 
++#if !GLIB_CHECK_VERSION(2,35,0)
+ 	g_type_init ();
++#endif
+ 
+ 	mainloop = g_main_loop_new (NULL, FALSE);
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gypsy.git/commitdiff/3bc51c06f27065f33183191ba4dd47ba21c3dc49