Upstream patch for fixing "Save as..." wrt #422933 by "Vladimir". Also switch 0.4.6-r1 to dev-lang/vala SLOT of 0.16 like -9999 is.

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

3 files changed, 180 insertions, 1 deletions

diff --git a/www-client/midori/ChangeLog b/www-client/midori/ChangeLog
index d88dd07fde03..53ae638fabf4 100644
--- a/www-client/midori/ChangeLog
+++ b/www-client/midori/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/midori
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.93 2012/07/02 16:49:07 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/ChangeLog,v 1.94 2012/07/02 17:24:39 ssuominen Exp $
+
+*midori-0.4.6-r1 (02 Jul 2012)
+
+  02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> +midori-0.4.6-r1.ebuild,
+  +files/midori-0.4.6-dl.patch:
+  Upstream patch for fixing "Save as..." wrt #422933 by "Vladimir". Also switch
+  0.4.6-r1 to dev-lang/vala SLOT of 0.16 like -9999 is.
 
   02 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> midori-0.4.6.ebuild:
   ppc stable wrt #416215
diff --git a/www-client/midori/files/midori-0.4.6-dl.patch b/www-client/midori/files/midori-0.4.6-dl.patch
new file mode 100644
index 000000000000..62b507ea940b
--- /dev/null
+++ b/www-client/midori/files/midori-0.4.6-dl.patch
@@ -0,0 +1,70 @@
+From f38715efb279e08bb3ddcd941d5d9ff6091b98c8 Mon Sep 17 00:00:00 2001
+From: André Stösel <andre@stoesel.de>
+Date: Thu, 31 May 2012 14:19:54 +0000
+Subject: Bugfix: "save as" doesn't download anything
+
+Fixes: https://bugs.launchpad.net/midori/+bug/1005881
+---
+diff --git a/midori/midori-browser.c b/midori/midori-browser.c
+index 22d74f5..bae714a 100644
+--- a/midori/midori-browser.c
++++ b/midori/midori-browser.c
+@@ -1342,24 +1342,6 @@ midori_view_new_view_cb (GtkWidget*     view,
+ }
+ 
+ static void
+-midori_view_download_save_as_response_cb (GtkWidget*      dialog,
+-                                          gint            response,
+-                                          MidoriBrowser*  browser)
+-{
+-    WebKitDownload* download = g_object_get_data (G_OBJECT (dialog), "download");
+-    if (response == GTK_RESPONSE_OK)
+-    {
+-        gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
+-        if (midori_browser_prepare_download (browser, download, uri))
+-            webkit_download_start (download);
+-        g_free (uri);
+-    }
+-    else
+-        g_object_unref (download);
+-    gtk_widget_hide (dialog);
+-}
+-
+-static void
+ midori_browser_download_status_cb (WebKitDownload*  download,
+                                    GParamSpec*      pspec,
+                                    GtkWidget*       widget)
+@@ -1515,14 +1497,28 @@ midori_view_download_requested_cb (GtkWidget*      view,
+                 g_free (folder);
+                 g_signal_connect (dialog, "destroy",
+                                   G_CALLBACK (gtk_widget_destroyed), &dialog);
+-                g_signal_connect (dialog, "response",
+-                    G_CALLBACK (midori_view_download_save_as_response_cb), browser);
+             }
+             g_object_set_data (G_OBJECT (dialog), "download", download);
+             filename = sokoke_get_download_filename (download);
+             gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER (dialog), filename);
+             g_free (filename);
+-            gtk_widget_show (dialog);
++
++            if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK)
++            {
++                gtk_widget_hide (dialog);
++                gchar* uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (dialog));
++                if (!midori_browser_prepare_download (browser, download, uri))
++                {
++                    g_free (uri);
++                    return FALSE;
++                }
++                g_free (uri);
++            }
++            else
++            {
++                gtk_widget_hide (dialog);
++                return FALSE;
++            }
+         }
+         else
+         {
+--
+cgit v0.9.0.3
diff --git a/www-client/midori/midori-0.4.6-r1.ebuild b/www-client/midori/midori-0.4.6-r1.ebuild
new file mode 100644
index 000000000000..1f44dccfcf37
--- /dev/null
+++ b/www-client/midori/midori-0.4.6-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/midori/midori-0.4.6-r1.ebuild,v 1.1 2012/07/02 17:24:39 ssuominen Exp $
+
+EAPI=4
+
+unset _live_inherits
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="git://git.xfce.org/apps/${PN}"
+	_live_inherits=git-2
+else
+	KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+	SRC_URI="mirror://xfce/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+fi
+
+inherit eutils fdo-mime gnome2-utils python waf-utils ${_live_inherits}
+
+PV_vala_version=0.16
+
+DESCRIPTION="A lightweight web browser based on WebKitGTK+"
+HOMEPAGE="http://www.twotoasts.de/index.php?/pages/midori_summary.html"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0"
+IUSE="+deprecated doc gnome libnotify nls +unique"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.22
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	x11-libs/libXScrnSaver
+	deprecated? (
+		net-libs/webkit-gtk:2
+		x11-libs/gtk+:2
+		unique? ( dev-libs/libunique:1 )
+		)
+	!deprecated? (
+		net-libs/webkit-gtk:3
+		x11-libs/gtk+:3
+		unique? ( dev-libs/libunique:3 )
+		)
+	gnome? ( net-libs/libsoup-gnome:2.4 )
+	libnotify? ( >=x11-libs/libnotify-0.7 )"
+DEPEND="${RDEPEND}
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
+	dev-lang/vala:${PV_vala_version}
+	dev-util/intltool
+	gnome-base/librsvg
+	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 )
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999* ]]; then
+		git-2_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-dl.patch
+}
+
+src_configure() {
+	strip-linguas -i po
+
+	VALAC="$(type -P valac-${PV_vala_version})" \
+	waf-utils_src_configure \
+		--disable-docs \
+		 $(use_enable doc apidocs) \
+		 $(use_enable unique) \
+		 $(use_enable libnotify) \
+		--enable-addons \
+		$(use_enable nls) \
+		$(use_enable !deprecated gtk3) \
+		--disable-granite
+}
+
+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
+}