Date: Fri, 8 Mar 2013 08:02:13 +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: r313622 - in head/www/midori: . files Message-ID: <201303080802.r2882DlI012787@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: olivierd Date: Fri Mar 8 08:02:13 2013 New Revision: 313622 URL: http://svnweb.freebsd.org/changeset/ports/313622 Log: - Update to 0.4.9 - Remove unneeded patch ChangeLog: http://git.xfce.org/apps/midori/tree/ChangeLog?id=0.4.9#n3 Approved by: rene, miwi (mentors, implicit) Deleted: head/www/midori/files/patch-data__midori.desktop.in Modified: head/www/midori/Makefile head/www/midori/distinfo head/www/midori/files/patch-extensions__external-download-manager.vala head/www/midori/files/patch-midori__midori-view.c head/www/midori/files/patch-wscript Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Fri Mar 8 07:55:31 2013 (r313621) +++ head/www/midori/Makefile Fri Mar 8 08:02:13 2013 (r313622) @@ -3,7 +3,7 @@ # 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} Modified: head/www/midori/distinfo ============================================================================== --- head/www/midori/distinfo Fri Mar 8 07:55:31 2013 (r313621) +++ head/www/midori/distinfo Fri Mar 8 08:02:13 2013 (r313622) @@ -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 Modified: head/www/midori/files/patch-extensions__external-download-manager.vala ============================================================================== --- head/www/midori/files/patch-extensions__external-download-manager.vala Fri Mar 8 07:55:31 2013 (r313621) +++ head/www/midori/files/patch-extensions__external-download-manager.vala Fri Mar 8 08:02:13 2013 (r313622) @@ -1,5 +1,5 @@ ---- ./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 { @@ -49,12 +49,3 @@ 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 Modified: head/www/midori/files/patch-midori__midori-view.c ============================================================================== --- head/www/midori/files/patch-midori__midori-view.c Fri Mar 8 07:55:31 2013 (r313621) +++ head/www/midori/files/patch-midori__midori-view.c Fri Mar 8 08:02:13 2013 (r313622) @@ -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 Modified: head/www/midori/files/patch-wscript ============================================================================== --- head/www/midori/files/patch-wscript Fri Mar 8 07:55:31 2013 (r313621) +++ head/www/midori/files/patch-wscript Fri Mar 8 08:02:13 2013 (r313622) @@ -1,6 +1,6 @@ ---- ./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') @@ -11,33 +11,11 @@ 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):
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201303080802.r2882DlI012787>