[meego-panel-myzone] Add patch to not call g_thread_init()
Milan Crha
mcrha at fedoraproject.org
Wed Nov 30 08:09:50 UTC 2011
commit 2eff713e7bf3b73342b5f35294d96d70996045cf
Author: Milan Crha <mcrha at redhat.com>
Date: Wed Nov 30 09:09:38 2011 +0100
Add patch to not call g_thread_init()
meego-panel-myzone-0.2.9-no-g-thread-init.patch | 12 ++++++++++++
meego-panel-myzone.spec | 5 ++++-
2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/meego-panel-myzone-0.2.9-no-g-thread-init.patch b/meego-panel-myzone-0.2.9-no-g-thread-init.patch
new file mode 100644
index 0000000..8016370
--- /dev/null
+++ b/meego-panel-myzone-0.2.9-no-g-thread-init.patch
@@ -0,0 +1,12 @@
+diff -up meego-panel-myzone-0.2.9/src/meego-panel-myzone.c.no-g-thread-init meego-panel-myzone-0.2.9/src/meego-panel-myzone.c
+--- meego-panel-myzone-0.2.9/src/meego-panel-myzone.c.no-g-thread-init 2011-11-30 08:59:55.717995781 +0100
++++ meego-panel-myzone-0.2.9/src/meego-panel-myzone.c 2011-11-30 09:00:02.958076304 +0100
+@@ -106,7 +106,7 @@ main (int argc,
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+- g_thread_init (NULL);
++ g_type_init ();
+ profile_timer = g_timer_new ();
+
+ context = g_option_context_new ("- mutter-meego myzone panel");
diff --git a/meego-panel-myzone.spec b/meego-panel-myzone.spec
index bd3a05d..d236f65 100644
--- a/meego-panel-myzone.spec
+++ b/meego-panel-myzone.spec
@@ -12,6 +12,7 @@ Group: System Environment/Libraries
License: LGPLv2+
URL: http://www.meego.com
Source0: %{tarfile}
+Patch01: meego-panel-myzone-0.2.9-no-g-thread-init.patch
BuildRequires: clutter-devel
BuildRequires: dbus-glib-devel
@@ -45,11 +46,12 @@ Files for development with %{name}.
%prep
%setup -q
+%patch01 -p1 -b .no-g-thread-init
+%build
# Require until stable tar ball release
NOCONFIGURE=yes ./autogen.sh --disable-capplet
-%build
%configure --disable-capplet --disable-static
# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
@@ -95,6 +97,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/mutter-netbook/panels/%{name}.des
%changelog
* Sun Oct 30 2011 Bruno Wolff III <bruno at wolff.to> - 0.2.9-2
- Rebuild against new evolution-data-server
+- Add patch to not call g_thread_init()
* Thu Oct 13 2011 Peter Robinson <pbrobinson at fedoraproject.org> - 0.2.9-1
- Release 0.2.9
More information about the scm-commits
mailing list