[yelp] fix build

Matthias Clasen mclasen at fedoraproject.org
Thu Nov 3 02:54:54 UTC 2011


commit 3e101a274f9e3bc28cd6ab478e758cc0120a8d4b
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Nov 2 22:54:29 2011 -0400

    fix build

 0001-Don-t-call-g_thread_init.patch |   26 ++++++++++++++++++++++++++
 yelp.spec                           |    3 +++
 2 files changed, 29 insertions(+), 0 deletions(-)
---
diff --git a/0001-Don-t-call-g_thread_init.patch b/0001-Don-t-call-g_thread_init.patch
new file mode 100644
index 0000000..d284386
--- /dev/null
+++ b/0001-Don-t-call-g_thread_init.patch
@@ -0,0 +1,26 @@
+From c9fa13942d3082ab122c8f3ac58d0a71198cbe4d Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Wed, 2 Nov 2011 22:52:17 -0400
+Subject: [PATCH] Don't call g_thread_init()
+
+g_type_init() has been doing this anyway since GLib 2.24 or so
+anyway. And with GLib 2.31, it is not necessary anymore.
+---
+ src/yelp.c |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/src/yelp.c b/src/yelp.c
+index 6cf425b..fac6d1a 100644
+--- a/src/yelp.c
++++ b/src/yelp.c
+@@ -37,7 +37,6 @@ main (int argc, char **argv)
+ {
+     YelpApplication *app;
+ 
+-    g_thread_init (NULL);
+     g_type_init ();
+ 
+     setlocale (LC_ALL, "");
+-- 
+1.7.7
+
diff --git a/yelp.spec b/yelp.spec
index f5684ab..d5f8a94 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -5,6 +5,8 @@ Version: 3.3.1
 Release: 1%{?dist}
 #VCS: git:git://git.gnome.org/yelp
 Source: http://download.gnome.org/sources/yelp/3.3/%{name}-%{version}.tar.xz
+# https://bugzilla.gnome.org/show_bug.cgi?id=663285
+Patch0: 0001-Don-t-call-g_thread_init.patch
 
 URL: http://live.gnome.org/Yelp
 License: GPLv2+
@@ -55,6 +57,7 @@ the libraries in the yelp-libs package.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure


More information about the scm-commits mailing list