[gnome-sharp] update to 2.24.2, explicitly init dbus glib threading

Tom Callaway spot at fedoraproject.org
Thu Mar 28 15:27:46 UTC 2013


commit f00a319be812cac4ba394e84187a8c7c4644f186
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu Mar 28 11:31:03 2013 -0400

    update to 2.24.2, explicitly init dbus glib threading

 .gitignore                               |    1 +
 gnome-sharp-2.24.2-dbus-thread-fix.patch |   29 +++++++++++++++++++++++++++++
 gnome-sharp.spec                         |   11 +++++++++--
 sources                                  |    2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e6249f..4e64ecf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gnome-sharp-2.24.1.tar.bz2
 /gnome-sharp-2.24.1.tar.bz2
+/gnome-sharp-2.24.2.tar.bz2
diff --git a/gnome-sharp-2.24.2-dbus-thread-fix.patch b/gnome-sharp-2.24.2-dbus-thread-fix.patch
new file mode 100644
index 0000000..e8c068c
--- /dev/null
+++ b/gnome-sharp-2.24.2-dbus-thread-fix.patch
@@ -0,0 +1,29 @@
+diff -up gnome-sharp-2.24.2/gconf/GConf/Client.cs.threadfix gnome-sharp-2.24.2/gconf/GConf/Client.cs
+--- gnome-sharp-2.24.2/gconf/GConf/Client.cs.threadfix	2013-03-27 15:22:31.786599211 -0400
++++ gnome-sharp-2.24.2/gconf/GConf/Client.cs	2013-03-27 15:23:45.081596591 -0400
+@@ -31,6 +31,17 @@ namespace GConf
+ 		[DllImport("gconf-2")]
+ 		static extern IntPtr gconf_client_get_default ();
+ 
++		[DllImport("dbus-glib-1")] 
++		static extern void dbus_g_thread_init (); 
++
++		static Client ()
++		{
++			// HACK: we have to initialize dbus' threading else GConf with its 
++			// dbus backend will not be thread safe and SEGVs in our face, see: 
++			// https://bugzilla.gnome.org/show_bug.cgi?id=683830
++			dbus_g_thread_init(); 
++		}
++
+ 		public Client ()
+ 		{
+ 			Initialize ();
+diff -up gnome-sharp-2.24.2/gconf/GConf/gconf-sharp.dll.config.in.threadfix gnome-sharp-2.24.2/gconf/GConf/gconf-sharp.dll.config.in
+--- gnome-sharp-2.24.2/gconf/GConf/gconf-sharp.dll.config.in.threadfix	2013-03-27 15:23:56.970596166 -0400
++++ gnome-sharp-2.24.2/gconf/GConf/gconf-sharp.dll.config.in	2013-03-27 15:24:28.152595051 -0400
+@@ -1,3 +1,4 @@
+ <configuration>
+   <dllmap dll="gconf-2" target="libgconf-2 at LIB_PREFIX@.4 at LIB_SUFFIX@"/>
++  <dllmap dll="dbus-glib-1" target="libdbus-glib-1 at LIB_PREFIX@.2 at LIB_SUFFIX@"/>
+ </configuration>
diff --git a/gnome-sharp.spec b/gnome-sharp.spec
index 50215c7..e55875b 100644
--- a/gnome-sharp.spec
+++ b/gnome-sharp.spec
@@ -1,6 +1,6 @@
 Name:           gnome-sharp
-Version:        2.24.1
-Release:        11%{?dist}
+Version:        2.24.2
+Release:        1%{?dist}
 Summary:        GTK+ and GNOME bindings for Mono
 
 Group:          System Environment/Libraries
@@ -11,6 +11,8 @@ Source0:        ftp://ftp.gnome.org/pub/gnome/sources/gnome-sharp/2.24/gnome-sha
 Patch0: %{name}-2241-getopts.patch
 # init gtype before using gconf
 Patch2: gnome-sharp-gconf-init.patch
+# https://github.com/meebey/gnome-sharp/commit/e9d06b56a54dcd399d1d3eaaf62bdacb7e07084d
+Patch3: gnome-sharp-2.24.2-dbus-thread-fix.patch
 
 BuildRequires:  mono-devel gtk2-devel libart_lgpl-devel gnome-vfs2-devel libgnomecanvas-devel libgnomeui-devel
 BuildRequires:  gtk-sharp2-devel >= 2.12.7
@@ -42,6 +44,7 @@ for writing gnome-sharp2 applications.
 %setup -q
 %patch0 -p1 -b .getopts
 %patch2 -p1 -b .gconf-init
+%patch3 -p1 -b .threadfix
 
 %build
 autoreconf --force --install
@@ -75,6 +78,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/gconf-sharp-peditors-2.0.pc
 
 %changelog
+* Wed Mar 27 2013 Tom Callaway <spot at fedoraproject.org> - 2.24.2-1
+- update to 2.24.2
+- explicitly initialize dbus glib threading
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.1-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 28f6566..10f02c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-408f83f790a5189bcf76ea9299bc6410  gnome-sharp-2.24.1.tar.bz2
+3b38f53960c736d4afb8f04204efe98b  gnome-sharp-2.24.2.tar.bz2


More information about the scm-commits mailing list