diff options
Diffstat (limited to 'www/webkit2-gtk3/files')
22 files changed, 0 insertions, 517 deletions
diff --git a/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake b/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake deleted file mode 100644 index f830b5c9116a..000000000000 --- a/www/webkit2-gtk3/files/patch-Source-cmake-OptionsCommon.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/cmake/OptionsCommon.cmake.orig 2021-09-22 23:05:58 UTC -+++ Source/cmake/OptionsCommon.cmake -@@ -144,7 +144,7 @@ WEBKIT_CHECK_HAVE_FUNCTION(HAVE_VASPRINTF vasprintf) - # Check for symbols - WEBKIT_CHECK_HAVE_SYMBOL(HAVE_REGEX_H regexec regex.h) - if (NOT (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")) -- WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h) -+ #WEBKIT_CHECK_HAVE_SYMBOL(HAVE_PTHREAD_MAIN_NP pthread_main_np pthread_np.h) - endif () - WEBKIT_CHECK_HAVE_SYMBOL(HAVE_TIMINGSAFE_BCMP timingsafe_bcmp string.h) - # Windows has signal.h but is missing symbols that are used in calls to signal. diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h deleted file mode 100644 index 181df653d2f1..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2021-09-22 23:05:58 UTC -+++ Source/JavaScriptCore/assembler/ARM64Assembler.h -@@ -2950,6 +2950,8 @@ class ARM64Assembler { (public) - { - #if OS(DARWIN) - sys_cache_control(kCacheFunctionPrepareForExecution, code, size); -+#elif OS(FREEBSD) || OS(NETBSD) -+ __clear_cache(code, reinterpret_cast<char*>(code) + size); - #elif OS(FUCHSIA) - zx_cache_flush(code, size, ZX_CACHE_FLUSH_INSN); - #elif OS(LINUX) diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h deleted file mode 100644 index 42294c5de4bc..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2021-09-22 23:05:58 UTC -+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h -@@ -2402,6 +2402,8 @@ class ARMv7Assembler { (public) - { - #if OS(DARWIN) - sys_cache_control(kCacheFunctionPrepareForExecution, code, size); -+#elif OS(FREEBSD) || OS(NETBSD) -+ __clear_cache(code, reinterpret_cast<char*>(code) + size); - #elif OS(LINUX) - size_t page = pageSize(); - uintptr_t current = reinterpret_cast<uintptr_t>(code); diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp deleted file mode 100644 index 4682641a2130..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jit_ExecutableAllocator.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/JavaScriptCore/jit/ExecutableAllocator.cpp.orig 2021-09-22 23:05:58 UTC -+++ Source/JavaScriptCore/jit/ExecutableAllocator.cpp -@@ -95,7 +95,7 @@ namespace JSC { - - using namespace WTF; - --#if defined(FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB) && FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB > 0 -+#if defined(FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB) && FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB > 0 && !defined(__aarch64__) - static constexpr size_t fixedExecutableMemoryPoolSize = FIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB * MB; - #elif CPU(ARM) - static constexpr size_t fixedExecutableMemoryPoolSize = 16 * MB; diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp deleted file mode 100644 index 5ed01ccd90af..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- Source/JavaScriptCore/jsc.cpp.orig 2021-09-22 23:05:58 UTC -+++ Source/JavaScriptCore/jsc.cpp -@@ -100,6 +100,9 @@ - #else - #include <unistd.h> - #endif -+#if PLATFORM(GTK) -+#include <locale.h> -+#endif - - #if PLATFORM(COCOA) - #include <crt_externs.h> diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb deleted file mode 100644 index 6dc60845f9aa..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2021-09-22 23:05:58 UTC -+++ Source/JavaScriptCore/offlineasm/arm64.rb -@@ -1127,7 +1127,7 @@ class Instruction - $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, #{operands[0].asmLabel}@GOTPAGEOFF]" - - # On Linux, use ELF GOT relocation specifiers. -- $asm.putStr("#elif OS(LINUX)") -+ $asm.putStr("#elif OS(LINUX) || OS(FREEBSD)") - $asm.puts "adrp #{operands[1].arm64Operand(:quad)}, :got:#{operands[0].asmLabel}" - $asm.puts "ldr #{operands[1].arm64Operand(:quad)}, [#{operands[1].arm64Operand(:quad)}, :got_lo12:#{operands[0].asmLabel}]" - diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb deleted file mode 100644 index 9a99da9a8a91..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_config.rb +++ /dev/null @@ -1,16 +0,0 @@ ---- Source/JavaScriptCore/offlineasm/config.rb.orig 2021-05-17 13:22:35 UTC -+++ Source/JavaScriptCore/offlineasm/config.rb -@@ -22,11 +22,11 @@ buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; - # THE POSSIBILITY OF SUCH DAMAGE. - - buildProductsDirectory = ENV['BUILT_PRODUCTS_DIR']; --if buildProductsDirectory and File.exists?(buildProductsDirectory) -+if buildProductsDirectory and File.exist?(buildProductsDirectory) - $: << "#{buildProductsDirectory}/usr/local/include/WebKitAdditions/Scripts" - end - sdkRootDirectory = ENV['SDKROOT']; --if sdkRootDirectory and File.exists?(sdkRootDirectory) -+if sdkRootDirectory and File.exist?(sdkRootDirectory) - $: << "#{sdkRootDirectory}/usr/local/include/WebKitAdditions/Scripts" - end - diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb deleted file mode 100644 index 12a141cefb52..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_parser.rb +++ /dev/null @@ -1,28 +0,0 @@ ---- Source/JavaScriptCore/offlineasm/parser.rb.orig 2021-10-21 08:52:07 UTC -+++ Source/JavaScriptCore/offlineasm/parser.rb -@@ -832,10 +832,10 @@ class Parser - @idx += 1 - additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" - fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName -- if not File.exists?(fileName) -+ if not File.exist?(fileName) - fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName - end -- fileExists = File.exists?(fileName) -+ fileExists = File.exist?(fileName) - raise "File not found: #{fileName}" if not fileExists and not isOptional - list << parse(fileName) if fileExists - else -@@ -864,10 +864,10 @@ class Parser - @idx += 1 - additionsDirectoryName = "#{@buildProductsDirectory}/usr/local/include/WebKitAdditions/" - fileName = IncludeFile.new(moduleName, additionsDirectoryName).fileName -- if not File.exists?(fileName) -+ if not File.exist?(fileName) - fileName = IncludeFile.new(moduleName, @tokens[@idx].codeOrigin.fileName.dirname).fileName - end -- fileExists = File.exists?(fileName) -+ fileExists = File.exist?(fileName) - raise "File not found: #{fileName}" if not fileExists and not isOptional - fileList << fileName if fileExists - else diff --git a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp b/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp deleted file mode 100644 index 47a726b426cb..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_JavaScriptCore_runtime_NativeExecutable.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- Source/JavaScriptCore/runtime/NativeExecutable.cpp.orig 2021-09-22 23:05:58 UTC -+++ Source/JavaScriptCore/runtime/NativeExecutable.cpp -@@ -24,6 +24,7 @@ - */ - - #include "config.h" -+#include "ExecutableBaseInlines.h" - #include "NativeExecutable.h" - - #include "ExecutableBaseInlines.h" diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_PlatformCPU.h b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_PlatformCPU.h deleted file mode 100644 index 2a9b4c87a99b..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_PlatformCPU.h +++ /dev/null @@ -1,18 +0,0 @@ ---- Source/WTF/wtf/PlatformCPU.h.orig 2020-08-12 09:17:54 UTC -+++ Source/WTF/wtf/PlatformCPU.h -@@ -155,6 +155,7 @@ - #elif defined(__ARM_ARCH_6__) \ - || defined(__ARM_ARCH_6J__) \ - || defined(__ARM_ARCH_6K__) \ -+ || defined(__ARM_ARCH_6KZ__) \ - || defined(__ARM_ARCH_6Z__) \ - || defined(__ARM_ARCH_6ZK__) \ - || defined(__ARM_ARCH_6T2__) \ -@@ -196,6 +197,7 @@ - - #elif defined(__ARM_ARCH_6J__) \ - || defined(__ARM_ARCH_6K__) \ -+ || defined(__ARM_ARCH_6KZ__) \ - || defined(__ARM_ARCH_6Z__) \ - || defined(__ARM_ARCH_6ZK__) \ - || defined(__ARM_ARCH_6M__) diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp deleted file mode 100644 index 8c6b00de1d48..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp +++ /dev/null @@ -1,34 +0,0 @@ ---- Source/WTF/wtf/RAMSize.cpp.orig 2021-09-22 23:29:42 UTC -+++ Source/WTF/wtf/RAMSize.cpp -@@ -35,6 +35,8 @@ - #include <sys/sysinfo.h> - #elif OS(UNIX) - #include <unistd.h> -+#include <sys/types.h> -+#include <sys/sysctl.h> - #endif // OS(LINUX) || OS(UNIX) - #else - #include <bmalloc/bmalloc.h> -@@ -56,14 +58,18 @@ static size_t computeRAMSize() - return ramSizeGuess; - return status.ullTotalPhys; - #elif USE(SYSTEM_MALLOC) --#if OS(LINUX) || OS(FREEBSD) -+#if OS(LINUX) - struct sysinfo si; - sysinfo(&si); - return si.totalram * si.mem_unit; - #elif OS(UNIX) -- long pages = sysconf(_SC_PHYS_PAGES); -- long pageSize = sysconf(_SC_PAGE_SIZE); -- return pages * pageSize; -+ size_t physmem, len; -+ int mib[2] = { CTL_HW, HW_PHYSMEM }; -+ if (sysctl(mib, 2, &physmem, &len, NULL, 0) == 0 -+ && len == sizeof(physmem)) -+ return physmem; -+ else -+ return 512 * MB; // guess - #else - #error "Missing a platform specific way of determining the available RAM" - #endif // OS(LINUX) || OS(FREEBSD) || OS(UNIX) diff --git a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp b/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp deleted file mode 100644 index a4e820ab8dbd..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WTF_wtf_unix_MemoryPressureHandlerUnix.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2021-09-22 23:05:58 UTC -+++ Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp -@@ -28,7 +28,7 @@ - #include "config.h" - #include <wtf/MemoryPressureHandler.h> - --#include <malloc.h> -+#include <stdlib.h> - #include <unistd.h> - #include <wtf/Logging.h> - #include <wtf/MainThread.h> diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_PlatformScreen.h b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_PlatformScreen.h deleted file mode 100644 index d5a4da093b36..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_PlatformScreen.h +++ /dev/null @@ -1,15 +0,0 @@ ---- Source/WebCore/platform/PlatformScreen.h.orig 2021-10-21 08:52:09 UTC -+++ Source/WebCore/platform/PlatformScreen.h -@@ -48,6 +48,12 @@ OBJC_CLASS UIScreen; - typedef struct CGColorSpace *CGColorSpaceRef; - #endif - -+// X11 headers define a bunch of macros with common terms, interfering with WebCore and WTF enum values. -+// As a workaround, we explicitly undef them here. -+#if defined(None) -+#undef None -+#endif -+ - namespace WebCore { - - class DestinationColorSpace; diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp deleted file mode 100644 index bdc88e12cb04..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_graphics_cpu_arm_filters_FELightingNEON.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp.orig 2018-05-07 07:58:18 UTC -+++ Source/WebCore/platform/graphics/cpu/arm/filters/FELightingNEON.cpp -@@ -35,7 +35,7 @@ namespace WebCore { - // ALPHAX_Q ALPHAY_Q REMAPX_D REMAPY_D - - --static alignas(16) short s_FELightingConstantsForNeon[] = { -+alignas(16) static short s_FELightingConstantsForNeon[] = { - // Alpha coefficients. - -2, 1, 0, -1, 2, 1, 0, -1, - 0, -1, -2, -1, 0, 1, 2, 1, -@@ -403,7 +403,7 @@ TOSTRING(neonDrawLighting) ":" NL - "vmin.f32 " TMP2_D0 ", " TMP2_D0 ", " CONST_ONE_HI_D NL - "vmul.f32 " TMP3_Q ", " COLOR_Q ", " TMP2_D0 "[1]" NL - "vcvt.u32.f32 " TMP3_Q ", " TMP3_Q NL -- "vmov.u32 r2, r3, " TMP3_S0 ", " TMP3_S1 NL -+ "vmov r2, r3, " TMP3_S0 ", " TMP3_S1 NL - // The color values are stored in-place. - "strb r2, [" PIXELS_R ", #-11]" NL - "strb r3, [" PIXELS_R ", #-10]" NL diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h deleted file mode 100644 index ee10afd21da1..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_DNS.h +++ /dev/null @@ -1,10 +0,0 @@ ---- Source/WebCore/platform/network/DNS.h.orig 2021-09-22 23:05:58 UTC -+++ Source/WebCore/platform/network/DNS.h -@@ -33,6 +33,7 @@ - #include <winsock2.h> - #include <ws2tcpip.h> - #else -+#include <sys/socket.h> - #include <netinet/in.h> - #endif - diff --git a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp b/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp deleted file mode 100644 index a9ecd20741e2..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/WebCore/platform/text/TextCodec.cpp.orig 2019-02-16 10:10:59 UTC -+++ Source/WebCore/platform/text/TextCodec.cpp -@@ -24,6 +24,8 @@ - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -+#include <stdio.h> -+ - #include "config.h" - #include "TextCodec.h" - diff --git a/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake b/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake deleted file mode 100644 index ba73721ae92c..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebDriver_PlatformGTK.cmake +++ /dev/null @@ -1,16 +0,0 @@ ---- Source/WebDriver/PlatformGTK.cmake.orig 2018-02-19 07:45:32 UTC -+++ Source/WebDriver/PlatformGTK.cmake -@@ -5,6 +5,7 @@ add_definitions(-DLIBEXECDIR="${CMAKE_INSTALL_FULL_LIB - list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES - "${GLIB_INCLUDE_DIRS}" - "${LIBSOUP_INCLUDE_DIRS}" -+ "${ICU_INCLUDE_DIRS}" - ) - - list(APPEND WebDriver_SOURCES -@@ -18,4 +19,5 @@ list(APPEND WebDriver_SOURCES - - list(APPEND WebDriver_LIBRARIES - ${LIBSOUP_LIBRARIES} -+ ${ICU_LIBRARIES} - ) diff --git a/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb b/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb deleted file mode 100644 index 5b1f4eef7e6b..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebInspectorUI_Scripts_update-LegacyInspectorBackendCommands.rb +++ /dev/null @@ -1,11 +0,0 @@ ---- Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb.orig 2021-05-17 13:22:42 UTC -+++ Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb -@@ -36,7 +36,7 @@ class Task - end - - generated_path = File.join tmpdir, output_filename -- if !File.exists?(generated_path) -+ if !File.exist?(generated_path) - puts "ERROR: Generated file does not exist at expected path." - exit 1 - end diff --git a/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map b/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map deleted file mode 100644 index 51b1d56082b3..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_WebKit_webkitglib-symbols.map +++ /dev/null @@ -1,12 +0,0 @@ ---- Source/WebKit/webkitglib-symbols.map.orig 2021-05-17 13:22:43 UTC -+++ Source/WebKit/webkitglib-symbols.map -@@ -3,9 +3,6 @@ global: - jsc_*; - webkit_*; - extern "C++" { -- "bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_didInitialize"; -- "bmalloc::PerThreadStorage<bmalloc::PerHeapKind<bmalloc::Cache> >::s_key"; -- "bmalloc::vmPageSize()::cached"; - "WebKit::NetworkProcessMain(int, char**)"; - "WebKit::WebKitExtensionManager::initialize(WebKit::InjectedBundle*, API::Object*)"; - "WebKit::WebKitExtensionManager::singleton()"; diff --git a/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h b/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h deleted file mode 100644 index bf77aefc2750..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h +++ /dev/null @@ -1,10 +0,0 @@ ---- Source/bmalloc/bmalloc/BPlatform.h.orig 2021-09-22 23:05:58 UTC -+++ Source/bmalloc/bmalloc/BPlatform.h -@@ -163,6 +163,7 @@ - #elif defined(__ARM_ARCH_6__) \ - || defined(__ARM_ARCH_6J__) \ - || defined(__ARM_ARCH_6K__) \ -+|| defined(__ARM_ARCH_6KZ__) \ - || defined(__ARM_ARCH_6Z__) \ - || defined(__ARM_ARCH_6ZK__) \ - || defined(__ARM_ARCH_6T2__) \ diff --git a/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake b/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake deleted file mode 100644 index c7ed8a9b638b..000000000000 --- a/www/webkit2-gtk3/files/patch-Source_cmake_WebKitCommon.cmake +++ /dev/null @@ -1,17 +0,0 @@ ---- Source/cmake/WebKitCommon.cmake.orig 2021-09-17 09:07:45 UTC -+++ Source/cmake/WebKitCommon.cmake -@@ -106,11 +106,11 @@ if (NOT HAS_RUN_WEBKIT_COMMON) - endif () - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)") - set(WTF_CPU_X86 1) -- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc") -+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc|powerpc)") - set(WTF_CPU_PPC 1) -- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64") -+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64|powerpc64)") - set(WTF_CPU_PPC64 1) -- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le") -+ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(ppc64le|powerpc64le)") - set(WTF_CPU_PPC64LE 1) - elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64") - set(WTF_CPU_RISCV64 1) diff --git a/www/webkit2-gtk3/files/patch-revert-11ccaf183fad b/www/webkit2-gtk3/files/patch-revert-11ccaf183fad deleted file mode 100644 index 23ad25609a5b..000000000000 --- a/www/webkit2-gtk3/files/patch-revert-11ccaf183fad +++ /dev/null @@ -1,211 +0,0 @@ -Regressed by: https://github.com/WebKit/WebKit/commit/11ccaf183fad - -GStreamer.cpp.o -c /wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/p -latform/graphics/gstreamer/MediaSampleGStreamer.cpp -/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/graphics/gs -treamer/MediaSampleGStreamer.cpp:220:12: error: call to implicitly-deleted copy constructor o -f 'WebCore::PlatformSample' - return sample; - ^~~~~~ -/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample -.h:57:7: note: copy constructor of 'PlatformSample' is implicitly deleted because field 'samp -le' has a deleted copy constructor - } sample; - ^ -/wrkdirs/usr/ports/www/webkit2-gtk3/work/webkitgtk-2.34.0/Source/WebCore/platform/MediaSample -.h:56:66: note: copy constructor of '' is implicitly deleted because variant field 'byteRange -Sample' has a non-trivial copy constructor - std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample; - ^ -1 error generated. - -diff --git Source/WTF/wtf/PlatformHave.h Source/WTF/wtf/PlatformHave.h -index 4c5f1d2..e61e7fc 100644 ---- Source/WTF/wtf/PlatformHave.h -+++ Source/WTF/wtf/PlatformHave.h -@@ -909,6 +909,12 @@ - #endif - #endif - -+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110300 -+#if !defined(HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON) -+#define HAVE_MT_PLUGIN_SAMPLE_CURSOR_PLAYABLE_HORIZON 1 -+#endif -+#endif -+ - #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 110200) \ - || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 140400) - #define HAVE_AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS 1 -diff --git Source/WebCore/page/RuntimeEnabledFeatures.h Source/WebCore/page/RuntimeEnabledFeatures.h -index c97386f..6bb9794 100644 ---- Source/WebCore/page/RuntimeEnabledFeatures.h -+++ Source/WebCore/page/RuntimeEnabledFeatures.h -@@ -243,6 +243,11 @@ public: - void setDisableMediaExperiencePIDInheritance(bool isDisabled) { m_disableMediaExperiencePIDInheritance = isDisabled; } - bool disableMediaExperiencePIDInheritance() const { return m_disableMediaExperiencePIDInheritance; } - #endif -+ -+#if HAVE(MT_PLUGIN_FORMAT_READER) -+ void setWebMFormatReaderEnabled(bool isEnabled) { m_webMFormatReaderEnabled = isEnabled; } -+ bool webMFormatReaderEnabled() const { return m_webMFormatReaderEnabled; } -+#endif - - #if ENABLE(VORBIS) - WEBCORE_EXPORT void setVorbisDecoderEnabled(bool isEnabled); -@@ -375,6 +380,10 @@ private: - bool m_webMFormatReaderEnabled { false }; - #endif - -+#if HAVE(MT_PLUGIN_FORMAT_READER) -+ bool m_webMFormatReaderEnabled { false }; -+#endif -+ - #if ENABLE(MEDIA_SOURCE) - bool m_webMParserEnabled { false }; - bool m_webMWebAudioEnabled { false }; -diff --git Source/WebCore/platform/MediaSample.h Source/WebCore/platform/MediaSample.h -index 0847b97..d34ba7f 100644 ---- Source/WebCore/platform/MediaSample.h -+++ Source/WebCore/platform/MediaSample.h -@@ -34,8 +34,6 @@ - - typedef struct opaqueCMSampleBuffer *CMSampleBufferRef; - typedef struct _GstSample GstSample; --typedef struct OpaqueMTPluginByteSource *MTPluginByteSourceRef; --typedef const struct opaqueCMFormatDescription *CMFormatDescriptionRef; - - namespace WebCore { - -@@ -47,13 +45,11 @@ struct PlatformSample { - MockSampleBoxType, - CMSampleBufferType, - GStreamerSampleType, -- ByteRangeSampleType, - } type; - union { - MockSampleBox* mockSampleBox; - CMSampleBufferRef cmSampleBuffer; - GstSample* gstSample; -- std::pair<MTPluginByteSourceRef, CMFormatDescriptionRef> byteRangeSample; - } sample; - }; - -@@ -91,12 +87,6 @@ public: - virtual SampleFlags flags() const = 0; - virtual PlatformSample platformSample() = 0; - -- struct ByteRange { -- size_t byteOffset { 0 }; -- size_t byteLength { 0 }; -- }; -- virtual std::optional<ByteRange> byteRange() const = 0; -- - enum class VideoRotation { - None = 0, - UpsideDown = 180, -diff --git Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h -index d7a49b9..874c3dc 100644 ---- Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h -+++ Source/WebCore/platform/graphics/gstreamer/MediaSampleGStreamer.h -@@ -57,7 +57,6 @@ public: - Ref<MediaSample> createNonDisplayingCopy() const override; - SampleFlags flags() const override { return m_flags; } - PlatformSample platformSample() override; -- std::optional<ByteRange> byteRange() const override { return std::nullopt; } - void dump(PrintStream&) const override; - RefPtr<JSC::Uint8ClampedArray> getRGBAImageData() const final; - -diff --git Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp -index 5cb60b9..83da5b0 100644 ---- Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp -+++ Source/WebCore/platform/mock/mediasource/MockSourceBufferPrivate.cpp -@@ -62,7 +62,6 @@ private: - size_t sizeInBytes() const override { return sizeof(m_box); } - SampleFlags flags() const override; - PlatformSample platformSample() override; -- std::optional<ByteRange> byteRange() const override { return std::nullopt; } - FloatSize presentationSize() const override { return FloatSize(); } - void dump(PrintStream&) const override; - void offsetTimestampsBy(const MediaTime& offset) override { m_box.offsetTimestampsBy(offset); } -diff --git Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp -index 496e42a..43664ed 100644 ---- Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp -+++ Source/WebKit/MediaFormatReaderPlugIn/MediaFormatReaderPlugIn.cpp -@@ -23,14 +23,15 @@ - * THE POSSIBILITY OF SUCH DAMAGE. - */ - --#include <WebKit/WKMediaFormatReader.h> -+#include "config.h" - --extern "C" WK_EXPORT OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionaryRef, MTPluginFormatReaderRef*); -+#if HAVE(MT_PLUGIN_FORMAT_READER) - --OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef byteSource, CFAllocatorRef allocator, CFDictionaryRef, MTPluginFormatReaderRef* formatReader) -+OSStatus CreateMediaFormatReaderInstance(MTPluginByteSourceRef, CFAllocatorRef, CFDictionary -+Ref, MTPluginFormatReaderRef* formatReader) - { -- OSStatus status = WKMediaFormatReaderCreate(allocator, formatReader); -- if (status != noErr) -- return status; -- return WKMediaFormatReaderStartOnMainThread(*formatReader, byteSource); -+ *formatReader = nullptr; -+ return kMTPluginFormatReaderError_InternalFailure; - } -+ -+#endif // HAVE(MT_PLUGIN_FORMAT_READER) -diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.cpp Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -index 8b24061..83e3a04 100644 ---- Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -+++ Source/WebKit/Shared/WebPreferencesDefaultValues.cpp -@@ -289,6 +289,19 @@ bool defaultWebMFormatReaderEnabled() - - #endif // ENABLE(WEBM_FORMAT_READER) - -+#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER) -+ -+bool defaultWebMFormatReaderEnabled() -+{ -+#if HAVE(SYSTEM_FEATURE_FLAGS) -+ return isFeatureFlagEnabled("webm_format_reader"); -+#endif -+ -+ return false; -+} -+ -+#endif -+ - #if ENABLE(VP9) - - bool defaultVP8DecoderEnabled() -diff --git Source/WebKit/Shared/WebPreferencesDefaultValues.h Source/WebKit/Shared/WebPreferencesDefaultValues.h -index c7af0cb..c1c91ed 100644 ---- Source/WebKit/Shared/WebPreferencesDefaultValues.h -+++ Source/WebKit/Shared/WebPreferencesDefaultValues.h -@@ -95,6 +95,10 @@ bool defaultWebXREnabled(); - bool defaultWebMFormatReaderEnabled(); - #endif - -+#if ENABLE(MEDIA_SOURCE) && HAVE(MT_PLUGIN_FORMAT_READER) -+bool defaultWebMFormatReaderEnabled(); -+#endif -+ - #if ENABLE(VP9) - bool defaultVP8DecoderEnabled(); - bool defaultVP9DecoderEnabled(); -diff --git Source/WebKit/SourcesCocoa.txt Source/WebKit/SourcesCocoa.txt -index 78fb424..ac04aa8 100644 ---- Source/WebKit/SourcesCocoa.txt -+++ Source/WebKit/SourcesCocoa.txt -@@ -229,6 +229,11 @@ Shared/mac/MediaFormatReader/MediaSampleByteRange.cpp - Shared/mac/MediaFormatReader/MediaSampleCursor.cpp - Shared/mac/MediaFormatReader/MediaTrackReader.cpp - -+Shared/mac/MediaFormatReader/CoreMediaWrapped.cpp -+Shared/mac/MediaFormatReader/FormatReader.cpp -+Shared/mac/MediaFormatReader/SampleCursor.cpp -+Shared/mac/MediaFormatReader/TrackReader.cpp -+ - Shared/Plugins/mac/PluginSandboxProfile.mm - - Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm |