summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2011-12-11 07:20:03 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2011-12-11 07:20:03 +0000
commit778dfa6db5a97481c9e34cfb339d70ce76720bd3 (patch)
tree1be45e2ca06b5edb459cd45fab62516b8c95560e /www-client/midori
parentamd64/x86 stable wrt #393343 (diff)
downloadhistorical-778dfa6db5a97481c9e34cfb339d70ce76720bd3.tar.gz
historical-778dfa6db5a97481c9e34cfb339d70ce76720bd3.tar.bz2
historical-778dfa6db5a97481c9e34cfb339d70ce76720bd3.zip
old
Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
Diffstat (limited to 'www-client/midori')
-rw-r--r--www-client/midori/ChangeLog6
-rw-r--r--www-client/midori/Manifest19
-rw-r--r--www-client/midori/files/midori-0.4.0-webkit151.patch59
-rw-r--r--www-client/midori/midori-0.4.0.ebuild71
4 files changed, 13 insertions, 142 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/Manifest b/www-client/midori/Manifest
index 5e269df1035a..a5b74672f352 100644
--- a/www-client/midori/Manifest
+++ b/www-client/midori/Manifest
@@ -1,23 +1,20 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX midori-0.4.0-webkit151.patch 1797 RMD160 eef08ba9d83cb37d12c097d4ea0ce9d29b292b2f SHA1 82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c SHA256 645140a499c05174909d1060aa0caa71a7fe6f81033814e9934f445a22e89275
-DIST midori-0.4.0.tar.bz2 913425 RMD160 f3449a2b830cdb99035a9bd9162159867bea93d0 SHA1 c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585 SHA256 0ac31b008b44e08cf0536a38405a0ecc2da7c28e3d549915325dbba74f74cd75
DIST midori-0.4.2.tar.bz2 923897 RMD160 ca16f66bafa4dcb49b0cfbcef9900cee94a0066b SHA1 fac3dc4bb8935f35b38ffc4d6c7a5daba9dc52f1 SHA256 2e3f104254fb9a28c77e8acf1cc8ae6dd529499711d558b29146ab0fa915f0a7
-EBUILD midori-0.4.0.ebuild 1780 RMD160 136c713c1e2d3fa2199627656014b2b8d27aedb0 SHA1 ecc9c15cf6a9eaa340acd023c93ecd033b380909 SHA256 55318698495f9ac8fdc92b55565a68a9170021e79c44138637ef74e2a99cde4a
EBUILD midori-0.4.2-r200.ebuild 1764 RMD160 d7313b055155780fe46675137515aa815056d0f1 SHA1 602117fc7f0083fc9715dfd2ff2c5edfa427ef8a SHA256 4786b663c6556c46414e4e3d03f5e2b450039efd7646d5387dd861eb1e65efd3
EBUILD midori-0.4.2-r300.ebuild 1869 RMD160 383c1430d5fb01eb63caf2e88884a3ab05c77678 SHA1 6552209f3f54a925df7b1ffe4e5a2c3e7fc23e18 SHA256 c65127d6b0378323ed583d59028735092d19d65bc9ab45614501cd93f83de2c4
EBUILD midori-9999.ebuild 1739 RMD160 a07286e21a46df4ea6c429323292bf2c657bc542 SHA1 941b8a4cebe73b8c492a77f99e26fe96ba853a56 SHA256 27319ebac22d2ff993c837720eca2f4527376f95a4170c6735943720a2232178
-MISC ChangeLog 11712 RMD160 a2854db14e34c5a59f6417ec3a684a43bee66397 SHA1 51e0999f99709cc9340062e9a0c81ae3c5fc4564 SHA256 ec7411d960259f597c8776e0e38c9d1665da1e38a60aed6d48b1bc0b0f4f9446
+MISC ChangeLog 11834 RMD160 dfaee7d44a1cd05fb7084cc53e7beb601908a848 SHA1 fed1f2979012c50397887047022aa55ddc90cc14 SHA256 f92a50f308b573387b24cbb990043c23163f60163e156221266a742bfc477692
MISC metadata.xml 274 RMD160 3ae0219141cb6e103701de78f56f37f72351b20d SHA1 0458b3f1368ca30ad19355d7db79eb406e2761fb SHA256 5d1336bd8e7ed8f67cfb304d72be04a5bcb18c221e4fbeb9ae68331f5e99d9ba
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJO5FlyAAoJEEdUh39IaPFNSJgH/3F2uJOo22WPDTM3KRFSpaQb
-PbROhxuFvKBTigV9NbEQR3sO8PQHlf0WO1RO4dW+7rY0W8+3t3H0JVmYn9iaF8cz
-xR+l4aD7xMbPYOOvz70aKDTE3YbCqyCEeFqNl4iV+ha3F4PqfTYpyQL6tOkqTsjJ
-9xt46N66S9eltEahNpbTYzCxGmulmfRCxwkd2yO8mD4MmiTSSU8fVVl3OQrUHU4j
-a8qRXJPYBuADo96a8FH0iJ6sWi16fPKKF4xs2R+Lxw3GhqfVOJBqonfL3+VjDgyl
-8FIzoEeoTJ7SRlj8qSJAxA2oBCUQaG39INggykWUdRlZH/dVxCpzfspCq5GiZUY=
-=EahQ
+iQEcBAEBAgAGBQJO5FmnAAoJEEdUh39IaPFNma8IAKQm7B26Z53466ViuzChmyBw
+Q0hmEmrb8fs8/z2koI4fGeqVhjfKJW/S9qb8+5yiheOLv3ob5qocJKD9U4jV3PXA
+JqKiO6ih4s/h9EcG9+wOaiZQiWsedkX601FiE+XqGfRs7liPzFuQZIPLgrae+8nw
+mJhqlUP4Z3vM292ntr08fu3aK2rAfE7g/TJ/Qx4BV5U/phT9yMndr/5LNiMZo8CG
+EhliyUrPh7jz4PKEX3g+j7TiaXCovYqa2+xmD3zQbP+KDlUCj1eLdC6Oh0P3AV5i
+GY11LHXaUtKJcrCRhngcGoUmmx+NfoldbsP/2hb+ano6uX+MN12c5Urjizjk4PM=
+=+sAT
-----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
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
-}