[eclipse/f19] Include a fix for a crash in libsoup/webkitgtk-2.x

Krzysztof Daniel kdaniel at fedoraproject.org
Mon Apr 22 12:45:26 UTC 2013


commit 9d980691c17800b6093c80abbf323c1e4442d657
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Mon Apr 22 14:45:16 2013 +0200

    Include a fix for a crash in libsoup/webkitgtk-2.x

 eclipse-fix-jsoup-crash.patch |   18 ++++++++++++++++++
 eclipse.spec                  |    8 +++++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-fix-jsoup-crash.patch b/eclipse-fix-jsoup-crash.patch
new file mode 100644
index 0000000..f626945
--- /dev/null
+++ b/eclipse-fix-jsoup-crash.patch
@@ -0,0 +1,18 @@
+--- eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java	2013-04-19 13:08:29.315958306 +0200
++++ eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse SWT WebKit/gtk/org/eclipse/swt/browser/WebKit.java.bak	2013-04-19 13:06:32.843978924 +0200
+@@ -597,9 +597,13 @@ public void create (Composite parent, int style) {
+ 	*/
+ 	long /*int*/ session = WebKitGTK.webkit_get_default_session ();
+ 	long /*int*/ originalAuth = WebKitGTK.soup_session_get_feature (session, WebKitGTK.webkit_soup_auth_dialog_get_type ());
+-	WebKitGTK.soup_session_feature_detach (originalAuth, session);
++	if (originalAuth != 0) {
++		WebKitGTK.soup_session_feature_detach (originalAuth, session);
++	}
+ 	OS.g_signal_connect (session, WebKitGTK.authenticate, Proc5.getAddress (), webView);
+-	WebKitGTK.soup_session_feature_attach (originalAuth, session);
++	if (originalAuth != 0) {
++		WebKitGTK.soup_session_feature_attach (originalAuth, session);
++	}
+ 
+ 	/*
+ 	* Check for proxy values set as documented java properties and update the
diff --git a/eclipse.spec b/eclipse.spec
index 783b899..88b7924 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -51,7 +51,7 @@ fi;
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        0.38%{?dist}
+Release:        0.39%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -123,6 +123,8 @@ Patch22:		%{pkg_name}-bug-903537.patch
 
 Patch23:		%{pkg_name}-jetty-9.patch
 
+Patch24:		%{pkg_name}-fix-jsoup-crash.patch
+
 BuildRequires: ant >= 1.8.3
 BuildRequires: rsync
 BuildRequires: jpackage-utils >= 0:1.5, make, gcc
@@ -342,6 +344,7 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch21
 %patch22
 %{!?scl:%patch23}
+%patch24
 
 #Disable as many things as possible to make the build faster. We care only for Eclipse.
 %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -1028,6 +1031,9 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Mon Apr 22 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.39
+- Include a fix for a crash in libsoup/webkitgtk-2.x
+
 * Fri Apr 12 2013 Krzysztof Daniel <kdaniel at redhat.com> 1:4.3.0-0.38
 - Generate tests summary after running tests.
 


More information about the scm-commits mailing list