webkitgtk: update to 2.16.0, still a gcc6 problem open

3 files changed, 7 insertions, 53 deletions

diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile
index 0da0ef090..3ef7547c6 100644
--- a/package/webkitgtk/Makefile
+++ b/package/webkitgtk/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		webkitgtk
-PKG_VERSION:=		2.14.2
-PKG_RELEASE:=		2
-PKG_HASH:=		2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556
+PKG_VERSION:=		2.16.0
+PKG_RELEASE:=		1
+PKG_HASH:=		5ea371d8910ef3ce7f7d087242c5646f8f3073a5298287c9eb60e055ec107cdc
 PKG_DESCR:=		web browser engine
 PKG_SECTION:=		libs/misc
 PKG_DEPENDS:=		glib icu4c zlib libwebp libgtk3 libsoup
@@ -21,7 +21,6 @@ PKG_SITES:=		http://webkitgtk.org/releases/
 PKG_OPTS:=		dev
 
 PKG_ARCH_DEPENDS:=	!mips
-PKG_SYSTEM_DEPENDS:=	!raspberry-pi3
 
 include $(ADK_TOPDIR)/mk/package.mk
 
@@ -29,13 +28,15 @@ $(eval $(call PKG_template,WEBKITGTK,webkitgtk,$(PKG_VERSION)-$(PKG_RELEASE),$(P
 
 WRKBUILD=               $(WRKDIR)/$(PKG_NAME)-obj
 TARGET_CXXFLAGS+=	-D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS
+XAKE_FLAGS+=		VERBOSE=1
+
 CONFIG_STYLE:=		cmake
-CMAKE_FLAGS+=           -DCMAKE_BUILD_TYPE=Release \
-			-DPORT=GTK \
+CMAKE_FLAGS+= 		-DPORT=GTK \
 			-DENABLE_API_TESTS=OFF \
 			-DENABLE_GTKDOC=OFF \
 			-DENABLE_GEOLOCATION=OFF \
 			-DENABLE_MINIBROWSER=ON \
+			-DUSE_SYSTEM_MALLOC=ON \
 			-DUSE_LIBNOTIFY=OFF \
 			-DUSE_LIBHYPHEN=OFF \
 			-DENABLE_INTROSPECTION=OFF
diff --git a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp
deleted file mode 100644
index ea8e5b73f..000000000
--- a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- webkitgtk-2.14.2.orig/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2016-10-16 10:00:46.000000000 +0200
-+++ webkitgtk-2.14.2/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp	2016-11-23 09:02:54.022866789 +0100
-@@ -305,7 +305,7 @@ void MemoryPressureHandler::respondToMem
- 
- void MemoryPressureHandler::platformReleaseMemory(Critical)
- {
--#ifdef __GLIBC__
-+#if defined(__GLIBC__) && !defined(__UCLIBC__)
-     ReliefLogger log("Run malloc_trim");
-     malloc_trim(0);
- #endif
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 09b6a217d..000000000
--- a/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake
+++ /dev/null
@@ -1,36 +0,0 @@
---- webkitgtk-2.14.2.orig/Source/cmake/OptionsCommon.cmake	2016-11-03 08:04:21.000000000 +0100
-+++ webkitgtk-2.14.2/Source/cmake/OptionsCommon.cmake	2016-11-23 12:23:24.503018028 +0100
-@@ -64,6 +64,33 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS})
- 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 ()
-+
- # Detect Cortex-A53 core if CPU is ARM64 and OS is Linux.
- # Query /proc/cpuinfo for each available core and check reported CPU part number: 0xd03 signals Cortex-A53.
- # (see Main ID Register in ARM Cortex-A53 MPCore Processor Technical Reference Manual)