diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-24 16:09:27 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-11-24 16:09:51 +0100 |
| commit | 301795aced0720686b10b02b38f7459203e10ee5 (patch) | |
| tree | 879fa94e77bb4b9eb65a24565ad33be7b6f2915b /package | |
| parent | 47cc7ad43be2d3a61f9b1dfc677efc1ac07f98b9 (diff) | |
webkitgtk: update to 2.14.2, add a patch from buildroot
Diffstat (limited to 'package')
3 files changed, 41 insertions, 5 deletions
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index d2a6fb8f5..804e597b9 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.0 +PKG_VERSION:= 2.14.2 PKG_RELEASE:= 1 -PKG_HASH:= 0513ad836c624a3d24bdf1a99f4b4aead984ab6684150bc70f16db651590ea0a +PKG_HASH:= 2edbcbd5105046aea55af9671c4de8deedb5b0e3567c618034d440a760675556 PKG_DESCR:= web browser engine PKG_SECTION:= libs/misc PKG_DEPENDS:= glib icu4c zlib libwebp libgtk3 libsoup diff --git a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp index 103391413..ea8e5b73f 100644 --- a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp +++ b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp @@ -1,6 +1,6 @@ ---- webkitgtk-2.12.0.orig/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2016-03-22 09:38:02.000000000 +0100 -+++ webkitgtk-2.12.0/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2016-04-05 09:42:03.711465052 +0200 -@@ -201,7 +201,7 @@ void MemoryPressureHandler::respondToMem +--- 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) { diff --git a/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake b/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake new file mode 100644 index 000000000..09b6a217d --- /dev/null +++ b/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake @@ -0,0 +1,36 @@ +--- 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) |