webkitgtk: update to 2.16.6

Fix some common cmake variables to fix some webkitgtk compile issues.

3 files changed, 5 insertions, 41 deletions

diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
index 4328fe029..6c9a33efa 100644
--- a/package/webkitgtk/Makefile
+++ b/package/webkitgtk/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		webkitgtk
-PKG_VERSION:=		2.16.5
+PKG_VERSION:=		2.16.6
 PKG_RELEASE:=		1
-PKG_HASH:=		8e0396f3428e757898c5856e642eed4fcd5a20ae03d96d3eaa03b76634be7dd4
+PKG_HASH:=		fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21
 PKG_DESCR:=		web browser engine
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk3 libsoup
@@ -20,15 +20,13 @@ PKG_URL:=		http://www.webkitgtk.org/
 PKG_SITES:=		http://webkitgtk.org/releases/
 PKG_OPTS:=		dev
 
-PKG_ARCH_DEPENDS:=	!mips
-
 include $(ADK_TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
-TARGET_CXXFLAGS+=	-D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
 XAKE_FLAGS+=		VERBOSE=1
+TARGET_CXXFLAGS+=	-D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
 
 CONFIG_STYLE:=		cmake
 CMAKE_FLAGS+= 		-DPORT=GTK \
diff --git a/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake b/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake
deleted file mode 100644
index ea76a696c..000000000
--- a/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- webkitgtk-2.16.3.orig/Source/cmake/OptionsCommon.cmake	2017-05-06 10:48:27.000000000 +0200
-+++ webkitgtk-2.16.3/Source/cmake/OptionsCommon.cmake	2017-06-06 23:50:44.794146984 +0200
-@@ -48,6 +48,33 @@ if (COMPILER_IS_CLANG AND CMAKE_GENERATO
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
- endif ()
- 
-+# Ensure that the default include system directories are added to the list of CMake implicit includes.
-+# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem).
-+# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697
-+macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result)
-+    file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n")
-+    separate_arguments(_buildFlags UNIX_COMMAND "${_flags}")
-+    execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy
-+                    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET
-+                    ERROR_VARIABLE _gccOutput)
-+    file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy")
-+    if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list")
-+        set(${_result} ${CMAKE_MATCH_1})
-+        string(REPLACE "\n" " " ${_result} "${${_result}}")
-+        separate_arguments(${_result})
-+    endif ()
-+endmacro()
-+
-+if (CMAKE_COMPILER_IS_GNUCC)
-+   DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS)
-+   set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
-+endif ()
-+
-+if (CMAKE_COMPILER_IS_GNUCXX)
-+   DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS)
-+   set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
-+endif ()
-+
- if (WIN32 AND COMPILER_IS_GCC_OR_CLANG)
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields -Wno-unknown-pragmas")
-     add_definitions(-D__USE_MINGW_ANSI_STDIO=1)
diff --git a/scripts/toolchain.cmake.in b/scripts/toolchain.cmake.in
index 39f1c1a93..941fbc534 100644
--- a/scripts/toolchain.cmake.in
+++ b/scripts/toolchain.cmake.in
@@ -6,8 +6,10 @@ set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@" CACHE STRING "OpenADK CFLAGS" FORCE)
 set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@" CACHE STRING "OpenADK CXXFLAGS" FORCE)
 set(CMAKE_INSTALL_SO_NO_EXE 0)
 set(CMAKE_PROGRAM_PATH "@@STAGING_HOST_DIR@@/usr/bin")
+set(CMAKE_SYSROOT "@@STAGING_TARGET_DIR@@")
 set(CMAKE_FIND_ROOT_PATH "@@STAGING_TARGET_DIR@@")
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(ENV{PKG_CONFIG_SYSROOT_DIR} "@@STAGING_TARGET_DIR@@")