rpms/compat-wxGTK26/devel wxGTK-2.6.3-g_thread_init.patch, NONE, 1.1 compat-wxGTK26.spec, 1.2, 1.3

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12614

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-g_thread_init.patch 
Log Message:
* Sun Jul  8 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-4
- Call g_thread_init early (#244542).


wxGTK-2.6.3-g_thread_init.patch:

--- NEW FILE wxGTK-2.6.3-g_thread_init.patch ---
diff -Nur wxGTK-2.6.3-orig/src/gtk/app.cpp wxGTK-2.6.3/src/gtk/app.cpp
--- wxGTK-2.6.3-orig/src/gtk/app.cpp	2006-03-22 00:42:16.000000000 +0100
+++ wxGTK-2.6.3/src/gtk/app.cpp	2007-07-08 12:52:15.000000000 +0200
@@ -442,12 +442,26 @@
 
     m_idleTag = 0;
     g_isIdle = TRUE;
-    wxapp_install_idle_handler();
 
 #if wxUSE_THREADS
+    // GTK 1.2 up to version 1.2.3 has broken threads
+    if ((gtk_major_version == 1) &&
+        (gtk_minor_version == 2) &&
+        (gtk_micro_version < 4))
+    {
+        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
+    }
+    else
+    {
+        if (!g_thread_supported())
+            g_thread_init(NULL);
+    }
+
     g_main_set_poll_func( wxapp_poll_func );
 #endif
 
+    wxapp_install_idle_handler();
+
     m_colorCube = (unsigned char*) NULL;
 
     // this is NULL for a "regular" wxApp, but is set (and freed) by a wxGLApp
@@ -580,21 +594,6 @@
 {
     bool init_result;
     
-#if wxUSE_THREADS
-    // GTK 1.2 up to version 1.2.3 has broken threads
-    if ((gtk_major_version == 1) &&
-        (gtk_minor_version == 2) &&
-        (gtk_micro_version < 4))
-    {
-        printf( "wxWidgets warning: GUI threading disabled due to outdated GTK version\n" );
-    }
-    else
-    {
-        if (!g_thread_supported())
-            g_thread_init(NULL);
-    }
-#endif // wxUSE_THREADS
-
     gtk_set_locale();
 
     // We should have the wxUSE_WCHAR_T test on the _outside_


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compat-wxGTK26.spec	8 Jul 2007 10:30:03 -0000	1.2
+++ compat-wxGTK26.spec	8 Jul 2007 11:07:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.3
-Release:        3
+Release:        4
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -12,6 +12,7 @@
 Patch0:         wxGTK-2.6.3.2-cvs.patch
 Patch1:         wxGTK-2.6.3-locale-compat.patch
 Patch2:         wxGTK-2.6.3-gtk-crash.patch
+Patch3:         wxGTK-2.6.3-g_thread_init.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -48,6 +49,7 @@
 %patch0 -p1 -b .2.6.3.2
 %patch1 -p1 -b .locale-compat
 %patch2 -p1 -b .gtk-crash
+%patch3 -p1 -b .g_thread_init
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -154,6 +156,9 @@
 
 
 %changelog
+* Sun Jul  8 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-4
+- Call g_thread_init early (#244542).
+
 * Sun Jul  8 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-3
 - Avoid g_free related crashes in gtk.