diff --git a/srcpkgs/webkit2gtk/patches/musl-ctype_h.patch b/srcpkgs/webkit2gtk/patches/musl-ctype_h.patch deleted file mode 100644 index 84fd7606763..00000000000 --- a/srcpkgs/webkit2gtk/patches/musl-ctype_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/WTF/wtf/DisallowCType.h -+++ Source/WTF/wtf/DisallowCType.h -@@ -40,7 +40,7 @@ - // are used from wx headers. On GTK+ for Mac many GTK+ files include - // or , which in turn include which uses - // isacii(). --#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) -+#if !(OS(DARWIN) && PLATFORM(GTK)) && !PLATFORM(EFL) && !defined(_LIBCPP_VERSION) && defined(__GLIBC__) - - #include - diff --git a/srcpkgs/webkit2gtk/patches/musl-execinfo.patch b/srcpkgs/webkit2gtk/patches/musl-execinfo.patch deleted file mode 100644 index 644cd82f779..00000000000 --- a/srcpkgs/webkit2gtk/patches/musl-execinfo.patch +++ /dev/null @@ -1,37 +0,0 @@ -There is no execinfo.h in musl. Disable backtrace code if -__GLIBC__ is not defined. - ---- Source/WTF/wtf/Assertions.cpp -+++ Source/WTF/wtf/Assertions.cpp -@@ -71,8 +71,10 @@ - #if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) - #include - #include -+#if defined(__GLIBC__) - #include - #endif -+#endif - - extern "C" { - -@@ -225,7 +227,7 @@ - - void WTFGetBacktrace(void** stack, int* size) - { --#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__)) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) - // The CaptureStackBackTrace function is available in XP, but it is not defined -index 657ced4..ceb9c47 100644 ---- Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp.orig 2015-09-24 08:04:57.685969077 +0200 -+++ Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp 2015-09-24 08:05:25.307830938 +0200 -@@ -46,7 +46,7 @@ - #include - - #include --#if OS(DARWIN) || (OS(LINUX) && !PLATFORM(GTK)) -+#if OS(DARWIN) || (defined(__GLIBC__) && !PLATFORM(GTK)) - #include - #include - #endif diff --git a/srcpkgs/webkit2gtk/patches/musl-isnan.patch b/srcpkgs/webkit2gtk/patches/musl-isnan.patch deleted file mode 100644 index 7b64bdf153e..00000000000 --- a/srcpkgs/webkit2gtk/patches/musl-isnan.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- Source/JavaScriptCore/runtime/Options.cpp 2015-09-21 09:29:46.000000000 +0200 -+++ Source/JavaScriptCore/runtime/Options.cpp 2015-09-30 12:32:25.447786694 +0200 -@@ -610,7 +610,8 @@ - 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/srcpkgs/webkit2gtk/patches/musl-malloc_trim.patch b/srcpkgs/webkit2gtk/patches/musl-malloc_trim.patch deleted file mode 100644 index 2bd46816ecc..00000000000 --- a/srcpkgs/webkit2gtk/patches/musl-malloc_trim.patch +++ /dev/null @@ -1,15 +0,0 @@ -There is no malloc_trim() in musl libc - ---- Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp -+++ Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp -@@ -206,8 +206,10 @@ - - void MemoryPressureHandler::platformReleaseMemory(bool) - { -+#if defined(__GLIBC__) - ReliefLogger log("Run malloc_trim"); - malloc_trim(0); -+#endif - } - - void MemoryPressureHandler::ReliefLogger::platformLog() diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template index 1ea7f408c88..013d2578108 100644 --- a/srcpkgs/webkit2gtk/template +++ b/srcpkgs/webkit2gtk/template @@ -1,6 +1,6 @@ # Template file for 'webkit2gtk' pkgname=webkit2gtk -version=2.10.8 +version=2.10.9 revision=1 wrksrc="webkitgtk-$version" build_style=cmake @@ -10,7 +10,7 @@ maintainer="Enno Boland " homepage="http://webkitgtk.org/" license="LGPL-2.1, 2-clause-BSD" distfiles="${homepage}/releases/webkitgtk-${version}.tar.xz" -checksum=313682b23f03c457b28a7ef2d5bdb70a8174cca1d32e0a853fb36fa4dcf928a9 +checksum=bbb18d741780b1b7fa284beb9a97361ac57cda2e42bad2ae2fcdbf797919e969 # ETOOHUGE nodebug=1