Attachment 207413 Details for Bug 240528 – webkit2-gtk3.diff

[patch] webkit2-gtk3.diff

webkit2-gtk3.diff (text/plain), 5.95 KB, created by Tobias Kortkamp on 2019-09-12 09:53:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias Kortkamp

Created: 2019-09-12 09:53:04 UTC

Size: 5.95 KB

patch

obsolete

>Index: www/webkit2-gtk3/Makefile
>===================================================================
>--- www/webkit2-gtk3/Makefile	(revision 511867)
>+++ www/webkit2-gtk3/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	webkit
>-PORTVERSION=	2.24.4
>+PORTVERSION=	2.26.0
> CATEGORIES=	www
> MASTER_SITES=	https://webkitgtk.org/releases/
> PKGNAMESUFFIX=	2-gtk3
>@@ -37,7 +37,7 @@
> 
> USES=		bison cmake compiler:c++14-lang gettext gl gnome gperf \
> 		jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \
>-		sqlite tar:xz
>+		sqlite tar:xz xorg
> USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
> USE_GL=		gl egl glesv2
> USE_GSTREAMER1=	bad gl
>@@ -54,7 +54,8 @@
> CMAKE_ARGS=		-DPORT=GTK
> CMAKE_OFF=		USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
> 			ENABLE_GLES2 \
>-			USE_SYSTEM_MALLOC
>+			USE_SYSTEM_MALLOC \
>+			USE_WPE_RENDERER
> CMAKE_ON=		ENABLE_MINIBROWSER
> CMAKE_OFF_armv6=	ENABLE_JIT
> CMAKE_OFF_armv7=	ENABLE_JIT
>Index: www/webkit2-gtk3/distinfo
>===================================================================
>--- www/webkit2-gtk3/distinfo	(revision 511867)
>+++ www/webkit2-gtk3/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1567099248
>-SHA256 (gnome/webkitgtk-2.24.4.tar.xz) = 8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8
>-SIZE (gnome/webkitgtk-2.24.4.tar.xz) = 17575784
>+TIMESTAMP = 1568112099
>+SHA256 (gnome/webkitgtk-2.26.0.tar.xz) = d210c0ecd1a89a22c9f8f1f450334f3489c5c50159b3a5e14dd93d5f349dcced
>+SIZE (gnome/webkitgtk-2.26.0.tar.xz) = 19321552
>Index: www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp
>===================================================================
>--- www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp	(revision 511867)
>+++ www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp	(nonexistent)
>@@ -1,19 +0,0 @@
>-.build/lib/libwebkit2gtk-4.0.so: undefined reference to `JSC::JSObject::didBecomePrototype()'
>-
>-https://trac.webkit.org/changeset/246922/webkit
>-
>---- Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp.orig	2019-08-26 14:55:44 UTC
>-+++ Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
>-@@ -48,11 +48,8 @@
>- #include "SQLiteTransaction.h"
>- #include "ThreadSafeDataBuffer.h"
>- #include <JavaScriptCore/AuxiliaryBarrierInlines.h>
>--#include <JavaScriptCore/HeapInlines.h>
>--#include <JavaScriptCore/JSCJSValueInlines.h>
>--#include <JavaScriptCore/JSGlobalObject.h>
>-+#include <JavaScriptCore/JSCInlines.h>
>- #include <JavaScriptCore/StrongInlines.h>
>--#include <JavaScriptCore/StructureInlines.h>
>- #include <wtf/FileSystem.h>
>- #include <wtf/NeverDestroyed.h>
>- #include <wtf/text/StringConcatenateNumbers.h>
>
>Property changes on: www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp
>===================================================================
>--- www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp	(revision 511867)
>+++ www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp	(nonexistent)
>@@ -1,13 +0,0 @@
>-https://trac.webkit.org/changeset/244591
>-
>---- Source/WebCore/contentextensions/DFACombiner.cpp.orig	2019-02-12 11:21:18 UTC
>-+++ Source/WebCore/contentextensions/DFACombiner.cpp
>-@@ -37,7 +37,7 @@ namespace WebCore {
>- namespace ContentExtensions {
>- 
>- class DFAMerger {
>--    typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
>-+    typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
>- 
>-     enum class WhichDFA {
>-         A,
>
>Property changes on: www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp
>===================================================================
>--- www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp	(revision 511867)
>+++ www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp	(nonexistent)
>@@ -1,17 +0,0 @@
>-https://trac.webkit.org/changeset/244591
>-
>---- Source/WebCore/contentextensions/NFAToDFA.cpp.orig	2019-02-12 11:21:18 UTC
>-+++ Source/WebCore/contentextensions/NFAToDFA.cpp
>-@@ -41,9 +41,9 @@ namespace WebCore {
>- 
>- namespace ContentExtensions {
>- 
>--typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
>--typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
>--typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
>-+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
>-+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
>-+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
>- typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
>- typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
>- 
>
>Property changes on: www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 240528: 207413