- Update to 0.5.0

- Remove unneeded patches
- Remove 'HelpBugs' entry, because it depends of Apport (bug report tool in
Ubuntu)

Feature safe:	yes

6 files changed, 39 insertions, 29 deletions

diff --git a/www/midori/Makefile b/www/midori/Makefile
index 72d65f5f1ddf..a818cb4ae7cc 100644
--- a/www/midori/Makefile
+++ b/www/midori/Makefile
@@ -3,8 +3,7 @@
 #
 
 PORTNAME=	midori
-PORTVERSION=	0.4.9
-PORTREVISION=	2
+PORTVERSION=	0.5.0
 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 322816c3c3d9..a1ca07a3d826 100644
--- a/www/midori/distinfo
+++ b/www/midori/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/midori-0.4.9.tar.bz2) = f01e5dc45e94f909e48f0dd62cc4afedd80710769fdf98bc4e0b38d4ef0abc11
-SIZE (xfce4/midori-0.4.9.tar.bz2) = 1079713
+SHA256 (xfce4/midori-0.5.0.tar.bz2) = d280c19bb135f2b644a67d9f34d1ec1c148ceb14b5de11ce6c23f64c15be5df0
+SIZE (xfce4/midori-0.5.0.tar.bz2) = 1093278
diff --git a/www/midori/files/patch-midori__midori-browser.c b/www/midori/files/patch-midori__midori-browser.c
new file mode 100644
index 000000000000..86e85ae330f1
--- /dev/null
+++ b/www/midori/files/patch-midori__midori-browser.c
@@ -0,0 +1,35 @@
+--- ./midori/midori-browser.c.orig	2013-04-04 20:31:20.000000000 +0000
++++ ./midori/midori-browser.c	2013-04-06 12:28:33.000000000 +0000
+@@ -3228,8 +3228,10 @@
+       { NULL },
+       #ifndef HAVE_GRANITE
+       { "HelpFAQ" },
++      #ifdef __linux__
+       { "HelpBugs"},
+       #endif
++      #endif
+       { "About" },
+       { "Preferences" },
+     };
+@@ -5509,9 +5511,11 @@
+     { "HelpFAQ", GTK_STOCK_HELP,
+         N_("_Frequent Questions"), "F1",
+         NULL, G_CALLBACK (_action_help_link_activate) },
++    #ifdef __linux__
+     { "HelpBugs", NULL,
+         N_("_Report a Problem…"), NULL,
+         NULL, G_CALLBACK (_action_help_link_activate) },
++    #endif
+     { "About", GTK_STOCK_ABOUT,
+         NULL, "",
+         NULL, G_CALLBACK (_action_about_activate) },
+@@ -5814,7 +5818,9 @@
+             "<menuitem action='Window'/>"
+             "<menu action='Help'>"
+                 "<menuitem action='HelpFAQ'/>"
++                #ifdef __linux__
+                 "<menuitem action='HelpBugs'/>"
++                #endif
+                 "<separator/>"
+                 "<menuitem action='About'/>"
+         "</menu>"
diff --git a/www/midori/files/patch-midori__midori-view.c b/www/midori/files/patch-midori__midori-view.c
deleted file mode 100644
index 2cbbc70e4dea..000000000000
--- a/www/midori/files/patch-midori__midori-view.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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
deleted file mode 100644
index fa26b8cf6d26..000000000000
--- a/www/midori/files/patch-wscript
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./wscript.orig	2013-03-07 17:44:14.000000000 +0000
-+++ ./wscript	2013-03-10 16:54:29.000000000 +0000
-@@ -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 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):
diff --git a/www/midori/pkg-plist b/www/midori/pkg-plist
index 3bddb3a31fd5..08ad132ca440 100644
--- a/www/midori/pkg-plist
+++ b/www/midori/pkg-plist
@@ -9,6 +9,7 @@ lib/midori/libadblock.so
 lib/midori/libaddons.so
 lib/midori/libcolorful-tabs.so
 lib/midori/libcookie-manager.so
+lib/midori/libcookie-permissions.so
 lib/midori/libcopy-tabs.so
 lib/midori/libdelayed-load.so
 lib/midori/libexternal-download-manager.so
@@ -38,7 +39,6 @@ share/applications/midori-private.desktop
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/index.sgml
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-KatzeItem.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-KatzePreferences.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-KatzeScrolled.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-gtk3-compat.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-array.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-arrayaction.html
@@ -46,7 +46,6 @@ share/applications/midori-private.desktop
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-http-cookies.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-http-cookies-sqlite.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-net.html
-%%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-separatoraction.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-throbber.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze-katze-utils.html
 %%APIDOCS%%%%DOCSDIR%%/api/katze/html/katze.devhelp