[swt-gtk] 03/08: Remove d/patches/libwebkitgtk-1.11.91-compatibility.patch
Jakub Adam
xhaakon-guest at moszumanska.debian.org
Mon Dec 23 12:19:38 UTC 2013
This is an automated email from the git hooks/post-receive script.
xhaakon-guest pushed a commit to branch master-4.3
in repository swt-gtk.
commit d0df9075c9f70ad2f7ce3cb9bd8b8ae6aaeb4feb
Author: Ángel Guzmán Maeso <shakaran at gmail.com>
Date: Mon Dec 23 11:56:38 2013 +0100
Remove d/patches/libwebkitgtk-1.11.91-compatibility.patch
---
debian/changelog | 1 +
.../fix-libwebkitgtk-1.11.91-compatibility.diff | 32 ----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index de3f73a..696946f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ swt4-gtk (4.3.1-1) UNRELEASED; urgency=medium
- no need for debian/patches/64* anymore.
* Move d/patches/common to d/patches.
* Refresh d/patches/01-make_linux.patch
+ * Remove d/patches/fix-libwebkitgtk-1.11.91-compatibility.diff.
-- Jakub Adam <jakub.adam at ktknet.cz> Sun, 15 Dec 2013 14:34:25 +0100
diff --git a/debian/patches/fix-libwebkitgtk-1.11.91-compatibility.diff b/debian/patches/fix-libwebkitgtk-1.11.91-compatibility.diff
deleted file mode 100644
index d9928d4..0000000
--- a/debian/patches/fix-libwebkitgtk-1.11.91-compatibility.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-From d4cd04aaea5b4d7ddbf4edda1b812ef038faf2c7 Mon Sep 17 00:00:00 2001
-From: Jakub Adam <jakub.adam at ktknet.cz>
-Date: Tue, 2 Apr 2013 23:04:29 +0200
-Subject: [PATCH 1/2] fix-libwebkitgtk-1.11.91-compatibility
-
----
- org/eclipse/swt/browser/WebKit.java | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/org/eclipse/swt/browser/WebKit.java b/org/eclipse/swt/browser/WebKit.java
-index 0bae664..34852d5 100644
---- a/org/eclipse/swt/browser/WebKit.java
-+++ b/org/eclipse/swt/browser/WebKit.java
-@@ -597,9 +597,13 @@ public void create (Composite parent, int style) {
- */
- int /*long*/ session = WebKitGTK.webkit_get_default_session ();
- int /*long*/ 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
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 6df444c..28d15fd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01-make_linux.patch
fix-glib-2.35-compatibility.patch
-fix-libwebkitgtk-1.11.91-compatibility.diff
format-security.diff
search-usr-lib-jni.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/swt-gtk.git
More information about the pkg-java-commits
mailing list