diff options
-rw-r--r-- | community/webkit2gtk/APKBUILD | 28 | ||||
-rw-r--r-- | community/webkit2gtk/disallow-ctype.patch | 11 | ||||
-rw-r--r-- | community/webkit2gtk/disallow-malloc_trim.patch | 12 | ||||
-rw-r--r-- | community/webkit2gtk/fix-execinfo.patch | 20 | ||||
-rw-r--r-- | community/webkit2gtk/fix-isnan.patch | 19 | ||||
-rw-r--r-- | community/webkit2gtk/musl-fixes.patch | 40 |
6 files changed, 48 insertions, 82 deletions
diff --git a/community/webkit2gtk/APKBUILD b/community/webkit2gtk/APKBUILD index dbb85ec621..4518f7f680 100644 --- a/community/webkit2gtk/APKBUILD +++ b/community/webkit2gtk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Jiri Horner <laeqten@gmail.com> # Maintainer: Jiri Horner <laeqten@gmail.com> pkgname=webkit2gtk -pkgver=2.10.7 +pkgver=2.12.0 pkgrel=0 pkgdesc="portable web rendering engine WebKit for GTK+" url="http://webkitgtk.org/" @@ -42,10 +42,7 @@ install= replaces="webkit" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz - fix-execinfo.patch - disallow-ctype.patch - fix-isnan.patch - disallow-malloc_trim.patch + musl-fixes.patch " _srcdir="${srcdir}/webkitgtk-${pkgver}" @@ -87,18 +84,9 @@ package() { paxmark -m "$pkgdir"/usr/lib/webkit2gtk-4.0/WebKitWebProcess || return 1 } -md5sums="84832b9d8329413b4f1d87df5f7e8efe webkitgtk-2.10.7.tar.xz -c114751c30cdcaede5a7ed5568b2b0d4 fix-execinfo.patch -375d22de42a0d1053985a6df942f1db3 disallow-ctype.patch -3fa45dbc0ea278e6426b6f86e0f8fc6d fix-isnan.patch -b98f38a61f4155eb808101b99690bcb0 disallow-malloc_trim.patch" -sha256sums="990d62c82ed6dede31a6ff0a82d847f16b812842ff3e1093d17113627652864e webkitgtk-2.10.7.tar.xz -b2bc9e03fd5d968d6df4531a7d102496139120e666e6fed397a19ae4026751c6 fix-execinfo.patch -f4fd0f6d2c70c95169ab5c84d39607d1c4b2f674c36119f8fc1c60c751564e12 disallow-ctype.patch -08a688126e3e9a0640786b4b928740bceec0e7f94720d71ecbec971dd1dd77ce fix-isnan.patch -3045c8022bee29cda9cb31e96e441473805701b672df8984a931082389f70259 disallow-malloc_trim.patch" -sha512sums="f0d7b303236910d18568ab1e0a522915a70e9d3658537b32ea2c6a42b8b3ece034a292490f7882760338f2afc56468fd7a8ad8659b7afaf87906220a5c815b5b webkitgtk-2.10.7.tar.xz -602630468ee80b9f9bb53ee7808f4b2f2c86d1d4db14ac9c244b3e2e79a245510a289eb321cb7dbefd3b7a2dde13cf444b8ecf7cd46f23eaa5c0f04670914e42 fix-execinfo.patch -59f4e977fae16145a5116c97e3700625f1ed27963ad65daa957f1355dc93269435c1225fc5302b45e5df731c14aa7e639db4e163003eb265b867a9df9f97ab6f disallow-ctype.patch -cf48a1faf1e4daebf37c17e6b646d797b4179cee37b37369c34f879e4bafd190c974c18bad80beb7bc4560ce4d9a1f39aab8f5e5df3c130c2c8eaabb9fd124be fix-isnan.patch -a42aafb24233451a6b01770641aaf8c2cd4ee26f9e4301c5723ad70b83f3615533595405a27a35ac26e844082021cc3d516a92c385d2e0cef32366fa64eef16b disallow-malloc_trim.patch" +md5sums="d233b5594c37a961308c230207d8b64f webkitgtk-2.12.0.tar.xz +ee395bd467fe4f6d6ef08ec5799b9218 musl-fixes.patch" +sha256sums="a68604f8fd1bcb247d647709290226289b90c16acb1f3730538b688db8df5ea6 webkitgtk-2.12.0.tar.xz +1f8edcc9429667fd9f14d8f7ad22e06f15d56bcc05ca42e2ec1a0fe82d6374f3 musl-fixes.patch" +sha512sums="b1ef35d47e65e94b0782007a864b6578855470ce07d17ed48af505e903339130d8c23f80ce4f300d9a6eb5e7ea3b819f6b7d09a25db4475923a6b2b7405b7467 webkitgtk-2.12.0.tar.xz +ef13d16c41feb45059f61feeb7fbedbbc7c546a19ffbde7ae345d510641d427a5233bd1adb3b9fd883cedd41506a14e6a9c2f59bc7f2e0c46c7601c56fd8ffeb musl-fixes.patch" diff --git a/community/webkit2gtk/disallow-ctype.patch b/community/webkit2gtk/disallow-ctype.patch deleted file mode 100644 index d14932ebe0..0000000000 --- a/community/webkit2gtk/disallow-ctype.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- webkitgtk-2.10.3/Source/WTF/wtf/DisallowCType.h.orig -+++ webkitgtk-2.10.3/Source/WTF/wtf/DisallowCType.h -@@ -40,7 +40,7 @@ - // are used from wx headers. On GTK+ for Mac many GTK+ files include <libintl.h> - // or <glib/gi18n-lib.h>, which in turn include <xlocale/_ctype.h> 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 <ctype.h> - diff --git a/community/webkit2gtk/disallow-malloc_trim.patch b/community/webkit2gtk/disallow-malloc_trim.patch deleted file mode 100644 index 34d4905dfc..0000000000 --- a/community/webkit2gtk/disallow-malloc_trim.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- webkitgtk-2.10.3/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp.orig -+++ webkitgtk-2.10.3/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp -@@ -202,7 +202,9 @@ - void MemoryPressureHandler::platformReleaseMemory(Critical) - { - ReliefLogger log("Run malloc_trim"); -+#if defined(__GLIBC__) - malloc_trim(0); -+#endif - } - - void MemoryPressureHandler::ReliefLogger::platformLog() diff --git a/community/webkit2gtk/fix-execinfo.patch b/community/webkit2gtk/fix-execinfo.patch deleted file mode 100644 index eb825312f3..0000000000 --- a/community/webkit2gtk/fix-execinfo.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp -+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp -@@ -64,7 +64,7 @@ - #include <windows.h> - #endif - --#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) - #include <cxxabi.h> - #include <dlfcn.h> - #include <execinfo.h> -@@ -242,7 +242,7 @@ - - void WTFGetBacktrace(void** stack, int* size) - { --#if OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__)) -+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined diff --git a/community/webkit2gtk/fix-isnan.patch b/community/webkit2gtk/fix-isnan.patch deleted file mode 100644 index 664446010b..0000000000 --- a/community/webkit2gtk/fix-isnan.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- webkitgtk-2.10.3/Source/JavaScriptCore/runtime/Options.cpp.orig -+++ webkitgtk-2.10.3/Source/JavaScriptCore/runtime/Options.cpp -@@ -29,7 +29,6 @@ - #include "HeapStatistics.h" - #include <algorithm> - #include <limits> --#include <math.h> - #include <mutex> - #include <stdlib.h> - #include <string.h> -@@ -610,7 +609,7 @@ - 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/community/webkit2gtk/musl-fixes.patch b/community/webkit2gtk/musl-fixes.patch new file mode 100644 index 0000000000..73ddaabee5 --- /dev/null +++ b/community/webkit2gtk/musl-fixes.patch @@ -0,0 +1,40 @@ +diff --git a/Source/JavaScriptCore/heap/MachineStackMarker.cpp b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +index 1df2874..de8beb2 100644 +--- a/Source/JavaScriptCore/heap/MachineStackMarker.cpp ++++ b/Source/JavaScriptCore/heap/MachineStackMarker.cpp +@@ -546,7 +546,7 @@ void* MachineThreads::Thread::Registers::stackPointer() const + + #elif USE(PTHREADS) + +-#if defined(__GLIBC__) && ENABLE(JIT) ++#if defined(__linux__) && ENABLE(JIT) + + #if CPU(X86) + return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]); +@@ -645,7 +645,7 @@ void* MachineThreads::Thread::Registers::framePointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -727,7 +727,7 @@ void* MachineThreads::Thread::Registers::instructionPointer() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) +@@ -818,7 +818,7 @@ void* MachineThreads::Thread::Registers::llintPC() const + #error Unknown Architecture + #endif + +-#elif defined(__GLIBC__) ++#elif defined(__linux__) // glibc and musl + + // The following sequence depends on glibc's sys/ucontext.h. + #if CPU(X86) |