Merge from bittboy/buildroot@db180c0

package/midori/0001-fix-bug-1492932.patch

@@ -0,0 +1,44 @@
+Fix for https://bugs.launchpad.net/midori/+bug/1492932
+Patch status: upstream
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+--- a/midori/midori-browser.c	2015-07-11 16:03:43 +0000
++++ b/midori/midori-browser.c	2015-09-25 21:30:31 +0000
+@@ -5953,11 +5953,6 @@
+                       G_CALLBACK (midori_browser_destroy_cb), NULL);
+     gtk_window_set_role (GTK_WINDOW (browser), "browser");
+     gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER);
+-    #if GTK_CHECK_VERSION (3, 4, 0)
+-    #ifndef HAVE_GRANITE
+-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE);
+-    #endif
+-    #endif
+     vbox = gtk_vbox_new (FALSE, 0);
+     /* gtk_container_add (GTK_CONTAINER (browser), vbox);
+     gtk_widget_show (vbox); */
+
+--- a/midori/midori-view.c	2015-07-06 21:26:46 +0000
++++ b/midori/midori-view.c	2015-09-25 21:30:31 +0000
+@@ -3495,9 +3495,6 @@
+     }
+     else
+         gtk_window_set_icon_name (GTK_WINDOW (window), icon_name);
+-    #if GTK_CHECK_VERSION (3, 4, 0)
+-    gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE);
+-    #endif
+     gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100);
+     #if GTK_CHECK_VERSION (3, 0, 0)
+     scrolled = gtk_scrolled_window_new (NULL, NULL);
+
+--- a/midori/midori-window.vala	2015-08-16 00:14:26 +0000
++++ b/midori/midori-window.vala	2015-09-25 21:30:31 +0000
+@@ -28,7 +28,6 @@
+                 toolbar.show_arrow = true;
+ #if HAVE_GTK3
+                 toolbar.get_style_context ().add_class ("primary-toolbar");
+-                hide_titlebar_when_maximized = true;
+ #endif
+                 toolbar.popup_context_menu.connect ((x, y, button) => {
+                     return button == 3 && context_menu (toolbar); });
+

package/midori/0002-gcr-for-x11-only.patch

@@ -0,0 +1,32 @@
+GCR support only works/is useful with X11 support.
+
+Reported upstream: https://bugs.launchpad.net/midori/+bug/1515985
+
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+diff -Nura midori-0.5.11.orig/CMakeLists.txt midori-0.5.11/CMakeLists.txt
+--- midori-0.5.11.orig/CMakeLists.txt	2015-11-12 13:41:02.045898814 -0300
++++ midori-0.5.11/CMakeLists.txt	2015-11-12 14:00:09.765545018 -0300
+@@ -175,18 +175,14 @@
+     set(PKGS ${PKGS} zeitgeist-2.0)
+ endif()
+ 
+-if (WIN32)
+-    add_definitions("-DGCR_VERSION=\"No\"")
+-else ()
+-    if (USE_GTK3)
+-        pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
+-    else ()
+-        pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32)
+-    endif ()
++if (USE_GTK3 AND X11)
++    pkg_check_modules(GCR REQUIRED gcr-3>=2.32)
+     add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"")
+     add_definitions("-DHAVE_GCR")
+     set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS})
+     set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES})
++else ()
++    add_definitions("-DGCR_VERSION=\"No\"")
+ endif ()
+ 
+ if (HALF_BRO_INCOM_WEBKIT2)

package/midori/Config.in

@@ -0,0 +1,28 @@
+comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 6, host gcc >= 4.8"
+	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 || \
+		!BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \
+		!BR2_TOOLCHAIN_USES_GLIBC
+
+config BR2_PACKAGE_MIDORI
+	bool "midori"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2
+	depends on BR2_PACKAGE_LIBGTK3
+	depends on BR2_INSTALL_LIBSTDCPP # webkitgtk
+	depends on BR2_HOST_GCC_AT_LEAST_4_8 # webkitgtk -> icu
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # webkitgtk
+	depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk
+	depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS
+	# GCR can only be used with the X11 backend
+	select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11
+	select BR2_PACKAGE_GRANITE
+	select BR2_PACKAGE_LIBSOUP
+	select BR2_PACKAGE_LIBSOUP_GNOME
+	select BR2_PACKAGE_LIBXML2
+	select BR2_PACKAGE_SQLITE
+	select BR2_PACKAGE_WEBKITGTK
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	help
+	  Midori is a lightweight web browser based on WebKit
+
+	  http://www.midori-browser.org/

package/midori/midori.hash

@@ -0,0 +1,2 @@
+# From download link @ http://midori-browser.org/download/source/
+sha1	64c86935028feb5f89d799c2acacaad67764da6f	midori_0.5.11_all_.tar.bz2

package/midori/midori.mk

@@ -0,0 +1,34 @@
+################################################################################
+#
+# midori
+#
+################################################################################
+
+MIDORI_VERSION = 0.5.11
+MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2
+MIDORI_SITE = http://midori-browser.org/downloads
+MIDORI_LICENSE = LGPL-2.1+
+MIDORI_LICENSE_FILES = COPYING
+MIDORI_DEPENDENCIES = \
+	host-intltool \
+	host-librsvg \
+	host-pkgconf \
+	host-vala \
+	host-python \
+	$(if $(BR2_PACKAGE_LIBGTK3_X11),gcr) \
+	granite \
+	libgtk3 \
+	libsoup \
+	libxml2 \
+	sqlite \
+	webkitgtk \
+	$(TARGET_NLS_DEPENDENCIES) \
+	$(if $(BR2_PACKAGE_LIBICONV),libiconv)
+
+MIDORI_CONF_OPTS = \
+	-DHALF_BRO_INCOM_WEBKIT2=ON \
+	-DUSE_GRANITE=ON \
+	-DUSE_GTK3=ON \
+	-DUSE_ZEITGEIST=OFF
+
+$(eval $(cmake-package))