Upgrade to 2.41.1

WebKitGTK JIT crashes on aarch64 hardware with new ARMv8.5 BTI
extension, most commonly seen on M2 Macs running Fedora Asahi. This
breaks large parts of GNOME using WebKitGTK, notably GNOME Online
Accounts; GNOME Help; and other similar things.

This removes Asahi specific changes as this could occur on any aarch64
hardware with this feature and makes WebKitGTK pretty much unuseable
without this change.

We also reduced generated debuginfo for aarch64 here as the memory
requirements are pretty huge for -g, making aarch64 rpms unbuildable in
copr without this change.

Reference: https://bugs.webkit.org/show_bug.cgi?id=245697
Related: rhbz#213000

.gitignore

@@ -1,3 +1,18 @@
-webkit-1.1.21.tar.gz
-/webkit-1.2.4.tar.gz
-/webkit-1.2.5.tar.gz
+/webkitgtk-*.tar.xz
+/webkitgtk-2.37.1.tar.xz.asc
+/webkitgtk-2.37.90.tar.xz.asc
+/webkitgtk-2.37.91.tar.xz.asc
+/webkitgtk-2.38.0.tar.xz.asc
+/webkitgtk-2.38.1.tar.xz.asc
+/webkitgtk-2.38.2.tar.xz.asc
+/webkitgtk-2.39.1.tar.xz.asc
+/webkitgtk-2.39.2.tar.xz.asc
+/webkitgtk-2.39.3.tar.xz.asc
+/webkitgtk-2.39.4.tar.xz.asc
+/webkitgtk-2.39.5.tar.xz.asc
+/webkitgtk-2.39.6.tar.xz.asc
+/webkitgtk-2.39.7.tar.xz.asc
+/webkitgtk-2.39.90.tar.xz.asc
+/webkitgtk-2.39.91.tar.xz.asc
+/webkitgtk-2.40.0.tar.xz.asc
+/webkitgtk-2.41.1.tar.xz.asc

build.patch

@@ -0,0 +1,149 @@
+From fd977228c791d5cf767a1e5b4ed3596add8ed6d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=BDan=20Dober=C5=A1ek?= <zdobersek@igalia.com>
+Date: Thu, 30 Mar 2023 10:36:24 -0700
+Subject: [PATCH] Build fix around std::variant in SourceBrush for
+ Clang/libstdc++ https://bugs.webkit.org/show_bug.cgi?id=254742
+
+Unreviewed, build fix for the SourceBrush::Brush std::variant construction when
+using Clang with libstdc++.
+
+Things get mixed up when using Ref<Pattern> for constructing the variant, with
+the compiler using it as initialization for the LogicalGradient type, the other
+possible type in the variant, which ends up in a compile-time error.
+
+This can be avoided by using the in-place tag when constructing the variant in
+the SourceBrush::setPattern() method, specifying which variant-alternative type
+should be used.
+
+Similar fix for the same reasons is also needed in the decoding part of the
+ArgumentCoder<std::variant<>> specialization, this being problematic due to the
+SourceBrush::Brush decoding produced for the generated serializers purpose.
+There the variant is constructed with the in-place tag that's based on the index
+value of the alternative.
+
+* Source/WebCore/platform/graphics/SourceBrush.cpp:
+(WebCore::SourceBrush::setPattern):
+* Source/WebCore/platform/graphics/SourceBrush.h:
+* Source/WebKit/Platform/IPC/ArgumentCoders.h:
+
+Canonical link: https://commits.webkit.org/262339@main
+---
+ Source/WebCore/platform/graphics/SourceBrush.cpp | 2 +-
+ Source/WebCore/platform/graphics/SourceBrush.h   | 3 ++-
+ Source/WebKit/Platform/IPC/ArgumentCoders.h      | 2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/SourceBrush.cpp b/Source/WebCore/platform/graphics/SourceBrush.cpp
+index f42e0d42f534..44135b7706ad 100644
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
++++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
+@@ -91,7 +91,7 @@ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& s
+ 
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+-    m_brush = { WTFMove(pattern) };
++    m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
+diff --git a/Source/WebCore/platform/graphics/SourceBrush.h b/Source/WebCore/platform/graphics/SourceBrush.h
+index 176b9fc85c18..cd97b82c7444 100644
+--- a/Source/WebCore/platform/graphics/SourceBrush.h
++++ b/Source/WebCore/platform/graphics/SourceBrush.h
+@@ -42,7 +42,8 @@ class SourceBrush {
+             template<typename Decoder> static std::optional<LogicalGradient> decode(Decoder&);
+         };
+ 
+-        std::variant<LogicalGradient, Ref<Pattern>> brush;
++        using Variant = std::variant<LogicalGradient, Ref<Pattern>>;
++        Variant brush;
+     };
+ 
+     SourceBrush() = default;
+diff --git a/Source/WebKit/Platform/IPC/ArgumentCoders.h b/Source/WebKit/Platform/IPC/ArgumentCoders.h
+index ae37b2145fc2..2d93984e3f36 100644
+--- a/Source/WebKit/Platform/IPC/ArgumentCoders.h
++++ b/Source/WebKit/Platform/IPC/ArgumentCoders.h
+@@ -743,7 +743,7 @@ template<typename... Types> struct ArgumentCoder<std::variant<Types...>> {
+                 auto optional = decoder.template decode<typename std::variant_alternative_t<index, std::variant<Types...>>>();
+                 if (!optional)
+                     return std::nullopt;
+-                return std::make_optional<std::variant<Types...>>(WTFMove(*optional));
++                return std::make_optional<std::variant<Types...>>(std::in_place_index<index>, WTFMove(*optional));
+             }
+             return decode(decoder, std::make_index_sequence<index + 1> { }, i);
+         } else
+
+From 93920b55f52ff8b883296f4845269e2ed746acb3 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Fri, 31 Mar 2023 12:24:09 -0700
+Subject: [PATCH] Fix build of SourceBrush.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=254821
+
+Unreviewed build fix.
+
+* Source/WebCore/platform/graphics/SourceBrush.cpp:
+(WebCore::SourceBrush::setGradient):
+(WebCore::SourceBrush::setPattern):
+
+Canonical link: https://commits.webkit.org/262434@main
+---
+ Source/WebCore/platform/graphics/SourceBrush.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Source/WebCore/platform/graphics/SourceBrush.cpp b/Source/WebCore/platform/graphics/SourceBrush.cpp
+index 44135b7706ad..5377831d7902 100644
+--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
++++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
+@@ -86,12 +86,12 @@ Pattern* SourceBrush::pattern() const
+ 
+ void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
+ {
+-    m_brush = { Brush::LogicalGradient { { WTFMove(gradient) }, spaceTransform } };
++    m_brush = Brush { Brush::LogicalGradient { { WTFMove(gradient) }, spaceTransform } };
+ }
+ 
+ void SourceBrush::setPattern(Ref<Pattern>&& pattern)
+ {
+-    m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
++    m_brush = Brush { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
+ }
+ 
+ WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)
+
+From 2fd83187cbe7cf7f57f4d6834f6060b00703683b Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@redhat.com>
+Date: Fri, 31 Mar 2023 13:23:45 -0500
+Subject: [PATCH] [GTK] AcceleratedSurfaceDMABuf.cpp does not build on i368
+ https://bugs.webkit.org/show_bug.cgi?id=254828
+
+Reviewed by NOBODY (OOPS!).
+
+* Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp:
+(WebKit::AcceleratedSurfaceDMABuf::clientResize):
+---
+ .../WebPage/gtk/AcceleratedSurfaceDMABuf.cpp           | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp
+index 2aa33586b317..34cca9f11d62 100644
+--- a/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp
++++ b/Source/WebKit/WebProcess/WebPage/gtk/AcceleratedSurfaceDMABuf.cpp
+@@ -130,12 +130,12 @@ void AcceleratedSurfaceDMABuf::clientResize(const WebCore::IntSize& size)
+     }
+     UnixFileDescriptor backFD(gbm_bo_get_fd(backObject), UnixFileDescriptor::Adopt);
+     Vector<EGLAttrib> attributes = {
+-        EGL_WIDTH, gbm_bo_get_width(backObject),
+-        EGL_HEIGHT, gbm_bo_get_height(backObject),
+-        EGL_LINUX_DRM_FOURCC_EXT, gbm_bo_get_format(backObject),
++        EGL_WIDTH, static_cast<EGLAttrib>(gbm_bo_get_width(backObject)),
++        EGL_HEIGHT, static_cast<EGLAttrib>(gbm_bo_get_height(backObject)),
++        EGL_LINUX_DRM_FOURCC_EXT, static_cast<EGLAttrib>(gbm_bo_get_format(backObject)),
+         EGL_DMA_BUF_PLANE0_FD_EXT, backFD.value(),
+-        EGL_DMA_BUF_PLANE0_OFFSET_EXT, gbm_bo_get_offset(backObject, 0),
+-        EGL_DMA_BUF_PLANE0_PITCH_EXT, gbm_bo_get_stride(backObject),
++        EGL_DMA_BUF_PLANE0_OFFSET_EXT, static_cast<EGLAttrib>(gbm_bo_get_offset(backObject, 0)),
++        EGL_DMA_BUF_PLANE0_PITCH_EXT, static_cast<EGLAttrib>(gbm_bo_get_stride(backObject)),
+         EGL_NONE
+     };
+     m_backImage = display.createEGLImage(EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, nullptr, attributes);

changelog

@@ -0,0 +1,2 @@
+* Thu Aug 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.37.1-12
+- Initial import. This manual changelog entry hides the repo's long git history from rpm-autospec.

crashy-jit.patch

@@ -0,0 +1,155 @@
+From 63f0b2d0c54093bfea054cc6b302e578260d0fcc Mon Sep 17 00:00:00 2001
+From: Yusuke Suzuki <ysuzuki@apple.com>
+Date: Thu, 30 Mar 2023 19:47:10 -0700
+Subject: [PATCH] [JSC] Reduce # of parameters of function#bind operations
+ https://bugs.webkit.org/show_bug.cgi?id=254752 rdar://problem/107427493
+
+Reviewed by Ross Kirsling.
+
+Let's reconstruct boundArgsLength via passed args to reduce # of parameters of operations,
+to mitigate issues on x64 Windows (Windows x64 does not have appropriate implementation for more parameters).
+
+* Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp:
+(JSC::DFG::ByteCodeParser::handleIntrinsicCall):
+* Source/JavaScriptCore/dfg/DFGOperations.cpp:
+(JSC::DFG::JSC_DEFINE_JIT_OPERATION):
+* Source/JavaScriptCore/dfg/DFGOperations.h:
+* Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp:
+(JSC::DFG::SpeculativeJIT::compileFunctionBind):
+(JSC::DFG::SpeculativeJIT::compileNewBoundFunction):
+* Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:
+(JSC::FTL::DFG::LowerDFGToB3::compileNewBoundFunction):
+(JSC::FTL::DFG::LowerDFGToB3::compileFunctionBind):
+
+Canonical link: https://commits.webkit.org/262385@main
+---
+ Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp   |  2 +-
+ Source/JavaScriptCore/dfg/DFGOperations.cpp       | 13 +++++++++++--
+ Source/JavaScriptCore/dfg/DFGOperations.h         |  4 ++--
+ Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp |  6 ++----
+ Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp     |  5 ++---
+ 5 files changed, 18 insertions(+), 12 deletions(-)
+
+diff --git a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+index fc1cd9e88efc..ae1265bb4bc8 100644
+--- a/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
++++ b/Source/JavaScriptCore/dfg/DFGByteCodeParser.cpp
+@@ -3886,7 +3886,7 @@ auto ByteCodeParser::handleIntrinsicCall(Node* callee, Operand result, CallVaria
+             for (; index < argumentCountIncludingThis; ++index)
+                 addVarArgChild(get(virtualRegisterForArgumentIncludingThis(index, registerOffset)));
+             for (; index < numChildren; ++index)
+-                addVarArgChild(jsConstant(jsUndefined()));
++                addVarArgChild(jsConstant(JSValue()));
+             Node* resultNode = addToGraph(Node::VarArg, FunctionBind, OpInfo(0), OpInfo(static_cast<unsigned>(argumentCountIncludingThis >= 2 ? argumentCountIncludingThis - 2 : 0)));
+             setResult(resultNode);
+             return CallOptimizationResult::Inlined;
+diff --git a/Source/JavaScriptCore/dfg/DFGOperations.cpp b/Source/JavaScriptCore/dfg/DFGOperations.cpp
+index ca316e1bd6d2..f19fcd7df41c 100644
+--- a/Source/JavaScriptCore/dfg/DFGOperations.cpp
++++ b/Source/JavaScriptCore/dfg/DFGOperations.cpp
+@@ -2818,7 +2818,7 @@ JSC_DEFINE_JIT_OPERATION(operationFunctionToString, JSString*, (JSGlobalObject*
+     return function->toString(globalObject);
+ }
+ 
+-JSC_DEFINE_JIT_OPERATION(operationFunctionBind, JSBoundFunction*, (JSGlobalObject* globalObject, JSObject* target, unsigned boundArgsLength, EncodedJSValue boundThisValue, EncodedJSValue arg0Value, EncodedJSValue arg1Value, EncodedJSValue arg2Value))
++JSC_DEFINE_JIT_OPERATION(operationFunctionBind, JSBoundFunction*, (JSGlobalObject* globalObject, JSObject* target, EncodedJSValue boundThisValue, EncodedJSValue arg0Value, EncodedJSValue arg1Value, EncodedJSValue arg2Value))
+ {
+     VM& vm = globalObject->vm();
+     CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
+@@ -2830,6 +2830,11 @@ JSC_DEFINE_JIT_OPERATION(operationFunctionBind, JSBoundFunction*, (JSGlobalObjec
+         return { };
+     }
+ 
++    unsigned boundArgsLength = 0;
++    boundArgsLength += !!(JSValue::decode(arg0Value));
++    boundArgsLength += !!(JSValue::decode(arg1Value));
++    boundArgsLength += !!(JSValue::decode(arg2Value));
++
+     JSValue boundThis = JSValue::decode(boundThisValue);
+     EncodedJSValue arguments[JSBoundFunction::maxEmbeddedArgs] {
+         arg0Value,
+@@ -2871,7 +2876,7 @@ JSC_DEFINE_JIT_OPERATION(operationFunctionBind, JSBoundFunction*, (JSGlobalObjec
+     RELEASE_AND_RETURN(scope, JSBoundFunction::create(vm, globalObject, target, boundThis, boundArgs, length, name));
+ }
+ 
+-JSC_DEFINE_JIT_OPERATION(operationNewBoundFunction, JSBoundFunction*, (JSGlobalObject* globalObject, JSFunction* function, unsigned boundArgsLength, EncodedJSValue boundThisValue, EncodedJSValue arg0Value, EncodedJSValue arg1Value, EncodedJSValue arg2Value))
++JSC_DEFINE_JIT_OPERATION(operationNewBoundFunction, JSBoundFunction*, (JSGlobalObject* globalObject, JSFunction* function, EncodedJSValue boundThisValue, EncodedJSValue arg0Value, EncodedJSValue arg1Value, EncodedJSValue arg2Value))
+ {
+     VM& vm = globalObject->vm();
+     CallFrame* callFrame = DECLARE_CALL_FRAME(vm);
+@@ -2880,6 +2885,10 @@ JSC_DEFINE_JIT_OPERATION(operationNewBoundFunction, JSBoundFunction*, (JSGlobalO
+     JSValue arg0 = JSValue::decode(arg0Value);
+     JSValue arg1 = JSValue::decode(arg1Value);
+     JSValue arg2 = JSValue::decode(arg2Value);
++    unsigned boundArgsLength = 0;
++    boundArgsLength += !!(arg0);
++    boundArgsLength += !!(arg1);
++    boundArgsLength += !!(arg2);
+     return JSBoundFunction::createRaw(vm, globalObject, function, boundArgsLength, boundThis, arg0, arg1, arg2);
+ }
+ 
+diff --git a/Source/JavaScriptCore/dfg/DFGOperations.h b/Source/JavaScriptCore/dfg/DFGOperations.h
+index 9602feb3d66a..7e6080a3ec4e 100644
+--- a/Source/JavaScriptCore/dfg/DFGOperations.h
++++ b/Source/JavaScriptCore/dfg/DFGOperations.h
+@@ -274,8 +274,8 @@ JSC_DECLARE_JIT_OPERATION(operationInt32ToStringWithValidRadix, char*, (JSGlobal
+ JSC_DECLARE_JIT_OPERATION(operationInt52ToStringWithValidRadix, char*, (JSGlobalObject*, int64_t, int32_t));
+ JSC_DECLARE_JIT_OPERATION(operationDoubleToStringWithValidRadix, char*, (JSGlobalObject*, double, int32_t));
+ JSC_DECLARE_JIT_OPERATION(operationFunctionToString, JSString*, (JSGlobalObject*, JSFunction*));
+-JSC_DECLARE_JIT_OPERATION(operationFunctionBind, JSBoundFunction*, (JSGlobalObject*, JSObject*, unsigned, EncodedJSValue, EncodedJSValue, EncodedJSValue, EncodedJSValue));
+-JSC_DECLARE_JIT_OPERATION(operationNewBoundFunction, JSBoundFunction*, (JSGlobalObject*, JSFunction*, unsigned, EncodedJSValue, EncodedJSValue, EncodedJSValue, EncodedJSValue));
++JSC_DECLARE_JIT_OPERATION(operationFunctionBind, JSBoundFunction*, (JSGlobalObject*, JSObject*, EncodedJSValue, EncodedJSValue, EncodedJSValue, EncodedJSValue));
++JSC_DECLARE_JIT_OPERATION(operationNewBoundFunction, JSBoundFunction*, (JSGlobalObject*, JSFunction*, EncodedJSValue, EncodedJSValue, EncodedJSValue, EncodedJSValue));
+ 
+ JSC_DECLARE_JIT_OPERATION(operationNormalizeMapKeyHeapBigInt, EncodedJSValue, (VM*, JSBigInt*));
+ JSC_DECLARE_JIT_OPERATION(operationMapHash, UCPUStrictInt32, (JSGlobalObject*, EncodedJSValue input));
+diff --git a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
+index 167e61a8d1d0..67f5def0dceb 100644
+--- a/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
++++ b/Source/JavaScriptCore/dfg/DFGSpeculativeJIT64.cpp
+@@ -6574,12 +6574,10 @@ void SpeculativeJIT::compileFunctionBind(Node* node)
+ 
+     speculateObject(m_graph.child(node, 0), targetGPR);
+ 
+-    unsigned boundArgsLength = node->numberOfBoundArguments();
+-
+     GPRFlushedCallResult result(this);
+     GPRReg resultGPR = result.gpr();
+     flushRegisters();
+-    callOperation(operationFunctionBind, resultGPR, LinkableConstant::globalObject(*this, node), targetGPR, TrustedImm32(boundArgsLength), boundThisRegs, arg0Regs, arg1Regs, arg2Regs);
++    callOperation(operationFunctionBind, resultGPR, LinkableConstant::globalObject(*this, node), targetGPR, boundThisRegs, arg0Regs, arg1Regs, arg2Regs);
+     exceptionCheck();
+     cellResult(resultGPR, node);
+ }
+@@ -6629,7 +6627,7 @@ void SpeculativeJIT::compileNewBoundFunction(Node* node)
+     store8(TrustedImm32(static_cast<uint8_t>(TriState::Indeterminate)), Address(resultGPR, JSBoundFunction::offsetOfCanConstruct()));
+     mutatorFence(vm());
+ 
+-    addSlowPathGenerator(slowPathCall(slowPath, this, operationNewBoundFunction, resultGPR, LinkableConstant::globalObject(*this, node), targetGPR, TrustedImm32(node->numberOfBoundArguments()), boundThisRegs, arg0Regs, arg1Regs, arg2Regs));
++    addSlowPathGenerator(slowPathCall(slowPath, this, operationNewBoundFunction, resultGPR, LinkableConstant::globalObject(*this, node), targetGPR, boundThisRegs, arg0Regs, arg1Regs, arg2Regs));
+     cellResult(resultGPR, node);
+ }
+ 
+diff --git a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
+index 2dda50507633..704d0dd68d8c 100644
+--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
++++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp
+@@ -7339,7 +7339,7 @@ IGNORE_CLANG_WARNINGS_END
+         LValue callResult = lazySlowPath(
+             [=, &vm] (const Vector<Location>& locations) -> RefPtr<LazySlowPath::Generator> {
+                 return createLazyCallGenerator(vm, operationNewBoundFunction, locations[0].directGPR(),
+-                    CCallHelpers::TrustedImmPtr(globalObject), locations[1].directGPR(), CCallHelpers::TrustedImm32(numberOfBoundArguments),
++                    CCallHelpers::TrustedImmPtr(globalObject), locations[1].directGPR(),
+                     locations[2].directGPR(), locations[3].directGPR(), locations[4].directGPR(), locations[5].directGPR());
+             },
+             target, thisValue, arg0, arg1, arg2);
+@@ -9014,8 +9014,7 @@ IGNORE_CLANG_WARNINGS_END
+     void compileFunctionBind()
+     {
+         JSGlobalObject* globalObject = m_graph.globalObjectFor(m_origin.semantic);
+-        unsigned boundArgsLength = m_node->numberOfBoundArguments();
+-        setJSValue(vmCall(pointerType(), operationFunctionBind, weakPointer(globalObject), lowObject(m_graph.child(m_node, 0)), m_out.constInt32(boundArgsLength), lowJSValue(m_graph.child(m_node, 1)), lowJSValue(m_graph.child(m_node, 2)), lowJSValue(m_graph.child(m_node, 3)), lowJSValue(m_graph.child(m_node, 4))));
++        setJSValue(vmCall(pointerType(), operationFunctionBind, weakPointer(globalObject), lowObject(m_graph.child(m_node, 0)), lowJSValue(m_graph.child(m_node, 1)), lowJSValue(m_graph.child(m_node, 2)), lowJSValue(m_graph.child(m_node, 3)), lowJSValue(m_graph.child(m_node, 4))));
+     }
+ 
+     void compileToPrimitive()

rpminspect.yaml

@@ -0,0 +1,5 @@
+---
+inspections:
+    abidiff: off
+    changedfiles: off
+    filesize: off

sources

@@ -1 +1,2 @@
-09f04985665b9abf6f0d9956f86a6a31  webkit-1.2.5.tar.gz
+SHA512 (webkitgtk-2.41.1.tar.xz) = a64e112855b53329d99b3f06239e2a7e593a4b22c4c91d87ae67cc37441fdd57458cfcd69151c43a614e10406b25d5f77c43f6865bb5883e32c25c993a506c37
+SHA512 (webkitgtk-2.41.1.tar.xz.asc) = a622232ba91291e3a19cb3693b415e2cf2005bdb52e92054dbe5ced56663d471a1a8942c1a2f53f46124910a270aaec72272ee03e3a590729e195571eab329fe

webkit-1.1.12-atomic-word.patch

@@ -1,73 +0,0 @@
---- webkit-1.1.11/JavaScriptCore/wtf/Platform.h.orig	2009-07-14 13:01:51.000000000 -0500
-+++ webkit-1.1.11/JavaScriptCore/wtf/Platform.h	2009-07-14 13:04:59.000000000 -0500
-@@ -272,9 +272,16 @@
- #endif
- 
- /* PLATFORM(SPARC64) */
--#if defined(__sparc64__)
-+#if defined(__sparc64__)\
-+    || defined(__sparc__) && defined(_arch64__)
- #define WTF_PLATFORM_SPARC64 1
- #define WTF_PLATFORM_BIG_ENDIAN 1
-+#else
-+/* PLATFORM(SPARC) */
-+#if defined(__sparc__)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
- #endif
- 
- /* PLATFORM(WINCE) && PLATFORM(QT)
---- webkit-1.1.12/JavaScriptCore/wtf/Threading.h.orig	2009-07-20 05:05:08.000000000 -0500
-+++ webkit-1.1.12/JavaScriptCore/wtf/Threading.h	2009-07-28 21:53:46.000000000 -0500
-@@ -229,14 +229,14 @@
- #elif COMPILER(GCC)
- #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
- 
--inline void atomicIncrement(int volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
--inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
-+inline void atomicIncrement(_Atomic_word volatile* addend) { __gnu_cxx::__atomic_add(addend, 1); }
-+inline _Atomic_word atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
- 
- #endif
- 
- class ThreadSafeSharedBase : public Noncopyable {
- public:
--    ThreadSafeSharedBase(int initialRefCount = 1)
-+    ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
-         : m_refCount(initialRefCount)
-     {
-     }
-@@ -256,12 +256,12 @@
-         return refCount() == 1;
-     }
- 
--    int refCount() const
-+    _Atomic_word refCount() const
-     {
- #if !USE(LOCKFREE_THREADSAFESHARED)
-         MutexLocker locker(m_mutex);
- #endif
--        return static_cast<int const volatile &>(m_refCount);
-+        return static_cast<_Atomic_word const volatile &>(m_refCount);
-     }
- 
- protected:
-@@ -288,7 +288,7 @@
-     template<class T>
-     friend class CrossThreadRefCounted;
- 
--    int m_refCount;
-+    _Atomic_word m_refCount;
- #if !USE(LOCKFREE_THREADSAFESHARED)
-     mutable Mutex m_mutex;
- #endif
-@@ -296,7 +296,7 @@
- 
- template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
- public:
--    ThreadSafeShared(int initialRefCount = 1)
-+    ThreadSafeShared(_Atomic_word initialRefCount = 1)
-         : ThreadSafeSharedBase(initialRefCount)
-     {
-     }

webkit-1.1.12-no-execmem.patch

@@ -1,12 +0,0 @@
-diff -up ./JavaScriptCore/wtf/Platform.h.old ./JavaScriptCore/wtf/Platform.h
---- ./JavaScriptCore/wtf/Platform.h.old	2009-08-22 15:00:39.306173267 -0700
-+++ ./JavaScriptCore/wtf/Platform.h	2009-08-22 15:03:40.551182842 -0700
-@@ -675,7 +675,7 @@
- #endif
- /* Setting this flag prevents the assembler from using RWX memory; this may improve
-    security but currectly comes at a significant performance cost. */
--#if PLATFORM(ARM)
-+#if PLATFORM(ARM) || PLATFORM(X86) || PLATFORM(X86_64)
- #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
- #else
- #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0

webkit-1.1.13-no-execmem.patch

@@ -1,12 +0,0 @@
-diff -up webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem webkit-1.1.13/JavaScriptCore/wtf/Platform.h
---- webkit-1.1.13/JavaScriptCore/wtf/Platform.h.no-execmem	2009-08-25 09:27:08.517026703 -0400
-+++ webkit-1.1.13/JavaScriptCore/wtf/Platform.h	2009-08-25 09:42:35.222265742 -0400
-@@ -724,7 +724,7 @@
- #endif
- /* Setting this flag prevents the assembler from using RWX memory; this may improve
-    security but currectly comes at a significant performance cost. */
--#if PLATFORM(IPHONE)
-+#if PLATFORM(IPHONE) || PLATFORM(X86) || PLATFORM(X86_64)
- #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 1
- #else
- #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0

webkit-1.1.14-atomic-word.patch

@@ -1,75 +0,0 @@
-diff -up webkit-1.1.14/JavaScriptCore/wtf/Platform.h.atomic-word webkit-1.1.14/JavaScriptCore/wtf/Platform.h
---- webkit-1.1.14/JavaScriptCore/wtf/Platform.h.atomic-word	2009-09-04 14:51:45.000000000 -0400
-+++ webkit-1.1.14/JavaScriptCore/wtf/Platform.h	2009-09-07 21:52:29.696143904 -0400
-@@ -282,9 +282,16 @@
- #endif
- 
- /* PLATFORM(SPARC64) */
--#if defined(__sparc64__)
-+#if defined(__sparc64__)\
-+    || defined(__sparc__) && defined(_arch64__)
- #define WTF_PLATFORM_SPARC64 1
- #define WTF_PLATFORM_BIG_ENDIAN 1
-+#else
-+/* PLATFORM(SPARC) */
-+#if defined(__sparc__)
-+#define WTF_PLATFORM_SPARC 1
-+#define WTF_PLATFORM_BIG_ENDIAN 1
-+#endif
- #endif
- 
- /* PLATFORM(WINCE) && PLATFORM(QT)
-diff -up webkit-1.1.14/JavaScriptCore/wtf/Threading.h.atomic-word webkit-1.1.14/JavaScriptCore/wtf/Threading.h
---- webkit-1.1.14/JavaScriptCore/wtf/Threading.h.atomic-word	2009-09-04 08:30:57.000000000 -0400
-+++ webkit-1.1.14/JavaScriptCore/wtf/Threading.h	2009-09-07 21:59:39.149138812 -0400
-@@ -231,14 +231,14 @@ inline int atomicDecrement(int volatile*
- #elif COMPILER(GCC)
- #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
- 
--inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
--inline int atomicDecrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
-+inline int atomicIncrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
-+inline int atomicDecrement(_Atomic_word volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, -1) - 1; }
- 
- #endif
- 
- class ThreadSafeSharedBase : public Noncopyable {
- public:
--    ThreadSafeSharedBase(int initialRefCount = 1)
-+    ThreadSafeSharedBase(_Atomic_word initialRefCount = 1)
-         : m_refCount(initialRefCount)
-     {
-     }
-@@ -258,12 +258,12 @@ public:
-         return refCount() == 1;
-     }
- 
--    int refCount() const
-+    _Atomic_word refCount() const
-     {
- #if !USE(LOCKFREE_THREADSAFESHARED)
-         MutexLocker locker(m_mutex);
- #endif
--        return static_cast<int const volatile &>(m_refCount);
-+        return static_cast<_Atomic_word const volatile &>(m_refCount);
-     }
- 
- protected:
-@@ -290,7 +290,7 @@ private:
-     template<class T>
-     friend class CrossThreadRefCounted;
- 
--    int m_refCount;
-+    _Atomic_word m_refCount;
- #if !USE(LOCKFREE_THREADSAFESHARED)
-     mutable Mutex m_mutex;
- #endif
-@@ -298,7 +298,7 @@ private:
- 
- template<class T> class ThreadSafeShared : public ThreadSafeSharedBase {
- public:
--    ThreadSafeShared(int initialRefCount = 1)
-+    ThreadSafeShared(_Atomic_word initialRefCount = 1)
-         : ThreadSafeSharedBase(initialRefCount)
-     {
-     }

webkit-1.1.14-nspluginwrapper.patch

@@ -1,12 +0,0 @@
---- webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp.old	2009-12-01 15:22:10.000000000 +0000
-+++ webkit-1.1.17/WebCore/plugins/PluginDatabase.cpp	2009-12-01 15:22:21.000000000 +0000
-@@ -357,6 +357,9 @@ Vector<String> PluginDatabase::defaultPl
-     paths.append("/usr/lib64/mozilla/plugins");
-     paths.append("/usr/lib/nsbrowser/plugins");
-     paths.append("/usr/lib64/nsbrowser/plugins");
-+    /* And for nspluginwrapper */
-+    paths.append("/usr/lib64/mozilla/plugins-wrapped");
-+    paths.append("/usr/lib/mozilla/plugins-wrapped");
- 
-     String mozHome(getenv("MOZILLA_HOME"));
-     mozHome.append("/plugins");

webkit-1.1.22-icu44.patch

@@ -1,141 +0,0 @@
-2010-03-22  Darin Adler  <darin@apple.com>
-
-        Reviewed by Dan Bernstein.
-
-        TextBreakIteratorICU.cpp is incompatible with new UBreakIterator type in ICU 4.4
-        https://bugs.webkit.org/show_bug.cgi?id=36381
-
-        * platform/text/TextBreakIteratorICU.cpp:
-        (WebCore::setUpIterator): Use reinterpret_cast instead of static_cast or relying
-        on conversion to void*.
-        (WebCore::textBreakFirst): Ditto.
-        (WebCore::textBreakLast): Ditto.
-        (WebCore::textBreakNext): Ditto.
-        (WebCore::textBreakPrevious): Ditto.
-        (WebCore::textBreakPreceding): Ditto.
-        (WebCore::textBreakFollowing): Ditto.
-        (WebCore::textBreakCurrent): Ditto.
-        (WebCore::isTextBreak): Ditto.
-        (WebCore::setUpIteratorWithRules): Ditto.
-
- 2010-03-22  Eric Carlson  <eric.carlson@apple.com>
- 
-Index: /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp
-===================================================================
---- /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 50977)
-+++ /trunk/WebCore/platform/text/TextBreakIteratorICU.cpp (revision 56345)
-@@ -25,5 +25,4 @@
- #include "PlatformString.h"
- #include "TextBreakIteratorInternalICU.h"
--
- #include <unicode/ubrk.h>
- #include <wtf/Assertions.h>
-@@ -39,5 +38,5 @@
-     if (!createdIterator) {
-         UErrorCode openStatus = U_ZERO_ERROR;
--        iterator = static_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
-+        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_open(type, currentTextBreakLocaleID(), 0, 0, &openStatus));
-         createdIterator = true;
-         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
-@@ -47,5 +46,5 @@
- 
-     UErrorCode setTextStatus = U_ZERO_ERROR;
--    ubrk_setText(iterator, string, length, &setTextStatus);
-+    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
-     if (U_FAILURE(setTextStatus))
-         return 0;
-@@ -86,42 +85,42 @@
- }
- 
--int textBreakFirst(TextBreakIterator* bi)
--{
--    return ubrk_first(bi);
--}
--
--int textBreakLast(TextBreakIterator* bi)
--{
--    return ubrk_last(bi);
--}
--
--int textBreakNext(TextBreakIterator* bi)
--{
--    return ubrk_next(bi);
--}
--
--int textBreakPrevious(TextBreakIterator* bi)
--{
--    return ubrk_previous(bi);
--}
--
--int textBreakPreceding(TextBreakIterator* bi, int pos)
--{
--    return ubrk_preceding(bi, pos);
--}
--
--int textBreakFollowing(TextBreakIterator* bi, int pos)
--{
--    return ubrk_following(bi, pos);
--}
--
--int textBreakCurrent(TextBreakIterator* bi)
--{
--    return ubrk_current(bi);
--}
--
--bool isTextBreak(TextBreakIterator* bi, int pos)
--{
--    return ubrk_isBoundary(bi, pos);
-+int textBreakFirst(TextBreakIterator* iterator)
-+{
-+    return ubrk_first(reinterpret_cast<UBreakIterator*>(iterator));
-+}
-+
-+int textBreakLast(TextBreakIterator* iterator)
-+{
-+    return ubrk_last(reinterpret_cast<UBreakIterator*>(iterator));
-+}
-+
-+int textBreakNext(TextBreakIterator* iterator)
-+{
-+    return ubrk_next(reinterpret_cast<UBreakIterator*>(iterator));
-+}
-+
-+int textBreakPrevious(TextBreakIterator* iterator)
-+{
-+    return ubrk_previous(reinterpret_cast<UBreakIterator*>(iterator));
-+}
-+
-+int textBreakPreceding(TextBreakIterator* iterator, int pos)
-+{
-+    return ubrk_preceding(reinterpret_cast<UBreakIterator*>(iterator), pos);
-+}
-+
-+int textBreakFollowing(TextBreakIterator* iterator, int pos)
-+{
-+    return ubrk_following(reinterpret_cast<UBreakIterator*>(iterator), pos);
-+}
-+
-+int textBreakCurrent(TextBreakIterator* iterator)
-+{
-+    return ubrk_current(reinterpret_cast<UBreakIterator*>(iterator));
-+}
-+
-+bool isTextBreak(TextBreakIterator* iterator, int position)
-+{
-+    return ubrk_isBoundary(reinterpret_cast<UBreakIterator*>(iterator), position);
- }
- 
-@@ -137,5 +136,5 @@
-         UErrorCode openStatus = U_ZERO_ERROR;
-         String rules(breakRules);
--        iterator = static_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
-+        iterator = reinterpret_cast<TextBreakIterator*>(ubrk_openRules(rules.characters(), rules.length(), 0, 0, &parseStatus, &openStatus));
-         createdIterator = true;
-         ASSERT_WITH_MESSAGE(U_SUCCESS(openStatus), "ICU could not open a break iterator: %s (%d)", u_errorName(openStatus), openStatus);
-@@ -145,5 +144,5 @@
- 
-     UErrorCode setTextStatus = U_ZERO_ERROR;
--    ubrk_setText(iterator, string, length, &setTextStatus);
-+    ubrk_setText(reinterpret_cast<UBreakIterator*>(iterator), string, length, &setTextStatus);
-     if (U_FAILURE(setTextStatus))
-         return 0;

webkit-1.1.22-s390.patch

@@ -1,30 +0,0 @@
-diff -up webkit-1.1.22/JavaScriptCore/wtf/Platform.h.s390 webkit-1.1.22/JavaScriptCore/wtf/Platform.h
---- webkit-1.1.22/JavaScriptCore/wtf/Platform.h.s390	2010-03-31 15:07:04.000000000 +0200
-+++ webkit-1.1.22/JavaScriptCore/wtf/Platform.h	2010-03-31 15:09:00.000000000 +0200
-@@ -145,6 +145,18 @@
- #define WTF_CPU_SPARC
- #endif
- 
-+/* CPU(S390X) - S390 64-bit */
-+#if defined(__s390x__)
-+#define WTF_CPU_S390X 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
-+/* CPU(S390) - S390 32-bit */
-+#if defined(__s390__)
-+#define WTF_CPU_S390 1
-+#define WTF_CPU_BIG_ENDIAN 1
-+#endif
-+
- /* CPU(X86) - i386 / x86 32-bit */
- #if   defined(__i386__) \
-     || defined(i386)     \
-@@ -831,6 +843,7 @@
- #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
-     || CPU(IA64)  \
-     || CPU(ALPHA) \
-+    || CPU(S390X) \
-     || CPU(SPARC64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)

webkit-1.1.22-sparc.patch

@@ -1,15 +0,0 @@
-diff -up webkit-1.1.22/JavaScriptCore/wtf/Platform.h.sparc webkit-1.1.22/JavaScriptCore/wtf/Platform.h
---- webkit-1.1.22/JavaScriptCore/wtf/Platform.h.sparc	2010-03-23 08:14:24.378618143 -0400
-+++ webkit-1.1.22/JavaScriptCore/wtf/Platform.h	2010-03-23 08:14:29.871502920 -0400
-@@ -828,7 +828,10 @@
- #endif
- 
- #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) || CPU(IA64) || CPU(ALPHA)
-+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
-+    || CPU(IA64)  \
-+    || CPU(ALPHA) \
-+    || CPU(SPARC64)
- #define WTF_USE_JSVALUE64 1
- #elif CPU(ARM) || CPU(PPC64)
- #define WTF_USE_JSVALUE32 1

webkitgtk.spec

@@ -1,461 +1,579 @@
 ## NOTE: Lots of files in various subdirectories have the same name (such as
 ## "LICENSE") so this short macro allows us to distinguish them by using their
 ## directory names (from the source tree) as prefixes for the files.
-%define 	add_to_doc_files()	\
-	mkdir -p %{buildroot}%{_docdir}/%{name}-%{version} ||: ; \
-	cp -p %1  %{buildroot}%{_docdir}/%{name}-%{version}/$(echo '%1' | sed -e 's!/!.!g')
+%global add_to_license_files() \
+        mkdir -p _license_files ; \
+        cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
-## Optional build modifications...
-## --with 3dtransforms: Enables support for 3-D transforms.
-##	(Default: No)
-##
-## --with coverage: Enables compile-time checking of code coverage.
-##	(Default: No)
-##
-## --with debug: Enable more verbose debugging. Makes runtime a bit slower.
-##	Also disables the optimized memory allocator.
-##	(Default: No)
-##
-## --with pango: Use Pango instead of freetype2 as the font renderer.
-##	CJK support is functional only with the freetype2 backend.
-##	(Default: No - use freetype2)
-##
-## --with svg: Experimental SVG support (filters)
-##	(Default: No) 
-##
-## --with wml: Build support for WML
-##	(Default: No)
-
-%bcond_with 	3dtransforms
-%bcond_with 	coverage
-%bcond_with 	debug
-%bcond_with 	pango
-%bcond_with 	svg
-%bcond_with 	wml
-
-Name:		webkitgtk
-Version:	1.2.5
-Release:	1%{?dist}
-Summary:	GTK+ Web content engine library
-
-Provides:	WebKit-gtk = %{version}-%{release}
-Obsoletes:	WebKit-gtk < %{version}-%{release}
-
-Group:		Development/Libraries
-License:	LGPLv2+ and BSD
-URL:		http://www.webkitgtk.org/
-
-Source0:	http://www.webkitgtk.org/webkit-%{version}.tar.gz
-
-## See: https://bugzilla.redhat.com/show_bug.cgi?id=516057
-## FIXME: We forcibly disable the JIT compiler for the time being.
-## This is a temporary workaround which causes a slight performance hit on
-## 32- and 64-bit x86; but until we can fix the JIT to correctly handle WX
-## memory, at least we'll have a WebKit stack that doesn't crash due to this
-## bug. :)
-#Patch1: 	webkit-1.1.13-no-execmem.patch
-Patch2: 	webkit-1.1.14-nspluginwrapper.patch
-
-BuildRequires:	bison
-BuildRequires:	chrpath
-BuildRequires:	enchant-devel
-BuildRequires:	flex
-BuildRequires:	geoclue-devel
-BuildRequires:	gettext
-BuildRequires:	gperf
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-BuildRequires:	gtk2-devel
-BuildRequires:	libsoup-devel >= 2.27.91
-BuildRequires:	libicu-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	libXt-devel
-BuildRequires:	pcre-devel
-BuildRequires:	sqlite-devel
-
-## Conditional dependencies...
-%if %{with pango}
-BuildRequires:	pango-devel
-%else
-BuildRequires:	cairo-devel
-BuildRequires:	fontconfig-devel
-BuildRequires:	freetype-devel
+# No libmanette in RHEL
+%if !0%{?rhel}
+%global with_gamepad 1
 %endif
 
+# Build documentation by default (use `rpmbuild --without docs` to override it).
+# This is used by Coverity. Coverity injects custom compiler warnings, but
+# any warning during WebKit docs build is fatal!
+%bcond_without docs
+
+Name:           webkitgtk
+Version:        2.41.1
+Release:        %autorelease
+Summary:        GTK web content engine library
+
+License:        LGPLv2
+URL:            https://www.webkitgtk.org/
+Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
+Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
+# Use the keys from https://webkitgtk.org/verifying.html
+# $ gpg --import aperez.key carlosgc.key
+# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+Source2:        webkitgtk-keys.gpg
+
+# https://commits.webkit.org/262385@main
+Patch0:         crashy-jit.patch
+
+# https://commits.webkit.org/262339@main
+# https://commits.webkit.org/262434@main
+# https://github.com/WebKit/WebKit/pull/12250
+Patch1:         build.patch
+
+BuildRequires:  bison
+BuildRequires:  bubblewrap
+BuildRequires:  cmake
+BuildRequires:  flex
+BuildRequires:  gcc-c++
+BuildRequires:  gettext
+BuildRequires:  gi-docgen
+BuildRequires:  git
+BuildRequires:  gnupg2
+BuildRequires:  gperf
+BuildRequires:  hyphen-devel
+BuildRequires:  libatomic
+BuildRequires:  ninja-build
+BuildRequires:  openssl-devel
+BuildRequires:  perl(English)
+BuildRequires:  perl(FindBin)
+BuildRequires:  perl(JSON::PP)
+BuildRequires:  python3
+BuildRequires:  ruby
+BuildRequires:  rubygems
+BuildRequires:  rubygem-json
+BuildRequires:  unifdef
+BuildRequires:  xdg-dbus-proxy
+
+BuildRequires:  pkgconfig(atspi-2)
+BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(enchant-2)
+BuildRequires:  pkgconfig(epoxy)
+BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(gtk4)
+BuildRequires:  pkgconfig(harfbuzz)
+BuildRequires:  pkgconfig(icu-uc)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libavif)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libgcrypt)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libnotify)
+BuildRequires:  pkgconfig(libopenjp2)
+BuildRequires:  pkgconfig(libpcre)
+BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libseccomp)
+BuildRequires:  pkgconfig(libsecret-1)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libsoup-3.0)
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libtasn1)
+BuildRequires:  pkgconfig(libwebp)
+BuildRequires:  pkgconfig(libwoff2dec)
+BuildRequires:  pkgconfig(libxslt)
+%if 0%{?with_gamepad}	
+BuildRequires:  pkgconfig(manette-0.2)
+%endif
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(upower-glib)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-server)
+BuildRequires:  pkgconfig(wpe-1.0)
+BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
+BuildRequires:  pkgconfig(xt)
+
+# Filter out provides for private libraries
+%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$
+
 %description
-WebKitGTK+ is the port of the portable web rendering engine WebKit to the
-GTK+ platform.
+WebKitGTK is the port of the WebKit web rendering engine to the
+GTK platform.
 
-%package	devel
-Summary:	Development files for %{name}
-Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	pkgconfig
-Requires:	gtk2-devel
-Provides:	WebKit-gtk-devel = %{version}-%{release}
-Obsoletes:	WebKit-gtk-devel < %{version}-%{release}
+%package -n     webkitgtk6.0
+Summary:        WebKitGTK for GTK 4
+Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
+Requires:       bubblewrap
+Requires:       xdg-dbus-proxy
+Recommends:     geoclue2
+Recommends:     gstreamer1-plugins-bad-free
+Recommends:     gstreamer1-plugins-good
+Recommends:     xdg-desktop-portal-gtk
+Provides:       bundled(angle)
+Provides:       bundled(pdfjs)
+Provides:       bundled(xdgmime)
+Obsoletes:      webkit2gtk5.0 < %{version}-%{release}
 
-%description	devel
-The %{name}-devel package contains libraries, build data, and header
-files for developing applications that use %{name}.
+%description -n webkitgtk6.0
+WebKitGTK is the port of the WebKit web rendering engine to the
+GTK platform. This package contains WebKitGTK for GTK 4.
 
+%package -n     webkit2gtk4.1
+Summary:        WebKitGTK for GTK 3 and libsoup 3
+Requires:       javascriptcoregtk4.1%{?_isa} = %{version}-%{release}
+Requires:       bubblewrap
+Requires:       xdg-dbus-proxy
+Recommends:     geoclue2
+Recommends:     gstreamer1-plugins-bad-free
+Recommends:     gstreamer1-plugins-good
+Recommends:     xdg-desktop-portal-gtk
+Provides:       bundled(angle)
+Provides:       bundled(pdfjs)
+Provides:       bundled(xdgmime)
 
-%package	doc
-Summary:	Documentation for %{name}
-Group:		Documentation
-Provides:	WebKit-doc = %{version}-%{release}
-Obsoletes:	WebKit-doc < %{version}-%{release}
+%description -n webkit2gtk4.1
+WebKitGTK is the port of the WebKit web rendering engine to the
+GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3.
 
-%description	doc
-This package contains the documentation for %{name}, including various
-LICENSE, README, and AUTHORS files.
+%package -n     webkit2gtk4.0
+Summary:        WebKitGTK for GTK 3 and libsoup 2
+Requires:       javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
+Requires:       bubblewrap
+Requires:       xdg-dbus-proxy
+Recommends:     geoclue2
+Recommends:     gstreamer1-plugins-bad-free
+Recommends:     gstreamer1-plugins-good
+Recommends:     xdg-desktop-portal-gtk
+Provides:       bundled(angle)
+Provides:       bundled(pdfjs)
+Provides:       bundled(xdgmime)
+Obsoletes:      webkitgtk4 < %{version}-%{release}
+Provides:       webkitgtk4 = %{version}-%{release}
+Obsoletes:      webkit2gtk3 < %{version}-%{release}
+Provides:       webkit2gtk3 = %{version}-%{release}
 
+%description -n webkit2gtk4.0
+WebKitGTK is the port of the WebKit web rendering engine to the
+GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2.
+
+%package -n     webkitgtk6.0-devel
+Summary:        Development files for webkitgtk6.0
+Requires:       webkitgtk6.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk6.0-devel%{?_isa} = %{version}-%{release}
+Obsoletes:      webkit2gtk5.0-devel < %{version}-%{release}
+
+%description -n webkitgtk6.0-devel
+The webkitgtk6.0-devel package contains libraries, build data, and header
+files for developing applications that use webkitgtk6.0.
+
+%package -n     webkit2gtk4.1-devel
+Summary:        Development files for webkit2gtk4.1
+Requires:       webkit2gtk4.1%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk4.1%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release}
+
+%description -n webkit2gtk4.1-devel
+The webkit2gtk4.1-devel package contains libraries, build data, and header
+files for developing applications that use webkit2gtk4.1.
+
+%package -n     webkit2gtk4.0-devel
+Summary:        Development files for webkit2gtk4.0
+Requires:       webkit2gtk4.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk4.0-devel%{?_isa} = %{version}-%{release}
+Obsoletes:      webkitgtk4-devel < %{version}-%{release}
+Provides:       webkitgtk4-devel = %{version}-%{release}
+Obsoletes:      webkit2gtk3-devel < %{version}-%{release}
+Provides:       webkit2gtk3-devel = %{version}-%{release}
+
+%description -n webkit2gtk4.0-devel
+The webkit2gtk4.0-devel package contains libraries, build data, and header
+files for developing applications that use webkit2gtk4.0.
+
+%if %{with docs}
+%package -n     webkitgtk6.0-doc
+Summary:        Documentation files for webkit2gtk5.0
+BuildArch:      noarch
+Requires:       webkitgtk6.0 = %{version}-%{release}
+Obsoletes:      webkit2gtk5.0-doc < %{version}-%{release}
+Recommends:     gi-docgen-fonts
+
+%description -n webkitgtk6.0-doc
+This package contains developer documentation for webkitgtk6.0.
+
+%package -n     webkit2gtk4.1-doc
+Summary:        Documentation files for webkit2gtk4.1
+BuildArch:      noarch
+Requires:       webkit2gtk4.1 = %{version}-%{release}
+Recommends:     gi-docgen-fonts
+
+%description -n webkit2gtk4.1-doc
+This package contains developer documentation for webkit2gtk4.1.
+
+%package -n     webkit2gtk4.0-doc
+Summary:        Documentation files for webkit2gtk4.0
+BuildArch:      noarch
+Requires:       webkit2gtk4.0 = %{version}-%{release}
+Obsoletes:      webkitgtk4-doc < %{version}-%{release}
+Provides:       webkitgtk4-doc = %{version}-%{release}
+Obsoletes:      webkit2gtk3-doc < %{version}-%{release}
+Provides:       webkit2gtk3-doc = %{version}-%{release}
+Recommends:     gi-docgen-fonts
+
+%description -n webkit2gtk4.0-doc
+This package contains developer documentation for webkit2gtk4.0.
+%endif
+
+%package -n     javascriptcoregtk6.0
+Summary:        JavaScript engine from webkitgtk6.0
+Obsoletes:      javascriptcoregtk5.0 < %{version}-%{release}
+
+%description -n javascriptcoregtk6.0
+This package contains the JavaScript engine from webkitgtk6.0.
+
+%package -n     javascriptcoregtk4.1
+Summary:        JavaScript engine from webkit2gtk4.1
+Obsoletes:      webkit2gtk4.1-jsc < %{version}-%{release}
+
+%description -n javascriptcoregtk4.1
+This package contains the JavaScript engine from webkit2gtk4.1.
+
+%package -n     javascriptcoregtk4.0
+Summary:        JavaScript engine from webkit2gtk4.0
+Obsoletes:      webkitgtk4-jsc < %{version}-%{release}
+Provides:       webkitgtk4-jsc = %{version}-%{release}
+Obsoletes:      webkit2gtk3-jsc < %{version}-%{release}
+Provides:       webkit2gtk3-jsc = %{version}-%{release}
+
+%description -n javascriptcoregtk4.0
+This package contains the JavaScript engine from webkit2gtk4.0.
+
+%package -n     javascriptcoregtk6.0-devel
+Summary:        Development files for JavaScript engine from webkitgtk6.0
+Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
+Obsoletes:      javascriptcoregtk5.0-devel < %{version}-%{release}
+
+%description -n javascriptcoregtk6.0-devel
+The javascriptcoregtk6.0-devel package contains libraries, build data, and header
+files for developing applications that use JavaScript engine from webkitgtk-6.0.
+
+%package -n     javascriptcoregtk4.1-devel
+Summary:        Development files for JavaScript engine from webkit2gtk4.1
+Requires:       javascriptcoregtk4.1%{?_isa} = %{version}-%{release}
+Obsoletes:      webkit2gtk4.1-jsc-devel < %{version}-%{release}
+
+%description -n javascriptcoregtk4.1-devel
+The javascriptcoregtk4.1-devel package contains libraries, build data, and header
+files for developing applications that use JavaScript engine from webkit2gtk-4.1.
+
+%package -n     javascriptcoregtk4.0-devel
+Summary:        Development files for JavaScript engine from webkit2gtk4.0
+Requires:       javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
+Obsoletes:      webkitgtk4-jsc-devel < %{version}-%{release}
+Provides:       webkitgtk4-jsc-devel = %{version}-%{release}
+Obsoletes:      webkit2gtk3-jsc-devel < %{version}-%{release}
+Provides:       webkit2gtk3-jsc-devel = %{version}-%{release}
+
+%description -n javascriptcoregtk4.0-devel
+The javascriptcoregtk4.0-devel package contains libraries, build data, and header
+files for developing applications that use JavaScript engine from webkit2gtk-4.0.
 
 %prep
-%setup -qn "webkit-%{version}"
-# %patch1 -p1 -b .no-execmem
-%patch2 -p1 -b .nspluginwrapper
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%autosetup -p1 -n webkitgtk-%{version}
 
 %build
-CFLAGS="%optflags -DLIBSOUP_I_HAVE_READ_BUG_594377_AND_KNOW_SOUP_PASSWORD_MANAGER_MIGHT_GO_AWAY" %configure							\
-			--disable-jit				\
-			--enable-geolocation			\
-%{?with_3dtransforms:	--enable-3D-transforms		}	\
-%{?with_coverage:	--enable-coverage		}	\
-%{?with_debug:		--enable-debug			}	\
-%{?with_pango:		--with-font-backend=pango	}	\
-%{?with_svg:		--enable-svg-filters		}	\
-%{?with_wml:		--enable-wml			}
+# Increase the DIE limit so our debuginfo packages can be size-optimized.
+# This previously decreased the size for x86_64 from ~5G to ~1.1G, but as of
+# 2022 it's more like 850 MB -> 675 MB. This requires lots of RAM on the
+# builders, so only do this for x86_64 and aarch64 to avoid overwhelming
+# builders with less RAM.
+# https://bugzilla.redhat.com/show_bug.cgi?id=1456261
+%global _dwz_max_die_limit_x86_64 250000000
+%global _dwz_max_die_limit_aarch64 250000000
 
-mkdir -p DerivedSources/
+# Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
+%global _find_debuginfo_opts %limit_build -m 32768
 
-make %{?_smp_mflags}
+# Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more.
+# https://bugs.webkit.org/show_bug.cgi?id=140176
+# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
+%ifarch %{ix86}
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
+%endif
+
+# JIT is broken on ARM systems with new ARMv8.5 BTI extension at the moment
+# Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2130009
+# Cf. https://bugs.webkit.org/show_bug.cgi?id=245697
+# Disable BTI until this is fixed upstream.
+%ifarch aarch64
+%global optflags %(echo %{optflags} | sed 's/-mbranch-protection=standard /-mbranch-protection=pac-ret /')
+%endif
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
+%cmake \
+  -GNinja \
+  -DPORT=GTK \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DUSE_GTK4=ON \
+%if %{without docs}
+  -DENABLE_DOCUMENTATION=OFF \
+%endif
+%if !0%{?with_gamepad}
+  -DENABLE_GAMEPAD=OFF \
+%endif
+%if 0%{?rhel}
+%ifarch aarch64
+  -DUSE_64KB_PAGE_BLOCK=ON \
+%endif
+%endif
+  %{nil}
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+%cmake \
+  -GNinja \
+  -DPORT=GTK \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DENABLE_WEBDRIVER=OFF \
+%if %{without docs}
+  -DENABLE_DOCUMENTATION=OFF \
+%endif
+%if !0%{?with_gamepad}
+  -DENABLE_GAMEPAD=OFF \
+%endif
+%if 0%{?rhel}
+%ifarch aarch64
+  -DUSE_64KB_PAGE_BLOCK=ON \
+%endif
+%endif
+  %{nil}
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
+%cmake \
+  -GNinja \
+  -DPORT=GTK \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DUSE_SOUP2=ON \
+  -DENABLE_WEBDRIVER=OFF \
+%if %{without docs}
+  -DENABLE_DOCUMENTATION=OFF \
+%endif
+%if !0%{?with_gamepad}
+  -DENABLE_GAMEPAD=OFF \
+%endif
+%if 0%{?rhel}
+%ifarch aarch64
+  -DUSE_64KB_PAGE_BLOCK=ON \
+%endif
+%endif
+  %{nil}
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
+export NINJA_STATUS="[1/3][%f/%t %es] "
+%cmake_build %limit_build -m 3072
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+export NINJA_STATUS="[2/3][%f/%t %es] "
+%cmake_build %limit_build -m 3072
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
+export NINJA_STATUS="[3/3][%f/%t %es] "
+%cmake_build %limit_build -m 3072
 
 %install
-rm -rf %{buildroot}
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
+%cmake_install
 
-make install DESTDIR=%{buildroot}
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+%cmake_install
 
-chrpath --delete Programs/GtkLauncher
-install -d -m 755 %{buildroot}%{_libexecdir}/%{name}
-install -m 755 Programs/GtkLauncher %{buildroot}%{_libexecdir}/%{name}
-%find_lang webkit
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
+%cmake_install
 
-## Finally, copy over and rename the various files for %%doc inclusion.
-%add_to_doc_files JavaScriptCore/icu/LICENSE
-%add_to_doc_files WebKit/LICENSE
-%add_to_doc_files WebCore/icu/LICENSE
-%add_to_doc_files WebCore/LICENSE-APPLE
-%add_to_doc_files WebCore/LICENSE-LGPL-2
-%add_to_doc_files WebCore/LICENSE-LGPL-2.1
+%find_lang WebKitGTK-6.0
+%find_lang WebKitGTK-4.1
+%find_lang WebKitGTK-4.0
 
-%add_to_doc_files JavaScriptCore/pcre/COPYING
-%add_to_doc_files JavaScriptCore/COPYING.LIB
+# Finally, copy over and rename various files for %%license inclusion
+%add_to_license_files Source/JavaScriptCore/COPYING.LIB
+%add_to_license_files Source/ThirdParty/ANGLE/LICENSE
+%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE
+%add_to_license_files Source/WebCore/LICENSE-APPLE
+%add_to_license_files Source/WebCore/LICENSE-LGPL-2
+%add_to_license_files Source/WebCore/LICENSE-LGPL-2.1
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/CodeMirror/LICENSE
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/Esprima/LICENSE
+%add_to_license_files Source/WebInspectorUI/UserInterface/External/three.js/LICENSE
+%add_to_license_files Source/WTF/icu/LICENSE
+%add_to_license_files Source/WTF/wtf/dtoa/COPYING
+%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
 
-%add_to_doc_files JavaScriptCore/icu/README
-%add_to_doc_files WebKit/gtk/po/README
+%files -n webkitgtk6.0 -f WebKitGTK-6.0.lang
+%license _license_files/*ThirdParty*
+%license _license_files/*WebCore*
+%license _license_files/*WebInspectorUI*
+%license _license_files/*WTF*
+%{_libdir}/libwebkitgtk-6.0.so.4*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/WebKit-6.0.typelib
+%{_libdir}/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
+%{_libdir}/webkitgtk-6.0/
+%{_libexecdir}/webkitgtk-6.0/
+%exclude %{_libexecdir}/webkitgtk-6.0/MiniBrowser
+%exclude %{_libexecdir}/webkitgtk-6.0/jsc
+%{_bindir}/WebKitWebDriver
 
-%add_to_doc_files JavaScriptCore/AUTHORS
-%add_to_doc_files JavaScriptCore/pcre/AUTHORS
+%files -n webkit2gtk4.1 -f WebKitGTK-4.1.lang
+%license _license_files/*ThirdParty*
+%license _license_files/*WebCore*
+%license _license_files/*WebInspectorUI*
+%license _license_files/*WTF*
+%{_libdir}/libwebkit2gtk-4.1.so.0*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/WebKit2-4.1.typelib
+%{_libdir}/girepository-1.0/WebKit2WebExtension-4.1.typelib
+%{_libdir}/webkit2gtk-4.1/
+%{_libexecdir}/webkit2gtk-4.1/
+%exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
+%exclude %{_libexecdir}/webkit2gtk-4.1/jsc
 
-%add_to_doc_files JavaScriptCore/THANKS
+%files -n webkit2gtk4.0 -f WebKitGTK-4.0.lang
+%license _license_files/*ThirdParty*
+%license _license_files/*WebCore*
+%license _license_files/*WebInspectorUI*
+%license _license_files/*WTF*
+%{_libdir}/libwebkit2gtk-4.0.so.37*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/WebKit2-4.0.typelib
+%{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib
+%{_libdir}/webkit2gtk-4.0/
+%{_libexecdir}/webkit2gtk-4.0/
+%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
+%exclude %{_libexecdir}/webkit2gtk-4.0/jsc
 
-%add_to_doc_files WebKit/gtk/NEWS
+%files -n webkitgtk6.0-devel
+%{_libexecdir}/webkitgtk-6.0/MiniBrowser
+%{_includedir}/webkitgtk-6.0/
+%exclude %{_includedir}/webkitgtk-6.0/jsc
+%{_libdir}/libwebkitgtk-6.0.so
+%{_libdir}/pkgconfig/webkitgtk-6.0.pc
+%{_libdir}/pkgconfig/webkitgtk-web-process-extension-6.0.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/WebKit-6.0.gir
+%{_datadir}/gir-1.0/WebKitWebProcessExtension-6.0.gir
 
+%files -n webkit2gtk4.1-devel
+%{_libexecdir}/webkit2gtk-4.1/MiniBrowser
+%{_includedir}/webkitgtk-4.1/
+%exclude %{_includedir}/webkitgtk-4.1/JavaScriptCore
+%exclude %{_includedir}/webkitgtk-4.1/jsc
+%{_libdir}/libwebkit2gtk-4.1.so
+%{_libdir}/pkgconfig/webkit2gtk-4.1.pc
+%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.1.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/WebKit2-4.1.gir
+%{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir
 
-%clean
-rm -rf %{buildroot}
+%files -n webkit2gtk4.0-devel
+%{_libexecdir}/webkit2gtk-4.0/MiniBrowser
+%{_includedir}/webkitgtk-4.0/
+%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore
+%exclude %{_includedir}/webkitgtk-4.0/jsc
+%{_libdir}/libwebkit2gtk-4.0.so
+%{_libdir}/pkgconfig/webkit2gtk-4.0.pc
+%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/WebKit2-4.0.gir
+%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
 
+%files -n javascriptcoregtk6.0
+%license _license_files/*JavaScriptCore*
+%{_libdir}/libjavascriptcoregtk-6.0.so.1*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/JavaScriptCore-6.0.typelib
 
-%post	-p /sbin/ldconfig
+%files -n javascriptcoregtk4.1
+%license _license_files/*JavaScriptCore*
+%{_libdir}/libjavascriptcoregtk-4.1.so.0*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib
 
-%postun	-p /sbin/ldconfig
+%files -n javascriptcoregtk4.0
+%license _license_files/*JavaScriptCore*
+%{_libdir}/libjavascriptcoregtk-4.0.so.18*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
 
+%files -n javascriptcoregtk6.0-devel
+%{_libexecdir}/webkitgtk-6.0/jsc
+%dir %{_includedir}/webkitgtk-6.0
+%{_includedir}/webkitgtk-6.0/jsc/
+%{_libdir}/libjavascriptcoregtk-6.0.so
+%{_libdir}/pkgconfig/javascriptcoregtk-6.0.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/JavaScriptCore-6.0.gir
 
-%files -f webkit.lang
-%defattr(-,root,root,-)
-%exclude %{_libdir}/*.la
-%{_libdir}/libwebkit-1.0.so.*
-%{_libexecdir}/%{name}/
+%files -n javascriptcoregtk4.1-devel
+%{_libexecdir}/webkit2gtk-4.1/jsc
+%dir %{_includedir}/webkitgtk-4.1
+%{_includedir}/webkitgtk-4.1/JavaScriptCore/
+%{_includedir}/webkitgtk-4.1/jsc/
+%{_libdir}/libjavascriptcoregtk-4.1.so
+%{_libdir}/pkgconfig/javascriptcoregtk-4.1.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/JavaScriptCore-4.1.gir
 
-%files	devel
-%defattr(-,root,root,-)
-%{_bindir}/jsc
-%{_datadir}/webkit-1.0
-%{_includedir}/webkit-1.0
-%{_libdir}/libwebkit-1.0.so
-%{_libdir}/pkgconfig/webkit-1.0.pc
+%files -n javascriptcoregtk4.0-devel
+%{_libexecdir}/webkit2gtk-4.0/jsc
+%dir %{_includedir}/webkitgtk-4.0
+%{_includedir}/webkitgtk-4.0/JavaScriptCore/
+%{_includedir}/webkitgtk-4.0/jsc/
+%{_libdir}/libjavascriptcoregtk-4.0.so
+%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
-%files	doc
-%defattr(-,root,root,-)
-%{_docdir}/%{name}-%{version}/
+%if %{with docs}
+%files -n webkitgtk6.0-doc
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/
+%{_datadir}/gtk-doc/html/webkitgtk-6.0/
+%{_datadir}/gtk-doc/html/webkitgtk-web-process-extension-6.0/
 
+%files -n webkit2gtk4.1-doc
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/
+%{_datadir}/gtk-doc/html/webkit2gtk-4.1/
+%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/
+
+%files -n webkit2gtk4.0-doc
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/
+%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
+%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/
+%endif
 
 %changelog
-* Mon Oct 04 2010 Kevin Fenzi <kevin@tummy.com> - 1.2.5-1
-- Update to 1.2.5. 
-- Fixes: CVE-2010-3113 CVE-2010-1814 CVE-2010-1812
-- Fixes: CVE-2010-1815 CVE-2010-3115 CVE-2010-1807 CVE-2010-3114
-- Fixes: CVE-2010-3116 CVE-2010-3257 CVE-2010-3259
-
-* Wed Sep 08 2010 Kevin Fenzi <kevin@tummy.com> - 1.2.4-1
-- Update to 1.2.4 which fixes: 
-- Fixes: CVE-2010-1780 CVE-2010-1782 CVE-2010-1784 CVE-2010-1785
-- Fixes: CVE-2010-1786 CVE-2010-1787 CVE-2010-1788 CVE-2010-1790
-- Fixes: CVE-2010-1792 CVE-2010-1793 CVE-2010-2648
-- Update to 1.2.3 which fixes: 
-- Fixes: CVE-2010-1386 CVE-2010-1392 CVE-2010-1405 CVE-2010-1407
-- Fixes: CVE-2010-1416 CVE-2010-1417 CVE-2010-1665 CVE-2010-1418
-- Fixes: CVE-2010-1421 CVE-2010-1422 CVE-2010-1501 CVE-2010-1767
-- Fixes: CVE-2010-1664 CVE-2010-1758 CVE-2010-1759 CVE-2010-1760
-- Fixes: CVE-2010-1761 CVE-2010-1762 CVE-2010-1770 CVE-2010-1771
-- Fixes: CVE-2010-1772 CVE-2010-1773 CVE-2010-1774 CVE-2010-2264
-- Fixes bugs: 606303 606304 615728 615729 631583
-
-* Sun Apr 11 2010 Matthias Clasen <mclasen@redhat.com> 1.2.0-1
-- Update to 1.2.0
-
-* Fri Apr 02 2010 Caolán McNamara <caolanm@redhat.com> 1.1.22-3
-- rebuild for icu 4.4
-
-* Tue Mar 23 2010 Tom "spot" Callaway <tcallawa@redhat.com> 1.1.22-2
-- apply upstream fix for sparc
-
-* Mon Feb 22 2010 Matthias Clasen <mclasen@redhat.com> 1.1.22-1
-- Update to 1.1.22
-
-* Wed Feb 10 2010 Bastien Nocera <bnocera@redhat.com> 1.1.21-1
-- Update to 1.1.21
-
-* Tue Jan 26 2010 Matthias Clasen <mclasen@redhat.com> 1.1.19-1
-- Update to 1.1.19
-
-* Sun Jan 17 2010 Matthias Clasen <mclasen@redhat.com> 1.1.18-1
-- Update to 1.1.18
-
-* Tue Dec 01 2009 Bastien Nocera <bnocera@redhat.com> 1.1.17-1
-- Update to 1.1.17
-
-* Sat Oct 31 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.15.3-1
-- Update to 1.1.15.3, more crash fixes and important media player fixes
-- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000047.html
-
-* Thu Oct 15 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.15.2-1
-- Update to 1.1.15.2, which has multiple crash and other fixes
-- See https://lists.webkit.org/pipermail/webkit-gtk/2009-October/000040.html
-
-* Thu Sep 24 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.15.1-3
-- Forcibly disable JIT until we can properly resolve the execmem-caused
-  segfaulting. (Temporary workaround until bug #516057 can be properly fixed.)
-- Remove the gnome-keyring build option (no longer used by the build scripts).
-- Correct release value of previous %%changelog entry.
-
-* Wed Sep 23 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.15.1-2
-- Update to 1.1.15.1
-
-* Mon Sep 14 2009 Bastien Nocera <bnocera@redhat.com> 1.1.14-3
-- Add support for nspluginwrapper plugins
-
-* Tue Sep 08 2009 Karsten Hopp <karsten@redhat.com> 1.1.14-2
-- bump release and rebuild as the package was linked with an old libicu
-  during the mass rebuild on s390x
-
-* Mon Sep  7 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.14-1
-- Update to 1.1.14
-
-* Tue Aug 25 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.13-1
-- Update to 1.1.13
-
-* Sat Aug 22 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.12-2
-- Add patch to forcibly disable RWX memory in the x86/x86-64 assembler.
-  + no-execmem.patch
-- Use %%add_to_doc_files to add the gtk/NEWS file instead of %%doc, which
-  clobbered the doc files before they could be properly installed to the -doc
-  subpackage.
-- Resolves: #516057 (gets whacked by selinux execmem check) and #518693
-  (webkitgtk-doc package effectively empty).
-- Update minimum required libsoup version.
-
-* Tue Jul 28 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.12-1
-- Update to 1.1.12
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.11-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 13 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.11-1
-- Update to 1.1.11
-
-* Wed Jul 08 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.10-3
-- Move jsc to the -devel subpackage (#510355).
-
-* Sat Jul 04 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.10-2
-- Invoke chrpath to remove the hardcoded RPATH in GtkLauncher.
-- Remove unnecessary libtool build dependency.
-
-* Tue Jun 16 2009 Matthias Clasen <mclasen@redhat.com> - 1.1.10-1
-- Update to 1.1.10
-
-* Sat Jun 13 2009 Dennis Gilmore <dennis@ausil.us> - 1.1.8-2
-- _atomic_word is not always an int
-
-* Fri May 29 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.8-1
-- Update to new upstream release (1.1.8)
-
-* Thu May 28 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.7-1
-- Update to new upstream release (1.1.7)
-- Remove jit build conditional. (JIT is now enabled by default on platforms
-  which support it: currently 32- and 64-bit x86.)
-- Fix installation of the GtkLauncher demo program so that it
-  is a binary and not a script. (Fixes bug #443048.)
-
-* Sat May 09 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.6-1
-- Update to new upstream release (1.1.6).
-- Drop workaround for bug 488112 (fixed upstream).
-- Fixes bug 484335 (Copy link locations to the primary selection; patched
-  upstream).
-- Include upstream changelog (NEWS) as part of the installed documentation.
-- Fix capitalization in previous %%changelog entry.
-- Add build-time conditional support for 3-D transforms (default off).
-
-* Sat May 09 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.1.4-2
-- Rebuild against new icu
-
-* Tue Apr 07 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.4-1
-- Update to new upstream release (1.1.4)
-- Enable building with geolocation support.
-- Add build-time conditional for enabling code coverage checking (coverage).
-- Remove html5video conditional and update dependencies accordingly. (HTML5
-  video embedding support is now enabled by default by upstream.)
-
-* Sun Mar 15 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.3-1
-- Rename from WebKit-gtk and friends to WebKitGTK and subpackages.
-- Update to new upstream release (1.1.3)
-- Clean up the add_to_doc_files macro usage.
-
-* Sat Mar 07 2009 Peter Gordon <peter@thecodergeek.com> - 1.1.1-1
-- Update to new upstream release (1.1.1), includes a soname bump.
-- Enable gnome-keyring support.
-
-* Wed Mar  4 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.1.0-0.21.svn41071
-- Compile libJavaScriptCore.a with -fno-strict-aliasing to
-  do workaround for #488112
-
-* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.0-0.20.svn41071
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 20 2009 Peter Gordon <peter@thecodergeek.com> 1.1.0-0.19.svn41071
-- Update to new upstream snapshot (SVN 41071).
-- Drop libsoup build conditional. Use libsoup as default HTTP backend instead
-  of cURL, following upstream's default.
-
-* Fri Jan 30 2009 Peter Gordon <peter@thecodergeek.com> 1.1.0-0.18.svn40351
-- Fix ownership of doc directory...this time without the oops (#473619).
-- Bump package version number to match that used in the configure/build
-  scripts. (Thanks to Martin Sourada for the bug report via email.)
-
-* Thu Jan 29 2009 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.17.svn40351
-- Update to new upstream snapshot (SVN 40351): adds the WebPolicyDelegate
-  implementaton and related API (#482739).
-- Drop Bison 2.4 patch (fixed upstream):
-  - bison24.patch
-- Fixes CVE-2008-6059: Sensitive information disclosure from cookies via
-  XMLHttpRequest calls (#484197).
-
-* Sat Nov 29 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.16.svn39370
-- Update to new upstream snapshot (SVN 39370)
-- Fix ownership of %%_docdir in the doc subpackage. 
-- Resolves: bug 473619 (WebKit : Unowned directories).
-- Adds webinspector data to the gtk-devel subpackage.
-- Add patch from upstream bug 22205 to fix compilation errors with Bison 2.4:
-  + bison24.patch
-- Add build-time conditional for WML support.
-
-* Thu Oct 23 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.15.svn37790
-- Update to new upstream snapshot (SVN 37790).
-- Default to freetype font backend for improved CJK/Unicode support. (#448693)
-- Add some notes to the build options comments block.
-- Add a build-time conditional for jit
-
-* Sun Aug 24 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.14.svn35904
-- Update to new upstream snapshot (SVN 35904)
-
-* Fri Jul 04 2008 Peter Gordon <peter@thecodergeek.com>
-- Remove outdated and unnecessary GCC 4.3 patch:
-  - gcc43.patch
-- Fix the curl-devel BuildRequire conditional. (It is only needed when building
-  against curl instead of libsoup.)
-
-* Thu Jun 12 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.13.svn34655
-- Update to new upstream snapshot (SVN 34655)
-- Add some build-time conditionals for non-default features: debug, 
-  html5video, libsoup, pango, svg. 
-
-* Tue Jun  3 2008 Caolán McNamara <caolanm@redhat.com> - 1.0.0-0.12.svn34279
-- rebuild for new icu
-
-* Tue Jun  3 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.0.0-0.11.svn34279
-- Update to new upstream snapshot (SVN 34279) anyway
-- Add BR: libXt-devel
-
-* Tue Apr 29 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.10.svn32531
-- Remove the -Qt subpackage stuff. QtWebKit is now included in Qt proper, as
-  of qt-4.4.0-0.6.rc1. (We no longer need separate build-qt and build-gtk
-  subdirectories either.)
-- Reference: bug 442200 (RFE: WebKit Migration)
-- Add libjpeg dependency (was previously pulled in by the qt4-devel dependency
-  tree).
-
-* Mon Apr 28 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.0.0-0.9.svn32531
-- Update to new upstream snapshot (SVN 32531).
-- Fix bug 443048 and hopefully fix bug 444445
-- Modify the process of building GTK+ port a bit
-- on qt port WebKit/qt/Plugins is not built for qt >= 4.4.0
-
-* Sat Apr 12 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.8.svn31787
-- Update to new upstream snapshot (SVN 31787).
-- Resolves: CVE-2008-1010 (bug 438532: Arbitrary code execution) and
-  CVE-2008-1011 (bug 438531: Cross-Site Scripting).
-- Switch to using autotools for building the GTK+ port.
-
-* Wed Mar 05 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.7.svn30667
-- Fix the WebKitGtk pkgconfig data (should depend on gtk+-2.0). Resolves
-  bug 436073 (Requires: gtk+-2.0 missing from WebKitGtk.pc).
-- Thanks to Mamoru Tasaka for helping find and squash these many bugs. 
-  
-* Sat Mar 01 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.6.svn30667
-- Fix include directory naming. Resolves: bug 435561 (Header file <> header
-  file location mismatch)
-- Remove qt4-devel runtime dependency and .prl file from WebKit-gtk-devel.
-  Resolves: bug 433138 (WebKit-gtk-devel has a requirement on qt4-devel) 
-
-* Fri Feb 29 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.5.svn30667
-- Update to new upstream snapshot (SVN 30667)
-- Add some build fixes for GCC 4.3:
-  + gcc43.patch
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.0-0.5.svn29336
-- Autorebuild for GCC 4.3
-
-* Wed Jan 09 2008 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.4.svn29336
-- Update to new upstream snapshot (SVN 29336).
-- Drop TCSpinLock pthread workaround (fixed upstream):
-  - TCSpinLock-use-pthread-stubs.patch
-
-* Thu Dec 06 2007 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.3.svn28482
-- Add proper %%defattr line to qt, qt-devel, and doc subpackages.
-- Add patch to forcibly build the TCSpinLock code using the pthread
-  implementation:
-  + TCSpinLock-use-pthread-stubs.patch
-
-* Thu Dec 06 2007 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.2.svn28482
-- Package renamed from WebKitGtk.
-- Update to SVN 28482.
-- Build both the GTK and Qt ports, putting each into their own respective
-  subpackages.
-- Invoke qmake-qt4 and make directly (with SMP build flags) instead of using
-  the build-webkit script from upstream.
-- Add various AUTHORS, README, and LICENSE files (via the doc subpackage). 
-
-* Tue Dec 04 2007 Peter Gordon <peter@thecodergeek.com> 1.0.0-0.1.svn28383
-- Initial packaging for Fedora.
+%autochangelog