[gtkhtml3] Add patch to not call g_thread_init()
Milan Crha
mcrha at fedoraproject.org
Mon Oct 24 07:38:16 UTC 2011
commit f7575c6438c8128c0476a79bbf4ef748bf7d5d73
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Oct 24 09:38:04 2011 +0200
Add patch to not call g_thread_init()
gtkhtml-4.3.1-no-g-thread-init.patch | 14 ++++++++++++++
gtkhtml3.spec | 6 ++++++
2 files changed, 20 insertions(+), 0 deletions(-)
---
diff --git a/gtkhtml-4.3.1-no-g-thread-init.patch b/gtkhtml-4.3.1-no-g-thread-init.patch
new file mode 100644
index 0000000..7460dca
--- /dev/null
+++ b/gtkhtml-4.3.1-no-g-thread-init.patch
@@ -0,0 +1,14 @@
+diff --git a/components/editor/main.c b/components/editor/main.c
+index 9f84da8..e345779 100644
+--- a/components/editor/main.c
++++ b/components/editor/main.c
+@@ -370,7 +370,9 @@ main (gint argc,
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
++ #if !GLIB_CHECK_VERSION(2,31,0)
+ g_thread_init (NULL);
++ #endif
+
+ gtk_init (&argc, &argv);
+
diff --git a/gtkhtml3.spec b/gtkhtml3.spec
index fdc64c7..fec3b1a 100644
--- a/gtkhtml3.spec
+++ b/gtkhtml3.spec
@@ -12,6 +12,10 @@ License: LGPLv2+ and GPLv2
URL: http://projects.gnome.org/evolution/
Source: http://download.gnome.org/sources/gtkhtml/4.3/gtkhtml-%{version}.tar.xz
+### Patches ###
+
+Patch01: gtkhtml-4.3.1-no-g-thread-init.patch
+
### Build Dependencies ###
BuildRequires: enchant-devel
@@ -41,6 +45,7 @@ developing applications that use %{name}.
%prep
%setup -q -n gtkhtml-%{version}
+%patch01 -p1 -b .no-g-thread-init
%build
autoreconf -fi
@@ -75,6 +80,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
* Mon Oct 24 2011 Milan Crha <mcrha at redhat.com> - 4.3.1-1
- Update to 4.3.1
+- Add patch to not call g_thread_init()
* Mon Sep 26 2011 Milan Crha <mcrha at redhat.com> - 4.2.0-1
- Update to 4.2.0
More information about the scm-commits
mailing list