Fix building with webkit-gtk >= 1.5.1 wrt #385371 by Hanno Meyer-Thurow

Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index e84568e204826090b5bc8f8b69b8e30eb403066f..ae70675e8254397340443780daf884380fd13fbc 100644 (file)
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.65 2011/09/09 16:39:59 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.66 2011/10/02 21:31:09 ssuominen Exp $
+
+  02 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.0.ebuild,
+  +files/midori-0.4.0-webkit151.patch:
+  Fix building with webkit-gtk >= 1.5.1 wrt #385371 by Hanno Meyer-Thurow
 
   09 Sep 2011; Christoph Mende <angelos@gentoo.org> midori-0.4.0.ebuild:
   Restore keywords

diff --git a/www-client/midori/Manifest b/www-client/midori/Manifest
index cf0d358791f997dc5adee94d2450fe4754fd5fb1..9613269bcb2ed8e56649013eb65f26303996487b 100644 (file)
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX midori-0.4.0-webkit151.patch 1797 RMD160 eef08ba9d83cb37d12c097d4ea0ce9d29b292b2f SHA1 82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c SHA256 645140a499c05174909d1060aa0caa71a7fe6f81033814e9934f445a22e89275
 DIST midori-0.3.3.tar.bz2 848720 RMD160 f2380250f3246a3a7c32edb3eba884d3c8ed946f SHA1 01baf6243f7b00af5e5b4eb6ac5d3233e60bc993 SHA256 236770d134e2eb9c44776e233903fc0afa760cd3b8b87d12316e1b25afe2d3fe
 DIST midori-0.3.5.tar.bz2 871235 RMD160 9dfe53448789540867aca7d81145c6e5c49573a0 SHA1 69940049ea98c06b2a6444e9a837e2bf472ba949 SHA256 748059b90d48cd5897d776d88f55d154081ea38eac8735ca393ed1c4317383ac
 DIST midori-0.3.6.tar.bz2 904370 RMD160 b74e1d2d99538ea6a54d28537d41b20987a5e8f4 SHA1 b790f33b72520e6910061a933f879b74482f801c SHA256 5fb290ffde81e5e6b39a54d286f5732496bfda10ff65019189cc6bf8408f2410
@@ -8,14 +9,18 @@ DIST midori-0.4.0.tar.bz2 913425 RMD160 f3449a2b830cdb99035a9bd9162159867bea93d0
 EBUILD midori-0.3.3.ebuild 1836 RMD160 027cee01a298247e513d8cf661c7a0b4dfb386f5 SHA1 a40ecd519a8be8866f062dbae8aa7704aade1366 SHA256 ce7885c2d573089333c4e5b69e8c069b03bf3f6e7d80295b51e54493710d98a3
 EBUILD midori-0.3.5.ebuild 1860 RMD160 e1093429e46648e0163870da7776508e869b9295 SHA1 4a46803daef273acff1bd3456774eefb9694498b SHA256 cc253832fbe7296c7d6f3e2808620d6965c409061ebe6ea1a8ffcef22b57ad48
 EBUILD midori-0.3.6.ebuild 1860 RMD160 a8301c5411fba484c71ea353e29f81c4b7bb2281 SHA1 b9d315c2e71a18a0b097a904e6ac992d9ea9b465 SHA256 be80c7c00c3c0e2cd50c734cdd2dc529c4b1c0e986d1e8da0a6893aaa2ecbcb7
-EBUILD midori-0.4.0.ebuild 1708 RMD160 fd1d32aba47e32ff2a6ee91a0f824de5603bdf5d SHA1 fd7b7bc8937703d92c231ea29cf5cec00e409532 SHA256 e2c17e7fe3880ca7b42b1b14434691eca425724e472919d96b48bd1ba932630b
+EBUILD midori-0.4.0.ebuild 1758 RMD160 94265af4067156df150d2575c0033057bdafdbe8 SHA1 1f928004061179b40413920cb2673dd4ba1f4eef SHA256 cdd0e4aa6be5016d3ff989e6332edbe90b8957dfaf4bcc857e980094c546dff2
 EBUILD midori-9999.ebuild 1673 RMD160 9edc0e009607aaf1f829d5d3aa65944e938c0afd SHA1 d774d89a62bd31b52db0320c6fb4f8e1f932fba4 SHA256 31140b99496fde5194b4499c9c9ebd4314832ce748d23cc4e6eadd64acba4972
-MISC ChangeLog 9840 RMD160 a667362fcfd4d3d47f656f38a407676802b849d9 SHA1 028ec3ba45fb12a5a23f2740ea1f9824bc14a70d SHA256 a2367d06240cb8cdff80af44539ddaf96dce7edb2a436da1e6298d89b1f700ab
+MISC ChangeLog 10031 RMD160 88d036af5dfaff0d9bb2705da159e65c0e23e6be SHA1 f36a0674c043d0035aa1e3d2de39df0b9e081b30 SHA256 fae844d687f7622df58c144272143931e83e8cc41f187a8ff006d59af74405c0
 MISC metadata.xml 324 RMD160 462191a93a3148df91b0ae430af36bb5e7d9a50e SHA1 d2d179fa5da9712cf8c5e6f64cf78b60a9af7b71 SHA256 4f530b1076e8a7c8e52019288be2af64d0f787e564a9f1a9f61188f059ed5dda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5qQWIACgkQmWq1bYTyC0OFygEAmbEjshWAY1HKKenrtEkOmgVh
-o2sf29UGxvi7oQWIaagBAKfbz4hw+FiZQUFrKkV3hyYKNqA3VhBMv9VMAR5THJ8C
-=QcRv
+iQEcBAEBAgAGBQJOiNhHAAoJEEdUh39IaPFNKgcH/jLZSRzKT2HcjMLHPiCfMXRz
+4FSOT5pkLf8hFpnV2ByNNvzpBy4htB7TnzfEVbtjKrqXfMC9qrF6NI/lP5v/RHry
+fXL0newzQE0cV3pBX3pM93A4FAehDxyetkN2gt6fn+UkbBvKQuyatPq5O7kKGpdx
+oUi3CZt8sE6zs7P8M0vdGOE5ddv705afXVkBIIQ67Ql1mD6QQFSkJU9NiLrIevSy
+ZQOI5P/8n4edpp3jnkx9w5oHv3Lm3mjeBY0T3/skzil/jzbcXCnwnX89DFTV3rFF
+fsqKLYSEpLoDNRgA02u3kvJFvlpvkgmj4mA7jdYgTfr68G7oRibYHcKrAnYCTH4=
+=IwwL
 -----END PGP SIGNATURE-----

diff --git a/www-client/midori/files/midori-0.4.0-webkit151.patch b/www-client/midori/files/midori-0.4.0-webkit151.patch
new file mode 100644 (file)
index 0000000..620cdc9
--- /dev/null
+++ b/www-client/midori/files/midori-0.4.0-webkit151.patch
@@ -0,0 +1,59 @@
+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 

diff --git a/www-client/midori/midori-0.4.0.ebuild b/www-client/midori/midori-0.4.0.ebuild
index ec33e109e5708b487840649235fbefccc47c4c6f..95c1890395a4476697d887d8b33d0168024a41f2 100644 (file)
--- a/www-client/midori/midori-0.4.0.ebuild
+++ b/www-client/midori/midori-0.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.0.ebuild,v 1.2 2011/09/09 16:39:59 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.0.ebuild,v 1.3 2011/10/02 21:31:09 ssuominen Exp $
 
 EAPI=3
 inherit eutils fdo-mime gnome2-utils python waf-utils
@@ -36,6 +36,7 @@ pkg_setup() {
 
        DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
        HTML_DOCS=( data/faq.html data/faq.css )
+       PATCHES=( "${FILESDIR}"/${P}-webkit151.patch )
 }
 
 src_configure() {