[mingw-gtkhtml3] Don't use g_thread_init anymore

epienbro epienbro at fedoraproject.org
Fri Mar 9 22:11:26 UTC 2012


commit 07b6f31dd42ecc6da47268e8d2746983e8356be2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Fri Mar 9 23:11:20 2012 +0100

    Don't use g_thread_init anymore

 gtkhtml-dont-use-g-thread-init.patch               |   11 +++++++++++
 ...tml-perform-g-thread-init-in-test-program.patch |   11 -----------
 mingw-gtkhtml3.spec                                |   14 +++++++++-----
 3 files changed, 20 insertions(+), 16 deletions(-)
---
diff --git a/gtkhtml-dont-use-g-thread-init.patch b/gtkhtml-dont-use-g-thread-init.patch
new file mode 100644
index 0000000..8d4b179
--- /dev/null
+++ b/gtkhtml-dont-use-g-thread-init.patch
@@ -0,0 +1,11 @@
+--- components/editor/main.c.orig	2012-03-09 23:07:48.695288447 +0100
++++ components/editor/main.c	2012-03-09 23:08:01.789203087 +0100
+@@ -373,8 +373,6 @@
+ 	bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ 	textdomain (GETTEXT_PACKAGE);
+ 
+-	g_thread_init (NULL);
+-
+ 	gtk_init (&argc, &argv);
+ 
+ 	editor = gtkhtml_editor_new ();
diff --git a/mingw-gtkhtml3.spec b/mingw-gtkhtml3.spec
index 22e988c..db51324 100644
--- a/mingw-gtkhtml3.spec
+++ b/mingw-gtkhtml3.spec
@@ -4,7 +4,7 @@
 
 Name:           mingw-gtkhtml3
 Version:        3.32.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        MinGW library for embedding a lightweight web browser in GTK programs
 
 License:        LGPLv2+
@@ -37,10 +37,8 @@ Patch2:         gtkhtml-make-iso-codes-optional.patch
 # being built as a static library
 Patch3:         gtkhtml_enable_static_build.patch
 
-# When executing the testgtkhtml.exe program an error occurs mentioning
-# that the GLib threads system wasn't initialized yet. This patch
-# adds that initialisation
-Patch4:         gtkhtml-perform-g-thread-init-in-test-program.patch
+# The GLib function g_thread_init isn't available anymore as of GLib 2.32
+Patch4:         gtkhtml-dont-use-g-thread-init.patch
 
 BuildArch:      noarch
 
@@ -67,8 +65,11 @@ This is the MinGW build of GtkHTML
 
 %package -n mingw32-gtkhtml3
 Summary:        MinGW library for embedding a lightweight web browser in GTK programs
+Requires:       pkgconfig
 
 %description -n mingw32-gtkhtml3
+GtkHTML is a lightweight HTML rendering/printing/editing engine
+This is the MinGW build of GtkHTML
 
 %package -n mingw32-gtkhtml3-static
 Summary:        Static version of the MinGW Windows GtkHTML library
@@ -154,6 +155,9 @@ install -m0755 build_shared/gtkhtml/.libs/testgtkhtml.exe $RPM_BUILD_ROOT%{mingw
 
 
 %changelog
+* Fri Mar 09 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.32.2-7
+- Don't use g_thread_init anymore
+
 * Tue Mar 06 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.32.2-6
 - Renamed the source package to mingw-gtkhtml3 (RHBZ #800393)
 - Use mingw macros without leading underscore


More information about the scm-commits mailing list