mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-17 03:25:46 +00:00
Update to 2.30.1
While here: - Use our system malloc instead of the bundle one - Avoid the dependency on sysinfo with a simple patch - fix some header issues
This commit is contained in:
parent
ffb42a7be1
commit
b3bfe5f889
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=550655
@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= webkit
|
||||
PORTVERSION= 2.28.4
|
||||
PORTVERSION= 2.30.1
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= https://webkitgtk.org/releases/
|
||||
PKGNAMESUFFIX= 2-gtk3
|
||||
@ -54,8 +54,9 @@ CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0
|
||||
CMAKE_ARGS= -DPORT=GTK
|
||||
CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
|
||||
ENABLE_GLES2 \
|
||||
USE_SYSTEMD
|
||||
CMAKE_ON= ENABLE_MINIBROWSER \
|
||||
USE_SYSTEM_MALLOC
|
||||
CMAKE_ON= ENABLE_MINIBROWSER
|
||||
CMAKE_OFF_armv6= ENABLE_JIT
|
||||
CMAKE_OFF_armv7= ENABLE_JIT
|
||||
CMAKE_OFF_powerpc= ENABLE_JIT
|
||||
|
@ -1,3 +1,3 @@
|
||||
TIMESTAMP = 1595943754
|
||||
SHA256 (gnome/webkitgtk-2.28.4.tar.xz) = 821952e8c9303ed752f1fb1d4283f612c25249d00d705d2b79c2db1bc49c9464
|
||||
SIZE (gnome/webkitgtk-2.28.4.tar.xz) = 21424908
|
||||
TIMESTAMP = 1601399196
|
||||
SHA256 (gnome/webkitgtk-2.30.1.tar.xz) = 17c59dfdadb7377192e9b59bc56c8a029c9fad4f38ed732b652bf33d0bd5d6b1
|
||||
SIZE (gnome/webkitgtk-2.30.1.tar.xz) = 22304672
|
||||
|
@ -1,7 +1,7 @@
|
||||
--- CMakeLists.txt.orig 2019-01-09 10:08:35 UTC
|
||||
--- CMakeLists.txt.orig 2020-08-12 09:17:37 UTC
|
||||
+++ CMakeLists.txt
|
||||
@@ -96,9 +96,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
|
||||
set(WTF_CPU_X86_64 1)
|
||||
@@ -109,9 +109,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
|
||||
endif ()
|
||||
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
|
||||
set(WTF_CPU_X86 1)
|
||||
-elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc")
|
||||
|
@ -1,8 +1,8 @@
|
||||
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2019-01-09 10:08:35 UTC
|
||||
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2020-08-12 09:17:52 UTC
|
||||
+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
|
||||
@@ -2874,6 +2874,8 @@ class ARM64Assembler { (public)
|
||||
@@ -2825,6 +2825,8 @@ class ARM64Assembler { (public)
|
||||
{
|
||||
#if OS(IOS_FAMILY)
|
||||
#if OS(DARWIN)
|
||||
sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
|
||||
+#elif OS(FREEBSD) || OS(NETBSD)
|
||||
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
|
@ -1,8 +1,8 @@
|
||||
--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2019-02-12 11:21:03 UTC
|
||||
--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2020-08-12 09:17:52 UTC
|
||||
+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
|
||||
@@ -2471,6 +2471,8 @@ class ARMv7Assembler { (public)
|
||||
@@ -2396,6 +2396,8 @@ class ARMv7Assembler { (public)
|
||||
{
|
||||
#if OS(IOS_FAMILY)
|
||||
#if OS(DARWIN)
|
||||
sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
|
||||
+#elif OS(FREEBSD) || OS(NETBSD)
|
||||
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
|
||||
|
12
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp
Normal file
12
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_jsc.cpp
Normal file
@ -0,0 +1,12 @@
|
||||
--- Source/JavaScriptCore/jsc.cpp.orig 2020-08-12 09:17:53 UTC
|
||||
+++ Source/JavaScriptCore/jsc.cpp
|
||||
@@ -94,6 +94,9 @@
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#if PLATFORM(GTK)
|
||||
+#include <locale.h>
|
||||
+#endif
|
||||
|
||||
#if PLATFORM(COCOA)
|
||||
#include <crt_externs.h>
|
@ -1,6 +1,6 @@
|
||||
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2019-02-12 11:21:03 UTC
|
||||
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2020-08-12 09:17:53 UTC
|
||||
+++ Source/JavaScriptCore/offlineasm/arm64.rb
|
||||
@@ -1034,7 +1034,7 @@ class Instruction
|
||||
@@ -1098,7 +1098,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.
|
||||
|
@ -1,5 +1,5 @@
|
||||
--- Source/WTF/wtf/PlatformCPU.h.orig 2020-03-16 20:02:18.816718000 +0100
|
||||
+++ Source/WTF/wtf/PlatformCPU.h 2020-03-16 20:02:49.520094000 +0100
|
||||
--- 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__) \
|
||||
|
33
www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp
Normal file
33
www/webkit2-gtk3/files/patch-Source_WTF_wtf_RAMSize.cpp
Normal file
@ -0,0 +1,33 @@
|
||||
--- Source/WTF/wtf/RAMSize.cpp.orig 2020-08-12 09:17:54 UTC
|
||||
+++ Source/WTF/wtf/RAMSize.cpp
|
||||
@@ -34,6 +34,10 @@
|
||||
#if OS(LINUX)
|
||||
#include <sys/sysinfo.h>
|
||||
#endif // OS(LINUX)
|
||||
+#if OS(FREEBSD)
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/sysctl.h>
|
||||
+#endif
|
||||
#else
|
||||
#include <bmalloc/bmalloc.h>
|
||||
#endif
|
||||
@@ -54,10 +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(FREEBSD)
|
||||
+ 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)
|
@ -0,0 +1,11 @@
|
||||
--- Source/WTF/wtf/unix/MemoryPressureHandlerUnix.cpp.orig 2020-08-12 09:17:54 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/MainThread.h>
|
||||
#include <wtf/MemoryFootprint.h>
|
@ -0,0 +1,10 @@
|
||||
--- Source/WebCore/platform/network/DNS.h.orig 2020-09-30 07:03:48 UTC
|
||||
+++ Source/WebCore/platform/network/DNS.h
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
#else
|
||||
+#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- Source/bmalloc/bmalloc/BPlatform.h.orig 2018-11-09 13:57:26 UTC
|
||||
--- Source/bmalloc/bmalloc/BPlatform.h.orig 2020-08-12 09:17:57 UTC
|
||||
+++ Source/bmalloc/bmalloc/BPlatform.h
|
||||
@@ -144,6 +144,7 @@
|
||||
@@ -159,6 +159,7 @@
|
||||
#elif defined(__ARM_ARCH_6__) \
|
||||
|| defined(__ARM_ARCH_6J__) \
|
||||
|| defined(__ARM_ARCH_6K__) \
|
||||
|
@ -1,77 +0,0 @@
|
||||
Partial backport of:
|
||||
|
||||
From c3cf651016e4cdcb4350598d4a586821071f91bf Mon Sep 17 00:00:00 2001
|
||||
From: "cturner@igalia.com"
|
||||
<cturner@igalia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
|
||||
Date: Thu, 30 Apr 2020 15:12:36 +0000
|
||||
Subject: [PATCH] [clang 11] fix build errors due to -WWc++11-narrowing
|
||||
https://bugs.webkit.org/show_bug.cgi?id=211193
|
||||
|
||||
Reviewed by Adrian Perez de Castro.
|
||||
|
||||
Fixes the following errors,
|
||||
|
||||
Source/WebCore/html/MediaElementSession.cpp:1059:9: error: type 'WebCore::RenderMedia *' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
|
||||
m_element.renderer(),
|
||||
^~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
Source/WebCore/style/StyleResolver.cpp:106:55: error: type 'const char [4]' cannot be narrowed to 'bool' in initializer list [-Wc++11-narrowing]
|
||||
m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
|
||||
^~~~~
|
||||
Source/WebCore/style/StyleResolver.cpp:106:55: note: insert an explicit cast to silence this issue
|
||||
m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
|
||||
^~~~~
|
||||
static_cast<bool>( )
|
||||
|
||||
* html/HTMLMediaElement.h:
|
||||
(WebCore::HTMLMediaElement::hasRenderer const):
|
||||
MediaElementSession was implicitly casting a pointer to a bool,
|
||||
which is not allowed with modern Clang checks. Add a helper method
|
||||
to encapsulate the now required static_cast<bool>.
|
||||
* html/MediaElementSession.cpp: Use the new helper method to see
|
||||
if the HTMLMediaElement has an associated renderer.
|
||||
(WebCore::MediaElementSession::updateMediaUsageIfChanged):
|
||||
* style/StyleResolver.cpp: This was calling MediaQueryEvaluator {
|
||||
"all" }; and seemingly expecting to cast a const char[] to a bool,
|
||||
or maybe String? It's confusing because of the MediaQueryEvaluator
|
||||
API. If it was implicitly converting to bool then that could be
|
||||
unintentional. Such casts are not allowed either now. The
|
||||
MediaQueryEvaluator's default constructor says it returns true for
|
||||
"all", which appears to be the original intent of this call, so I
|
||||
replaced it with that.
|
||||
(WebCore::Style::Resolver::Resolver):
|
||||
|
||||
|
||||
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@260951 268f45cc-cd09-0410-ab3c-d52691b4dbfc
|
||||
---
|
||||
Source/WebCore/ChangeLog | 39 +++++++++++++++++++++
|
||||
Source/WebCore/html/HTMLMediaElement.h | 1 +
|
||||
Source/WebCore/html/MediaElementSession.cpp | 2 +-
|
||||
Source/WebCore/style/StyleResolver.cpp | 2 +-
|
||||
4 files changed, 42 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
|
||||
index b466dfc139d7..444f349df87b 100644
|
||||
--- Source/WebCore/html/HTMLMediaElement.h
|
||||
+++ Source/WebCore/html/HTMLMediaElement.h
|
||||
@@ -155,6 +155,7 @@ class HTMLMediaElement
|
||||
virtual bool isVideo() const { return false; }
|
||||
bool hasVideo() const override { return false; }
|
||||
bool hasAudio() const override;
|
||||
+ bool hasRenderer() const { return static_cast<bool>(renderer()); }
|
||||
|
||||
static HashSet<HTMLMediaElement*>& allMediaElements();
|
||||
|
||||
diff --git a/Source/WebCore/style/StyleResolver.cpp b/Source/WebCore/style/StyleResolver.cpp
|
||||
index 651f8f1e2d78..9333b83913a4 100644
|
||||
--- Source/WebCore/style/StyleResolver.cpp
|
||||
+++ Source/WebCore/style/StyleResolver.cpp
|
||||
@@ -103,7 +103,7 @@ Resolver::Resolver(Document& document)
|
||||
if (view)
|
||||
m_mediaQueryEvaluator = MediaQueryEvaluator { view->mediaType() };
|
||||
else
|
||||
- m_mediaQueryEvaluator = MediaQueryEvaluator { "all" };
|
||||
+ m_mediaQueryEvaluator = MediaQueryEvaluator { };
|
||||
|
||||
if (root) {
|
||||
m_rootDefaultStyle = styleForElement(*root, m_document.renderStyle(), nullptr, RuleMatchingBehavior::MatchOnlyUserAgentRules).renderStyle;
|
@ -95,7 +95,9 @@ include/webkitgtk-4.0/webkit2/WebKitWebView.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWebViewBase.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWebViewSessionState.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWebsiteData.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWebsiteDataAccessPermissionRequest.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWebsiteDataManager.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWebsitePolicies.h
|
||||
include/webkitgtk-4.0/webkit2/WebKitWindowProperties.h
|
||||
include/webkitgtk-4.0/webkit2/webkit-web-extension.h
|
||||
include/webkitgtk-4.0/webkit2/webkit2.h
|
||||
@ -217,17 +219,16 @@ lib/girepository-1.0/WebKit2-4.0.typelib
|
||||
lib/girepository-1.0/WebKit2WebExtension-4.0.typelib
|
||||
lib/libjavascriptcoregtk-4.0.so
|
||||
lib/libjavascriptcoregtk-4.0.so.18
|
||||
lib/libjavascriptcoregtk-4.0.so.18.16.7
|
||||
lib/libjavascriptcoregtk-4.0.so.18.17.9
|
||||
lib/libwebkit2gtk-4.0.so
|
||||
lib/libwebkit2gtk-4.0.so.37
|
||||
lib/libwebkit2gtk-4.0.so.37.44.6
|
||||
lib/libwebkit2gtk-4.0.so.37.49.5
|
||||
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
|
||||
libdata/pkgconfig/javascriptcoregtk-4.0.pc
|
||||
libdata/pkgconfig/webkit2gtk-4.0.pc
|
||||
libdata/pkgconfig/webkit2gtk-web-extension-4.0.pc
|
||||
libexec/webkit2gtk-4.0/MiniBrowser
|
||||
libexec/webkit2gtk-4.0/WebKitNetworkProcess
|
||||
libexec/webkit2gtk-4.0/WebKitPluginProcess
|
||||
libexec/webkit2gtk-4.0/WebKitWebProcess
|
||||
libexec/webkit2gtk-4.0/jsc
|
||||
share/gir-1.0/JavaScriptCore-4.0.gir
|
||||
|
Loading…
Reference in New Issue
Block a user