rpms/webkitgtk/devel webkitgtk.spec,1.23,1.24

[Peter Gordon]

Author: pgordon

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

Modified Files:
	webkitgtk.spec 
Log Message:
Forcibly disable JIT to workaround bug 516057 (selinux execmem segfaults) until a proper solution can be found.


Index: webkitgtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/webkitgtk/devel/webkitgtk.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- webkitgtk.spec	24 Sep 2009 03:39:07 -0000	1.23
+++ webkitgtk.spec	25 Sep 2009 06:01:36 -0000	1.24
@@ -35,7 +35,7 @@
 
 Name:		webkitgtk
 Version:	1.1.15.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	GTK+ Web content engine library
 
 Provides:	WebKit-gtk = %{version}-%{release}
@@ -48,7 +48,14 @@ URL:		http://www.webkitgtk.org/
 Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
 
 #Patch0: 	webkit-1.1.14-atomic-word.patch
-Patch1: 	webkit-1.1.13-no-execmem.patch
+
+## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
+## FIXME: We forcibly disable the JIT compiler for the time being.
+## This is a temporary workaround which causes a slight performance hit on
+## 32- and 64-bit x86; but until we can fix the JIT to correctly handle WX
+## memory, at least we'll have a WebKit stack that doesn't crash due to this
+## bug. :)
+#Patch1: 	webkit-1.1.13-no-execmem.patch
 Patch2: 	webkit-1.1.14-nspluginwrapper.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -112,12 +119,12 @@ LICENSE, README, and AUTHORS files.
 %prep
 %setup -qn "webkit-%{version}"
 # %patch0 -p1 -b .atomic-word
-%patch1 -p1 -b .no-execmem
+# %patch1 -p1 -b .no-execmem
 %patch2 -p1 -b .nspluginwrapper
 
 %build
 CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
-			--enable-gnomekeyring			\
+			--disable-jit				\
 			--enable-geolocation			\
 %{?with_3dtransforms:	--enable-3D-transforms		}	\
 %{?with_coverage:	--enable-coverage		}	\
@@ -190,7 +197,13 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.1-1
+* Thu Sep 24 2009 Peter Gordon <peter at thecodergeek.com> - 1.1.15.1-3
+- Forcibly disable JIT until we can properly resolve the execmem-caused
+  segfaulting. (Temporary workaround until bug #516057 can be properly fixed.)
+- Remove the gnome-keyring build option (no longer used by the build scripts).
+- Correct release value of previous %%changelog entry.
+
+* Wed Sep 23 2009 Matthias Clasen <mclasen at redhat.com> - 1.1.15.1-2
 - Update to 1.1.15.1
 
 * Mon Sep 14 2009 Bastien Nocera <bnocera at redhat.com> 1.1.14-3