[gypsy] add patch to fix build on glib2 >= 2.35

Peter Robinson pbrobinson at fedoraproject.org
Sun May 19 17:10:29 UTC 2013


commit df6bc1d577eace8a7ec68bd35175482f88d4d3a4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun May 19 18:10:17 2013 +0100

    add patch to fix build on glib2 >= 2.35

 gypsy-0.9-gtypeinit.patch |   12 ++++++++++++
 gypsy.spec                |    2 ++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/gypsy-0.9-gtypeinit.patch b/gypsy-0.9-gtypeinit.patch
new file mode 100644
index 0000000..1d7692e
--- /dev/null
+++ b/gypsy-0.9-gtypeinit.patch
@@ -0,0 +1,12 @@
+--- gypsy-0.9/src/main.c.orig	2013-05-19 18:06:00.511498667 +0100
++++ gypsy-0.9/src/main.c	2013-05-19 18:06:44.789974863 +0100
+@@ -188,7 +188,9 @@
+ 
+ 	umask (022);
+ 
++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 35) 
+ 	g_type_init ();
++#endif
+ 
+ 	mainloop = g_main_loop_new (NULL, FALSE);
+ 
diff --git a/gypsy.spec b/gypsy.spec
index 3f86dba..1b26831 100644
--- a/gypsy.spec
+++ b/gypsy.spec
@@ -9,6 +9,7 @@ License:       LGPLv2 and GPLv2
 URL:           http://gypsy.freedesktop.org/
 Source0:       http://gypsy.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Patch0:        gypsy-0.8-unusedvar.patch
+Patch1:        gypsy-0.9-gtypeinit.patch
 
 BuildRequires: bluez-libs-devel
 BuildRequires: dbus-devel
@@ -46,6 +47,7 @@ This package contains developer documentation for %{name}.
 %prep
 %setup -q
 %patch0 -p1 -b .unusedvar
+%patch1 -p1 -b .gtypeinit
 
 %build
 %configure --disable-static


More information about the scm-commits mailing list