old

(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

3 files changed, 5 insertions, 131 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index bce6f8a43f63..a4b4c8d746c0 100644
--- 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.79 2011/12/11 07:19:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.80 2011/12/11 07:20:03 ssuominen Exp $
+
+  11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -midori-0.4.0.ebuild,
+  -files/midori-0.4.0-webkit151.patch:
+  old
 
   11 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.2-r200.ebuild:
   amd64/x86 stable wrt #393343
diff --git a/www-client/midori/files/midori-0.4.0-webkit151.patch b/www-client/midori/files/midori-0.4.0-webkit151.patch
deleted file mode 100644
index 620cdc96f464..000000000000
--- a/www-client/midori/files/midori-0.4.0-webkit151.patch
+++ /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 
diff --git a/www-client/midori/midori-0.4.0.ebuild b/www-client/midori/midori-0.4.0.ebuild
deleted file mode 100644
index 49b17d05efd8..000000000000
--- a/www-client/midori/midori-0.4.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.6 2011/10/28 20:08:10 ssuominen Exp $
-
-EAPI=3
-inherit eutils fdo-mime gnome2-utils python waf-utils
-
-DESCRIPTION="A lightweight web browser based on WebKitGTK+"
-HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
-SRC_URI="mirror://xfce/src/apps/${PN}/0.4/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-fbsd"
-IUSE="doc gnome idn libnotify nls +unique"
-
-RDEPEND="dev-libs/libxml2:2
-	>=dev-db/sqlite-3.0
-	>=net-libs/libsoup-2.25.2:2.4
-	net-libs/webkit-gtk:2
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	gnome? ( net-libs/libsoup-gnome:2.4 )
-	idn? ( net-dns/libidn )
-	libnotify? ( x11-libs/libnotify )
-	unique? ( dev-libs/libunique:1 )"
-DEPEND="${RDEPEND}
-	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
-	dev-lang/vala:0.10
-	dev-util/intltool
-	doc? ( dev-util/gtk-doc )
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-
-	DOCS=( AUTHORS ChangeLog HACKING INSTALL TODO TRANSLATE )
-	HTML_DOCS=( data/faq.html data/faq.css )
-	PATCHES=( "${FILESDIR}"/${P}-webkit151.patch )
-}
-
-src_configure() {
-	strip-linguas -i po
-
-	VALAC="$(type -p valac-0.10)" \
-	waf-utils_src_configure \
-		--disable-docs \
-		--enable-addons \
-		$(use_enable doc apidocs) \
-		$(use_enable idn libidn) \
-		$(use_enable libnotify) \
-		$(use_enable nls) \
-		$(use_enable unique)
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-	gnome2_icon_cache_update
-}