aboutsummaryrefslogtreecommitdiff
path: root/www/midori
diff options
context:
space:
mode:
Diffstat (limited to 'www/midori')
-rw-r--r--www/midori/Makefile2
-rw-r--r--www/midori/distinfo4
-rw-r--r--www/midori/files/patch-data__midori.desktop.in26
-rw-r--r--www/midori/files/patch-extensions__external-download-manager.vala13
-rw-r--r--www/midori/files/patch-midori__midori-view.c29
-rw-r--r--www/midori/files/patch-wscript42
6 files changed, 28 insertions, 88 deletions
diff --git a/www/midori/Makefile b/www/midori/Makefile
index 2fc8029615c5..3c669edcc85d 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -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}
diff --git a/www/midori/distinfo b/www/midori/distinfo
index 3e9e7e37ddd1..322816c3c3d9 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -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
diff --git a/www/midori/files/patch-data__midori.desktop.in b/www/midori/files/patch-data__midori.desktop.in
deleted file mode 100644
index 9ff13a0bce17..000000000000
--- a/www/midori/files/patch-data__midori.desktop.in
+++ /dev/null
@@ -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
diff --git a/www/midori/files/patch-extensions__external-download-manager.vala b/www/midori/files/patch-extensions__external-download-manager.vala
index 1c5fefc3943c..bc66cb996857 100644
--- a/www/midori/files/patch-extensions__external-download-manager.vala
+++ b/www/midori/files/patch-extensions__external-download-manager.vala
@@ -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
diff --git a/www/midori/files/patch-midori__midori-view.c b/www/midori/files/patch-midori__midori-view.c
index 9be9777f9679..2cbbc70e4dea 100644
--- a/www/midori/files/patch-midori__midori-view.c
+++ b/www/midori/files/patch-midori__midori-view.c
@@ -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
diff --git a/www/midori/files/patch-wscript b/www/midori/files/patch-wscript
index 038d372cc8bf..a24aa1b0a96a 100644
--- a/www/midori/files/patch-wscript
+++ b/www/midori/files/patch-wscript
@@ -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):
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 03:22:19 +0000