mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00
Code Issues Releases Activity

Update webkit2-gtk3 to 2.24.0.

Browse Source 
Disable GLES support (upstream default is off), this should fix display
issues with nvidia cards. [1]

PR:		229491 [1]
Reported by:	c0141@xbsd.net and others
Obtained from:	gnome development repo
This commit is contained in:
Koop Mast 2019-03-23 15:25:20 +00:00
parent 5843a10d65
commit b870d97c83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=496665
15 changed files with 57 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
www/webkit2-gtk3/Makefile
View File

@ -2,11 +2,12 @@
# $FreeBSD$
PORTNAME= webkit
PORTVERSION= 2.22.6
PORTVERSION= 2.24.0
CATEGORIES= www
MASTER_SITES= https://webkitgtk.org/releases/
PKGNAMESUFFIX= 2-gtk3
DISTNAME= ${PORTNAME}gtk-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Opensource browser engine using the GTK+ 3 toolkit
@ -24,6 +25,7 @@ LIB_DEPENDS= libenchant-2.so:textproc/enchant2 \
libnotify.so:devel/libnotify \
libhyphen.so:textproc/hyphen \
libicutu.so:devel/icu \
libopenjp2.so:graphics/openjpeg \
libharfbuzz.so:print/harfbuzz \
libharfbuzz-icu.so:print/harfbuzz-icu \
libsoup-2.4.so:devel/libsoup \
@ -51,8 +53,9 @@ CXXFLAGS_powerpc= -DENABLE_YARR_JIT=0
CXXFLAGS_powerpc64= -DENABLE_YARR_JIT=0
CMAKE_ARGS= -DPORT=GTK
CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
ENABLE_GLES2 \
USE_SYSTEM_MALLOC
CMAKE_ON= ENABLE_GLES2 ENABLE_MINIBROWSER
CMAKE_ON= ENABLE_MINIBROWSER
CMAKE_OFF_armv6= ENABLE_JIT
CMAKE_OFF_armv7= ENABLE_JIT
CMAKE_OFF_powerpc= ENABLE_JIT

6
www/webkit2-gtk3/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1549750133
SHA256 (webkitgtk-2.22.6.tar.xz) = df90db9c0db0a2072b945fa3e1d45865922bd686c4659cce6cb5897ce357c85b
SIZE (webkitgtk-2.22.6.tar.xz) = 16773696
TIMESTAMP = 1552504408
SHA256 (gnome/webkitgtk-2.24.0.tar.xz) = 2e4ad1503fe482ceb5a83cf70ac9cd42f37eb718555a4d6844fe4c59a9214407
SIZE (gnome/webkitgtk-2.24.0.tar.xz) = 17894000

4
www/webkit2-gtk3/files/patch-CMakeLists.txt
View File

@ -1,6 +1,6 @@
--- CMakeLists.txt.orig 2018-09-06 11:51:31 UTC
--- CMakeLists.txt.orig 2019-01-09 10:08:35 UTC
+++ CMakeLists.txt
@@ -95,9 +95,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
@@ -96,9 +96,9 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(x64
set(WTF_CPU_X86_64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "(i[3-6]86|x86)")
set(WTF_CPU_X86 1)

6
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARM64Assembler.h
View File

@ -1,8 +1,8 @@
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2018-08-21 16:06:10 UTC
--- Source/JavaScriptCore/assembler/ARM64Assembler.h.orig 2019-01-09 10:08:35 UTC
+++ Source/JavaScriptCore/assembler/ARM64Assembler.h
@@ -2863,6 +2863,8 @@ class ARM64Assembler { (public)
@@ -2874,6 +2874,8 @@ class ARM64Assembler { (public)
{
#if OS(IOS)
#if OS(IOS_FAMILY)
sys_cache_control(kCacheFunctionPrepareForExecution, code, size);
+#elif OS(FREEBSD) || OS(NETBSD)
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);

11
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_assembler_ARMv7Assembler.h Normal file
View File

@ -0,0 +1,11 @@
--- Source/JavaScriptCore/assembler/ARMv7Assembler.h.orig 2019-02-12 11:21:03 UTC
+++ Source/JavaScriptCore/assembler/ARMv7Assembler.h
@@ -2471,6 +2471,8 @@ class ARMv7Assembler { (public)
{
#if OS(IOS_FAMILY)
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);

11
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64.rb Normal file
View File

@ -0,0 +1,11 @@
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2019-02-12 11:21:03 UTC
+++ Source/JavaScriptCore/offlineasm/arm64.rb
@@ -1034,7 +1034,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}]"

11
www/webkit2-gtk3/files/patch-Source_JavaScriptCore_offlineasm_arm64_rb
View File

@ -1,11 +0,0 @@
--- Source/JavaScriptCore/offlineasm/arm64.rb.orig 2018-10-27 21:20:55 UTC
+++ Source/JavaScriptCore/offlineasm/arm64.rb
@@ -938,7 +938,7 @@ class Instruction
$asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, #{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(:ptr)}, :got:#{operands[0].asmLabel}"
$asm.puts "ldr #{operands[1].arm64Operand(:ptr)}, [#{operands[1].arm64Operand(:ptr)}, :got_lo12:#{operands[0].asmLabel}]"

17
www/webkit2-gtk3/files/patch-Source_WTF_wtf_Optional.h
View File

@ -1,17 +0,0 @@
--- Source/WTF/wtf/Optional.h.orig 2018-09-21 19:59:47 UTC
+++ Source/WTF/wtf/Optional.h
@@ -277,12 +277,14 @@ struct nullopt_t
constexpr nullopt_t nullopt{nullopt_t::init()};
+# if !defined(_LIBCPP_VERSION) || _LIBCPP_VERSION < 7000
// 20.5.8, class bad_optional_access
class bad_optional_access : public std::logic_error {
public:
explicit bad_optional_access(const std::string& what_arg) : std::logic_error{what_arg} {}
explicit bad_optional_access(const char* what_arg) : std::logic_error{what_arg} {}
};
+# endif // _LIBCPP_VERSION < 7000
template <class T>

6
www/webkit2-gtk3/files/patch-Source_WTF_wtf_Platform.h
View File

@ -1,6 +1,6 @@
--- Source/WTF/wtf/Platform.h.orig 2018-09-21 19:59:47 UTC
--- Source/WTF/wtf/Platform.h.orig 2019-01-14 07:57:51 UTC
+++ Source/WTF/wtf/Platform.h
@@ -183,6 +183,7 @@
@@ -182,6 +182,7 @@
#elif defined(__ARM_ARCH_6__) \
|| defined(__ARM_ARCH_6J__) \
|| defined(__ARM_ARCH_6K__) \
@ -8,7 +8,7 @@
|| defined(__ARM_ARCH_6Z__) \
|| defined(__ARM_ARCH_6ZK__) \
|| defined(__ARM_ARCH_6T2__) \
@@ -230,6 +231,7 @@
@@ -229,6 +230,7 @@
#elif defined(__ARM_ARCH_6J__) \
|| defined(__ARM_ARCH_6K__) \

16
www/webkit2-gtk3/files/patch-Source_WebCore_PAL_pal_PlatformGTK.cmake
View File

@ -1,16 +0,0 @@
--- Source/WebCore/PAL/pal/PlatformGTK.cmake.orig 2018-07-25 11:56:30 UTC
+++ Source/WebCore/PAL/pal/PlatformGTK.cmake
@@ -20,6 +20,13 @@ list(APPEND PAL_SOURCES
unix/LoggingUnix.cpp
)
+list(APPEND PAL_INCLUDE_DIRECTORIES
+ ${LIBGCRYPT_INCLUDE_DIRS}
+)
+list(APPEND PAL_LIBRARIES
+ ${LIBGCRYPT_LIBRARIES}
+)
+
if (ENABLE_SUBTLE_CRYPTO)
list(APPEND PAL_PUBLIC_HEADERS
crypto/tasn1/Utilities.h

11
www/webkit2-gtk3/files/patch-Source_WebCore_platform_network_soup_SoupNetworkSession.h
View File

@ -1,11 +0,0 @@
--- Source/WebCore/platform/network/soup/SoupNetworkSession.h.orig 2018-09-06 11:51:34 UTC
+++ Source/WebCore/platform/network/soup/SoupNetworkSession.h
@@ -34,6 +34,8 @@
#include <wtf/glib/GRefPtr.h>
#include <wtf/text/WTFString.h>
+#include "URL.h"
+
typedef struct _SoupCache SoupCache;
typedef struct _SoupCookieJar SoupCookieJar;
typedef struct _SoupMessage SoupMessage;

11
www/webkit2-gtk3/files/patch-Source_WebCore_platform_text_TextCodec.cpp Normal file
View File

@ -0,0 +1,11 @@
--- 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"

11
www/webkit2-gtk3/files/patch-Source__JavaScriptCore__assembler__ARMAssembler.h
View File

@ -1,11 +0,0 @@
--- Source/JavaScriptCore/assembler/ARMAssembler.h.orig 2018-08-21 16:06:10 UTC
+++ Source/JavaScriptCore/assembler/ARMAssembler.h
@@ -1201,6 +1201,8 @@ namespace JSC {
linuxPageFlush(current, current + page);
linuxPageFlush(current, end);
+#elif CPU(ARM_TRADITIONAL) && OS(FREEBSD) && COMPILER(CLANG)
+ __clear_cache(code, reinterpret_cast<char*>(code) + size);
#else
#error "The cacheFlush support is missing on this platform."
#endif

4
www/webkit2-gtk3/files/patch-Source_bmalloc_bmalloc_BPlatform.h
View File

@ -1,6 +1,6 @@
--- Source/bmalloc/bmalloc/BPlatform.h.orig 2018-07-25 11:56:32 UTC
--- Source/bmalloc/bmalloc/BPlatform.h.orig 2018-11-09 13:57:26 UTC
+++ Source/bmalloc/bmalloc/BPlatform.h
@@ -138,6 +138,7 @@
@@ -144,6 +144,7 @@
#elif defined(__ARM_ARCH_6__) \
|| defined(__ARM_ARCH_6J__) \
|| defined(__ARM_ARCH_6K__) \

9
www/webkit2-gtk3/pkg-plist
View File

@ -14,6 +14,7 @@ include/webkitgtk-4.0/jsc/JSCClass.h
include/webkitgtk-4.0/jsc/JSCContext.h
include/webkitgtk-4.0/jsc/JSCDefines.h
include/webkitgtk-4.0/jsc/JSCException.h
include/webkitgtk-4.0/jsc/JSCOptions.h
include/webkitgtk-4.0/jsc/JSCValue.h
include/webkitgtk-4.0/jsc/JSCVersion.h
include/webkitgtk-4.0/jsc/JSCVirtualMachine.h
@ -33,6 +34,7 @@ include/webkitgtk-4.0/webkit2/WebKitContextMenuItem.h
include/webkitgtk-4.0/webkit2/WebKitCookieManager.h
include/webkitgtk-4.0/webkit2/WebKitCredential.h
include/webkitgtk-4.0/webkit2/WebKitDefines.h
include/webkitgtk-4.0/webkit2/WebKitDeviceInfoPermissionRequest.h
include/webkitgtk-4.0/webkit2/WebKitDownload.h
include/webkitgtk-4.0/webkit2/WebKitEditingCommands.h
include/webkitgtk-4.0/webkit2/WebKitEditorState.h
@ -70,7 +72,9 @@ include/webkitgtk-4.0/webkit2/WebKitSettings.h
include/webkitgtk-4.0/webkit2/WebKitURIRequest.h
include/webkitgtk-4.0/webkit2/WebKitURIResponse.h
include/webkitgtk-4.0/webkit2/WebKitURISchemeRequest.h
include/webkitgtk-4.0/webkit2/WebKitURIUtilities.h
include/webkitgtk-4.0/webkit2/WebKitUserContent.h
include/webkitgtk-4.0/webkit2/WebKitUserContentFilterStore.h
include/webkitgtk-4.0/webkit2/WebKitUserContentManager.h
include/webkitgtk-4.0/webkit2/WebKitUserMediaPermissionRequest.h
include/webkitgtk-4.0/webkit2/WebKitVersion.h
@ -209,10 +213,10 @@ 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.11.7
lib/libjavascriptcoregtk-4.0.so.18.13.3
lib/libwebkit2gtk-4.0.so
lib/libwebkit2gtk-4.0.so.37
lib/libwebkit2gtk-4.0.so.37.33.7
lib/libwebkit2gtk-4.0.so.37.37.2
lib/webkit2gtk-4.0/injected-bundle/libwebkit2gtkinjectedbundle.so
libdata/pkgconfig/javascriptcoregtk-4.0.pc
libdata/pkgconfig/webkit2gtk-4.0.pc
@ -221,7 +225,6 @@ libexec/webkit2gtk-4.0/MiniBrowser
libexec/webkit2gtk-4.0/WebKitNetworkProcess
libexec/webkit2gtk-4.0/WebKitPluginProcess
%%NPAPI%%libexec/webkit2gtk-4.0/WebKitPluginProcess2
libexec/webkit2gtk-4.0/WebKitStorageProcess
libexec/webkit2gtk-4.0/WebKitWebProcess
libexec/webkit2gtk-4.0/jsc
share/gir-1.0/JavaScriptCore-4.0.gir