rpms/gimp/devel gimp-2.6.6-help-browser-webkit.patch, NONE, 1.1 gimp.spec, 1.192, 1.193

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/gimp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20190

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.6.6-help-browser-webkit.patch 
Log Message:
fix help browser crash with new WebKit versions (#508301)
BR: webkitgtk-devel from F-11 on


gimp-2.6.6-help-browser-webkit.patch:

--- NEW FILE gimp-2.6.6-help-browser-webkit.patch ---
commit 1d38c1c2daabb7dac94a37fa87caa0f1bb4d95f9
Author: Nils Philippsen <nils at 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 at 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 at 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 at 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:


Index: gimp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gimp/devel/gimp.spec,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -p -r1.192 -r1.193
--- gimp.spec	5 Jun 2009 08:28:30 -0000	1.192
+++ gimp.spec	27 Jun 2009 15:55:59 -0000	1.193
@@ -31,7 +31,7 @@ Summary:        GNU Image Manipulation P
 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.patc
 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 at 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 at redhat.com> - 2:2.6.6-4
 - don't build against aalib on RHEL
 - use backported patch to correctly check gegl/babl versions