pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
webkit-gtk: Always use OS(...) and BOS(...) instead of __Os__ macros
Module Name: pkgsrc-wip
Committed By: Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By: leot
Date: Tue Oct 2 18:26:10 2018 +0200
Changeset: 31c837b0fc622b48e07fe505f55472716ba04355
Modified Files:
webkit-gtk/TODO
webkit-gtk/distinfo
webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
Log Message:
webkit-gtk: Always use OS(...) and BOS(...) instead of __Os__ macros
XXX: Not even compile tested!
XXX: OS(SOLARIS) needs to be defined!
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=31c837b0fc622b48e07fe505f55472716ba04355
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
webkit-gtk/TODO | 1 -
webkit-gtk/distinfo | 12 ++++++------
.../patch-Source_JavaScriptCore_assembler_ARMAssembler.h | 4 ++--
.../patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp | 2 +-
webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h | 2 +-
webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp | 2 +-
...ce_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp | 6 +++---
webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h | 4 ++--
8 files changed, 16 insertions(+), 17 deletions(-)
diffs:
diff --git a/webkit-gtk/TODO b/webkit-gtk/TODO
index 7a66afcdf2..0979163a04 100644
--- a/webkit-gtk/TODO
+++ b/webkit-gtk/TODO
@@ -7,7 +7,6 @@
- Add support for OS(SOLARIS) and add it to the WTF_OS_UNIX list:
the logic should be probably added in Source/WTF/wtf/Platform.h
by adding a WTF_OS_SOLARIS definition.
-- Review all __OS__ ifdef usage, can they be all converted to OS(...) instead?
- Could the NetBSD logic in
patches/patch-Source_JavaScriptCore_runtime_MachineContext.h be rewritten
using ucontext(2) _UC_MACHINE_* macros instead?
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index 14d2fdd39f..1fe40a6f37 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -5,24 +5,24 @@ RMD160 (webkitgtk-2.22.2.tar.xz) = f8f16a72800debdf9b74a03151299f16f69fcc1c
SHA512 (webkitgtk-2.22.2.tar.xz) = 0bb885726872f128a0e0d71cbc75ba076e5c0c928c40e71e030c87444a7068568c568587514407d6549c27d0bfe121dc33f96f0c516d2ae1c6801e005ad52756
Size (webkitgtk-2.22.2.tar.xz) = 16769120 bytes
SHA1 (patch-CMakeLists.txt) = dacc4c2694c517ea34a3512ffd48731b21afa5b1
-SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = 99e46f9d9b26a8d9ba6b29c66d7ce5326c4ffeb6
+SHA1 (patch-Source_JavaScriptCore_assembler_ARMAssembler.h) = aad458e8b062c0833193f354ca96e7b3082f1ec7
SHA1 (patch-Source_JavaScriptCore_assembler_MacroAssemblerARM.cpp) = f78e6150ed8901b3fe046b2ef182f50f1c7500a4
SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = e6a23d5ef22bddd0a9606fb0e472960e4cf5673e
-SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 81d9c3a9f5d850d85aaa24d00cc72b5d0261f33a
+SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 36d29a5db03c2413ae93224ac391f3ff248983e8
SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 928050c743dc889cb42fa4e74bec5664b8e1318c
SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = f1eee7f9d3012edee1915234c837cff820f97092
-SHA1 (patch-Source_WTF_wtf_Platform.h) = 3677181ad0a686e79f666dad34236d4475b8da15
-SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 0b35ab065e4cccbb63199cd8a9add0d5106c6150
+SHA1 (patch-Source_WTF_wtf_Platform.h) = 22290c6db58cedd4f9c166924150d019a269fdc4
+SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
SHA1 (patch-Source_WTF_wtf_ThreadSpecific.h) = 38a85e10a72fe38d286a2ce747e090a2955b8791
SHA1 (patch-Source_WebCore_inspector_InspectorFrontendHost.cpp) = daf6351a1a0b5a49592a2bb6db0d54620c7b09e3
SHA1 (patch-Source_WebCore_platform_FileSystem.cpp) = adef1a42c4e210f0a3dcb82807e2d2039684a0ec
SHA1 (patch-Source_WebCore_platform_graphics_filters_FEMorphology.cpp) = 16b36d2d91fd7f43156b9ee09bcafd19602ebbd9
SHA1 (patch-Source_WebCore_rendering_shapes_RasterShape.cpp) = 551e47698dee50d097b11e3218f13bb3447edfea
SHA1 (patch-Source_WebKit_CMakeLists.txt) = 228cc4734de3b08a3877ac839b1ffa2fbf2d3aa8
-SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 3051360e2770360781027f6f0153e0ea6f304073
+SHA1 (patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp) = 810dfbd5be6a6a2fd2c70795ed257d973fc3e4fe
SHA1 (patch-Source_WebKit_PlatformGTK.cmake) = 91a7e63ebeac06cca21547aa7025a55a4d174b6d
SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = 9c58253868e06b3dd3cac936651ba7e6a1437fc6
SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
-SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = f5235df843849f8e1dd8fceaa015bc91785d8b3b
+SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 7bbf23f5ac92173dcce9743c5a115bdf0bf7c0ea
SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 03b72552414e7114bfa7ddc2d68fd97009a5ff7d
SHA1 (patch-aj) = cd9a280c3bbab82c1a7aeb62a27ee6eb96c67ec2
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
index e0a69ed717..e37bfda92c 100644
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_assembler_ARMAssembler.h
@@ -6,7 +6,7 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.6 2016/01/21 1
#if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
-+#if defined(__NetBSD__)
++#if OS(NETBSD)
+#include <sys/types.h>
+#include <machine/sysarch.h>
+#endif
@@ -18,7 +18,7 @@ $NetBSD: patch-Source_JavaScriptCore_assembler_ARMAssembler.h,v 1.6 2016/01/21 1
linuxPageFlush(current, current + page);
linuxPageFlush(current, end);
-+#elif defined(__NetBSD__)
++#elif OS(NETBSD)
+ struct arm_sync_icache_args arg;
+ arg.addr = reinterpret_cast<uintptr_t>(code);
+ arg.len = size;
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
index 64c6783ebb..3514e87196 100644
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
+++ b/webkit-gtk/patches/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp
@@ -13,7 +13,7 @@ From OpenBSD ports.
#elif CPU(ARM64)
static const size_t fixedExecutableMemoryPoolSize = 64 * 1024 * 1024;
-#elif CPU(X86_64)
-+#elif CPU(X86_64) && !defined(__OpenBSD__)
++#elif CPU(X86_64) && !OS(OPENBSD)
static const size_t fixedExecutableMemoryPoolSize = 1024 * 1024 * 1024;
#else
static const size_t fixedExecutableMemoryPoolSize = 32 * 1024 * 1024;
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
index 3e857f0b8d..d82adddaef 100644
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_Platform.h
@@ -9,7 +9,7 @@ $NetBSD$
#define USE_HARFBUZZ 1
#define USE_SOUP 1
#define USE_WEBP 1
-+#ifndef __sun
++#if !OS(SOLARIS)
#define USE_FILE_LOCK 1
#endif
+#endif
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp b/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
index af179ae08f..c048d11c38 100644
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
+++ b/webkit-gtk/patches/patch-Source_WTF_wtf_StackBounds.cpp
@@ -8,7 +8,7 @@ SunOS does not have pthread_getattr_np.
#if HAVE(PTHREAD_NP_H) || OS(NETBSD)
// e.g. on FreeBSD 5.4, neundorf%kde.org@localhost
pthread_attr_get_np(thread, &sattr);
-+#elif defined(__sun)
++#elif OS(SOLARIS)
#else
// FIXME: this function is non-portable; other POSIX systems may have different np alternatives
pthread_getattr_np(thread, &sattr);
diff --git a/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp b/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
index 0a7d4324af..ca60216d4c 100644
--- a/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
+++ b/webkit-gtk/patches/patch-Source_WebKit_NetworkProcess_cache_NetworkCacheFileSystem.cpp
@@ -21,7 +21,7 @@ SunOS does not support DT_{DIR,REG}
void traverseDirectory(const String& path, const Function<void (const String&, DirectoryEntryType)>& function)
{
#if !OS(WINDOWS)
-+#ifdef __sun
++#if OS(SOLARIS)
+ struct stat s;
+#endif
DIR* dir = opendir(WebCore::FileSystem::fileSystemRepresentation(path).data());
@@ -29,7 +29,7 @@ SunOS does not support DT_{DIR,REG}
return;
dirent* dp;
while ((dp = readdir(dir))) {
-+#ifdef __sun
++#if OS(SOLARIS)
+ stat(dp->d_name, &s);
+ if (s.st_mode != S_IFDIR && s.st_mode != S_IFREG)
+#else
@@ -42,7 +42,7 @@ SunOS does not support DT_{DIR,REG}
auto nameString = String::fromUTF8(name);
if (nameString.isNull())
continue;
-+#ifdef __sun
++#if OS(SOLARIS)
+ function(nameString, directoryEntryType(s.st_mode));
+#else
function(nameString, directoryEntryType(dp->d_type));
diff --git a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
index c71ac3a363..e0dfebef4b 100644
--- a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
+++ b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_VMAllocate.h
@@ -8,7 +8,7 @@ Use posix_madvise on SunOS.
vmValidatePhysical(p, vmSize);
#if BOS(DARWIN)
SYSCALL(madvise(p, vmSize, MADV_FREE_REUSABLE));
-+#elif defined(__sun)
++#elif BOS(SOLARIS)
+ SYSCALL(posix_madvise(p, vmSize, MADV_DONTNEED));
#else
SYSCALL(madvise(p, vmSize, MADV_DONTNEED));
@@ -17,7 +17,7 @@ Use posix_madvise on SunOS.
vmValidatePhysical(p, vmSize);
#if BOS(DARWIN)
SYSCALL(madvise(p, vmSize, MADV_FREE_REUSE));
-+#elif defined(__sun)
++#elif BOS(SOLARIS)
+ SYSCALL(posix_madvise(p, vmSize, MADV_NORMAL));
#else
SYSCALL(madvise(p, vmSize, MADV_NORMAL));
Home |
Main Index |
Thread Index |
Old Index