diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-10 22:36:55 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-06-10 22:38:24 +0200 |
| commit | 083c4c7c198f3a474064b48a7c6ef7821e98e129 (patch) | |
| tree | d357377d631df62e3102eb8ac7c99edbbeba8120 /package/webkitgtk | |
| parent | 0053a1525256542fbb9bdee414ad9ebc4bb0b985 (diff) | |
webkitgtk: update to 2.16.3
Diffstat (limited to 'package/webkitgtk')
| -rw-r--r-- | package/webkitgtk/Makefile | 4 | ||||
| -rw-r--r-- | package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake | 36 |
2 files changed, 38 insertions, 2 deletions
diff --git a/package/webkitgtk/Makefile b/package/webkitgtk/Makefile index 3ef7547c6..da1de9bea 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.0 +PKG_VERSION:= 2.16.3 PKG_RELEASE:= 1 -PKG_HASH:= 5ea371d8910ef3ce7f7d087242c5646f8f3073a5298287c9eb60e055ec107cdc +PKG_HASH:= 204e9131da0101b9bc8765716e70a897121af04b964d9827cd9f20816a77b512 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_cmake_OptionsCommon_cmake b/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake new file mode 100644 index 000000000..ea76a696c --- /dev/null +++ b/package/webkitgtk/patches/patch-Source_cmake_OptionsCommon_cmake @@ -0,0 +1,36 @@ +--- 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) |