Attachment #207413 for bug #240528

View | Details | Raw Unified | Return to bug 240528
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	webkit
PORTVERSION=	2.26.0
CATEGORIES=	www
MASTER_SITES=	https://webkitgtk.org/releases/
PKGNAMESUFFIX=	2-gtk3


USES=		bison cmake compiler:c++14-lang gettext gl gnome gperf \
		jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \
		sqlite tar:xz xorg
USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
USE_GL=		gl egl glesv2
USE_GSTREAMER1=	bad gl

CMAKE_ARGS=		-DPORT=GTK
CMAKE_OFF=		USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
			ENABLE_GLES2 \
			USE_SYSTEM_MALLOC \
			USE_WPE_RENDERER
CMAKE_ON=		ENABLE_MINIBROWSER
CMAKE_OFF_armv6=	ENABLE_JIT
CMAKE_OFF_armv7=	ENABLE_JIT

Lines 1-3 Link Here

(-)www/webkit2-gtk3/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1567099248	1	TIMESTAMP = 1568112099
2	SHA256 (gnome/webkitgtk-2.24.4.tar.xz) = 8668b129c026624ec226a4cccf4995f9d26f3e88fc28ab75b0e965f3c32b7dd8	2	SHA256 (gnome/webkitgtk-2.26.0.tar.xz) = d210c0ecd1a89a22c9f8f1f450334f3489c5c50159b3a5e14dd93d5f349dcced
3	SIZE (gnome/webkitgtk-2.24.4.tar.xz) = 17575784	3	SIZE (gnome/webkitgtk-2.26.0.tar.xz) = 19321552




.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>




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,




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;
 

Return to bug 240528

Lines 2-8 Link Here

(-)www/webkit2-gtk3/Makefile (-3 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.24.4	5	PORTVERSION= 2.26.0
6	CATEGORIES= www	6	CATEGORIES= www
7	MASTER_SITES= https://webkitgtk.org/releases/	7	MASTER_SITES= https://webkitgtk.org/releases/
8	PKGNAMESUFFIX= 2-gtk3	8	PKGNAMESUFFIX= 2-gtk3
Lines 37-43 Link Here
37		37
38	USES= bison cmake compiler:c++14-lang gettext gl gnome gperf \	38	USES= bison cmake compiler:c++14-lang gettext gl gnome gperf \
39	jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \	39	jpeg localbase:ldflags perl5 pkgconfig python:2.7,build \
40	sqlite tar:xz	40	sqlite tar:xz xorg
41	USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt	41	USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build libxml2 libxslt
42	USE_GL= gl egl glesv2	42	USE_GL= gl egl glesv2
43	USE_GSTREAMER1= bad gl	43	USE_GSTREAMER1= bad gl
Lines 54-60 Link Here
54	CMAKE_ARGS= -DPORT=GTK	54	CMAKE_ARGS= -DPORT=GTK
55	CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \	55	CMAKE_OFF= USE_LD_GOLD ${CMAKE_OFF_${ARCH}:U} \
56	ENABLE_GLES2 \	56	ENABLE_GLES2 \
57	USE_SYSTEM_MALLOC	57	USE_SYSTEM_MALLOC \
		58	USE_WPE_RENDERER
58	CMAKE_ON= ENABLE_MINIBROWSER	59	CMAKE_ON= ENABLE_MINIBROWSER
59	CMAKE_OFF_armv6= ENABLE_JIT	60	CMAKE_OFF_armv6= ENABLE_JIT
60	CMAKE_OFF_armv7= ENABLE_JIT	61	CMAKE_OFF_armv7= ENABLE_JIT

Lines 1-19 Link Here

(-)www/webkit2-gtk3/files/patch-Source_WebCore_Modules_indexeddb_server_SQLiteIDBBackingStore.cpp (-19 lines)
1	.build/lib/libwebkit2gtk-4.0.so: undefined reference to `JSC::JSObject::didBecomePrototype()'
2
3	https://trac.webkit.org/changeset/246922/webkit
4
5	--- Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp.orig 2019-08-26 14:55:44 UTC
6	+++ Source/WebCore/Modules/indexeddb/server/SQLiteIDBBackingStore.cpp
7	@@ -48,11 +48,8 @@
8	#include "SQLiteTransaction.h"
9	#include "ThreadSafeDataBuffer.h"
10	#include <JavaScriptCore/AuxiliaryBarrierInlines.h>
11	-#include <JavaScriptCore/HeapInlines.h>
12	-#include <JavaScriptCore/JSCJSValueInlines.h>
13	-#include <JavaScriptCore/JSGlobalObject.h>
14	+#include <JavaScriptCore/JSCInlines.h>
15	#include <JavaScriptCore/StrongInlines.h>
16	-#include <JavaScriptCore/StructureInlines.h>
17	#include <wtf/FileSystem.h>
18	#include <wtf/NeverDestroyed.h>
19	#include <wtf/text/StringConcatenateNumbers.h>

Lines 1-13 Link Here

(-)www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_DFACombiner.cpp (-13 lines)
1	https://trac.webkit.org/changeset/244591
2
3	--- Source/WebCore/contentextensions/DFACombiner.cpp.orig 2019-02-12 11:21:18 UTC
4	+++ Source/WebCore/contentextensions/DFACombiner.cpp
5	@@ -37,7 +37,7 @@ namespace WebCore {
6	namespace ContentExtensions {
7
8	class DFAMerger {
9	- typedef MutableRangeList<char, uint64_t, 128> CombinedTransitionsMutableRangeList;
10	+ typedef MutableRangeList<signed char, uint64_t, 128> CombinedTransitionsMutableRangeList;
11
12	enum class WhichDFA {
13	A,

Lines 1-17 Link Here

(-)www/webkit2-gtk3/files/patch-Source_WebCore_contentextensions_NFAToDFA.cpp (-17 lines)
1	https://trac.webkit.org/changeset/244591
2
3	--- Source/WebCore/contentextensions/NFAToDFA.cpp.orig 2019-02-12 11:21:18 UTC
4	+++ Source/WebCore/contentextensions/NFAToDFA.cpp
5	@@ -41,9 +41,9 @@ namespace WebCore {
6
7	namespace ContentExtensions {
8
9	-typedef MutableRange<char, NFANodeIndexSet> NFANodeRange;
10	-typedef MutableRangeList<char, NFANodeIndexSet> NFANodeRangeList;
11	-typedef MutableRangeList<char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
12	+typedef MutableRange<signed char, NFANodeIndexSet> NFANodeRange;
13	+typedef MutableRangeList<signed char, NFANodeIndexSet> NFANodeRangeList;
14	+typedef MutableRangeList<signed char, NFANodeIndexSet, 128> PreallocatedNFANodeRangeList;
15	typedef Vector<uint32_t, 0, ContentExtensionsOverflowHandler> UniqueNodeList;
16	typedef Vector<UniqueNodeList, 0, ContentExtensionsOverflowHandler> NFANodeClosures;
17