Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0bf0587f0d00272bb9a0fafad126c159b986d83c)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0bf0587f0d00272bb9a0fafad126c159b986d83c)
  • Date: Fri, 30 Sep 2011 21:46:53 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

http/midori/HISTORY | 4 ++
http/midori/PRE_BUILD | 4 ++
http/midori/webkit-1.6.patch | 59
+++++++++++++++++++++++++++++++++++++++++++
3 files changed, 67 insertions(+)

New commits:
commit 0bf0587f0d00272bb9a0fafad126c159b986d83c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

midori: fixed compilation with recent webkitgtk

diff --git a/http/midori/HISTORY b/http/midori/HISTORY
index 7958555..6879454 100644
--- a/http/midori/HISTORY
+++ b/http/midori/HISTORY
@@ -1,3 +1,7 @@
+2011-10-01 Vlad Glagolev <stealth AT sourcemage.org>
+ * PRE_BUILD: added, to apply the patch
+ * webkit-1.6.patch: added, to fix compilation with webkit 1.6
+
2011-09-14 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fix scm SOURCE and SOURCE_DIRECTORY
* PREPARE, DETAILS: Use prepare_select_branch
diff --git a/http/midori/PRE_BUILD b/http/midori/PRE_BUILD
new file mode 100755
index 0000000..01e5a8e
--- /dev/null
+++ b/http/midori/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/webkit-1.6.patch"
diff --git a/http/midori/webkit-1.6.patch b/http/midori/webkit-1.6.patch
new file mode 100644
index 0000000..620cdc9
--- /dev/null
+++ b/http/midori/webkit-1.6.patch
@@ -0,0 +1,59 @@
+From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
+From: Christian Dywan <christian AT twotoasts.de>
+Date: Wed, 21 Sep 2011 21:50:51 +0000
+Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1
+
+Fixes: https://bugs.launchpad.net/midori/+bug/799603
+---
+diff --git a/midori/midori-view.c b/midori/midori-view.c
+index 0d7a96e..e426e7f 100644
+--- a/midori/midori-view.c
++++ b/midori/midori-view.c
+@@ -39,9 +39,11 @@
+ #include <sys/utsname.h>
+ #endif
+
++#if !WEBKIT_CHECK_VERSION (1, 5, 1)
+ /* This is unstable API, so we need to declare it */
+ gchar*
+ webkit_web_view_get_selected_text (WebKitWebView* web_view);
++#endif
+
+ static void
+ midori_view_construct_web_view (MidoriView* view);
+@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view)
+ gboolean
+ midori_view_has_selection (MidoriView* view)
+ {
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++ WebKitDOMDocument* doc;
++ WebKitDOMDOMWindow* window;
++ WebKitDOMDOMSelection* selection;
++ WebKitDOMRange* range;
++#endif
++
+ g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE);
+
++
++#if WEBKIT_CHECK_VERSION (1, 5, 1)
++ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW
(view->web_view));
++ window = webkit_dom_document_get_default_view (doc);
++ selection = webkit_dom_dom_window_get_selection (window);
++ if (selection == NULL)
++ return FALSE;
++
++ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL);
++ if (range == NULL)
++ return FALSE;
++
++ katze_assign (view->selected_text, webkit_dom_range_get_text (range));
++#else
+ katze_assign (view->selected_text, webkit_web_view_get_selected_text (
+ WEBKIT_WEB_VIEW (view->web_view)));
++#endif
++
+ if (view->selected_text && *view->selected_text)
+ return TRUE;
+ else
+--
+cgit



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (0bf0587f0d00272bb9a0fafad126c159b986d83c), Vlad Glagolev, 09/30/2011

Archive powered by MHonArc 2.6.24.

Top of Page