webkit-gtk: Remove patches merged upstream

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: webkit-gtk: Remove patches merged upstream
From: Leonardo Taccari <leot%NetBSD.org@localhost>
Date: Sat, 24 Dec 2022 14:06:36 +0000
Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Sat Dec 24 15:06:36 2022 +0100
Changeset:	35f0314c67bdf1334c8c19f26cf25107259181fa

Modified Files:
	webkit-gtk/distinfo
Removed Files:
	webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
	webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
	webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp
	webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h
	webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp

Log Message:
webkit-gtk: Remove patches merged upstream

No longer needed, all of them were merged upstream.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=35f0314c67bdf1334c8c19f26cf25107259181fa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 webkit-gtk/distinfo                                |   5 -
 ...-Source_JavaScriptCore_runtime_MachineContext.h | 123 ---------------------
 .../patches/patch-Source_WTF_wtf_PlatformHave.h    |  17 ---
 ...patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp |  30 -----
 ...ess_WebPage_CoordinatedGraphics_LayerTreeHost.h |  37 -------
 ...atch-Source_bmalloc_bmalloc_AvailableMemory.cpp |  26 -----
 6 files changed, 238 deletions(-)

diffs:
diff --git a/webkit-gtk/distinfo b/webkit-gtk/distinfo
index d074c4d273..b155e55a4a 100644
--- a/webkit-gtk/distinfo
+++ b/webkit-gtk/distinfo
@@ -10,18 +10,15 @@ SHA1 (patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h) = 70975aac175ec413
 SHA1 (patch-Source_JavaScriptCore_heap_MarkedSpace.cpp) = 8f324091df41be96b011bcbeed5fd64c4464f010
 SHA1 (patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp) = 7f6c0c57d46478e83c4ff21dae2415f44085ba32
 SHA1 (patch-Source_JavaScriptCore_offlineasm_arm64.rb) = 8c05dafa317667bbf55504d05eeb8ae06fba4e93
-SHA1 (patch-Source_JavaScriptCore_runtime_MachineContext.h) = 6c3bdbf8041df27510da5999ee85f4e5ed09be8b
 SHA1 (patch-Source_ThirdParty_ANGLE_src_common_third__party_smhasher_src_PMurHash.cpp) = 73dfe781efe7e8aa7d49094af8820a87c501818f
 SHA1 (patch-Source_ThirdParty_ANGLE_src_compiler_translator_SymbolTable.h) = 10debffda84bc752ed434657a337a466aad19a3a
 SHA1 (patch-Source_ThirdParty_gtest_include_gtest_internal_gtest-port.h) = ac07d4d8faa6dab606bcea31936340d260fcda33
 SHA1 (patch-Source_WTF_wtf_Assertions.h) = 427de20eba4627578087feaa7de2f23e80b9debf
 SHA1 (patch-Source_WTF_wtf_FileSystem.cpp) = 2fe7b7755646d9a1cc022aec3d01091766378aba
 SHA1 (patch-Source_WTF_wtf_PlatformEnable.h) = eb5598c20c8453314daba7897066f15827bbede7
-SHA1 (patch-Source_WTF_wtf_PlatformHave.h) = 4bae0a5b48ab95fbccb1ce09d239d744d274e4eb
 SHA1 (patch-Source_WTF_wtf_PlatformOS.h) = 80aa6ff20f10407d447fdb41606d4bb4989351aa
 SHA1 (patch-Source_WTF_wtf_PlatformUse.h) = 595486b48e7d89378208c0a209a121ef136415e6
 SHA1 (patch-Source_WTF_wtf_StackBounds.cpp) = 22a71daac8443f079ad8bcc7285cfd7319c972b3
-SHA1 (patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp) = 036154b445b88c755855e906231d5e438318710a
 SHA1 (patch-Source_WebCore_Scripts_check-xcfilelists.sh) = b292baf2494bcd459d9af91386263123046c6615
 SHA1 (patch-Source_WebCore_Scripts_generate-unified-sources.sh) = 9b323aa1fa8e6e5599ac0a7ae08fbbed4348c70e
 SHA1 (patch-Source_WebCore_crypto_algorithms_CryptoAlgorithmAES__GCM.cpp) = 03337c5eec54d6974dfea1766b14cb2c1b9f7750
@@ -38,8 +35,6 @@ SHA1 (patch-Source_WebKit_Platform_IPC_unix_ConnectionUnix.cpp) = f2ee81bf200fe1
 SHA1 (patch-Source_WebKit_Platform_classifier_ResourceLoadStatisticsClassifier.cpp) = 920376ec8697780637f376b2fff312b7e214a7f6
 SHA1 (patch-Source_WebKit_Scripts_check-xcfilelists.sh) = 22cc5ba1ababc6395aa0ef467db0c27c2fbf6878
 SHA1 (patch-Source_WebKit_Scripts_generate-unified-sources.sh) = def930cf3f706ac657b2f8835c8c0278ade8f663
-SHA1 (patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h) = 91a3002d47c469375e70fcde7d575ec352f642f9
-SHA1 (patch-Source_bmalloc_bmalloc_AvailableMemory.cpp) = 18915c691d6f4e2a8870f8fee0909bd1a609cc05
 SHA1 (patch-Source_bmalloc_bmalloc_BPlatform.h) = 28d1f657fde427062a729b26398e96825082fc4d
 SHA1 (patch-Source_bmalloc_bmalloc_VMAllocate.h) = 22c23689fa79c930145068ed7966844bbf92a6a9
 SHA1 (patch-Source_cmake_OptionsCommon.cmake) = 83f0bfdb104e9e5c5c9afb155d399ae4c767c450
diff --git a/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h b/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
deleted file mode 100644
index a7a72f4355..0000000000
--- a/webkit-gtk/patches/patch-Source_JavaScriptCore_runtime_MachineContext.h
+++ /dev/null
@@ -1,123 +0,0 @@
-$NetBSD: patch-Source_JavaScriptCore_runtime_MachineContext.h,v 1.4 2022/06/08 20:56:50 leot Exp $
-
-Add support for NetBSD.
-
-Shared and applied upstream via <https://bugs.webkit.org/show_bug.cgi?id=241125>.
-
---- Source/JavaScriptCore/runtime/MachineContext.h.orig	2021-05-05 05:33:24.000000000 +0000
-+++ Source/JavaScriptCore/runtime/MachineContext.h
-@@ -196,6 +196,22 @@ static inline void*& stackPointerImpl(mc
- #error Unknown Architecture
- #endif
- 
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_UESP]);
-+#elif CPU(X86_64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSP]);
-+#elif CPU(ARM)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
-+#elif CPU(ARM64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
-+#elif CPU(MIPS)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_SP]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || OS(LINUX)
- 
- #if CPU(X86)
-@@ -347,6 +363,22 @@ static inline void*& framePointerImpl(mc
- #error Unknown Architecture
- #endif
- 
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EBP]);
-+#elif CPU(X86_64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RBP]);
-+#elif CPU(ARM)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
-+#elif CPU(ARM64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_FP]);
-+#elif CPU(MIPS)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_S8]);
-+#else
-+#error Unknown Architecture
-+#endif
-+
- #elif OS(FUCHSIA) || OS(LINUX)
- 
- // The following sequence depends on glibc's sys/ucontext.h.
-@@ -497,6 +529,22 @@ static inline void*& instructionPointerI
- #else
- #error Unknown Architecture
- #endif
-+ 
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EIP]);
-+#elif CPU(X86_64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RIP]);
-+#elif CPU(ARM)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
-+#elif CPU(ARM64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_PC]);
-+#elif CPU(MIPS)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EPC]);
-+#else
-+#error Unknown Architecture
-+#endif
- 
- #elif OS(FUCHSIA) || OS(LINUX)
- 
-@@ -655,6 +703,22 @@ inline void*& argumentPointer<1>(mcontex
- #else
- #error Unknown Architecture
- #endif
-+ 
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_EDX]);
-+#elif CPU(X86_64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_RSI]);
-+#elif CPU(ARM)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R1]);
-+#elif CPU(ARM64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X1]);
-+#elif CPU(MIPS)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_A1]);
-+#else
-+#error Unknown Architecture
-+#endif
- 
- #elif OS(FUCHSIA) || OS(LINUX)
- 
-@@ -772,6 +836,22 @@ inline void*& llintInstructionPointer(mc
- #else
- #error Unknown Architecture
- #endif
-+ 
-+#elif OS(NETBSD)
-+
-+#if CPU(X86)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_ESI]);
-+#elif CPU(X86_64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
-+#elif CPU(ARM)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_R8]);
-+#elif CPU(ARM64)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_X4]);
-+#elif CPU(MIPS)
-+    return reinterpret_cast<void*&>((uintptr_t&) machineContext.__gregs[_REG_T4]);
-+#else
-+#error Unknown Architecture
-+#endif
- 
- #elif OS(FUCHSIA) || OS(LINUX)
- 
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h b/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
deleted file mode 100644
index 16b8da514e..0000000000
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_PlatformHave.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_PlatformHave.h,v 1.4 2022/05/31 12:52:14 leot Exp $
-
-Add support for NetBSD.
-
-Shared upstream via <https://bugs.webkit.org/show_bug.cgi?id=241125>
-
---- Source/WTF/wtf/PlatformHave.h.orig	2022-02-23 08:58:57.000000000 +0000
-+++ Source/WTF/wtf/PlatformHave.h
-@@ -229,7 +229,7 @@
- #define HAVE_HOSTED_CORE_ANIMATION 1
- #endif
- 
--#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(OPENBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS) || CPU(RISCV64)))
-+#if OS(DARWIN) || OS(FUCHSIA) || ((OS(FREEBSD) || OS(NETBSD) || OS(OPENBSD) || OS(LINUX)) && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS) || CPU(RISCV64)))
- #define HAVE_MACHINE_CONTEXT 1
- #endif
- 
diff --git a/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp b/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp
deleted file mode 100644
index 86a11f9f65..0000000000
--- a/webkit-gtk/patches/patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-Source_WTF_wtf_posix_OSAllocatorPOSIX.cpp,v 1.3 2022/06/08 20:56:50 leot Exp $
-
-Set protections for tryReserveUncommittedAligned() on platforms
-that have MAP_ALIGNED.
-
-This avoid a regression introduced by 247105@main.
-
-Shared and applied upstream via <https://bugs.webkit.org/show_bug.cgi?id=241386>.
-
---- Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp.orig	2022-02-23 11:41:47.560819000 +0000
-+++ Source/WTF/wtf/posix/OSAllocatorPOSIX.cpp
-@@ -183,11 +183,15 @@ void* OSAllocator::tryReserveUncommitted
- #define MAP_NORESERVE 0
- #endif
-     UNUSED_PARAM(usage);
--    UNUSED_PARAM(writable);
--    UNUSED_PARAM(executable);
-     UNUSED_PARAM(jitCageEnabled);
-     UNUSED_PARAM(includesGuardPages);
--    void* result = mmap(0, bytes, PROT_NONE, MAP_NORESERVE | MAP_PRIVATE | MAP_ANON | MAP_ALIGNED(getLSBSet(alignment)), -1, 0);
-+    int protection = PROT_READ;
-+    if (writable)
-+        protection |= PROT_WRITE;
-+    if (executable)
-+        protection |= PROT_EXEC;
-+
-+    void* result = mmap(0, bytes, protection, MAP_NORESERVE | MAP_PRIVATE | MAP_ANON | MAP_ALIGNED(getLSBSet(alignment)), -1, 0);
-     if (result == MAP_FAILED)
-         return nullptr;
-     if (result)
diff --git a/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h b/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h
deleted file mode 100644
index 272d4de51c..0000000000
--- a/webkit-gtk/patches/patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-Source_WebKit_WebProcess_WebPage_CoordinatedGraphics_LayerTreeHost.h,v 1.3 2022/10/23 07:33:50 mcf Exp $
-
-Fix build with -opengl.
-
-Upstream: https://commits.webkit.org/254220@main
-
---- Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h.orig	Thu Jun 30 09:49:38 2022
-+++ Source/WebKit/WebProcess/WebPage/CoordinatedGraphics/LayerTreeHost.h
-@@ -37,9 +37,6 @@
- #include <wtf/Forward.h>
- #include <wtf/OptionSet.h>
- #include <wtf/RunLoop.h>
--#if PLATFORM(GTK)
--#include <WebCore/CoordinatedGraphicsLayer.h>
--#endif
- 
- #if USE(GRAPHICS_LAYER_TEXTURE_MAPPER)
- 
-@@ -48,6 +45,7 @@
- #else // USE(GRAPHICS_LAYER_TEXTURE_MAPPER)
- 
- namespace WebCore {
-+class CoordinatedGraphicsLayer;
- class IntRect;
- class IntSize;
- class GraphicsLayer;
-@@ -241,6 +239,10 @@ inline void LayerTreeHost::didChangeViewportAttributes
- inline void LayerTreeHost::setIsDiscardable(bool) { }
- inline void LayerTreeHost::deviceOrPageScaleFactorChanged() { }
- inline RefPtr<WebCore::DisplayRefreshMonitor> LayerTreeHost::createDisplayRefreshMonitor(WebCore::PlatformDisplayID) { return nullptr; }
-+#if PLATFORM(GTK)
-+inline void LayerTreeHost::adjustTransientZoom(double, WebCore::FloatPoint) { }
-+inline void LayerTreeHost::commitTransientZoom(double, WebCore::FloatPoint) { }
-+#endif
- #endif
- 
- } // namespace WebKit
diff --git a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp b/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp
deleted file mode 100644
index 6bc51c52b4..0000000000
--- a/webkit-gtk/patches/patch-Source_bmalloc_bmalloc_AvailableMemory.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-Source_bmalloc_bmalloc_AvailableMemory.cpp,v 1.1 2022/05/29 17:47:15 leot Exp $
-
-sysinfo() is used only on FreeBSD and Linux.
-
-Shared upstream via <https://bugs.webkit.org/show_bug.cgi?id=241077>.
-
---- Source/bmalloc/bmalloc/AvailableMemory.cpp.orig	2022-02-23 08:59:06.000000000 +0000
-+++ Source/bmalloc/bmalloc/AvailableMemory.cpp
-@@ -44,15 +44,16 @@
- #import <mach/mach_error.h>
- #import <math.h>
- #elif BOS(UNIX)
--#include <sys/sysinfo.h>
- #if BOS(LINUX)
- #include <algorithm>
- #include <fcntl.h>
-+#include <sys/sysinfo.h>
- #elif BOS(FREEBSD)
- #include "VMAllocate.h"
- #include <sys/sysctl.h>
- #include <sys/types.h>
- #include <sys/user.h>
-+#include <sys/sysinfo.h>
- #endif
- #include <unistd.h>
- #endif
Prev by Date: webkit-gtk: Adjust *.sh patches mismatches
Next by Date: webkit-gtk: regen remaining patches
Previous by Thread: webkit-gtk: Adjust *.sh patches mismatches
Next by Thread: webkit-gtk: regen remaining patches
Indexes:
Home | Main Index | Thread Index | Old Index