Date: Wed, 13 Mar 2013 18:16:51 +0000 (UTC) From: Olivier Duchateau <olivierd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314102 - in head/www/midori: . files Message-ID: <201303131816.r2DIGpqE025292@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Wed Mar 13 18:16:50 2013 New Revision: 314102 URL: http://svnweb.freebsd.org/changeset/ports/314102 Log: - Drop support for Vala 0.12 - Disable Steadyflow like external download manager (broken with Vala 0.18) Approved by: rene, miwi (mentors, implicit) Deleted: head/www/midori/files/patch-extensions__delayed-load.vala head/www/midori/files/patch-midori__midori-session.c Modified: head/www/midori/Makefile head/www/midori/files/patch-extensions__external-download-manager.vala head/www/midori/files/patch-wscript Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Wed Mar 13 17:44:52 2013 (r314101) +++ head/www/midori/Makefile Wed Mar 13 18:16:50 2013 (r314102) @@ -4,6 +4,7 @@ PORTNAME= midori PORTVERSION= 0.4.9 +PORTREVISION= 1 CATEGORIES= www xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} @@ -91,10 +92,6 @@ CONFIGURE_ARGS+=--enable-zeitgeist CONFIGURE_ARGS+=--disable-zeitgeist .endif -pre-patch: -# Disable HTTP Strict Transport Security (hsts) - @cd ${WRKSRC}/katze && ${RM} midori-hsts.vala - post-install: @-update-desktop-database .if ${PORT_OPTIONS:MAPIDOCS} Modified: head/www/midori/files/patch-extensions__external-download-manager.vala ============================================================================== --- head/www/midori/files/patch-extensions__external-download-manager.vala Wed Mar 13 17:44:52 2013 (r314101) +++ head/www/midori/files/patch-extensions__external-download-manager.vala Wed Mar 13 18:16:50 2013 (r314102) @@ -1,51 +1,38 @@ --- ./extensions/external-download-manager.vala.orig 2013-03-07 17:44:14.000000000 +0000 -+++ ./extensions/external-download-manager.vala 2013-03-07 23:04:44.000000000 +0000 -@@ -137,18 +137,34 @@ - #if !HAVE_WIN32 - private class Aria2 : ExternalDownloadManager { - public override bool download (DownloadRequest dlReq) { -+#if !HAVE_GLIB_2_30 -+ var url = new GLib.ValueArray (2); -+ var uri = new GLib.Value (typeof (string)); -+ uri.set_string (dlReq.uri); -+ url.insert (0, uri); -+#else - var url = value_array_new (); - value_array_insert (url, 0, typeof (string), dlReq.uri); -+#endif ++++ ./extensions/external-download-manager.vala 2013-03-11 06:50:27.000000000 +0000 +@@ -16,7 +16,7 @@ + using WebKit; - GLib.HashTable<string, GLib.Value?> options = value_hash_new (); - var referer = new GLib.Value (typeof (string)); - referer.set_string (dlReq.referer); - options.insert ("referer", referer); - -+#if !HAVE_GLIB_2_30 -+ var headers = new GLib.ValueArray (2); -+ if (dlReq.cookie_header != null) { -+ var cookie = new GLib.Value (typeof (string)); -+ cookie.set_string ("Cookie: %s".printf(dlReq.cookie_header)); -+ headers.insert (0, cookie); -+ } -+#else - var headers = value_array_new (); - if (dlReq.cookie_header != null) { - value_array_insert (headers, 0, typeof (string), "Cookie: %s".printf(dlReq.cookie_header)); - } -+#endif - - if (headers.n_values > 0) - options.insert ("header", headers); -@@ -161,8 +177,13 @@ - session.send_message (message); + namespace EDM { +-#if !HAVE_WIN32 ++#if !HAVE_WIN32 || HAVE_GTK3 + [DBus (name = "net.launchpad.steadyflow.App")] + interface SteadyflowInterface : GLib.Object { + public abstract void AddFile (string url) throws IOError; +@@ -183,6 +183,7 @@ + } + } ++#if HAVE_GTK3 + private class SteadyFlow : ExternalDownloadManager { + public override bool download (DownloadRequest dlReq) { try { -+#if !HAVE_GLIB_2_30 -+ var v = new GLib.Value (typeof (string)); -+ XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, v); -+#else - Value v; - XMLRPC.parse_method_response ((string) message.response_body.flatten ().data, -1, out v); +@@ -210,6 +211,7 @@ + } + } + #endif +#endif - return true; - } catch (Error e) { - this.handle_exception (e); + + private class CommandLinePreferences : Gtk.Dialog { + protected Entry input; +@@ -339,8 +341,10 @@ + var extensions = new Katze.Array( typeof (Midori.Extension)); + #if !HAVE_WIN32 + extensions.add_item (new EDM.Aria2 ()); ++ #if HAVE_GTK3 + extensions.add_item (new EDM.SteadyFlow ()); + #endif ++ #endif + extensions.add_item (new EDM.CommandLine ()); + return extensions; + } Modified: head/www/midori/files/patch-wscript ============================================================================== --- head/www/midori/files/patch-wscript Wed Mar 13 17:44:52 2013 (r314101) +++ head/www/midori/files/patch-wscript Wed Mar 13 18:16:50 2013 (r314102) @@ -1,16 +1,5 @@ --- ./wscript.orig 2013-03-07 17:44:14.000000000 +0000 -+++ ./wscript 2013-03-07 23:10:59.000000000 +0000 -@@ -113,8 +113,8 @@ - conf.check_tool ('compiler_cc') - conf.check_tool ('vala') - conf.check_tool ('glib2') -- if not check_version (conf.env['VALAC_VERSION'], 0, 14, 0): -- Utils.pprint ('RED', 'Vala 0.14.0 or later is required.') -+ if not check_version (conf.env['VALAC_VERSION'], 0, 12, 0): -+ Utils.pprint ('RED', 'Vala 0.12.0 or later is required.') - sys.exit (1) - - if option_enabled ('nls'): ++++ ./wscript 2013-03-10 16:54:29.000000000 +0000 @@ -267,7 +267,6 @@ else: check_pkg ('gtk+-2.0', '2.16.0', var='GTK')
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303131816.r2DIGpqE025292>