Index: head/www/midori/Makefile =================================================================== --- head/www/midori/Makefile (revision 313621) +++ head/www/midori/Makefile (revision 313622) @@ -1,107 +1,107 @@ # Created by: Michael Johnson # $FreeBSD$ # PORTNAME= midori -PORTVERSION= 0.4.8 +PORTVERSION= 0.4.9 CATEGORIES= www xfce MASTER_SITES= ${MASTER_SITE_XFCE} MASTER_SITE_SUBDIR= src/apps/${PORTNAME}/${PORTVERSION:R} DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= Lightweight web browser using WebKit browser engine LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= rsvg-convert:${PORTSDIR}/graphics/librsvg2 \ valac:${PORTSDIR}/lang/vala LIB_DEPENDS= webkitgtk-1:${PORTSDIR}/www/webkit-gtk2 \ sqlite3:${PORTSDIR}/databases/sqlite3 \ notify:${PORTSDIR}/devel/libnotify RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+=--enable-libnotify \ --enable-addons \ --enable-docs \ --disable-gtk3 # if user has set DISABLE_MAKE_JOBS, then MAKE_JOBS_NUMBER is undefined .if defined(DISABLE_MAKE_JOBS) CONFIGURE_ARGS+=--jobs=1 .else CONFIGURE_ARGS+=--jobs=${MAKE_JOBS_NUMBER} .endif MAKE_JOBS_SAFE= yes HAS_CONFIGURE= yes USE_PYTHON_BUILD= yes USE_BZIP2= yes USE_GNOME= glib20 gtk20 intltool libxml2 desktopfileutils USE_XORG= xscrnsaver INSTALLS_ICONS= yes USE_LDCONFIG= yes USE_PKGCONFIG= build PLIST_SUB= VERSION="${PORTVERSION:R}" OPTIONS_DEFINE= APIDOCS NLS UNIQUE ZEITGEIST OPTIONS_DEFAULT= NLS UNIQUE APIDOCS_DESC= Build API documentation UNIQUE_DESC= Single instance support ZEITGEIST_DESC= User logs activities .include # WAF needs that CONFIGURE_ENV+= CC="${CC}" .if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif .if ${PORT_OPTIONS:MAPIDOCS} BUILD_DEPENDS+= gtkdoc-scan:${PORTSDIR}/textproc/gtk-doc CONFIGURE_ARGS+=--enable-apidocs PLIST_SUB+= APIDOCS="" .else CONFIGURE_ARGS+=--disable-apidocs PLIST_SUB+= APIDOCS="@comment " .endif .if ${PORT_OPTIONS:MUNIQUE} LIB_DEPENDS+= unique-1:${PORTSDIR}/x11-toolkits/unique CONFIGURE_ARGS+=--enable-unique .else CONFIGURE_ARGS+=--disable-unique .endif .if ${PORT_OPTIONS:MZEITGEIST} LIB_DEPENDS+= zeitgeist-1:${PORTSDIR}/sysutils/libzeitgeist CONFIGURE_ARGS+=--enable-zeitgeist .else 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} ${MKDIR} ${DOCSDIR}/api/katze/html ${MKDIR} ${DOCSDIR}/api/midori/html (cd ${WRKSRC}/_build/docs/api/katze/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/katze/html) (cd ${WRKSRC}/_build/docs/api/midori/html && ${COPYTREE_SHARE} \* ${DOCSDIR}/api/midori/html) .endif .include Index: head/www/midori/distinfo =================================================================== --- head/www/midori/distinfo (revision 313621) +++ head/www/midori/distinfo (revision 313622) @@ -1,2 +1,2 @@ -SHA256 (xfce4/midori-0.4.8.tar.bz2) = 40bf23f84a3537f54d7eb45df1da40ebef54c321b1b34d0d0c8e45bb0cce5e9f -SIZE (xfce4/midori-0.4.8.tar.bz2) = 1047789 +SHA256 (xfce4/midori-0.4.9.tar.bz2) = f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11 +SIZE (xfce4/midori-0.4.9.tar.bz2) = 1079713 Index: head/www/midori/files/patch-data__midori.desktop.in =================================================================== --- head/www/midori/files/patch-data__midori.desktop.in (revision 313621) +++ head/www/midori/files/patch-data__midori.desktop.in (nonexistent) @@ -1,26 +0,0 @@ ---- ./data/midori.desktop.in.orig 2013-02-05 23:28:05.000000000 +0000 -+++ ./data/midori.desktop.in 2013-02-07 06:50:36.000000000 +0000 -@@ -15,19 +15,19 @@ - StartupNotify=true - X-Osso-Type=application/x-executable - X-Osso-Service=midori --X-Ayatana-Desktop-Shortcuts=TabNew;WindowNew;Private -+Actions=TabNew;WindowNew;Private - --[TabNew Shortcut Group] -+[Desktop Action TabNew] - _Name=New Tab - Exec=midori -e TabNew - TargetEnvironment=Unity - --[WindowNew Shortcut Group] -+[Desktop Action WindowNew] - _Name=New Window - Exec=midori -e WindowNew - TargetEnvironment=Unity - --[Private Shortcut Group] -+[Desktop Action Private] - _Name=New Private Browsing Window - Exec=midori --private - TargetEnvironment=Unity Property changes on: head/www/midori/files/patch-data__midori.desktop.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/www/midori/files/patch-extensions__external-download-manager.vala =================================================================== --- head/www/midori/files/patch-extensions__external-download-manager.vala (revision 313621) +++ head/www/midori/files/patch-extensions__external-download-manager.vala (revision 313622) @@ -1,60 +1,51 @@ ---- ./extensions/external-download-manager.vala.orig 2013-02-05 23:28:05.000000000 +0000 -+++ ./extensions/external-download-manager.vala 2013-02-07 06:20:07.000000000 +0000 +--- ./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 GLib.HashTable 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); 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); +#endif return true; } catch (Error e) { this.handle_exception (e); -@@ -311,6 +332,8 @@ - internal CommandLine () { - #if HAVE_WIN32 - string default_commandline = "\"%s\\FlashGet\\flashget.exe\" {URL}".printf (Environment.get_variable ("ProgramFiles")); -+#elif HAVE_FREEBSD -+ string default_commandline = "fetch {URL}"; - #else - string default_commandline = "wget --no-check-certificate --referer={REFERER} --header={COOKIES} {URL}"; - #endif Index: head/www/midori/files/patch-midori__midori-view.c =================================================================== --- head/www/midori/files/patch-midori__midori-view.c (revision 313621) +++ head/www/midori/files/patch-midori__midori-view.c (revision 313622) @@ -1,16 +1,13 @@ ---- ./midori/midori-view.c.orig 2013-02-05 23:28:05.000000000 +0000 -+++ ./midori/midori-view.c 2013-02-06 22:29:13.000000000 +0000 -@@ -3981,10 +3981,12 @@ - gchar const* version_strings[] = { - LIBSOUP_VERSION, - CAIRO_VERSION_STRING, cairo_version_string (), -+ #if HAVE_GCR - GCR_VERSION, -+ #elif HAVE_GRANITE - GRANITE_VERSION, - LIBNOTIFY_VERSION, -- #if HAVE_UNIQUE -+ #elif HAVE_UNIQUE - "libunique " UNIQUE_VERSION, - #else - "Sockets", +--- ./midori/midori-view.c.orig 2013-03-07 17:44:14.000000000 +0000 ++++ ./midori/midori-view.c 2013-03-07 23:30:37.000000000 +0000 +@@ -3789,8 +3789,10 @@ + midori_view_add_version (markup, html, g_strdup_printf ("cairo %s (%s)\tlibnotify %s", + CAIRO_VERSION_STRING, cairo_version_string (), + LIBNOTIFY_VERSION)); ++#if defined HAVE_GCR && defined HAVE_GRANITE + midori_view_add_version (markup, html, g_strdup_printf ("gcr %s\tgranite %s", + GCR_VERSION, GRANITE_VERSION)); ++#endif + midori_view_add_version (markup, html, g_strdup_printf ("single instance %s", + #if HAVE_UNIQUE + "libunique " UNIQUE_VERSION Index: head/www/midori/files/patch-wscript =================================================================== --- head/www/midori/files/patch-wscript (revision 313621) +++ head/www/midori/files/patch-wscript (revision 313622) @@ -1,43 +1,21 @@ ---- ./wscript.orig 2013-02-05 23:28:05.000000000 +0000 -+++ ./wscript 2013-02-07 21:21:09.000000000 +0000 -@@ -117,8 +117,8 @@ +--- ./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'): -@@ -199,8 +199,6 @@ - - if option_enabled ('gtk3'): - check_pkg ('gcr-3', '2.32', mandatory=False) -- else: +@@ -267,7 +267,6 @@ + else: + check_pkg ('gtk+-2.0', '2.16.0', var='GTK') + check_pkg ('webkit-1.0', '1.1.17', args=args) - check_pkg ('gcr-3-gtk2', '2.32', mandatory=False) - - if option_enabled ('unique'): - if option_enabled('gtk3'): unique_pkg = 'unique-3.0' -@@ -257,7 +255,10 @@ - if Options.platform == 'win32': - args = '--define-variable=target=win32' - conf.env.append_value ('VALAFLAGS', '-D HAVE_WIN32') -- elif sys.platform != 'darwin': -+ elif sys.platform.startswith('freebsd'): -+ conf.env.append_value ('VALAFLAGS', '-D HAVE_FREEBSD') -+ -+ if sys.platform != 'darwin': - check_pkg ('x11') - # Pass /usr/X11R6/include for OpenBSD - conf.check (header_name='X11/extensions/scrnsaver.h', -@@ -371,8 +372,6 @@ - '-Winit-self -Wundef -Wdeclaration-after-statement ' - '-Wmissing-format-attribute -Wnested-externs'.split ()) - conf.env.append_value ('CCFLAGS', '-Wno-unused-variable -Wno-comment'.split ()) -- if compiler == 'gcc': -- conf.env.append_value ('CCFLAGS', '-Wno-unused-but-set-variable'.split ()) - - if conf.env['UNIQUE_VERSION'] == '1.0.4': - Utils.pprint ('RED', 'unique 1.0.4 found, this version is erroneous.') + if check_version (conf.env['WEBKIT_VERSION'], 1, 5, 1): + check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args) + if check_version (conf.env['GTK_VERSION'], 2, 20, 0):