Sun Feb 10 01:12:35 PST 2013

3 files changed, 0 insertions, 99 deletions

diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch
deleted file mode 100644
index 599780b78..000000000
--- a/community/midori/0.4.7-private-mode.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala
---- midori-0.4.7/katze/midori-paths.vala	2012-09-19 23:17:43.000000000 +0200
-+++ midori-0.4.7.patch/katze/midori-paths.vala	2012-09-24 20:36:04.585209437 +0200
-@@ -74,7 +74,7 @@
-             else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) {
-                 /* Use mock folders in development builds */
-                 if ("." in MIDORI_VERSION_SUFFIX)
--                    config_dir = cache_dir = user_data_dir = config_base;
-+                    config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S;
-                 else
-                     config_dir = cache_dir = user_data_dir = "/";
-                 readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S,
diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch
deleted file mode 100644
index 2debc92fe..000000000
--- a/community/midori/0001-Fix-libsoup-version-check-defines.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@twotoasts.de>
-Date: Mon, 16 Apr 2012 17:17:23 +0000
-Subject: Fix libsoup version check #defines
-
-Fixes: https://bugs.launchpad.net/midori/+bug/983137
----
-diff --git a/wscript b/wscript
-index db74324..c7a0c87 100644
---- a/wscript
-+++ b/wscript
-@@ -260,11 +260,11 @@ def configure (conf):
-     check_pkg ('libsoup-2.4', '2.27.90')
-     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
-     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
--        conf.define ('LIBSOUP_2_29_3', 1)
-+        conf.define ('HAVE_LIBSOUP_2_29_3', 1)
-     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
--        conf.define ('LIBSOUP_2_29_91', 1)
-+        conf.define ('HAVE_LIBSOUP_2_29_91', 1)
-     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
--        conf.define ('LIBSOUP_2_37_1', 1)
-+        conf.define ('HAVE_LIBSOUP_2_37_1', 1)
-     check_pkg ('libxml-2.0', '2.6')
-     check_pkg ('sqlite3', '3.0', True, var='SQLITE')
- 
---
-cgit v0.9.0.3
diff --git a/community/midori/webkit_search.diff b/community/midori/webkit_search.diff
deleted file mode 100644
index 620cdc96f..000000000
--- a/community/midori/webkit_search.diff
+++ /dev/null
@@ -1,59 +0,0 @@
-From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001
-From: Christian Dywan <christian@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