From 0ea1f6afbf7eb98d9d2cbfb8cde0b5c270b2e2ae Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Wed, 6 Apr 2016 20:48:08 +0200
Subject: unbreak midori compile

---
 package/midori/Makefile                     | 22 ++++++++--------------
 package/midori/patches/patch-CMakeLists_txt | 13 +++++++++++++
 2 files changed, 21 insertions(+), 14 deletions(-)
 create mode 100644 package/midori/patches/patch-CMakeLists_txt

diff --git a/package/midori/Makefile b/package/midori/Makefile
index f641c6afc..8f1835e13 100644
--- a/package/midori/Makefile
+++ b/package/midori/Makefile
@@ -6,32 +6,26 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		midori
 PKG_VERSION:=		0.5.11
 PKG_RELEASE:=		1
-PKG_HASH:=		2fe13e17c310a2277c52e4fad932614963410305d10a48df0f0c5d210ebd51c5
+PKG_HASH:=		3b8f3a0fe8283fcbb0f9c88b2165e2689d3e18f7c1b5d275fff97cf20e7be198
 PKG_DESCR:=		graphical web browser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libnotify webkitgtk
-PKG_BUILDDEP:=		cmake-host vala-host libnotify webkitgtk
+PKG_DEPENDS:=		libnotify webkitgtk gcr
+PKG_BUILDDEP:=		cmake-host vala-host libnotify webkitgtk gcr
 PKG_BUILDDEP+=		librsvg-host librsvg
 PKG_URL:=		http://www.midori-browser.org
 PKG_SITES:=		http://distfiles.openadk.org/
 
-PKG_CFLINE_MIDORI:=	depends on ADK_BROKEN
-
 WRKBUILD=               ${WRKDIR}/${PKG_NAME}-obj
 
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,MIDORI,midori,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIG_STYLE:=          manual
-
-do-configure:
-	(cd $(WRKBUILD) && PATH='${HOST_PATH}' \
-		cmake -DCMAKE_SYSTEM_NAME=Linux \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DENABLE_NLS=0 \
-		-DUSE_ZEITGEIST=0 \
-		$(WRKSRC)/)
+CONFIG_STYLE:=          cmake
+CMAKE_FLAGS+=		-DUSE_GTK3=ON \
+			-DHALF_BRO_INCOM_WEBKIT2=ON \
+			-DENABLE_NLS=OFF \
+			-DUSE_ZEITGEIST=OFF
 
 midori-install:
 	$(INSTALL_DIR) $(IDIR_MIDORI)/usr/bin
diff --git a/package/midori/patches/patch-CMakeLists_txt b/package/midori/patches/patch-CMakeLists_txt
new file mode 100644
index 000000000..2129969f6
--- /dev/null
+++ b/package/midori/patches/patch-CMakeLists_txt
@@ -0,0 +1,13 @@
+--- midori-0.5.11.orig/CMakeLists.txt	2015-08-30 13:56:26.000000000 +0200
++++ midori-0.5.11/CMakeLists.txt	2016-04-03 15:01:39.481595419 +0200
+@@ -206,8 +206,8 @@ if (HALF_BRO_INCOM_WEBKIT2)
+ elseif (USE_GTK3)
+     pkg_check_modules(DEPS_GTK REQUIRED
+                       gtk+-3.0>=3.10.0
+-                      webkitgtk-3.0>=1.8.1
+-                      javascriptcoregtk-3.0
++                      webkitgtk-4.0>=1.8.1
++                      javascriptcoregtk-4.0
+                       )
+     add_definitions("-DGTK_VERSION=\"${DEPS_GTK_gtk+-3.0_VERSION}\"")
+     add_definitions("-DWEBKIT_VERSION=\"${DEPS_GTK_webkitgtk-3.0_VERSION}\"")
-- 
cgit v1.2.3