[ffgtk] Do not use g_thread_init()
Milan Crha
mcrha at fedoraproject.org
Fri Nov 4 06:44:14 UTC 2011
commit fad7d2814a345f85e47da4c15109e8b7294440ae
Author: Milan Crha <mcrha at redhat.com>
Date: Fri Nov 4 07:43:58 2011 +0100
Do not use g_thread_init()
ffgtk-0.7.94-g-thread-init.patch | 18 ++++++++++++++++++
ffgtk.spec | 7 ++++++-
2 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/ffgtk-0.7.94-g-thread-init.patch b/ffgtk-0.7.94-g-thread-init.patch
new file mode 100644
index 0000000..4859f50
--- /dev/null
+++ b/ffgtk-0.7.94-g-thread-init.patch
@@ -0,0 +1,18 @@
+diff -up ffgtk-0.7.94/ffgtk/main.c.g-thread-init ffgtk-0.7.94/ffgtk/main.c
+--- ffgtk-0.7.94/ffgtk/main.c.g-thread-init 2011-11-04 07:40:52.579648504 +0100
++++ ffgtk-0.7.94/ffgtk/main.c 2011-11-04 07:40:57.629710577 +0100
+@@ -176,13 +176,11 @@ int main( int argc, char **argv ) {
+ /* Display version information */
+ Debug( KERN_INFO, "ffgtk %s - %s\n", PACKAGE_VERSION, anSvnRevision );
+
++ g_type_init();
+ /* Initialize thread support */
+- if ( !g_thread_supported() ) {
+- g_thread_init( NULL );
+ #ifdef HAVE_DBUS
+ dbus_g_thread_init();
+ #endif
+- }
+ gdk_threads_init();
+
+ ffgtkInitLock();
diff --git a/ffgtk.spec b/ffgtk.spec
index 8c9fb7a..33590b3 100644
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@ -9,6 +9,7 @@ Source0: http://www.tabos.org/ffgtk/download/%{name}-%{version}.tar.bz2
Source1: ffgtk-fax.ppd
Source2: ffgtk-README.Fedora
Patch0: ffgtk-use-old-spooler.patch
+Patch1: ffgtk-0.7.94-g-thread-init.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -56,6 +57,7 @@ This package contains the gstreamer plugin for ffgtk.
%prep
%setup -q
%patch0 -p1 -b .spooler
+%patch1 -p1 -b .g-thread-init
install -m644 %{SOURCE2} ./README.Fedora
%build
@@ -174,7 +176,10 @@ fi
%{_libdir}/ffgtk/plugins/lib_audio_gstreamer.so.0.0.0
%changelog
-* Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 0.7.94-8
+* Fri Nov 04 2011 Milan Crha <mcrha at redhat.com> 0.7.94-9
+- Do not use g_thread_init()
+
+* Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 0.7.94-9
- Rebuild against newer evolution-data-server
* Thu Sep 15 2011 Louis Lagendijk <louis.lagendijk at gmail.com> 0.7.94-8
More information about the scm-commits
mailing list