diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2016-04-06 20:46:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2016-04-06 20:48:22 +0200 |
| commit | cb4400a349ef5b5d26023355011d518093df632b (patch) | |
| tree | 4fe046e03926719e209b30ea17d22e53c40ed33d /package/webkitgtk/patches | |
| parent | 718713ef32aa4f6354ef951a16bb2cfbc0761913 (diff) | |
webkitgtk: update to 2.12.0
Diffstat (limited to 'package/webkitgtk/patches')
3 files changed, 13 insertions, 21 deletions
diff --git a/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp b/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp deleted file mode 100644 index 2d1a35c7e..000000000 --- a/package/webkitgtk/patches/patch-Source_JavaScriptCore_runtime_Options_cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- webkitgtk-2.10.7.orig/Source/JavaScriptCore/runtime/Options.cpp 2016-01-29 17:29:32.000000000 +0100 -+++ webkitgtk-2.10.7/Source/JavaScriptCore/runtime/Options.cpp 2016-03-02 07:46:04.000000000 +0100 -@@ -610,7 +610,7 @@ bool Option::operator==(const Option& ot - case Options::Type::unsignedType: - return m_entry.unsignedVal == other.m_entry.unsignedVal; - case Options::Type::doubleType: -- return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) && isnan(other.m_entry.doubleVal)); -+ return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) && std::isnan(other.m_entry.doubleVal)); - case Options::Type::int32Type: - return m_entry.int32Val == other.m_entry.int32Val; - case Options::Type::optionRangeType: diff --git a/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake b/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake new file mode 100644 index 000000000..863e86475 --- /dev/null +++ b/package/webkitgtk/patches/patch-Source_PlatformGTK_cmake @@ -0,0 +1,7 @@ +--- webkitgtk-2.12.0.orig/Source/PlatformGTK.cmake 2016-03-17 08:51:05.000000000 +0100 ++++ webkitgtk-2.12.0/Source/PlatformGTK.cmake 2016-04-03 10:54:31.244767406 +0200 +@@ -1,4 +1,3 @@ +-add_subdirectory(${WEBCORE_DIR}/platform/gtk/po) + + # This allows exposing a 'gir' target which builds all GObject introspection files. + if (ENABLE_INTROSPECTION) 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 f5566ff08..103391413 100644 --- a/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp +++ b/package/webkitgtk/patches/patch-Source_WebCore_platform_linux_MemoryPressureHandlerLinux_cpp @@ -1,15 +1,11 @@ ---- webkitgtk-2.10.7.orig/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2016-01-29 17:29:33.000000000 +0100 -+++ webkitgtk-2.10.7/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp 2016-03-02 19:21:10.000000000 +0100 -@@ -201,8 +201,12 @@ void MemoryPressureHandler::respondToMem +--- 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 void MemoryPressureHandler::platformReleaseMemory(Critical) { -+#ifndef __UCLIBC__ +-#ifdef __GLIBC__ ++#if defined(__GLIBC__) && !defined(__UCLIBC__) ReliefLogger log("Run malloc_trim"); malloc_trim(0); -+#else -+ ReliefLogger log("malloc_trim not available"); -+#endif - } - - void MemoryPressureHandler::ReliefLogger::platformLog() + #endif |