From cc7d03bf50da915a8c796865d13dce6fce1f7f36 Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nphilipp@fedoraproject.org>
Date: Jun 27 2009 15:55:59 +0000
Subject: fix help browser crash with new WebKit versions (#508301) BR:

    webkitgtk-devel from F-11 on

---

diff --git a/gimp-2.6.6-help-browser-webkit.patch b/gimp-2.6.6-help-browser-webkit.patch
new file mode 100644
index 0000000..a2d3e9d
--- /dev/null
+++ b/gimp-2.6.6-help-browser-webkit.patch
@@ -0,0 +1,39 @@
+commit 1d38c1c2daabb7dac94a37fa87caa0f1bb4d95f9
+Author: Nils Philippsen <nils@redhat.com>
+Date:   Sat Jun 27 17:04:48 2009 +0200
+
+    patch: help-browser-webkit
+    
+    Squashed commit of the following:
+    
+    commit 7647788dbf37369b602361a6abd598388a4cb923
+    Author: Sven Neumann <sven@gimp.org>
+    Date:   Sat Mar 28 16:42:50 2009 +0000
+    
+        Bug 577024 – help-browser plugin crashes when used with webkit 1.1.3
+    
+        2009-03-28  Sven Neumann  <sven@gimp.org>
+    
+        	Bug 577024 – help-browser plugin crashes when used with webkit 1.1.3
+    
+        	* plug-ins/help-browser/help-browser.c (run): call g_thread_init().
+        	Seems to be needed with newer versions of webkit.
+    
+        svn path=/trunk/; revision=28227
+    
+        Signed-off-by: Nils Philippsen <nils@redhat.com>
+
+diff --git a/plug-ins/help-browser/help-browser.c b/plug-ins/help-browser/help-browser.c
+index efbabfe..d632d9c 100644
+--- a/plug-ins/help-browser/help-browser.c
++++ b/plug-ins/help-browser/help-browser.c
+@@ -129,6 +129,9 @@ run (const gchar      *name,
+ 
+   INIT_I18N ();
+ 
++  if (! g_thread_supported ())
++    g_thread_init (NULL);
++
+   switch (run_mode)
+     {
+     case GIMP_RUN_INTERACTIVE:
diff --git a/gimp.spec b/gimp.spec
index 79352d3..f3b328d 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation Program
 Name:           gimp
 Epoch:          2
 Version:        2.6.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 %define binver 2.6
 %define gimp_lang_ver 20
 %define interfacever 2.0
@@ -80,7 +80,11 @@ BuildRequires:  poppler-devel >= 0.4.1
 BuildRequires:  python-devel
 BuildRequires:  pygtk2-devel >= 2.10.4
 BuildRequires:  pygobject2-devel
+%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5
+BuildRequires:  webkitgtk-devel >= 1.0.0
+%else
 BuildRequires:  WebKit-gtk-devel >= 1.0.0
+%endif
 %if %{with modular_x}
 BuildRequires:  libX11-devel
 BuildRequires:  libXmu-devel
@@ -120,6 +124,7 @@ Patch0:         gimp-2.6.2-xdg-open.patch
 Patch1:         gimp-2.6.2-jpeg-units.patch
 Patch2:         gimp-2.6.6-minimize-dialogs.patch
 Patch3:         gimp-2.6.6-gegl-babl-versions-check.patch
+Patch4:         gimp-2.6.6-help-browser-webkit.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -202,6 +207,7 @@ EOF
 %patch1 -p1 -b .jpeg-units
 %patch2 -p1 -b .minimize-dialogs
 %patch3 -p1 -b .gegl-babl-versions-check
+%patch4 -p1 -b .help-browser-webkit
 
 %build
 # if [ ! -f configure ]; then
@@ -492,6 +498,10 @@ fi
 %{_libdir}/gimp/%{interfacever}/plug-ins/help-browser
 
 %changelog
+* Sat Jun 27 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-5
+- fix help browser crash with new WebKit versions (#508301)
+- BR: webkitgtk-devel from F-11 on
+
 * Fri Jun 05 2009 Nils Philippsen <nils@redhat.com> - 2:2.6.6-4
 - don't build against aalib on RHEL
 - use backported patch to correctly check gegl/babl versions