Compare commits
No commits in common. "c8" and "imports/c9/webkit2gtk3-2.38.5-1.el9_2.1" have entirely different histories.
c8
...
imports/c9
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,2 @@
|
|||||||
SOURCES/webkitgtk-2.42.5.tar.xz
|
SOURCES/webkitgtk-2.38.5.tar.xz
|
||||||
SOURCES/webkitgtk-keys.gpg
|
SOURCES/webkitgtk-keys.gpg
|
||||||
|
2
.webkit2gtk3.metadata
Normal file
2
.webkit2gtk3.metadata
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
1774390c628bb3a524d4ed76f11de4a878078db6 SOURCES/webkitgtk-2.38.5.tar.xz
|
||||||
|
cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg
|
638
SOURCES/CVE-2023-28205.patch
Normal file
638
SOURCES/CVE-2023-28205.patch
Normal file
@ -0,0 +1,638 @@
|
|||||||
|
From 1039f0c3235ffd9a6584657adb34db10c562e4af Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mark Lam <mark.lam@apple.com>
|
||||||
|
Date: Fri, 31 Mar 2023 10:49:49 -0700
|
||||||
|
Subject: [PATCH] Cherry-pick 2c49ff7b0481. rdar://problem/107369977
|
||||||
|
|
||||||
|
CloneDeserializer::deserialize() should store cell pointers in a MarkedVector.
|
||||||
|
https://bugs.webkit.org/show_bug.cgi?id=254797
|
||||||
|
rdar://107369977
|
||||||
|
|
||||||
|
Reviewed by Justin Michaud.
|
||||||
|
|
||||||
|
Previously, CloneDeserializer::deserialize() was storing pointers to newly created objects
|
||||||
|
in a few Vectors. This is problematic because the GC is not aware of Vectors, and cannot
|
||||||
|
scan them. In this patch, we refactor the MarkedArgumentBuffer class into a MarkedVector
|
||||||
|
template class that offer 2 enhancements:
|
||||||
|
|
||||||
|
1. It can be configured to store specific types of cell pointer types. This avoids us
|
||||||
|
having to constantly cast JSValues into these pointers.
|
||||||
|
|
||||||
|
2. It allows us to specify the type of OverflowHandler we want to use. In this case,
|
||||||
|
we want to use CrashOnOverflow. The previous MarkedArgumentBuffer always assumes
|
||||||
|
RecordOnOverflow. This allows us to avoid having to manually check for overflows,
|
||||||
|
or have to use appendWithCrashOnOverflow. For our current needs, MarkedVector can be
|
||||||
|
used as a drop in replacement for Vector.
|
||||||
|
|
||||||
|
And we fix the CloneDeserializer::deserialize() issue by replacing the use of Vectors
|
||||||
|
with MarkedVector instead.
|
||||||
|
|
||||||
|
* Source/JavaScriptCore/heap/Heap.cpp:
|
||||||
|
(JSC::Heap::addCoreConstraints):
|
||||||
|
* Source/JavaScriptCore/heap/Heap.h:
|
||||||
|
* Source/JavaScriptCore/heap/HeapInlines.h:
|
||||||
|
* Source/JavaScriptCore/runtime/ArgList.cpp:
|
||||||
|
(JSC::MarkedVectorBase::addMarkSet):
|
||||||
|
(JSC::MarkedVectorBase::markLists):
|
||||||
|
(JSC::MarkedVectorBase::slowEnsureCapacity):
|
||||||
|
(JSC::MarkedVectorBase::expandCapacity):
|
||||||
|
(JSC::MarkedVectorBase::slowAppend):
|
||||||
|
(JSC::MarkedArgumentBufferBase::addMarkSet): Deleted.
|
||||||
|
(JSC::MarkedArgumentBufferBase::markLists): Deleted.
|
||||||
|
(JSC::MarkedArgumentBufferBase::slowEnsureCapacity): Deleted.
|
||||||
|
(JSC::MarkedArgumentBufferBase::expandCapacity): Deleted.
|
||||||
|
(JSC::MarkedArgumentBufferBase::slowAppend): Deleted.
|
||||||
|
* Source/JavaScriptCore/runtime/ArgList.h:
|
||||||
|
(JSC::MarkedVectorWithSize::MarkedVectorWithSize):
|
||||||
|
(JSC::MarkedVectorWithSize::at const):
|
||||||
|
(JSC::MarkedVectorWithSize::clear):
|
||||||
|
(JSC::MarkedVectorWithSize::append):
|
||||||
|
(JSC::MarkedVectorWithSize::appendWithCrashOnOverflow):
|
||||||
|
(JSC::MarkedVectorWithSize::last const):
|
||||||
|
(JSC::MarkedVectorWithSize::takeLast):
|
||||||
|
(JSC::MarkedVectorWithSize::ensureCapacity):
|
||||||
|
(JSC::MarkedVectorWithSize::hasOverflowed):
|
||||||
|
(JSC::MarkedVectorWithSize::fill):
|
||||||
|
(JSC::MarkedArgumentBufferWithSize::MarkedArgumentBufferWithSize): Deleted.
|
||||||
|
* Source/WebCore/Modules/webaudio/AudioWorkletProcessor.cpp:
|
||||||
|
(WebCore::AudioWorkletProcessor::buildJSArguments):
|
||||||
|
* Source/WebCore/Modules/webaudio/AudioWorkletProcessor.h:
|
||||||
|
* Source/WebCore/bindings/js/SerializedScriptValue.cpp:
|
||||||
|
(WebCore::CloneDeserializer::deserialize):
|
||||||
|
|
||||||
|
Canonical link: https://commits.webkit.org/259548.530@safari-7615-branch
|
||||||
|
|
||||||
|
Identifier: 259548.395@safari-7615.1.26.11-branch
|
||||||
|
---
|
||||||
|
Source/JavaScriptCore/heap/Heap.cpp | 4 +-
|
||||||
|
Source/JavaScriptCore/heap/Heap.h | 8 +-
|
||||||
|
Source/JavaScriptCore/heap/HeapInlines.h | 2 +-
|
||||||
|
Source/JavaScriptCore/runtime/ArgList.cpp | 46 ++--
|
||||||
|
Source/JavaScriptCore/runtime/ArgList.h | 206 ++++++++++--------
|
||||||
|
.../webaudio/AudioWorkletProcessor.cpp | 4 +-
|
||||||
|
.../Modules/webaudio/AudioWorkletProcessor.h | 7 +-
|
||||||
|
.../bindings/js/SerializedScriptValue.cpp | 11 +-
|
||||||
|
8 files changed, 158 insertions(+), 130 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp
|
||||||
|
index d773eb9e79d6..37bf0e94b266 100644
|
||||||
|
--- a/Source/JavaScriptCore/heap/Heap.cpp
|
||||||
|
+++ b/Source/JavaScriptCore/heap/Heap.cpp
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (C) 2003-2022 Apple Inc. All rights reserved.
|
||||||
|
+ * Copyright (C) 2003-2023 Apple Inc. All rights reserved.
|
||||||
|
* Copyright (C) 2007 Eric Seidel <eric@webkit.org>
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
@@ -2854,7 +2854,7 @@ void Heap::addCoreConstraints()
|
||||||
|
|
||||||
|
if (!m_markListSet.isEmpty()) {
|
||||||
|
SetRootMarkReasonScope rootScope(visitor, RootMarkReason::ConservativeScan);
|
||||||
|
- MarkedArgumentBufferBase::markLists(visitor, m_markListSet);
|
||||||
|
+ MarkedVectorBase::markLists(visitor, m_markListSet);
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
diff --git a/Source/JavaScriptCore/heap/Heap.h b/Source/JavaScriptCore/heap/Heap.h
|
||||||
|
index d6cb99c4e4b5..315d62e50b1d 100644
|
||||||
|
--- a/Source/JavaScriptCore/heap/Heap.h
|
||||||
|
+++ b/Source/JavaScriptCore/heap/Heap.h
|
||||||
|
@@ -1,7 +1,7 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
|
||||||
|
* Copyright (C) 2001 Peter Kelly (pmk@post.com)
|
||||||
|
- * Copyright (C) 2003-2022 Apple Inc. All rights reserved.
|
||||||
|
+ * Copyright (C) 2003-2023 Apple Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
@@ -85,7 +85,7 @@ class MarkStackArray;
|
||||||
|
class MarkStackMergingConstraint;
|
||||||
|
class MarkedJSValueRefArray;
|
||||||
|
class BlockDirectory;
|
||||||
|
-class MarkedArgumentBufferBase;
|
||||||
|
+class MarkedVectorBase;
|
||||||
|
class MarkingConstraint;
|
||||||
|
class MarkingConstraintSet;
|
||||||
|
class MutatorScheduler;
|
||||||
|
@@ -413,7 +413,7 @@ class Heap {
|
||||||
|
JS_EXPORT_PRIVATE std::unique_ptr<TypeCountSet> protectedObjectTypeCounts();
|
||||||
|
JS_EXPORT_PRIVATE std::unique_ptr<TypeCountSet> objectTypeCounts();
|
||||||
|
|
||||||
|
- HashSet<MarkedArgumentBufferBase*>& markListSet();
|
||||||
|
+ HashSet<MarkedVectorBase*>& markListSet();
|
||||||
|
void addMarkedJSValueRefArray(MarkedJSValueRefArray*);
|
||||||
|
|
||||||
|
template<typename Functor> void forEachProtectedCell(const Functor&);
|
||||||
|
@@ -782,7 +782,7 @@ class Heap {
|
||||||
|
size_t m_deprecatedExtraMemorySize { 0 };
|
||||||
|
|
||||||
|
ProtectCountSet m_protectedValues;
|
||||||
|
- HashSet<MarkedArgumentBufferBase*> m_markListSet;
|
||||||
|
+ HashSet<MarkedVectorBase*> m_markListSet;
|
||||||
|
SentinelLinkedList<MarkedJSValueRefArray, BasicRawSentinelNode<MarkedJSValueRefArray>> m_markedJSValueRefArrays;
|
||||||
|
|
||||||
|
std::unique_ptr<MachineThreads> m_machineThreads;
|
||||||
|
diff --git a/Source/JavaScriptCore/heap/HeapInlines.h b/Source/JavaScriptCore/heap/HeapInlines.h
|
||||||
|
index f91546bb62c4..8e33eaae4a4f 100644
|
||||||
|
--- a/Source/JavaScriptCore/heap/HeapInlines.h
|
||||||
|
+++ b/Source/JavaScriptCore/heap/HeapInlines.h
|
||||||
|
@@ -205,7 +205,7 @@ inline void Heap::decrementDeferralDepthAndGCIfNeeded()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-inline HashSet<MarkedArgumentBufferBase*>& Heap::markListSet()
|
||||||
|
+inline HashSet<MarkedVectorBase*>& Heap::markListSet()
|
||||||
|
{
|
||||||
|
return m_markListSet;
|
||||||
|
}
|
||||||
|
diff --git a/Source/JavaScriptCore/runtime/ArgList.cpp b/Source/JavaScriptCore/runtime/ArgList.cpp
|
||||||
|
index f2815b80c8c7..a72dea74a56f 100644
|
||||||
|
--- a/Source/JavaScriptCore/runtime/ArgList.cpp
|
||||||
|
+++ b/Source/JavaScriptCore/runtime/ArgList.cpp
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (C) 2003-2021 Apple Inc. All rights reserved.
|
||||||
|
+ * Copyright (C) 2003-2023 Apple Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Library General Public
|
||||||
|
@@ -27,7 +27,7 @@ using std::min;
|
||||||
|
|
||||||
|
namespace JSC {
|
||||||
|
|
||||||
|
-void MarkedArgumentBufferBase::addMarkSet(JSValue v)
|
||||||
|
+void MarkedVectorBase::addMarkSet(JSValue v)
|
||||||
|
{
|
||||||
|
if (m_markSet)
|
||||||
|
return;
|
||||||
|
@@ -52,47 +52,47 @@ void ArgList::getSlice(int startIndex, ArgList& result) const
|
||||||
|
}
|
||||||
|
|
||||||
|
template<typename Visitor>
|
||||||
|
-void MarkedArgumentBufferBase::markLists(Visitor& visitor, ListSet& markSet)
|
||||||
|
+void MarkedVectorBase::markLists(Visitor& visitor, ListSet& markSet)
|
||||||
|
{
|
||||||
|
ListSet::iterator end = markSet.end();
|
||||||
|
for (ListSet::iterator it = markSet.begin(); it != end; ++it) {
|
||||||
|
- MarkedArgumentBufferBase* list = *it;
|
||||||
|
+ MarkedVectorBase* list = *it;
|
||||||
|
for (int i = 0; i < list->m_size; ++i)
|
||||||
|
visitor.appendUnbarriered(JSValue::decode(list->slotFor(i)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
-template void MarkedArgumentBufferBase::markLists(AbstractSlotVisitor&, ListSet&);
|
||||||
|
-template void MarkedArgumentBufferBase::markLists(SlotVisitor&, ListSet&);
|
||||||
|
+template void MarkedVectorBase::markLists(AbstractSlotVisitor&, ListSet&);
|
||||||
|
+template void MarkedVectorBase::markLists(SlotVisitor&, ListSet&);
|
||||||
|
|
||||||
|
-void MarkedArgumentBufferBase::slowEnsureCapacity(size_t requestedCapacity)
|
||||||
|
+auto MarkedVectorBase::slowEnsureCapacity(size_t requestedCapacity) -> Status
|
||||||
|
{
|
||||||
|
setNeedsOverflowCheck();
|
||||||
|
auto checkedNewCapacity = CheckedInt32(requestedCapacity);
|
||||||
|
if (UNLIKELY(checkedNewCapacity.hasOverflowed()))
|
||||||
|
- return this->overflowed();
|
||||||
|
- expandCapacity(checkedNewCapacity);
|
||||||
|
+ return Status::Overflowed;
|
||||||
|
+ return expandCapacity(checkedNewCapacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
-void MarkedArgumentBufferBase::expandCapacity()
|
||||||
|
+auto MarkedVectorBase::expandCapacity() -> Status
|
||||||
|
{
|
||||||
|
setNeedsOverflowCheck();
|
||||||
|
auto checkedNewCapacity = CheckedInt32(m_capacity) * 2;
|
||||||
|
if (UNLIKELY(checkedNewCapacity.hasOverflowed()))
|
||||||
|
- return this->overflowed();
|
||||||
|
- expandCapacity(checkedNewCapacity);
|
||||||
|
+ return Status::Overflowed;
|
||||||
|
+ return expandCapacity(checkedNewCapacity);
|
||||||
|
}
|
||||||
|
|
||||||
|
-void MarkedArgumentBufferBase::expandCapacity(int newCapacity)
|
||||||
|
+auto MarkedVectorBase::expandCapacity(int newCapacity) -> Status
|
||||||
|
{
|
||||||
|
setNeedsOverflowCheck();
|
||||||
|
ASSERT(m_capacity < newCapacity);
|
||||||
|
auto checkedSize = CheckedSize(newCapacity) * sizeof(EncodedJSValue);
|
||||||
|
if (UNLIKELY(checkedSize.hasOverflowed()))
|
||||||
|
- return this->overflowed();
|
||||||
|
+ return Status::Overflowed;
|
||||||
|
EncodedJSValue* newBuffer = static_cast<EncodedJSValue*>(Gigacage::tryMalloc(Gigacage::JSValue, checkedSize));
|
||||||
|
if (!newBuffer)
|
||||||
|
- return this->overflowed();
|
||||||
|
+ return Status::Overflowed;
|
||||||
|
for (int i = 0; i < m_size; ++i) {
|
||||||
|
newBuffer[i] = m_buffer[i];
|
||||||
|
addMarkSet(JSValue::decode(m_buffer[i]));
|
||||||
|
@@ -103,21 +103,23 @@ void MarkedArgumentBufferBase::expandCapacity(int newCapacity)
|
||||||
|
|
||||||
|
m_buffer = newBuffer;
|
||||||
|
m_capacity = newCapacity;
|
||||||
|
+ return Status::Success;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void MarkedArgumentBufferBase::slowAppend(JSValue v)
|
||||||
|
+auto MarkedVectorBase::slowAppend(JSValue v) -> Status
|
||||||
|
{
|
||||||
|
ASSERT(m_size <= m_capacity);
|
||||||
|
- if (m_size == m_capacity)
|
||||||
|
- expandCapacity();
|
||||||
|
- if (UNLIKELY(Base::hasOverflowed())) {
|
||||||
|
- ASSERT(m_needsOverflowCheck);
|
||||||
|
- return;
|
||||||
|
+ if (m_size == m_capacity) {
|
||||||
|
+ auto status = expandCapacity();
|
||||||
|
+ if (status == Status::Overflowed) {
|
||||||
|
+ ASSERT(m_needsOverflowCheck);
|
||||||
|
+ return status;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
-
|
||||||
|
slotFor(m_size) = JSValue::encode(v);
|
||||||
|
++m_size;
|
||||||
|
addMarkSet(v);
|
||||||
|
+ return Status::Success;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace JSC
|
||||||
|
diff --git a/Source/JavaScriptCore/runtime/ArgList.h b/Source/JavaScriptCore/runtime/ArgList.h
|
||||||
|
index 8ea9b0e308b8..07632263266b 100644
|
||||||
|
--- a/Source/JavaScriptCore/runtime/ArgList.h
|
||||||
|
+++ b/Source/JavaScriptCore/runtime/ArgList.h
|
||||||
|
@@ -28,20 +28,20 @@
|
||||||
|
|
||||||
|
namespace JSC {
|
||||||
|
|
||||||
|
-class alignas(alignof(EncodedJSValue)) MarkedArgumentBufferBase : public RecordOverflow {
|
||||||
|
- WTF_MAKE_NONCOPYABLE(MarkedArgumentBufferBase);
|
||||||
|
- WTF_MAKE_NONMOVABLE(MarkedArgumentBufferBase);
|
||||||
|
+class alignas(alignof(EncodedJSValue)) MarkedVectorBase {
|
||||||
|
+ WTF_MAKE_NONCOPYABLE(MarkedVectorBase);
|
||||||
|
+ WTF_MAKE_NONMOVABLE(MarkedVectorBase);
|
||||||
|
WTF_FORBID_HEAP_ALLOCATION;
|
||||||
|
friend class VM;
|
||||||
|
friend class ArgList;
|
||||||
|
|
||||||
|
+protected:
|
||||||
|
+ enum class Status { Success, Overflowed };
|
||||||
|
public:
|
||||||
|
- using Base = RecordOverflow;
|
||||||
|
- typedef HashSet<MarkedArgumentBufferBase*> ListSet;
|
||||||
|
+ typedef HashSet<MarkedVectorBase*> ListSet;
|
||||||
|
|
||||||
|
- ~MarkedArgumentBufferBase()
|
||||||
|
+ ~MarkedVectorBase()
|
||||||
|
{
|
||||||
|
- ASSERT(!m_needsOverflowCheck);
|
||||||
|
if (m_markSet)
|
||||||
|
m_markSet->remove(this);
|
||||||
|
|
||||||
|
@@ -52,92 +52,20 @@ class alignas(alignof(EncodedJSValue)) MarkedArgumentBufferBase : public RecordO
|
||||||
|
size_t size() const { return m_size; }
|
||||||
|
bool isEmpty() const { return !m_size; }
|
||||||
|
|
||||||
|
- JSValue at(int i) const
|
||||||
|
- {
|
||||||
|
- if (i >= m_size)
|
||||||
|
- return jsUndefined();
|
||||||
|
-
|
||||||
|
- return JSValue::decode(slotFor(i));
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- void clear()
|
||||||
|
- {
|
||||||
|
- ASSERT(!m_needsOverflowCheck);
|
||||||
|
- clearOverflow();
|
||||||
|
- m_size = 0;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- enum OverflowCheckAction {
|
||||||
|
- CrashOnOverflow,
|
||||||
|
- WillCheckLater
|
||||||
|
- };
|
||||||
|
- template<OverflowCheckAction action>
|
||||||
|
- void appendWithAction(JSValue v)
|
||||||
|
- {
|
||||||
|
- ASSERT(m_size <= m_capacity);
|
||||||
|
- if (m_size == m_capacity || mallocBase()) {
|
||||||
|
- slowAppend(v);
|
||||||
|
- if (action == CrashOnOverflow)
|
||||||
|
- RELEASE_ASSERT(!hasOverflowed());
|
||||||
|
- return;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- slotFor(m_size) = JSValue::encode(v);
|
||||||
|
- ++m_size;
|
||||||
|
- }
|
||||||
|
- void append(JSValue v) { appendWithAction<WillCheckLater>(v); }
|
||||||
|
- void appendWithCrashOnOverflow(JSValue v) { appendWithAction<CrashOnOverflow>(v); }
|
||||||
|
-
|
||||||
|
void removeLast()
|
||||||
|
{
|
||||||
|
ASSERT(m_size);
|
||||||
|
m_size--;
|
||||||
|
}
|
||||||
|
|
||||||
|
- JSValue last()
|
||||||
|
- {
|
||||||
|
- ASSERT(m_size);
|
||||||
|
- return JSValue::decode(slotFor(m_size - 1));
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- JSValue takeLast()
|
||||||
|
- {
|
||||||
|
- JSValue result = last();
|
||||||
|
- removeLast();
|
||||||
|
- return result;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
template<typename Visitor> static void markLists(Visitor&, ListSet&);
|
||||||
|
|
||||||
|
- void ensureCapacity(size_t requestedCapacity)
|
||||||
|
- {
|
||||||
|
- if (requestedCapacity > static_cast<size_t>(m_capacity))
|
||||||
|
- slowEnsureCapacity(requestedCapacity);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- bool hasOverflowed()
|
||||||
|
- {
|
||||||
|
- clearNeedsOverflowCheck();
|
||||||
|
- return Base::hasOverflowed();
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
void overflowCheckNotNeeded() { clearNeedsOverflowCheck(); }
|
||||||
|
|
||||||
|
- template<typename Functor>
|
||||||
|
- void fill(size_t count, const Functor& func)
|
||||||
|
- {
|
||||||
|
- ASSERT(!m_size);
|
||||||
|
- ensureCapacity(count);
|
||||||
|
- if (Base::hasOverflowed())
|
||||||
|
- return;
|
||||||
|
- m_size = count;
|
||||||
|
- func(reinterpret_cast<JSValue*>(&slotFor(0)));
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
protected:
|
||||||
|
// Constructor for a read-write list, to which you may append values.
|
||||||
|
// FIXME: Remove all clients of this API, then remove this API.
|
||||||
|
- MarkedArgumentBufferBase(size_t capacity)
|
||||||
|
+ MarkedVectorBase(size_t capacity)
|
||||||
|
: m_size(0)
|
||||||
|
, m_capacity(capacity)
|
||||||
|
, m_buffer(inlineBuffer())
|
||||||
|
@@ -147,17 +75,16 @@ class alignas(alignof(EncodedJSValue)) MarkedArgumentBufferBase : public RecordO
|
||||||
|
|
||||||
|
EncodedJSValue* inlineBuffer()
|
||||||
|
{
|
||||||
|
- return bitwise_cast<EncodedJSValue*>(bitwise_cast<uint8_t*>(this) + sizeof(MarkedArgumentBufferBase));
|
||||||
|
+ return bitwise_cast<EncodedJSValue*>(bitwise_cast<uint8_t*>(this) + sizeof(MarkedVectorBase));
|
||||||
|
}
|
||||||
|
|
||||||
|
-private:
|
||||||
|
- void expandCapacity();
|
||||||
|
- void expandCapacity(int newCapacity);
|
||||||
|
- void slowEnsureCapacity(size_t requestedCapacity);
|
||||||
|
+ Status expandCapacity();
|
||||||
|
+ Status expandCapacity(int newCapacity);
|
||||||
|
+ Status slowEnsureCapacity(size_t requestedCapacity);
|
||||||
|
|
||||||
|
void addMarkSet(JSValue);
|
||||||
|
|
||||||
|
- JS_EXPORT_PRIVATE void slowAppend(JSValue);
|
||||||
|
+ JS_EXPORT_PRIVATE Status slowAppend(JSValue);
|
||||||
|
|
||||||
|
EncodedJSValue& slotFor(int item) const
|
||||||
|
{
|
||||||
|
@@ -172,11 +99,14 @@ class alignas(alignof(EncodedJSValue)) MarkedArgumentBufferBase : public RecordO
|
||||||
|
}
|
||||||
|
|
||||||
|
#if ASSERT_ENABLED
|
||||||
|
- void setNeedsOverflowCheck() { m_needsOverflowCheck = true; }
|
||||||
|
+ void disableNeedsOverflowCheck() { m_overflowCheckEnabled = false; }
|
||||||
|
+ void setNeedsOverflowCheck() { m_needsOverflowCheck = m_overflowCheckEnabled; }
|
||||||
|
void clearNeedsOverflowCheck() { m_needsOverflowCheck = false; }
|
||||||
|
|
||||||
|
bool m_needsOverflowCheck { false };
|
||||||
|
+ bool m_overflowCheckEnabled { true };
|
||||||
|
#else
|
||||||
|
+ void disableNeedsOverflowCheck() { }
|
||||||
|
void setNeedsOverflowCheck() { }
|
||||||
|
void clearNeedsOverflowCheck() { }
|
||||||
|
#endif // ASSERT_ENABLED
|
||||||
|
@@ -186,22 +116,114 @@ class alignas(alignof(EncodedJSValue)) MarkedArgumentBufferBase : public RecordO
|
||||||
|
ListSet* m_markSet;
|
||||||
|
};
|
||||||
|
|
||||||
|
-template<size_t passedInlineCapacity = 8>
|
||||||
|
-class MarkedArgumentBufferWithSize : public MarkedArgumentBufferBase {
|
||||||
|
+template<typename T, size_t passedInlineCapacity = 8, class OverflowHandler = CrashOnOverflow>
|
||||||
|
+class MarkedVector : public OverflowHandler, public MarkedVectorBase {
|
||||||
|
public:
|
||||||
|
static constexpr size_t inlineCapacity = passedInlineCapacity;
|
||||||
|
|
||||||
|
- MarkedArgumentBufferWithSize()
|
||||||
|
- : MarkedArgumentBufferBase(inlineCapacity)
|
||||||
|
+ MarkedVector()
|
||||||
|
+ : MarkedVectorBase(inlineCapacity)
|
||||||
|
{
|
||||||
|
ASSERT(inlineBuffer() == m_inlineBuffer);
|
||||||
|
+ if constexpr (std::is_same_v<OverflowHandler, CrashOnOverflow>) {
|
||||||
|
+ // CrashOnOverflow handles overflows immediately. So, we do not
|
||||||
|
+ // need to check for it after.
|
||||||
|
+ disableNeedsOverflowCheck();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ auto at(int i) const -> decltype(auto)
|
||||||
|
+ {
|
||||||
|
+ if constexpr (std::is_same_v<T, JSValue>) {
|
||||||
|
+ if (i >= m_size)
|
||||||
|
+ return jsUndefined();
|
||||||
|
+ return JSValue::decode(slotFor(i));
|
||||||
|
+ } else {
|
||||||
|
+ if (i >= m_size)
|
||||||
|
+ return static_cast<T>(nullptr);
|
||||||
|
+ return jsCast<T>(JSValue::decode(slotFor(i)).asCell());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ void clear()
|
||||||
|
+ {
|
||||||
|
+ ASSERT(!m_needsOverflowCheck);
|
||||||
|
+ OverflowHandler::clearOverflow();
|
||||||
|
+ m_size = 0;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ void append(T v)
|
||||||
|
+ {
|
||||||
|
+ ASSERT(m_size <= m_capacity);
|
||||||
|
+ if (m_size == m_capacity || mallocBase()) {
|
||||||
|
+ if (slowAppend(v) == Status::Overflowed)
|
||||||
|
+ this->overflowed();
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ slotFor(m_size) = JSValue::encode(v);
|
||||||
|
+ ++m_size;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ void appendWithCrashOnOverflow(T v)
|
||||||
|
+ {
|
||||||
|
+ append(v);
|
||||||
|
+ if constexpr (!std::is_same<OverflowHandler, CrashOnOverflow>::value)
|
||||||
|
+ RELEASE_ASSERT(!this->hasOverflowed());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ auto last() const -> decltype(auto)
|
||||||
|
+ {
|
||||||
|
+ if constexpr (std::is_same_v<T, JSValue>) {
|
||||||
|
+ ASSERT(m_size);
|
||||||
|
+ return JSValue::decode(slotFor(m_size - 1));
|
||||||
|
+ } else {
|
||||||
|
+ ASSERT(m_size);
|
||||||
|
+ return jsCast<T>(JSValue::decode(slotFor(m_size - 1)).asCell());
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ JSValue takeLast()
|
||||||
|
+ {
|
||||||
|
+ JSValue result = last();
|
||||||
|
+ removeLast();
|
||||||
|
+ return result;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ void ensureCapacity(size_t requestedCapacity)
|
||||||
|
+ {
|
||||||
|
+ if (requestedCapacity > static_cast<size_t>(m_capacity)) {
|
||||||
|
+ if (slowEnsureCapacity(requestedCapacity) == Status::Overflowed)
|
||||||
|
+ this->overflowed();
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ bool hasOverflowed()
|
||||||
|
+ {
|
||||||
|
+ clearNeedsOverflowCheck();
|
||||||
|
+ return OverflowHandler::hasOverflowed();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ template<typename Functor>
|
||||||
|
+ void fill(size_t count, const Functor& func)
|
||||||
|
+ {
|
||||||
|
+ ASSERT(!m_size);
|
||||||
|
+ ensureCapacity(count);
|
||||||
|
+ if (OverflowHandler::hasOverflowed())
|
||||||
|
+ return;
|
||||||
|
+ m_size = count;
|
||||||
|
+ func(reinterpret_cast<JSValue*>(&slotFor(0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
EncodedJSValue m_inlineBuffer[inlineCapacity] { };
|
||||||
|
};
|
||||||
|
|
||||||
|
-using MarkedArgumentBuffer = MarkedArgumentBufferWithSize<>;
|
||||||
|
+template<size_t passedInlineCapacity>
|
||||||
|
+class MarkedArgumentBufferWithSize : public MarkedVector<JSValue, passedInlineCapacity, RecordOverflow> {
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+using MarkedArgumentBuffer = MarkedVector<JSValue, 8, RecordOverflow>;
|
||||||
|
|
||||||
|
class ArgList {
|
||||||
|
WTF_MAKE_FAST_ALLOCATED;
|
||||||
|
diff --git a/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.cpp b/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.cpp
|
||||||
|
index e41a46dd57de..2ab3abb48117 100644
|
||||||
|
--- a/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.cpp
|
||||||
|
+++ b/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.cpp
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (C) 2020 Apple Inc. All rights reserved.
|
||||||
|
+ * Copyright (C) 2020-2023 Apple Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
@@ -220,7 +220,7 @@ AudioWorkletProcessor::AudioWorkletProcessor(AudioWorkletGlobalScope& globalScop
|
||||||
|
ASSERT(!isMainThread());
|
||||||
|
}
|
||||||
|
|
||||||
|
-void AudioWorkletProcessor::buildJSArguments(VM& vm, JSGlobalObject& globalObject, MarkedArgumentBufferBase& args, const Vector<RefPtr<AudioBus>>& inputs, Vector<Ref<AudioBus>>& outputs, const MemoryCompactLookupOnlyRobinHoodHashMap<String, std::unique_ptr<AudioFloatArray>>& paramValuesMap)
|
||||||
|
+void AudioWorkletProcessor::buildJSArguments(VM& vm, JSGlobalObject& globalObject, MarkedArgumentBuffer& args, const Vector<RefPtr<AudioBus>>& inputs, Vector<Ref<AudioBus>>& outputs, const MemoryCompactLookupOnlyRobinHoodHashMap<String, std::unique_ptr<AudioFloatArray>>& paramValuesMap)
|
||||||
|
{
|
||||||
|
// For performance reasons, we cache the arrays passed to JS and reconstruct them only when the topology changes.
|
||||||
|
if (!copyDataFromBusesToJSArray(globalObject, inputs, toJSArray(m_jsInputs)))
|
||||||
|
diff --git a/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.h b/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.h
|
||||||
|
index 746059067f87..40751a2e501b 100644
|
||||||
|
--- a/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.h
|
||||||
|
+++ b/Source/WebCore/Modules/webaudio/AudioWorkletProcessor.h
|
||||||
|
@@ -1,5 +1,5 @@
|
||||||
|
/*
|
||||||
|
- * Copyright (C) 2020 Apple Inc. All rights reserved.
|
||||||
|
+ * Copyright (C) 2020-2023 Apple Inc. All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions
|
||||||
|
@@ -41,7 +41,8 @@
|
||||||
|
|
||||||
|
namespace JSC {
|
||||||
|
class JSArray;
|
||||||
|
-class MarkedArgumentBufferBase;
|
||||||
|
+template<typename T, size_t, class> class MarkedVector;
|
||||||
|
+using MarkedArgumentBuffer = MarkedVector<JSValue, 8, RecordOverflow>;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace WebCore {
|
||||||
|
@@ -71,7 +72,7 @@ class AudioWorkletProcessor : public ScriptWrappable, public ThreadSafeRefCounte
|
||||||
|
|
||||||
|
private:
|
||||||
|
explicit AudioWorkletProcessor(AudioWorkletGlobalScope&, const AudioWorkletProcessorConstructionData&);
|
||||||
|
- void buildJSArguments(JSC::VM&, JSC::JSGlobalObject&, JSC::MarkedArgumentBufferBase&, const Vector<RefPtr<AudioBus>>& inputs, Vector<Ref<AudioBus>>& outputs, const MemoryCompactLookupOnlyRobinHoodHashMap<String, std::unique_ptr<AudioFloatArray>>& paramValuesMap);
|
||||||
|
+ void buildJSArguments(JSC::VM&, JSC::JSGlobalObject&, JSC::MarkedArgumentBuffer&, const Vector<RefPtr<AudioBus>>& inputs, Vector<Ref<AudioBus>>& outputs, const MemoryCompactLookupOnlyRobinHoodHashMap<String, std::unique_ptr<AudioFloatArray>>& paramValuesMap);
|
||||||
|
|
||||||
|
AudioWorkletGlobalScope& m_globalScope;
|
||||||
|
String m_name;
|
||||||
|
diff --git a/Source/WebCore/bindings/js/SerializedScriptValue.cpp b/Source/WebCore/bindings/js/SerializedScriptValue.cpp
|
||||||
|
index ad135b5da8f8..a465d5a57a73 100644
|
||||||
|
--- a/Source/WebCore/bindings/js/SerializedScriptValue.cpp
|
||||||
|
+++ b/Source/WebCore/bindings/js/SerializedScriptValue.cpp
|
||||||
|
@@ -573,6 +573,7 @@ static const unsigned StringDataIs8BitFlag = 0x80000000;
|
||||||
|
using DeserializationResult = std::pair<JSC::JSValue, SerializationReturnCode>;
|
||||||
|
|
||||||
|
class CloneBase {
|
||||||
|
+ WTF_FORBID_HEAP_ALLOCATION;
|
||||||
|
protected:
|
||||||
|
CloneBase(JSGlobalObject* lexicalGlobalObject)
|
||||||
|
: m_lexicalGlobalObject(lexicalGlobalObject)
|
||||||
|
@@ -650,6 +651,7 @@ template <> bool writeLittleEndian<uint8_t>(Vector<uint8_t>& buffer, const uint8
|
||||||
|
}
|
||||||
|
|
||||||
|
class CloneSerializer : CloneBase {
|
||||||
|
+ WTF_FORBID_HEAP_ALLOCATION;
|
||||||
|
public:
|
||||||
|
static SerializationReturnCode serialize(JSGlobalObject* lexicalGlobalObject, JSValue value, Vector<RefPtr<MessagePort>>& messagePorts, Vector<RefPtr<JSC::ArrayBuffer>>& arrayBuffers, const Vector<RefPtr<ImageBitmap>>& imageBitmaps,
|
||||||
|
#if ENABLE(OFFSCREEN_CANVAS_IN_WORKERS)
|
||||||
|
@@ -2318,6 +2320,7 @@ SerializationReturnCode CloneSerializer::serialize(JSValue in)
|
||||||
|
}
|
||||||
|
|
||||||
|
class CloneDeserializer : CloneBase {
|
||||||
|
+ WTF_FORBID_HEAP_ALLOCATION;
|
||||||
|
public:
|
||||||
|
static String deserializeString(const Vector<uint8_t>& buffer)
|
||||||
|
{
|
||||||
|
@@ -4285,10 +4288,10 @@ DeserializationResult CloneDeserializer::deserialize()
|
||||||
|
|
||||||
|
Vector<uint32_t, 16> indexStack;
|
||||||
|
Vector<Identifier, 16> propertyNameStack;
|
||||||
|
- Vector<JSObject*, 32> outputObjectStack;
|
||||||
|
- Vector<JSValue, 4> mapKeyStack;
|
||||||
|
- Vector<JSMap*, 4> mapStack;
|
||||||
|
- Vector<JSSet*, 4> setStack;
|
||||||
|
+ MarkedVector<JSObject*, 32> outputObjectStack;
|
||||||
|
+ MarkedVector<JSValue, 4> mapKeyStack;
|
||||||
|
+ MarkedVector<JSMap*, 4> mapStack;
|
||||||
|
+ MarkedVector<JSSet*, 4> setStack;
|
||||||
|
Vector<WalkerState, 16> stateStack;
|
||||||
|
WalkerState lexicalGlobalObject = StateUnknown;
|
||||||
|
JSValue outValue;
|
@ -1,36 +0,0 @@
|
|||||||
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
|
|
||||||
index 526fe7cfe0cf..7650ea1bade2 100644
|
|
||||||
--- a/Source/cmake/OptionsGTK.cmake
|
|
||||||
+++ b/Source/cmake/OptionsGTK.cmake
|
|
||||||
@@ -13,7 +13,7 @@ endif ()
|
|
||||||
|
|
||||||
set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
|
|
||||||
|
|
||||||
-find_package(Cairo 1.16.0 REQUIRED)
|
|
||||||
+find_package(Cairo 1.14.0 REQUIRED)
|
|
||||||
find_package(Fontconfig 2.13.0 REQUIRED)
|
|
||||||
find_package(Freetype 2.9.0 REQUIRED)
|
|
||||||
find_package(LibGcrypt 1.6.0 REQUIRED)
|
|
||||||
@@ -91,6 +91,14 @@ else ()
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_RESOURCE_USAGE PRIVATE OFF)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
+# Enable variation fonts when cairo >= 1.16, fontconfig >= 2.13.0, freetype >= 2.9.0 and harfbuzz >= 1.4.2.
|
|
||||||
+if (("${PC_CAIRO_VERSION}" VERSION_GREATER "1.16.0" OR "${PC_CAIRO_VERSION}" STREQUAL "1.16.0")
|
|
||||||
+ AND ("${PC_FONTCONFIG_VERSION}" VERSION_GREATER "2.13.0" OR "${PC_FONTCONFIG_VERSION}" STREQUAL "2.13.0")
|
|
||||||
+ AND ("${FREETYPE_VERSION_STRING}" VERSION_GREATER "2.9.0" OR "${FREETYPE_VERSION_STRING}" STREQUAL "2.9.0")
|
|
||||||
+ AND ("${PC_HARFBUZZ_VERSION}" VERSION_GREATER "1.4.2" OR "${PC_HARFBUZZ_VERSION}" STREQUAL "1.4.2"))
|
|
||||||
+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
|
|
||||||
+endif ()
|
|
||||||
+
|
|
||||||
# Public options shared with other WebKit ports. Do not add any options here
|
|
||||||
# without approval from a GTK reviewer. There must be strong reason to support
|
|
||||||
# changing the value of the option.
|
|
||||||
@@ -149,7 +157,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE ON)
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SERVICE_WORKER PRIVATE ON)
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHAREABLE_RESOURCE PRIVATE ON)
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SPEECH_SYNTHESIS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
|
|
||||||
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VARIATION_FONTS PRIVATE ON)
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_API_STATISTICS PRIVATE ON)
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_CODECS PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
|
|
||||||
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PRIVATE ${ENABLE_EXPERIMENTAL_FEATURES})
|
|
@ -1,14 +0,0 @@
|
|||||||
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
|
||||||
index a30f5b13be26..72ad006cde21 100644
|
|
||||||
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
|
||||||
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
|
|
||||||
@@ -438,6 +438,9 @@ static void webkitWebContextConstructed(GObject* object)
|
|
||||||
}
|
|
||||||
configuration.setTimeZoneOverride(String::fromUTF8(priv->timeZoneOverride.data(), priv->timeZoneOverride.length()));
|
|
||||||
|
|
||||||
+ if (!g_strcmp0(g_get_prgname(), "evolution"))
|
|
||||||
+ configuration.setUsesSingleWebProcess(true);
|
|
||||||
+
|
|
||||||
#if !ENABLE(2022_GLIB_API)
|
|
||||||
if (!priv->websiteDataManager)
|
|
||||||
priv->websiteDataManager = adoptGRef(webkit_website_data_manager_new("local-storage-directory", priv->localStorageDirectory.data(), nullptr));
|
|
@ -1,39 +0,0 @@
|
|||||||
diff --git a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
|
|
||||||
index ef000cd2b910..432c97257048 100644
|
|
||||||
--- a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
|
|
||||||
+++ b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c
|
|
||||||
@@ -175,11 +175,12 @@ static void featureTreeViewRenderStatusData(GtkTreeViewColumn *column, GtkCellRe
|
|
||||||
{
|
|
||||||
g_autoptr(WebKitFeature) feature = NULL;
|
|
||||||
gtk_tree_model_get(model, iter, FEATURES_LIST_COLUMN_FEATURE, &feature, -1);
|
|
||||||
- g_autoptr(GEnumClass) enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
|
|
||||||
+ GEnumClass *enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
|
|
||||||
g_object_set(renderer,
|
|
||||||
"markup", NULL,
|
|
||||||
"text", g_enum_get_value(enumClass, webkit_feature_get_status(feature))->value_nick,
|
|
||||||
NULL);
|
|
||||||
+ g_type_class_unref(enumClass);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void featureTreeViewRenderCategoryData(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
|
|
||||||
diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c
|
|
||||||
index 8be643a54151..ae82b41400b5 100644
|
|
||||||
--- a/Tools/MiniBrowser/gtk/main.c
|
|
||||||
+++ b/Tools/MiniBrowser/gtk/main.c
|
|
||||||
@@ -273,7 +273,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
|
|
||||||
"features, prefixes '-' and '!' disable features. Names are case-insensitive. Example:\n"
|
|
||||||
"\n %s --features='!DirPseudo,+WebAnimationsCustomEffects,webgl'\n\n"
|
|
||||||
"Available features (+/- = enabled/disabled by default):\n\n", g_get_prgname());
|
|
||||||
- g_autoptr(GEnumClass) statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
|
|
||||||
+ GEnumClass *statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS);
|
|
||||||
for (gsize i = 0; i < webkit_feature_list_get_length(featureList); i++) {
|
|
||||||
WebKitFeature *feature = webkit_feature_list_get(featureList, i);
|
|
||||||
g_print(" %c %s (%s)",
|
|
||||||
@@ -284,6 +284,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va
|
|
||||||
g_print(": %s", webkit_feature_get_name(feature));
|
|
||||||
g_print("\n");
|
|
||||||
}
|
|
||||||
+ g_type_class_unref(statusEnum);
|
|
||||||
exit(EXIT_SUCCESS);
|
|
||||||
}
|
|
||||||
|
|
@ -1,483 +0,0 @@
|
|||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
|
||||||
index 77a0d6507240..353fb87900ba 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
|
||||||
@@ -479,7 +479,6 @@ bool MediaPlayerPrivateGStreamer::doSeek(const MediaTime& position, float rate)
|
|
||||||
|
|
||||||
auto seekStart = toGstClockTime(startTime);
|
|
||||||
auto seekStop = toGstClockTime(endTime);
|
|
||||||
- GST_DEBUG_OBJECT(pipeline(), "[Seek] Performing actual seek to %" GST_TIMEP_FORMAT " (endTime: %" GST_TIMEP_FORMAT ") at rate %f", &seekStart, &seekStop, rate);
|
|
||||||
return gst_element_seek(m_pipeline.get(), rate, GST_FORMAT_TIME, m_seekFlags, GST_SEEK_TYPE_SET, seekStart, GST_SEEK_TYPE_SET, seekStop);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -3296,9 +3295,6 @@ static uint32_t fourccValue(GstVideoFormat format)
|
|
||||||
case GST_VIDEO_FORMAT_P010_10LE:
|
|
||||||
case GST_VIDEO_FORMAT_P010_10BE:
|
|
||||||
return uint32_t(DMABufFormat::FourCC::P010);
|
|
||||||
- case GST_VIDEO_FORMAT_P016_LE:
|
|
||||||
- case GST_VIDEO_FORMAT_P016_BE:
|
|
||||||
- return uint32_t(DMABufFormat::FourCC::P016);
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
From bbc469a2b43531275243850693af65f5f7d11bc6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
|
||||||
Date: Wed, 20 Sep 2023 13:07:44 -0500
|
|
||||||
Subject: [PATCH 1/2] Revert GStreamer 1.18 dependency
|
|
||||||
|
|
||||||
This reverts https://commits.webkit.org/263218@main
|
|
||||||
---
|
|
||||||
.../AudioSourceProviderGStreamer.cpp | 5 +-
|
|
||||||
.../gstreamer/GLVideoSinkGStreamer.cpp | 11 ++--
|
|
||||||
.../gstreamer/GStreamerAudioMixer.cpp | 2 +-
|
|
||||||
.../graphics/gstreamer/GStreamerCommon.cpp | 52 +++++++++++++++++++
|
|
||||||
.../graphics/gstreamer/GStreamerCommon.h | 16 ++++++
|
|
||||||
.../gstreamer/GStreamerRegistryScanner.cpp | 9 +++-
|
|
||||||
.../gstreamer/MediaPlayerPrivateGStreamer.cpp | 46 +++++++++++++---
|
|
||||||
.../gstreamer/MediaPlayerPrivateGStreamer.h | 1 +
|
|
||||||
Source/cmake/GStreamerChecks.cmake | 2 +-
|
|
||||||
9 files changed, 127 insertions(+), 17 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
|
||||||
index a97e6431802c..d8b1a1f4bd8b 100644
|
|
||||||
--- a/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/audio/gstreamer/AudioSourceProviderGStreamer.cpp
|
|
||||||
@@ -122,7 +122,10 @@ AudioSourceProviderGStreamer::AudioSourceProviderGStreamer(MediaStreamTrackPriva
|
|
||||||
g_signal_connect_swapped(decodebin, "pad-added", G_CALLBACK(+[](AudioSourceProviderGStreamer* provider, GstPad* pad) {
|
|
||||||
auto padCaps = adoptGRef(gst_pad_query_caps(pad, nullptr));
|
|
||||||
bool isAudio = doCapsHaveType(padCaps.get(), "audio");
|
|
||||||
- RELEASE_ASSERT(isAudio);
|
|
||||||
+ if (webkitGstCheckVersion(1, 18, 0))
|
|
||||||
+ RELEASE_ASSERT(isAudio);
|
|
||||||
+ else if (!isAudio)
|
|
||||||
+ return;
|
|
||||||
|
|
||||||
auto sinkPad = adoptGRef(gst_element_get_static_pad(provider->m_audioSinkBin.get(), "sink"));
|
|
||||||
gst_pad_link(pad, sinkPad.get());
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
|
||||||
index 1a7480828861..f3a51be68534 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
|
||||||
@@ -186,12 +186,13 @@ static void webKitGLVideoSinkGetProperty(GObject* object, guint propertyId, GVal
|
|
||||||
WebKitGLVideoSink* sink = WEBKIT_GL_VIDEO_SINK(object);
|
|
||||||
|
|
||||||
switch (propertyId) {
|
|
||||||
- case PROP_STATS: {
|
|
||||||
- GUniqueOutPtr<GstStructure> stats;
|
|
||||||
- g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
|
|
||||||
- gst_value_set_structure(value, stats.get());
|
|
||||||
+ case PROP_STATS:
|
|
||||||
+ if (webkitGstCheckVersion(1, 18, 0)) {
|
|
||||||
+ GUniqueOutPtr<GstStructure> stats;
|
|
||||||
+ g_object_get(sink->priv->appSink.get(), "stats", &stats.outPtr(), nullptr);
|
|
||||||
+ gst_value_set_structure(value, stats.get());
|
|
||||||
+ }
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
default:
|
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, paramSpec);
|
|
||||||
RELEASE_ASSERT_NOT_REACHED();
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
|
||||||
index ad4b1ae3f77e..fb7e617b5d56 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerAudioMixer.cpp
|
|
||||||
@@ -32,7 +32,7 @@ GST_DEBUG_CATEGORY_STATIC(webkit_media_gst_audio_mixer_debug);
|
|
||||||
|
|
||||||
bool GStreamerAudioMixer::isAvailable()
|
|
||||||
{
|
|
||||||
- return isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer");
|
|
||||||
+ return webkitGstCheckVersion(1, 18, 0) && isGStreamerPluginAvailable("inter") && isGStreamerPluginAvailable("audiomixer");
|
|
||||||
}
|
|
||||||
|
|
||||||
GStreamerAudioMixer& GStreamerAudioMixer::singleton()
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
|
||||||
index 794beaa6932a..5f6b3826f182 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.cpp
|
|
||||||
@@ -105,6 +105,24 @@ GstPad* webkitGstGhostPadFromStaticTemplate(GstStaticPadTemplate* staticPadTempl
|
|
||||||
return pad;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
|
||||||
+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo* info, guint plane, gint components[GST_VIDEO_MAX_COMPONENTS])
|
|
||||||
+{
|
|
||||||
+ guint c, i = 0;
|
|
||||||
+
|
|
||||||
+ /* Reverse mapping of info->plane. */
|
|
||||||
+ for (c = 0; c < GST_VIDEO_FORMAT_INFO_N_COMPONENTS(info); c++) {
|
|
||||||
+ if (GST_VIDEO_FORMAT_INFO_PLANE(info, c) == plane) {
|
|
||||||
+ components[i] = c;
|
|
||||||
+ i++;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ for (c = i; c < GST_VIDEO_MAX_COMPONENTS; c++)
|
|
||||||
+ components[c] = -1;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if ENABLE(VIDEO)
|
|
||||||
bool getVideoSizeAndFormatFromCaps(const GstCaps* caps, WebCore::IntSize& size, GstVideoFormat& format, int& pixelAspectRatioNumerator, int& pixelAspectRatioDenominator, int& stride)
|
|
||||||
{
|
|
||||||
@@ -748,6 +766,36 @@ String gstStructureToJSONString(const GstStructure* structure)
|
|
||||||
return value->toJSONString();
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
|
||||||
+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement* element)
|
|
||||||
+{
|
|
||||||
+ g_return_val_if_fail(GST_IS_ELEMENT(element), GST_CLOCK_TIME_NONE);
|
|
||||||
+
|
|
||||||
+ auto baseTime = gst_element_get_base_time(element);
|
|
||||||
+ if (!GST_CLOCK_TIME_IS_VALID(baseTime)) {
|
|
||||||
+ GST_DEBUG_OBJECT(element, "Could not determine base time");
|
|
||||||
+ return GST_CLOCK_TIME_NONE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ auto clock = adoptGRef(gst_element_get_clock(element));
|
|
||||||
+ if (!clock) {
|
|
||||||
+ GST_DEBUG_OBJECT(element, "Element has no clock");
|
|
||||||
+ return GST_CLOCK_TIME_NONE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ auto clockTime = gst_clock_get_time(clock.get());
|
|
||||||
+ if (!GST_CLOCK_TIME_IS_VALID(clockTime))
|
|
||||||
+ return GST_CLOCK_TIME_NONE;
|
|
||||||
+
|
|
||||||
+ if (clockTime < baseTime) {
|
|
||||||
+ GST_DEBUG_OBJECT(element, "Got negative current running time");
|
|
||||||
+ return GST_CLOCK_TIME_NONE;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return clockTime - baseTime;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
GstClockTime webkitGstInitTime()
|
|
||||||
{
|
|
||||||
return s_webkitGstInitTime;
|
|
||||||
@@ -805,6 +853,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
|
|
||||||
case GST_VIDEO_TRANSFER_BT709:
|
|
||||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt709;
|
|
||||||
break;
|
|
||||||
+#if GST_CHECK_VERSION(1, 18, 0)
|
|
||||||
case GST_VIDEO_TRANSFER_BT601:
|
|
||||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Smpte170m;
|
|
||||||
break;
|
|
||||||
@@ -817,6 +866,7 @@ PlatformVideoColorSpace videoColorSpaceFromInfo(const GstVideoInfo& info)
|
|
||||||
case GST_VIDEO_TRANSFER_BT2020_10:
|
|
||||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_10bit;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
case GST_VIDEO_TRANSFER_BT2020_12:
|
|
||||||
colorSpace.transfer = PlatformVideoTransferCharacteristics::Bt2020_12bit;
|
|
||||||
break;
|
|
||||||
@@ -935,6 +985,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
|
|
||||||
case PlatformVideoTransferCharacteristics::Bt709:
|
|
||||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT709;
|
|
||||||
break;
|
|
||||||
+#if GST_CHECK_VERSION(1, 18, 0)
|
|
||||||
case PlatformVideoTransferCharacteristics::Smpte170m:
|
|
||||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT601;
|
|
||||||
break;
|
|
||||||
@@ -947,6 +998,7 @@ void fillVideoInfoColorimetryFromColorSpace(GstVideoInfo* info, const PlatformVi
|
|
||||||
case PlatformVideoTransferCharacteristics::Bt2020_10bit:
|
|
||||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_10;
|
|
||||||
break;
|
|
||||||
+#endif
|
|
||||||
case PlatformVideoTransferCharacteristics::Bt2020_12bit:
|
|
||||||
GST_VIDEO_INFO_COLORIMETRY(info).transfer = GST_VIDEO_TRANSFER_BT2020_12;
|
|
||||||
break;
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
|
||||||
index fae7ef96d6c5..65ef4bfefdaa 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerCommon.h
|
|
||||||
@@ -56,6 +56,15 @@ inline bool webkitGstCheckVersion(guint major, guint minor, guint micro)
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+// gst_video_format_info_component() is GStreamer 1.18 API, so for older versions we use a local
|
|
||||||
+// vendored copy of the function.
|
|
||||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
|
||||||
+#define GST_VIDEO_MAX_COMPONENTS 4
|
|
||||||
+void webkitGstVideoFormatInfoComponent(const GstVideoFormatInfo*, guint, gint components[GST_VIDEO_MAX_COMPONENTS]);
|
|
||||||
+
|
|
||||||
+#define gst_video_format_info_component webkitGstVideoFormatInfoComponent
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#define GST_VIDEO_CAPS_TYPE_PREFIX "video/"
|
|
||||||
#define GST_AUDIO_CAPS_TYPE_PREFIX "audio/"
|
|
||||||
#define GST_TEXT_CAPS_TYPE_PREFIX "text/"
|
|
||||||
@@ -323,6 +332,13 @@ GstElement* makeGStreamerBin(const char* description, bool ghostUnlinkedPads);
|
|
||||||
|
|
||||||
String gstStructureToJSONString(const GstStructure*);
|
|
||||||
|
|
||||||
+// gst_element_get_current_running_time() is GStreamer 1.18 API, so for older versions we use a local
|
|
||||||
+// vendored copy of the function.
|
|
||||||
+#if !GST_CHECK_VERSION(1, 18, 0)
|
|
||||||
+GstClockTime webkitGstElementGetCurrentRunningTime(GstElement*);
|
|
||||||
+#define gst_element_get_current_running_time webkitGstElementGetCurrentRunningTime
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
GstClockTime webkitGstInitTime();
|
|
||||||
|
|
||||||
PlatformVideoColorSpace videoColorSpaceFromCaps(const GstCaps*);
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
|
|
||||||
index 7cd1926e6d15..032f086b43c0 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GStreamerRegistryScanner.cpp
|
|
||||||
@@ -900,8 +900,13 @@ GStreamerRegistryScanner::CodecLookupResult GStreamerRegistryScanner::isAVC1Code
|
|
||||||
return checkH264Caps(makeString("video/x-h264, level=(string)", maxLevelString).utf8().data());
|
|
||||||
}
|
|
||||||
|
|
||||||
- GST_DEBUG("Checking video decoders for constrained caps");
|
|
||||||
- return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());
|
|
||||||
+ if (webkitGstCheckVersion(1, 18, 0)) {
|
|
||||||
+ GST_DEBUG("Checking video decoders for constrained caps");
|
|
||||||
+ return checkH264Caps(makeString("video/x-h264, level=(string)", level, ", profile=(string)", profile).utf8().data());
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ GST_DEBUG("Falling back to unconstrained caps");
|
|
||||||
+ return checkH264Caps("video/x-h264");
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* GStreamerRegistryScanner::configurationNameForLogging(Configuration configuration) const
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
|
||||||
index aad2c0bc432b..77a0d6507240 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp
|
|
||||||
@@ -4114,7 +4114,29 @@ GstElement* MediaPlayerPrivateGStreamer::createVideoSink()
|
|
||||||
g_signal_connect_swapped(m_videoSink.get(), "repaint-cancelled", G_CALLBACK(repaintCancelledCallback), this);
|
|
||||||
}
|
|
||||||
|
|
||||||
- return m_videoSink.get();
|
|
||||||
+ GstElement* videoSink = nullptr;
|
|
||||||
+ if (!webkitGstCheckVersion(1, 18, 0)) {
|
|
||||||
+ m_fpsSink = makeGStreamerElement("fpsdisplaysink", "sink");
|
|
||||||
+ if (m_fpsSink) {
|
|
||||||
+ g_object_set(m_fpsSink.get(), "silent", TRUE , nullptr);
|
|
||||||
+
|
|
||||||
+ // Turn off text overlay unless tracing is enabled.
|
|
||||||
+ if (gst_debug_category_get_threshold(webkit_media_player_debug) < GST_LEVEL_TRACE)
|
|
||||||
+ g_object_set(m_fpsSink.get(), "text-overlay", FALSE , nullptr);
|
|
||||||
+
|
|
||||||
+ if (gstObjectHasProperty(m_fpsSink.get(), "video-sink")) {
|
|
||||||
+ g_object_set(m_fpsSink.get(), "video-sink", m_videoSink.get(), nullptr);
|
|
||||||
+ videoSink = m_fpsSink.get();
|
|
||||||
+ } else
|
|
||||||
+ m_fpsSink = nullptr;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!m_fpsSink)
|
|
||||||
+ videoSink = m_videoSink.get();
|
|
||||||
+
|
|
||||||
+ ASSERT(videoSink);
|
|
||||||
+ return videoSink;
|
|
||||||
}
|
|
||||||
|
|
||||||
void MediaPlayerPrivateGStreamer::setStreamVolumeElement(GstStreamVolume* volume)
|
|
||||||
@@ -4147,16 +4169,26 @@ bool MediaPlayerPrivateGStreamer::updateVideoSinkStatistics()
|
|
||||||
if (!m_videoSink)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
+ if (!webkitGstCheckVersion(1, 18, 0) && !m_fpsSink)
|
|
||||||
+ return false;
|
|
||||||
+
|
|
||||||
uint64_t totalVideoFrames = 0;
|
|
||||||
uint64_t droppedVideoFrames = 0;
|
|
||||||
- GUniqueOutPtr<GstStructure> stats;
|
|
||||||
- g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
|
|
||||||
+ if (webkitGstCheckVersion(1, 18, 0)) {
|
|
||||||
+ GUniqueOutPtr<GstStructure> stats;
|
|
||||||
+ g_object_get(m_videoSink.get(), "stats", &stats.outPtr(), nullptr);
|
|
||||||
|
|
||||||
- if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames))
|
|
||||||
- return false;
|
|
||||||
+ if (!gst_structure_get_uint64(stats.get(), "rendered", &totalVideoFrames))
|
|
||||||
+ return false;
|
|
||||||
|
|
||||||
- if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames))
|
|
||||||
- return false;
|
|
||||||
+ if (!gst_structure_get_uint64(stats.get(), "dropped", &droppedVideoFrames))
|
|
||||||
+ return false;
|
|
||||||
+ } else if (m_fpsSink) {
|
|
||||||
+ unsigned renderedFrames, droppedFrames;
|
|
||||||
+ g_object_get(m_fpsSink.get(), "frames-rendered", &renderedFrames, "frames-dropped", &droppedFrames, nullptr);
|
|
||||||
+ totalVideoFrames = renderedFrames;
|
|
||||||
+ droppedVideoFrames = droppedFrames;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
// Caching is required so that metrics queries performed after EOS still return valid values.
|
|
||||||
if (totalVideoFrames)
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
|
|
||||||
index e0cdb0a2d01f..f33a674481e1 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.h
|
|
||||||
@@ -578,6 +578,7 @@ private:
|
|
||||||
uint64_t m_networkReadPosition { 0 };
|
|
||||||
mutable uint64_t m_readPositionAtLastDidLoadingProgress { 0 };
|
|
||||||
|
|
||||||
+ GRefPtr<GstElement> m_fpsSink { nullptr };
|
|
||||||
uint64_t m_totalVideoFrames { 0 };
|
|
||||||
uint64_t m_droppedVideoFrames { 0 };
|
|
||||||
uint64_t m_decodedVideoFrames { 0 };
|
|
||||||
diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
|
|
||||||
index 5380617afc9c..8774f1d2aca8 100644
|
|
||||||
--- a/Source/cmake/GStreamerChecks.cmake
|
|
||||||
+++ b/Source/cmake/GStreamerChecks.cmake
|
|
||||||
@@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
|
|
||||||
list(APPEND GSTREAMER_COMPONENTS webrtc)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
- find_package(GStreamer 1.18.4 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
|
||||||
+ find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
|
||||||
|
|
||||||
if (ENABLE_WEB_AUDIO)
|
|
||||||
if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
||||||
From 9046961d80cc168aab253e3e0eda2268bd956293 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Michael Catanzaro <mcatanzaro@redhat.com>
|
|
||||||
Date: Wed, 20 Sep 2023 13:09:28 -0500
|
|
||||||
Subject: [PATCH 2/2] Revert GStreamer 1.16 dependency
|
|
||||||
|
|
||||||
This (mostly) reverts https://commits.webkit.org/256284@main
|
|
||||||
---
|
|
||||||
.../gstreamer/GLVideoSinkGStreamer.cpp | 20 ++++++++++++++++++-
|
|
||||||
.../gstreamer/eme/GStreamerEMEUtilities.h | 10 ++++++++++
|
|
||||||
...bKitCommonEncryptionDecryptorGStreamer.cpp | 7 +++++--
|
|
||||||
Source/cmake/GStreamerChecks.cmake | 2 +-
|
|
||||||
4 files changed, 35 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
|
||||||
index f3a51be68534..bf8ebeda1725 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/GLVideoSinkGStreamer.cpp
|
|
||||||
@@ -88,7 +88,25 @@ static void webKitGLVideoSinkConstructed(GObject* object)
|
|
||||||
ASSERT(colorconvert);
|
|
||||||
gst_bin_add_many(GST_BIN_CAST(sink), upload, colorconvert, sink->priv->appSink.get(), nullptr);
|
|
||||||
|
|
||||||
- GRefPtr<GstCaps> caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
|
|
||||||
+ // Workaround until we can depend on GStreamer 1.16.2.
|
|
||||||
+ // https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/commit/8d32de090554cf29fe359f83aa46000ba658a693
|
|
||||||
+ // Forcing a color conversion to RGBA here allows glupload to internally use
|
|
||||||
+ // an uploader that adds a VideoMeta, through the TextureUploadMeta caps
|
|
||||||
+ // feature, without needing the patch above. However this specific caps
|
|
||||||
+ // feature is going to be removed from GStreamer so it is considered a
|
|
||||||
+ // short-term workaround. This code path most likely will have a negative
|
|
||||||
+ // performance impact on embedded platforms as well. Downstream embedders
|
|
||||||
+ // are highly encouraged to cherry-pick the patch linked above in their BSP
|
|
||||||
+ // and set the WEBKIT_GST_NO_RGBA_CONVERSION environment variable until
|
|
||||||
+ // GStreamer 1.16.2 is released.
|
|
||||||
+ // See also https://bugs.webkit.org/show_bug.cgi?id=201422
|
|
||||||
+ GRefPtr<GstCaps> caps;
|
|
||||||
+ if (webkitGstCheckVersion(1, 16, 2) || getenv("WEBKIT_GST_NO_RGBA_CONVERSION"))
|
|
||||||
+ caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) " GST_GL_CAPS_FORMAT));
|
|
||||||
+ else {
|
|
||||||
+ GST_INFO_OBJECT(sink, "Forcing RGBA as GStreamer is not new enough.");
|
|
||||||
+ caps = adoptGRef(gst_caps_from_string("video/x-raw, format = (string) RGBA"));
|
|
||||||
+ }
|
|
||||||
gst_caps_set_features(caps.get(), 0, gst_caps_features_new(GST_CAPS_FEATURE_MEMORY_GL_MEMORY, nullptr));
|
|
||||||
g_object_set(sink->priv->appSink.get(), "caps", caps.get(), nullptr);
|
|
||||||
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
|
|
||||||
index 6dbf6a67dfd1..184c5c3e5f77 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/eme/GStreamerEMEUtilities.h
|
|
||||||
@@ -61,8 +61,10 @@ public:
|
|
||||||
const String& systemId() const { return m_systemId; }
|
|
||||||
String payloadContainerType() const
|
|
||||||
{
|
|
||||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
|
||||||
if (m_systemId == GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s)
|
|
||||||
return "webm"_s;
|
|
||||||
+#endif
|
|
||||||
return "cenc"_s;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -111,8 +113,10 @@ public:
|
|
||||||
static constexpr auto s_WidevineKeySystem = "com.widevine.alpha"_s;
|
|
||||||
static constexpr auto s_PlayReadyUUID = WEBCORE_GSTREAMER_EME_UTILITIES_PLAYREADY_UUID ""_s;
|
|
||||||
static constexpr std::array<ASCIILiteral, 2> s_PlayReadyKeySystems = { "com.microsoft.playready"_s, "com.youtube.playready"_s };
|
|
||||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
|
||||||
static constexpr auto s_unspecifiedUUID = GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s;
|
|
||||||
static constexpr auto s_unspecifiedKeySystem = GST_PROTECTION_UNSPECIFIED_SYSTEM_ID ""_s;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static bool isClearKeyKeySystem(const String& keySystem)
|
|
||||||
{
|
|
||||||
@@ -144,6 +148,7 @@ public:
|
|
||||||
return equalIgnoringASCIICase(uuid, s_PlayReadyUUID);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
|
||||||
static bool isUnspecifiedKeySystem(const String& keySystem)
|
|
||||||
{
|
|
||||||
return equalIgnoringASCIICase(keySystem, s_unspecifiedKeySystem);
|
|
||||||
@@ -153,6 +158,7 @@ public:
|
|
||||||
{
|
|
||||||
return equalIgnoringASCIICase(uuid, s_unspecifiedUUID);
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static const char* keySystemToUuid(const String& keySystem)
|
|
||||||
{
|
|
||||||
@@ -165,8 +171,10 @@ public:
|
|
||||||
if (isPlayReadyKeySystem(keySystem))
|
|
||||||
return s_PlayReadyUUID;
|
|
||||||
|
|
||||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
|
||||||
if (isUnspecifiedKeySystem(keySystem))
|
|
||||||
return s_unspecifiedUUID;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
ASSERT_NOT_REACHED();
|
|
||||||
return { };
|
|
||||||
@@ -183,8 +191,10 @@ public:
|
|
||||||
if (isPlayReadyUUID(uuid))
|
|
||||||
return s_PlayReadyKeySystems[0];
|
|
||||||
|
|
||||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
|
||||||
if (isUnspecifiedUUID(uuid))
|
|
||||||
return s_unspecifiedKeySystem;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
ASSERT_NOT_REACHED();
|
|
||||||
return ""_s;
|
|
||||||
diff --git a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
|
|
||||||
index 0cde37e1f83f..a7bbf7fc569c 100644
|
|
||||||
--- a/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
|
|
||||||
+++ b/Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp
|
|
||||||
@@ -171,8 +171,11 @@ static GstCaps* transformCaps(GstBaseTransform* base, GstPadDirection direction,
|
|
||||||
|
|
||||||
// GST_PROTECTION_UNSPECIFIED_SYSTEM_ID was added in the GStreamer
|
|
||||||
// developement git master which will ship as version 1.16.0.
|
|
||||||
- gst_structure_set_name(outgoingStructure.get(), !g_strcmp0(klass->protectionSystemId(self),
|
|
||||||
- GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" : "application/x-cenc");
|
|
||||||
+ gst_structure_set_name(outgoingStructure.get(),
|
|
||||||
+#if GST_CHECK_VERSION(1, 16, 0)
|
|
||||||
+ !g_strcmp0(klass->protectionSystemId(self), GST_PROTECTION_UNSPECIFIED_SYSTEM_ID) ? "application/x-webm-enc" :
|
|
||||||
+#endif
|
|
||||||
+ "application/x-cenc");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/Source/cmake/GStreamerChecks.cmake b/Source/cmake/GStreamerChecks.cmake
|
|
||||||
index 8774f1d2aca8..d43093ec7824 100644
|
|
||||||
--- a/Source/cmake/GStreamerChecks.cmake
|
|
||||||
+++ b/Source/cmake/GStreamerChecks.cmake
|
|
||||||
@@ -36,7 +36,7 @@ if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
|
|
||||||
list(APPEND GSTREAMER_COMPONENTS webrtc)
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
- find_package(GStreamer 1.16.2 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
|
||||||
+ find_package(GStreamer 1.14.0 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
|
|
||||||
|
|
||||||
if (ENABLE_WEB_AUDIO)
|
|
||||||
if (NOT PC_GSTREAMER_AUDIO_FOUND OR NOT PC_GSTREAMER_FFT_FOUND)
|
|
||||||
--
|
|
||||||
2.41.0
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
|||||||
From: Alberto Garcia <berto@igalia.com>
|
|
||||||
Subject: Fix FTBFS in i386
|
|
||||||
Bug: https://bugs.webkit.org/show_bug.cgi?id=268739
|
|
||||||
Index: webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
|
||||||
===================================================================
|
|
||||||
--- webkitgtk.orig/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
|
||||||
+++ webkitgtk/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
|
|
||||||
@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpc
|
|
||||||
UNUSED_VARIABLE(t2);
|
|
||||||
UNUSED_VARIABLE(t3);
|
|
||||||
UNUSED_VARIABLE(t5);
|
|
||||||
- UNUSED_VARIABLE(t6);
|
|
||||||
- UNUSED_VARIABLE(t7);
|
|
||||||
|
|
||||||
struct StackPointerScope {
|
|
||||||
StackPointerScope(CLoopStack& stack)
|
|
@ -1,167 +0,0 @@
|
|||||||
diff --git a/Source/JavaScriptCore/runtime/IntlCache.cpp b/Source/JavaScriptCore/runtime/IntlCache.cpp
|
|
||||||
index b17d7340df56..94a5474059b6 100644
|
|
||||||
--- a/Source/JavaScriptCore/runtime/IntlCache.cpp
|
|
||||||
+++ b/Source/JavaScriptCore/runtime/IntlCache.cpp
|
|
||||||
@@ -26,6 +26,7 @@
|
|
||||||
#include "config.h"
|
|
||||||
#include "IntlCache.h"
|
|
||||||
|
|
||||||
+#include "IntlDisplayNames.h"
|
|
||||||
#include <wtf/Vector.h>
|
|
||||||
|
|
||||||
namespace JSC {
|
|
||||||
@@ -53,6 +54,7 @@ Vector<UChar, 32> IntlCache::getBestDateTimePattern(const CString& locale, const
|
|
||||||
return patternBuffer;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
|
|
||||||
Vector<UChar, 32> IntlCache::getFieldDisplayName(const CString& locale, UDateTimePatternField field, UDateTimePGDisplayWidth width, UErrorCode& status)
|
|
||||||
{
|
|
||||||
auto sharedGenerator = getSharedPatternGenerator(locale, status);
|
|
||||||
@@ -64,5 +66,6 @@ Vector<UChar, 32> IntlCache::getFieldDisplayName(const CString& locale, UDateTim
|
|
||||||
return { };
|
|
||||||
return buffer;
|
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
} // namespace JSC
|
|
||||||
diff --git a/Source/JavaScriptCore/runtime/IntlCache.h b/Source/JavaScriptCore/runtime/IntlCache.h
|
|
||||||
index 058b2423786d..e7a8c82f392b 100644
|
|
||||||
--- a/Source/JavaScriptCore/runtime/IntlCache.h
|
|
||||||
+++ b/Source/JavaScriptCore/runtime/IntlCache.h
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
+#include "IntlDisplayNames.h"
|
|
||||||
#include <unicode/udatpg.h>
|
|
||||||
#include <wtf/Noncopyable.h>
|
|
||||||
#include <wtf/text/CString.h>
|
|
||||||
@@ -39,7 +40,9 @@ public:
|
|
||||||
IntlCache() = default;
|
|
||||||
|
|
||||||
Vector<UChar, 32> getBestDateTimePattern(const CString& locale, const UChar* skeleton, unsigned skeletonSize, UErrorCode&);
|
|
||||||
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
|
|
||||||
Vector<UChar, 32> getFieldDisplayName(const CString& locale, UDateTimePatternField, UDateTimePGDisplayWidth, UErrorCode&);
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
private:
|
|
||||||
UDateTimePatternGenerator* getSharedPatternGenerator(const CString& locale, UErrorCode& status)
|
|
||||||
diff --git a/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp b/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
|
|
||||||
index ed8dd34fdf44..9ec789b65413 100644
|
|
||||||
--- a/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
|
|
||||||
+++ b/Source/JavaScriptCore/runtime/IntlDisplayNames.cpp
|
|
||||||
@@ -104,6 +104,7 @@ void IntlDisplayNames::initializeDisplayNames(JSGlobalObject* globalObject, JSVa
|
|
||||||
m_languageDisplay = intlOption<LanguageDisplay>(globalObject, options, vm.propertyNames->languageDisplay, { { "dialect"_s, LanguageDisplay::Dialect }, { "standard"_s, LanguageDisplay::Standard } }, "languageDisplay must be either \"dialect\" or \"standard\""_s, LanguageDisplay::Dialect);
|
|
||||||
RETURN_IF_EXCEPTION(scope, void());
|
|
||||||
|
|
||||||
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
|
|
||||||
UErrorCode status = U_ZERO_ERROR;
|
|
||||||
|
|
||||||
UDisplayContext contexts[] = {
|
|
||||||
@@ -131,6 +132,10 @@ void IntlDisplayNames::initializeDisplayNames(JSGlobalObject* globalObject, JSVa
|
|
||||||
throwTypeError(globalObject, scope, "failed to initialize DisplayNames"_s);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
+#else
|
|
||||||
+ throwTypeError(globalObject, scope, "failed to initialize Intl.DisplayNames since feature is not supported by the ICU version"_s);
|
|
||||||
+ return;
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// https://tc39.es/proposal-intl-displaynames/#sec-Intl.DisplayNames.prototype.of
|
|
||||||
@@ -140,6 +145,7 @@ JSValue IntlDisplayNames::of(JSGlobalObject* globalObject, JSValue codeValue) co
|
|
||||||
VM& vm = globalObject->vm();
|
|
||||||
auto scope = DECLARE_THROW_SCOPE(vm);
|
|
||||||
|
|
||||||
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
|
|
||||||
ASSERT(m_displayNames);
|
|
||||||
auto code = codeValue.toWTFString(globalObject);
|
|
||||||
RETURN_IF_EXCEPTION(scope, { });
|
|
||||||
@@ -344,6 +350,11 @@ JSValue IntlDisplayNames::of(JSGlobalObject* globalObject, JSValue codeValue) co
|
|
||||||
return throwTypeError(globalObject, scope, "Failed to query a display name."_s);
|
|
||||||
}
|
|
||||||
return jsString(vm, String(WTFMove(buffer)));
|
|
||||||
+#else
|
|
||||||
+ UNUSED_PARAM(codeValue);
|
|
||||||
+ throwTypeError(globalObject, scope, "failed to initialize Intl.DisplayNames since feature is not supported by the ICU version"_s);
|
|
||||||
+ return { };
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// https://tc39.es/proposal-intl-displaynames/#sec-Intl.DisplayNames.prototype.resolvedOptions
|
|
||||||
diff --git a/Source/JavaScriptCore/runtime/IntlDisplayNames.h b/Source/JavaScriptCore/runtime/IntlDisplayNames.h
|
|
||||||
index 2101c342865e..87a95a26f55c 100644
|
|
||||||
--- a/Source/JavaScriptCore/runtime/IntlDisplayNames.h
|
|
||||||
+++ b/Source/JavaScriptCore/runtime/IntlDisplayNames.h
|
|
||||||
@@ -29,6 +29,13 @@
|
|
||||||
#include <unicode/uldnames.h>
|
|
||||||
#include <wtf/unicode/icu/ICUHelpers.h>
|
|
||||||
|
|
||||||
+#if !defined(HAVE_ICU_U_LOCALE_DISPLAY_NAMES)
|
|
||||||
+// We need 61 or later since part of implementation uses UCURR_NARROW_SYMBOL_NAME.
|
|
||||||
+#if U_ICU_VERSION_MAJOR_NUM >= 61
|
|
||||||
+#define HAVE_ICU_U_LOCALE_DISPLAY_NAMES 1
|
|
||||||
+#endif
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
namespace JSC {
|
|
||||||
|
|
||||||
enum class RelevantExtensionKey : uint8_t;
|
|
||||||
diff --git a/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp b/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
|
|
||||||
index fdcaa71f2011..f6aa1b0e3def 100644
|
|
||||||
--- a/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
|
|
||||||
+++ b/Source/JavaScriptCore/runtime/IntlDurationFormat.cpp
|
|
||||||
@@ -41,7 +41,6 @@
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#include <unicode/ulistformatter.h>
|
|
||||||
-#include <unicode/unumberformatter.h>
|
|
||||||
#include <unicode/ures.h>
|
|
||||||
#if HAVE(ICU_U_LIST_FORMATTER)
|
|
||||||
#define U_HIDE_DRAFT_API 1
|
|
||||||
@@ -49,6 +48,7 @@
|
|
||||||
|
|
||||||
#if HAVE(ICU_U_LIST_FORMATTER)
|
|
||||||
#include <unicode/uformattedvalue.h>
|
|
||||||
+#include <unicode/unumberformatter.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
namespace JSC {
|
|
||||||
diff --git a/Source/JavaScriptCore/runtime/IntlObject.cpp b/Source/JavaScriptCore/runtime/IntlObject.cpp
|
|
||||||
index cba15c79bc45..9553eb6b263b 100644
|
|
||||||
--- a/Source/JavaScriptCore/runtime/IntlObject.cpp
|
|
||||||
+++ b/Source/JavaScriptCore/runtime/IntlObject.cpp
|
|
||||||
@@ -165,7 +165,6 @@ namespace JSC {
|
|
||||||
supportedValuesOf intlObjectFuncSupportedValuesOf DontEnum|Function 1
|
|
||||||
Collator createCollatorConstructor DontEnum|PropertyCallback
|
|
||||||
DateTimeFormat createDateTimeFormatConstructor DontEnum|PropertyCallback
|
|
||||||
- DisplayNames createDisplayNamesConstructor DontEnum|PropertyCallback
|
|
||||||
Locale createLocaleConstructor DontEnum|PropertyCallback
|
|
||||||
NumberFormat createNumberFormatConstructor DontEnum|PropertyCallback
|
|
||||||
PluralRules createPluralRulesConstructor DontEnum|PropertyCallback
|
|
||||||
@@ -253,6 +252,11 @@ void IntlObject::finishCreation(VM& vm, JSGlobalObject*)
|
|
||||||
Base::finishCreation(vm);
|
|
||||||
ASSERT(inherits(info()));
|
|
||||||
JSC_TO_STRING_TAG_WITHOUT_TRANSITION();
|
|
||||||
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
|
|
||||||
+ putDirectWithoutTransition(vm, vm.propertyNames->DisplayNames, createDisplayNamesConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
|
|
||||||
+#else
|
|
||||||
+ UNUSED_PARAM(&createDisplayNamesConstructor);
|
|
||||||
+#endif
|
|
||||||
#if HAVE(ICU_U_LIST_FORMATTER)
|
|
||||||
if (Options::useIntlDurationFormat())
|
|
||||||
putDirectWithoutTransition(vm, vm.propertyNames->DurationFormat, createDurationFormatConstructor(vm, this), static_cast<unsigned>(PropertyAttribute::DontEnum));
|
|
||||||
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
|
|
||||||
index 526fe7cfe0cf..7b057f87b67e 100644
|
|
||||||
--- a/Source/cmake/OptionsGTK.cmake
|
|
||||||
+++ b/Source/cmake/OptionsGTK.cmake
|
|
||||||
@@ -18,7 +18,7 @@ find_package(Fontconfig 2.13.0 REQUIRED)
|
|
||||||
find_package(Freetype 2.9.0 REQUIRED)
|
|
||||||
find_package(LibGcrypt 1.6.0 REQUIRED)
|
|
||||||
find_package(HarfBuzz 1.4.2 REQUIRED COMPONENTS ICU)
|
|
||||||
-find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc)
|
|
||||||
+find_package(ICU 60 REQUIRED COMPONENTS data i18n uc)
|
|
||||||
find_package(JPEG REQUIRED)
|
|
||||||
find_package(LibEpoxy 1.4.0 REQUIRED)
|
|
||||||
find_package(LibXml2 2.8.0 REQUIRED)
|
|
6
SOURCES/webkitgtk-2.38.5.tar.xz.asc
Normal file
6
SOURCES/webkitgtk-2.38.5.tar.xz.asc
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCY+yu2QAKCRDz0yLQ7EWC
|
||||||
|
w7UkAKCS0EoptKZRn3/Z+WgGerHQEQXaFQCg51h2++dwb1bqVZ05Q1YtHmoT2gk=
|
||||||
|
=or/S
|
||||||
|
-----END PGP SIGNATURE-----
|
@ -1,6 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iF0EABECAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZcCvFAAKCRDz0yLQ7EWC
|
|
||||||
w1FoAJ9+JY5XpvsElI4nSgXhLk3k6O7L5QCeNx1Hj5iFlSDQY17oYfa4FyMEI9I=
|
|
||||||
=NxQN
|
|
||||||
-----END PGP SIGNATURE-----
|
|
@ -5,83 +5,66 @@
|
|||||||
mkdir -p _license_files ; \
|
mkdir -p _license_files ; \
|
||||||
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
|
cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
|
||||||
|
|
||||||
|
# No libmanette in RHEL
|
||||||
|
%if !0%{?rhel}
|
||||||
|
%global with_gamepad 1
|
||||||
|
%endif
|
||||||
|
|
||||||
Name: webkit2gtk3
|
Name: webkit2gtk3
|
||||||
Version: 2.42.5
|
Version: 2.38.5
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}.1
|
||||||
Summary: GTK Web content engine library
|
Summary: GTK Web content engine library
|
||||||
|
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
URL: http://www.webkitgtk.org/
|
URL: https://www.webkitgtk.org/
|
||||||
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
|
||||||
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
|
Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
|
||||||
# Use the keys from https://webkitgtk.org/verifying.html
|
# Use the keys from https://webkitgtk.org/verifying.html
|
||||||
# $ gpg --import aperez.key carlosgc.key
|
# $ gpg --import aperez.key carlosgc.key
|
||||||
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
|
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
|
||||||
Source2: webkitgtk-keys.gpg
|
Source2: webkitgtk-keys.gpg
|
||||||
|
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=193749
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2185745
|
||||||
Patch0: evolution-shared-secondary-process.patch
|
Patch0: CVE-2023-28205.patch
|
||||||
|
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=235367
|
|
||||||
Patch1: icu60.patch
|
|
||||||
|
|
||||||
# Partial revert of https://commits.webkit.org/256284@main
|
|
||||||
Patch2: gstreamer-1.16.1.patch
|
|
||||||
|
|
||||||
# Partial revert of https://commits.webkit.org/260744@main
|
|
||||||
Patch3: cairo-1.15.patch
|
|
||||||
|
|
||||||
# Avoid dependency on GEnumClass_autoptr
|
|
||||||
Patch4: glib-2.56.patch
|
|
||||||
|
|
||||||
# https://bugs.webkit.org/show_bug.cgi?id=268739
|
|
||||||
Patch5: i686-build.patch
|
|
||||||
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
BuildRequires: bubblewrap
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gcc-toolset-13
|
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: git
|
BuildRequires: git
|
||||||
|
BuildRequires: gnupg2
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
BuildRequires: hyphen-devel
|
BuildRequires: hyphen-devel
|
||||||
BuildRequires: libatomic
|
BuildRequires: libatomic
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: openssl-devel
|
|
||||||
BuildRequires: perl(English)
|
BuildRequires: perl(English)
|
||||||
BuildRequires: perl(FindBin)
|
BuildRequires: perl(FindBin)
|
||||||
BuildRequires: perl(JSON::PP)
|
BuildRequires: perl(JSON::PP)
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
BuildRequires: ruby
|
BuildRequires: ruby
|
||||||
BuildRequires: rubygem-json
|
|
||||||
BuildRequires: rubygems
|
BuildRequires: rubygems
|
||||||
BuildRequires: shadow-utils
|
BuildRequires: rubygem-json
|
||||||
BuildRequires: unifdef
|
BuildRequires: xdg-dbus-proxy
|
||||||
|
|
||||||
BuildRequires: pkgconfig(atspi-2)
|
BuildRequires: pkgconfig(atspi-2)
|
||||||
BuildRequires: pkgconfig(cairo)
|
BuildRequires: pkgconfig(cairo)
|
||||||
BuildRequires: pkgconfig(egl)
|
BuildRequires: pkgconfig(egl)
|
||||||
%ifarch aarch64 s390x
|
|
||||||
# On aarch64 and s390x enchant-2 is not available (gnome-less)
|
|
||||||
BuildRequires: pkgconfig(enchant)
|
|
||||||
%else
|
|
||||||
BuildRequires: pkgconfig(enchant-2)
|
BuildRequires: pkgconfig(enchant-2)
|
||||||
%endif
|
|
||||||
BuildRequires: pkgconfig(epoxy)
|
|
||||||
BuildRequires: pkgconfig(fontconfig)
|
BuildRequires: pkgconfig(fontconfig)
|
||||||
BuildRequires: pkgconfig(freetype2)
|
BuildRequires: pkgconfig(freetype2)
|
||||||
BuildRequires: pkgconfig(gbm)
|
BuildRequires: pkgconfig(gl)
|
||||||
BuildRequires: pkgconfig(glib-2.0)
|
BuildRequires: pkgconfig(glib-2.0)
|
||||||
|
BuildRequires: pkgconfig(glesv2)
|
||||||
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||||
BuildRequires: pkgconfig(gstreamer-1.0)
|
BuildRequires: pkgconfig(gstreamer-1.0)
|
||||||
BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0)
|
|
||||||
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
|
||||||
BuildRequires: pkgconfig(gtk+-3.0)
|
BuildRequires: pkgconfig(gtk+-3.0)
|
||||||
BuildRequires: pkgconfig(harfbuzz)
|
BuildRequires: pkgconfig(harfbuzz)
|
||||||
BuildRequires: pkgconfig(icu-uc)
|
BuildRequires: pkgconfig(icu-uc)
|
||||||
BuildRequires: pkgconfig(lcms2)
|
BuildRequires: pkgconfig(lcms2)
|
||||||
BuildRequires: pkgconfig(libdrm)
|
BuildRequires: pkgconfig(libgcrypt)
|
||||||
BuildRequires: pkgconfig(libjpeg)
|
BuildRequires: pkgconfig(libjpeg)
|
||||||
BuildRequires: pkgconfig(libnotify)
|
BuildRequires: pkgconfig(libnotify)
|
||||||
BuildRequires: pkgconfig(libopenjp2)
|
BuildRequires: pkgconfig(libopenjp2)
|
||||||
@ -95,6 +78,9 @@ BuildRequires: pkgconfig(libtasn1)
|
|||||||
BuildRequires: pkgconfig(libwebp)
|
BuildRequires: pkgconfig(libwebp)
|
||||||
BuildRequires: pkgconfig(libwoff2dec)
|
BuildRequires: pkgconfig(libwoff2dec)
|
||||||
BuildRequires: pkgconfig(libxslt)
|
BuildRequires: pkgconfig(libxslt)
|
||||||
|
%if 0%{?with_gamepad}
|
||||||
|
BuildRequires: pkgconfig(manette-0.2)
|
||||||
|
%endif
|
||||||
BuildRequires: pkgconfig(sqlite3)
|
BuildRequires: pkgconfig(sqlite3)
|
||||||
BuildRequires: pkgconfig(upower-glib)
|
BuildRequires: pkgconfig(upower-glib)
|
||||||
BuildRequires: pkgconfig(wayland-client)
|
BuildRequires: pkgconfig(wayland-client)
|
||||||
@ -105,8 +91,9 @@ BuildRequires: pkgconfig(wpe-1.0)
|
|||||||
BuildRequires: pkgconfig(wpebackend-fdo-1.0)
|
BuildRequires: pkgconfig(wpebackend-fdo-1.0)
|
||||||
BuildRequires: pkgconfig(xt)
|
BuildRequires: pkgconfig(xt)
|
||||||
|
|
||||||
# libepoxy will crash when WebKit tries using GLES2 if it's not installed.
|
# These are hard requirements of WebKit's bubblewrap sandbox.
|
||||||
Requires: libGLES
|
Requires: bubblewrap
|
||||||
|
Requires: xdg-dbus-proxy
|
||||||
|
|
||||||
# If Geoclue is not running, the geolocation API will not work.
|
# If Geoclue is not running, the geolocation API will not work.
|
||||||
Recommends: geoclue2
|
Recommends: geoclue2
|
||||||
@ -115,6 +102,11 @@ Recommends: geoclue2
|
|||||||
Recommends: gstreamer1-plugins-bad-free
|
Recommends: gstreamer1-plugins-bad-free
|
||||||
Recommends: gstreamer1-plugins-good
|
Recommends: gstreamer1-plugins-good
|
||||||
|
|
||||||
|
# If no xdg-desktop-portal backend is installed, many features will be broken
|
||||||
|
# inside the sandbox. In particular, the -gtk backend has to be installed for
|
||||||
|
# desktop settings access, including font settings.
|
||||||
|
Recommends: xdg-desktop-portal-gtk
|
||||||
|
|
||||||
# Obsolete libwebkit2gtk from the webkitgtk3 package
|
# Obsolete libwebkit2gtk from the webkitgtk3 package
|
||||||
Obsoletes: libwebkit2gtk < 2.5.0
|
Obsoletes: libwebkit2gtk < 2.5.0
|
||||||
Provides: libwebkit2gtk = %{version}-%{release}
|
Provides: libwebkit2gtk = %{version}-%{release}
|
||||||
@ -126,8 +118,6 @@ Provides: webkitgtk4 = %{version}-%{release}
|
|||||||
# GTK+ 2 plugins support was removed in 2.25.3
|
# GTK+ 2 plugins support was removed in 2.25.3
|
||||||
Obsoletes: webkit2gtk3-plugin-process-gtk2 < %{version}-%{release}
|
Obsoletes: webkit2gtk3-plugin-process-gtk2 < %{version}-%{release}
|
||||||
Provides: webkit2gtk3-plugin-process-gtk2 = %{version}-%{release}
|
Provides: webkit2gtk3-plugin-process-gtk2 = %{version}-%{release}
|
||||||
Obsoletes: webkitgtk4-plugin-process-gtk2 < %{version}-%{release}
|
|
||||||
Provides: webkitgtk4-plugin-process-gtk2 = %{version}-%{release}
|
|
||||||
|
|
||||||
# Don't build documentation anymore to avoid gi-docgen dependency
|
# Don't build documentation anymore to avoid gi-docgen dependency
|
||||||
Obsoletes: webkit2gtk3-doc < %{version}-%{release}
|
Obsoletes: webkit2gtk3-doc < %{version}-%{release}
|
||||||
@ -182,7 +172,7 @@ files for developing applications that use JavaScript engine from %{name}.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||||
%autosetup -p1 -n webkitgtk-%{version} -S git
|
%autosetup -p1 -n webkitgtk-%{version}
|
||||||
|
|
||||||
# Remove bundled libraries
|
# Remove bundled libraries
|
||||||
rm -rf Source/ThirdParty/gtest/
|
rm -rf Source/ThirdParty/gtest/
|
||||||
@ -205,48 +195,46 @@ rm -rf Source/ThirdParty/qunit/
|
|||||||
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# The system GCC is too old to build WebKit, so use a GCC Toolset instead.
|
# Warning: although RHEL 9 aarch64 now uses 4 KB page sizes, we still have to
|
||||||
# This prints warnings complaining that it should not be used except in
|
# support 64 KB page sizes until the *builders* use RHEL 9. This means we still
|
||||||
# SCL scriplets, but I can't figure out any other way to make it work.
|
# have to disable JIT and bmalloc, even though this disables important heap
|
||||||
source scl_source enable gcc-toolset-13
|
# security features. We can't simply disable them only during this build,
|
||||||
|
# because gobject-introspection will crash when building anything that depends
|
||||||
|
# on WebKitGTK, because it calls each object's get_type() function, which will
|
||||||
|
# initialize bmalloc and JIT.
|
||||||
|
|
||||||
# -DUSE_SYSTEM_MALLOC=ON is really bad for security, but libpas requires
|
|
||||||
# __atomic_compare_exchange_16 which does not seem to be available.
|
|
||||||
mkdir -p %{_target_platform}
|
|
||||||
pushd %{_target_platform}
|
|
||||||
%cmake \
|
%cmake \
|
||||||
-GNinja \
|
-GNinja \
|
||||||
-DPORT=GTK \
|
-DPORT=GTK \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DUSE_SYSTEM_MALLOC=ON \
|
|
||||||
-DENABLE_JIT=OFF \
|
|
||||||
-DENABLE_BUBBLEWRAP_SANDBOX=OFF \
|
|
||||||
-DUSE_SOUP2=ON \
|
-DUSE_SOUP2=ON \
|
||||||
-DUSE_AVIF=OFF \
|
|
||||||
-DENABLE_DOCUMENTATION=OFF \
|
-DENABLE_DOCUMENTATION=OFF \
|
||||||
-DUSE_GSTREAMER_TRANSCODER=OFF \
|
%if !0%{?with_gamepad}
|
||||||
-DUSE_JPEGXL=OFF \
|
|
||||||
-DENABLE_GAMEPAD=OFF \
|
-DENABLE_GAMEPAD=OFF \
|
||||||
|
%endif
|
||||||
|
%if 0%{?fedora}
|
||||||
|
-DUSER_AGENT_BRANDING="Fedora" \
|
||||||
|
%endif
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%ifarch aarch64
|
%ifarch aarch64
|
||||||
-DUSE_64KB_PAGE_BLOCK=ON \
|
-DUSE_64KB_PAGE_BLOCK=ON \
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
..
|
%{nil}
|
||||||
popd
|
|
||||||
|
|
||||||
# Show the build time in the status
|
# Show the build time in the status
|
||||||
export NINJA_STATUS="[%f/%t][%e] "
|
export NINJA_STATUS="[%f/%t][%e] "
|
||||||
%ninja_build -C %{_target_platform}
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%ninja_install -C %{_target_platform}
|
%cmake_install
|
||||||
|
|
||||||
%find_lang WebKitGTK-4.0
|
%find_lang WebKit2GTK-4.0
|
||||||
|
|
||||||
# Finally, copy over and rename various files for %%license inclusion
|
# Finally, copy over and rename various files for %%license inclusion
|
||||||
%add_to_license_files Source/JavaScriptCore/COPYING.LIB
|
%add_to_license_files Source/JavaScriptCore/COPYING.LIB
|
||||||
%add_to_license_files Source/ThirdParty/ANGLE/LICENSE
|
%add_to_license_files Source/ThirdParty/ANGLE/LICENSE
|
||||||
|
%add_to_license_files Source/ThirdParty/ANGLE/src/common/third_party/smhasher/LICENSE
|
||||||
%add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/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-APPLE
|
||||||
%add_to_license_files Source/WebCore/LICENSE-LGPL-2
|
%add_to_license_files Source/WebCore/LICENSE-LGPL-2
|
||||||
@ -258,7 +246,7 @@ export NINJA_STATUS="[%f/%t][%e] "
|
|||||||
%add_to_license_files Source/WTF/wtf/dtoa/COPYING
|
%add_to_license_files Source/WTF/wtf/dtoa/COPYING
|
||||||
%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
|
%add_to_license_files Source/WTF/wtf/dtoa/LICENSE
|
||||||
|
|
||||||
%files -f WebKitGTK-4.0.lang
|
%files -f WebKit2GTK-4.0.lang
|
||||||
%license _license_files/*ThirdParty*
|
%license _license_files/*ThirdParty*
|
||||||
%license _license_files/*WebCore*
|
%license _license_files/*WebCore*
|
||||||
%license _license_files/*WebInspectorUI*
|
%license _license_files/*WebInspectorUI*
|
||||||
@ -302,253 +290,418 @@ export NINJA_STATUS="[%f/%t][%e] "
|
|||||||
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
|
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Feb 05 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.5-1
|
|
||||||
- Update to 2.42.5
|
|
||||||
Resolves: RHEL-3961
|
|
||||||
|
|
||||||
* Fri Dec 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.4-1
|
|
||||||
- Update to 2.42.4
|
|
||||||
Resolves: RHEL-3961
|
|
||||||
Resolves: RHEL-19365
|
|
||||||
|
|
||||||
* Tue Dec 05 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.3-1
|
|
||||||
- Update to 2.42.3
|
|
||||||
Resolves: RHEL-3961
|
|
||||||
|
|
||||||
* Fri Nov 10 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.2-1
|
|
||||||
- Update to 2.42.2
|
|
||||||
Resolves: RHEL-3961
|
|
||||||
|
|
||||||
* Wed Sep 27 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.1-1
|
|
||||||
- Update to 2.42.1
|
|
||||||
Resolves: RHEL-3961
|
|
||||||
|
|
||||||
* Wed Sep 20 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.42.0-1
|
|
||||||
- Upgrade to 2.42.0
|
|
||||||
Resolves: RHEL-3961
|
|
||||||
|
|
||||||
* Tue Aug 01 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.40.5-1
|
|
||||||
- Upgrade to 2.40.5. Also, disable JIT
|
|
||||||
Resolves: #2176269
|
|
||||||
Resolves: #2185742
|
|
||||||
Resolves: #2209728
|
|
||||||
Resolves: #2209745
|
|
||||||
Resolves: #2218649
|
|
||||||
Resolves: #2218651
|
|
||||||
Resolves: #2224611
|
|
||||||
|
|
||||||
* Thu May 25 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.4
|
|
||||||
- Add patch for CVE-2023-28204
|
|
||||||
Resolves: #2209744
|
|
||||||
- Add patch for CVE-2023-32373
|
|
||||||
Resolves: #2209727
|
|
||||||
|
|
||||||
* Fri Apr 14 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.3
|
|
||||||
- Restore libwpe and wpebackend-fdo dependencies
|
|
||||||
Related: #2185741 (sort of)
|
|
||||||
|
|
||||||
* Wed Apr 12 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.2
|
|
||||||
- Disable libwpe and wpebackend-fdo dependencies
|
|
||||||
Related: #2185741 (sort of)
|
|
||||||
|
|
||||||
* Tue Apr 11 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.1
|
* Tue Apr 11 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1.1
|
||||||
- Add patch for CVE-2023-28205
|
- Add patch for CVE-2023-28205
|
||||||
Resolves: #2185741
|
Resolves: #2185745
|
||||||
|
|
||||||
* Wed Feb 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1
|
* Wed Feb 15 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.5-1
|
||||||
- Update to 2.38.5
|
- Update to 2.38.5
|
||||||
Related: #2127468
|
Related: #2127467
|
||||||
|
|
||||||
* Thu Feb 02 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.4-1
|
* Thu Feb 02 2023 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.4-1
|
||||||
- Update to 2.38.4
|
- Update to 2.38.4
|
||||||
Related: #2127468
|
Related: #2127467
|
||||||
|
|
||||||
* Thu Dec 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.3-1
|
* Thu Dec 22 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.3-1
|
||||||
- Update to 2.38.3
|
- Update to 2.38.3
|
||||||
Related: #2127468
|
Related: #2127467
|
||||||
|
|
||||||
* Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1
|
* Fri Nov 04 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.2-1
|
||||||
- Update to 2.38.2
|
- Update to 2.38.2
|
||||||
Related: #2127468
|
Related: #2127467
|
||||||
|
|
||||||
* Wed Nov 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-2
|
* Mon Oct 31 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-2
|
||||||
- Fix crashes on aarch64
|
- Fix use with aarch64 64 KiB page size
|
||||||
Enable WPE renderer
|
Related: #2127467
|
||||||
Related: #2127468
|
|
||||||
|
|
||||||
* Thu Oct 27 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-1
|
* Mon Oct 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.38.1-1
|
||||||
- Update to 2.38.1
|
- Update to 2.38.1
|
||||||
Related: #2127468
|
Resolves: #2127467
|
||||||
|
|
||||||
* Wed Aug 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.7-1
|
* Wed Aug 24 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.7-1
|
||||||
- Update to 2.36.7
|
- Update to 2.36.7
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
|
|
||||||
* Tue Aug 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.6-1
|
* Tue Aug 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.6-1
|
||||||
- Update to 2.36.6
|
- Update to 2.36.6
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
|
|
||||||
* Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
|
* Tue Aug 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-2
|
||||||
- Fix Eclipse after update to 2.36.5
|
- Fix Eclipse after update to 2.36.5
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
|
|
||||||
* Thu Jul 28 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-1
|
* Thu Jul 28 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.5-1
|
||||||
- Update to 2.36.5
|
- Update to 2.36.5
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
Resolves: #2099334
|
|
||||||
|
|
||||||
* Tue Jul 05 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.4-1
|
* Tue Jul 05 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.4-1
|
||||||
- Update to 2.36.4
|
- Update to 2.36.4
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
|
|
||||||
* Thu Jun 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.3-1
|
* Thu Jun 02 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.3-1
|
||||||
- Update to 2.36.3
|
- Update to 2.36.3
|
||||||
- Related: #2061994
|
- Related: #2061996
|
||||||
- Resolves: #2092748
|
- Resolves: #2092749
|
||||||
|
|
||||||
* Wed May 18 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.2-1
|
* Wed May 18 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.2-1
|
||||||
- Update to 2.36.2
|
- Update to 2.36.2
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
|
|
||||||
* Thu Apr 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.1-1
|
* Thu Apr 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.36.1-1
|
||||||
- Update to 2.36.1
|
- Update to 2.36.1
|
||||||
Related: #2061994
|
Related: #2061996
|
||||||
- Resolves: #2075492
|
- Resolves: #2075493
|
||||||
- Resolves: #2075494
|
- Resolves: #2075495
|
||||||
- Resolves: #2075496
|
- Resolves: #2075497
|
||||||
|
|
||||||
* Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
|
* Thu Feb 17 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.6-1
|
||||||
- Update to 2.34.6
|
- Update to 2.34.6
|
||||||
Related: #1985042
|
Related: #1985041
|
||||||
|
- Resolves: #2037016
|
||||||
|
- Resolves: #2037269
|
||||||
|
|
||||||
* Wed Feb 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.5-1
|
* Wed Feb 09 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.5-1
|
||||||
- Update to 2.34.5
|
- Update to 2.34.5
|
||||||
- Related: #1985042
|
Related: #1985041
|
||||||
|
|
||||||
* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
|
* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
|
||||||
- Update to 2.34.4
|
- Update to 2.34.4
|
||||||
- Resolves: #1985042
|
Related: #1985041
|
||||||
|
|
||||||
* Tue Sep 28 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.4-1
|
* Wed Nov 24 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.2-1
|
||||||
- Update to 2.32.4
|
- Update to 2.34.2
|
||||||
- Related: #1985042
|
Related: #1985041
|
||||||
- Resolves: #2006429
|
|
||||||
|
* Tue Oct 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.1-1
|
||||||
|
- Update to 2.34.1
|
||||||
|
Related: #1985041
|
||||||
|
|
||||||
|
* Wed Sep 29 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.0-1
|
||||||
|
- Update to 2.34.0
|
||||||
|
Related: #1985041
|
||||||
|
Resolves: #2006423
|
||||||
|
- Enable LTO
|
||||||
|
Resolves: #1990111
|
||||||
|
|
||||||
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.32.3-2
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
* Fri Jul 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-1
|
* Fri Jul 23 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.3-1
|
||||||
- Update to 2.32.3
|
- Update to 2.32.3
|
||||||
- Related: #1937416
|
- Related: #1947884
|
||||||
|
|
||||||
|
* Fri Jul 16 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-2
|
||||||
|
- Add missing GStreamer recommends
|
||||||
|
Resolves: #1972375
|
||||||
|
|
||||||
* Tue Jul 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-1
|
* Tue Jul 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.2-1
|
||||||
- Update to 2.32.2
|
- Update to 2.32.2
|
||||||
- Related: #1937416
|
Related: #1947884
|
||||||
|
|
||||||
* Mon May 10 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.1-1
|
* Tue May 11 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.1-1
|
||||||
- Update to 2.32.1
|
- Update to 2.32.1
|
||||||
- Related: #1937416
|
Related: #1947884
|
||||||
|
|
||||||
* Fri Apr 30 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
|
* Wed May 05 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-4
|
||||||
|
- Fix aarch64
|
||||||
|
Resolves: #1957265
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.32.0-3
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Tue Mar 30 2021 Jonathan Wakely <jwakely@redhat.com> - 2.32.0-2
|
||||||
|
- Rebuilt for removed libstdc++ symbol (#1937698)
|
||||||
|
|
||||||
|
* Fri Mar 26 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.32.0-1
|
||||||
- Update to 2.32.0
|
- Update to 2.32.0
|
||||||
- Related: #1937416
|
|
||||||
|
* Fri Mar 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.91-1
|
||||||
|
- Update to 2.31.91
|
||||||
|
|
||||||
|
* Tue Mar 02 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.90-1
|
||||||
|
- Update to 2.31.90
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.31.1-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 14 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-3
|
||||||
|
- Fix multilib conflict in gir files
|
||||||
|
|
||||||
|
* Wed Jan 13 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-2
|
||||||
|
- Disable gamepad support in RHEL
|
||||||
|
|
||||||
|
* Tue Jan 12 2021 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-1
|
||||||
|
- Update to 2.31.1
|
||||||
|
|
||||||
* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
|
* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
|
||||||
- Update to 2.30.4
|
- Update to 2.30.4
|
||||||
- Related: #1883304
|
|
||||||
|
|
||||||
* Wed Nov 25 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
|
* Tue Nov 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
|
||||||
- Update to 2.30.3
|
- Update to 2.30.3
|
||||||
- Related: #1883304
|
|
||||||
|
|
||||||
* Thu Oct 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-2
|
* Wed Nov 11 2020 Jeff Law <law@redhat.com> - 2.30.2-2
|
||||||
- Try to fix coverity build by disabling docs (thanks to Kamil Dudka <kdudka@redhat.com>!)
|
- Fix bogus volatile caught by gcc-11
|
||||||
- Related: #1883304
|
|
||||||
|
|
||||||
* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1
|
* Mon Oct 26 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.2-1
|
||||||
- Update to 2.30.2
|
- Update to 2.30.2
|
||||||
- Related: #1883304
|
|
||||||
|
|
||||||
* Tue Oct 20 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.1-1
|
* Mon Sep 21 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.1-1
|
||||||
- Update to 2.30.1
|
- Update to 2.30.1
|
||||||
- Related: #1883304
|
|
||||||
|
|
||||||
* Mon Aug 03 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.4-1
|
* Fri Sep 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.0-1
|
||||||
- Update to 2.28.4
|
- Update to 2.30.0. Add patch for libwpe#59.
|
||||||
- Related: #1817143
|
|
||||||
|
|
||||||
* Thu May 21 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-2
|
* Fri Sep 04 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.92-1
|
||||||
- Related: rhbz#1817143 Properly remove webkit2gtk3-plugin-process-gtk2 package
|
- Update to 2.29.92
|
||||||
|
|
||||||
* Thu May 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-1
|
* Mon Aug 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.91-1
|
||||||
- Resolves: rhbz#1817143 Update to 2.28.2
|
- Update to 2.29.91
|
||||||
|
|
||||||
* Mon Oct 14 2019 Eike Rathke <erack@redhat.com> - 2.24.4-3
|
* Wed Jul 29 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.4-1
|
||||||
- Related: rhbz#1748890 Bump NVR
|
- Update to 2.29.4
|
||||||
|
|
||||||
* Fri Sep 27 2019 Eike Rathke <erack@redhat.com> - 2.24.4-1
|
* Tue Jul 14 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.3-2
|
||||||
- Resolves: rhbz#1748890 Update to 2.24.4
|
- Drop some Requires to Recommends
|
||||||
|
|
||||||
* Tue Jul 09 2019 Eike Rathke <erack@redhat.com> - 2.24.3-1
|
* Wed Jul 08 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.3-1
|
||||||
- Resolves: rhbz#1728277 Update to 2.24.3
|
- Update to 2.29.3
|
||||||
|
|
||||||
* Wed May 22 2019 Eike Rathke <erack@redhat.com> - 2.24.2-2
|
* Wed Jul 01 2020 Jeff Law <law@redhat.com> - 2.29.2-2
|
||||||
- Related: rhbz#1696708 Use enchant instead of enchant-2 on aarch64 and s390x
|
- Disable LTO
|
||||||
|
|
||||||
* Tue May 21 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
|
* Wed Jun 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.2-1
|
||||||
- Resolves: rhbz#1696708 Rebase to 2.24.2
|
- Update to 2.29.2
|
||||||
- Resolves: rhbz#1592271 Switch to Python 3 for build
|
|
||||||
|
|
||||||
* Tue Feb 12 2019 Eike Rathke <erack@redhat.com> - 2.22.6-1
|
* Mon May 18 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.29.1-1
|
||||||
- Resolves: rhbz#1676489 Update to 2.22.6
|
- Update to 2.29.1
|
||||||
|
|
||||||
* Fri Jan 25 2019 Eike Rathke <erack@redhat.com> - 2.22.5-2
|
* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 2.28.2-3
|
||||||
- Resolves: rhbz#1666984 Fix gigacage
|
- Rebuild for ICU 67
|
||||||
|
|
||||||
* Tue Dec 18 2018 Eike Rathke <erack@redhat.com> - 2.22.5-1
|
* Fri May 08 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-2
|
||||||
- Update to 2.22.5
|
- Fix garbage collection on ppc64le and s390x after upgrade to 2.28
|
||||||
|
|
||||||
* Tue Oct 30 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-1
|
* Fri Apr 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.2-1
|
||||||
|
- Update to 2.28.2
|
||||||
|
|
||||||
|
* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-4
|
||||||
|
- Actually reenable WPE renderer.
|
||||||
|
|
||||||
|
* Fri Apr 17 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-3
|
||||||
|
- Fix and reenable WPE renderer. Fix popup menus in X11.
|
||||||
|
|
||||||
|
* Wed Apr 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-2
|
||||||
|
- Disable WPE renderer again.
|
||||||
|
|
||||||
|
* Mon Apr 13 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.1-1
|
||||||
|
- Update to 2.28.1
|
||||||
|
|
||||||
|
* Thu Apr 09 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-9
|
||||||
|
- Reenable WPE renderer, seems to have mysteriously fixed itself.
|
||||||
|
- Second attempt to fix ppc64le.
|
||||||
|
|
||||||
|
* Tue Mar 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-8
|
||||||
|
- Fix accelerated compositing mode with bubblewrap sandbox enabled
|
||||||
|
- Fix JavaScriptCore on ppc64le
|
||||||
|
|
||||||
|
* Mon Mar 16 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-7
|
||||||
|
- Disable WPE renderer since it's busted, rhbz#1813993.
|
||||||
|
- Use perl() syntax to denote perl dependencies.
|
||||||
|
- Bump revision to maintain upgrade path
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-3
|
||||||
|
- BuildRequires: perl-English
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-2
|
||||||
|
- Rebuild with koji hopefully not broken this time?
|
||||||
|
- Add perl-FindBin BuildRequires
|
||||||
|
|
||||||
|
* Wed Mar 11 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.28.0-1
|
||||||
|
- Update to 2.28.0
|
||||||
|
|
||||||
|
* Thu Feb 27 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.91-1
|
||||||
|
- Update to 2.27.91
|
||||||
|
|
||||||
|
* Mon Feb 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.90-2
|
||||||
|
- Add GPG verification during prep
|
||||||
|
|
||||||
|
* Mon Feb 10 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.27.90-1
|
||||||
|
- Update to 2.27.90
|
||||||
|
|
||||||
|
* Mon Feb 10 2020 Eike Rathke <erack@redhat.com> - 2.27.4-3
|
||||||
|
- Resolves: rhbz#1800249 Fix FTBFS
|
||||||
|
|
||||||
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.27.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 10 2020 Eike Rathke <erack@redhat.com> - 2.27.4-1
|
||||||
|
- Update to 2.27.4
|
||||||
|
|
||||||
|
* Wed Dec 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.27.3-2
|
||||||
|
- Fix minor file and directory ownership issues, rhbz#1779754 and rhbz#1779772
|
||||||
|
|
||||||
|
* Tue Nov 26 2019 Eike Rathke <erack@redhat.com> - 2.27.3-1
|
||||||
|
- Resolves: rhbz#1776825 Update to 2.27.3
|
||||||
|
|
||||||
|
* Sat Nov 02 2019 Pete Walter <pwalter@fedoraproject.org> - 2.27.2-2
|
||||||
|
- Rebuild for ICU 65
|
||||||
|
|
||||||
|
* Tue Oct 22 2019 Eike Rathke <erack@redhat.com> - 2.27.2-1
|
||||||
|
- Resolves: rhbz#1764135 Update to 2.27.2
|
||||||
|
|
||||||
|
* Fri Oct 04 2019 Eike Rathke <erack@redhat.com> - 2.27.1-1
|
||||||
|
- Resolves: rhbz#1758590 Update to 2.27.1
|
||||||
|
|
||||||
|
* Thu Sep 26 2019 Eike Rathke <erack@redhat.com> - 2.26.1-1
|
||||||
|
- Resolves: rhbz#1754472 Update to 2.26.1
|
||||||
|
|
||||||
|
* Thu Sep 19 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.26.0-3
|
||||||
|
- Enable WPE renderer, resolves rhbz#1753730
|
||||||
|
|
||||||
|
* Tue Sep 17 2019 Tomas Popela <tpopela@redhat.com> - 2.26.0-2
|
||||||
|
- Backport fix for a crash when closing the view and HW acceleration is enabled
|
||||||
|
- Resolves: rhbz#1750345
|
||||||
|
- Backport fix for EGL_BAD_ALLOC
|
||||||
|
- Resolves: rhbz#1751936
|
||||||
|
|
||||||
|
* Mon Sep 09 2019 Kalev Lember <klember@redhat.com> - 2.26.0-1
|
||||||
|
- Update to 2.26.0
|
||||||
|
|
||||||
|
* Wed Sep 04 2019 Michael Catanzaro <mcatanzaro@gnome.org> - 2.25.92-2
|
||||||
|
- Add patch to fix startup in X11 when not using gdm
|
||||||
|
|
||||||
|
* Tue Sep 03 2019 Eike Rathke <erack@redhat.com> - 2.25.92-1
|
||||||
|
- Resolves: rhbz#1748305 Update to 2.25.92
|
||||||
|
|
||||||
|
* Fri Aug 02 2019 Eike Rathke <erack@redhat.com> - 2.25.4-1
|
||||||
|
- Update to 2.25.4
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Tomas Popela <tpopela@redhat.com> - 2.25.3-2
|
||||||
|
- Follow-up fixes for the GTK2 plugins support removal
|
||||||
|
- Fixes: rhbz#1733436
|
||||||
|
|
||||||
|
* Tue Jul 23 2019 Eike Rathke <erack@redhat.com> - 2.25.3-1
|
||||||
|
- Update to 2.25.3
|
||||||
|
- This removes support for GTK 2 based NPAPI plugins (such as Adobe Flash)
|
||||||
|
|
||||||
|
* Wed Jul 17 2019 Adam Williamson <awilliam@redhat.com> - 2.25.2-2
|
||||||
|
- Backport fix for crasher that affects Evolution (bwo#199621)
|
||||||
|
|
||||||
|
* Mon Jun 24 2019 Eike Rathke <erack@redhat.com> - 2.25.2-1
|
||||||
|
- Update to 2.25.2
|
||||||
|
|
||||||
|
* Thu Jun 06 2019 Eike Rathke <erack@redhat.com> - 2.25.1-1
|
||||||
|
- Update to 2.25.1
|
||||||
|
|
||||||
|
* Fri May 17 2019 Eike Rathke <erack@redhat.com> - 2.24.2-1
|
||||||
|
- Update to 2.24.2
|
||||||
|
|
||||||
|
* Tue Apr 09 2019 Eike Rathke <erack@redhat.com> - 2.24.1-1
|
||||||
|
- Update to 2.24.1
|
||||||
|
|
||||||
|
* Wed Mar 13 2019 Tomas Popela <tpopela@redhat.com> - 2.24.0-1
|
||||||
|
- Update to 2.24.0
|
||||||
|
|
||||||
|
* Fri Mar 08 2019 Tomas Popela <tpopela@redhat.com> - 2.23.92-1
|
||||||
|
- Update to 2.23.92
|
||||||
|
- Switch to python3
|
||||||
|
|
||||||
|
* Wed Feb 20 2019 Eike Rathke <erack@redhat.com> - 2.23.91-1
|
||||||
|
- Update to 2.23.91
|
||||||
|
|
||||||
|
* Mon Feb 18 2019 Eike Rathke <erack@redhat.com> - 2.23.90-1
|
||||||
|
- Update to 2.23.90
|
||||||
|
|
||||||
|
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.23.3-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 24 2019 Pete Walter <pwalter@fedoraproject.org> - 2.23.3-2
|
||||||
|
- Rebuild for ICU 63
|
||||||
|
|
||||||
|
* Mon Jan 14 2019 Eike Rathke <erack@redhat.com> - 2.23.3-1
|
||||||
|
- Update to 2.23.3
|
||||||
|
|
||||||
|
* Tue Nov 27 2018 Eike Rathke <erack@redhat.com> - 2.23.1-1
|
||||||
|
- Update to 2.23.1
|
||||||
|
|
||||||
|
* Thu Nov 22 2018 Tomáš Popela <tpopela@redhat.com> - 2.22.4-1
|
||||||
|
- Update to 2.22.4
|
||||||
|
|
||||||
|
* Thu Nov 01 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-2
|
||||||
|
- Switch to using pkgconfig build requires
|
||||||
|
- Switch to enchant-2
|
||||||
|
- Resolves: rhbz#1631486
|
||||||
|
|
||||||
|
* Mon Oct 29 2018 Tomas Popela <tpopela@redhat.com> - 2.22.3-1
|
||||||
- Update to 2.22.3
|
- Update to 2.22.3
|
||||||
- Resolves: rhbz#1641009
|
|
||||||
|
|
||||||
* Mon Sep 24 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
|
* Fri Oct 19 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-3
|
||||||
|
- Fix WebProcess crash while printing
|
||||||
|
- Resolves: rhbz#1639754
|
||||||
|
|
||||||
|
* Tue Sep 25 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-2
|
||||||
|
- Switch to Ninja:
|
||||||
|
-7 minutes on the x86_64
|
||||||
|
-11 minutes on ppc64le
|
||||||
|
-13 minutes on i686
|
||||||
|
-13 minutes on s390x
|
||||||
|
-10 minutes on armv7hl
|
||||||
|
-19 minutes on aarch64
|
||||||
|
|
||||||
|
* Sun Sep 23 2018 Tomas Popela <tpopela@redhat.com> - 2.22.2-1
|
||||||
- Update to 2.22.2
|
- Update to 2.22.2
|
||||||
- Resolves: rhbz#1625602
|
|
||||||
|
|
||||||
* Thu Sep 20 2018 Tomas Popela <tpopela@redhat.com> - 2.22.1-1
|
* Thu Sep 20 2018 Tomas Popela <tpopela@redhat.com> - 2.22.1-1
|
||||||
- Update to 2.22.1
|
- Update to 2.22.1
|
||||||
- Resolves: rhbz#1625602
|
|
||||||
|
|
||||||
* Tue Sep 11 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-2
|
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-3
|
||||||
- Backport patches from RHEL 7
|
- Rebuilt against fixed atk (#1626575)
|
||||||
- Resolves: rhbz#1625602
|
|
||||||
|
|
||||||
* Wed Sep 05 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
|
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 2.22.0-2
|
||||||
|
- Rebuilt for GNOME 3.30.0 megaupdate
|
||||||
|
|
||||||
|
* Mon Sep 03 2018 Tomas Popela <tpopela@redhat.com> - 2.22.0-1
|
||||||
- Update to 2.22.0
|
- Update to 2.22.0
|
||||||
- Resolves: rhbz#1625602
|
|
||||||
|
|
||||||
* Tue Jul 17 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-3
|
* Thu Aug 30 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-2
|
||||||
- Update the python2 patch
|
- Update the JSC build fix patch
|
||||||
|
|
||||||
* Mon Jun 18 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-3
|
* Wed Aug 29 2018 Tomas Popela <tpopela@redhat.com> - 2.21.92-1
|
||||||
- Export the python2 env variable
|
- Update to 2.21.92
|
||||||
- Resolves: rhbz#1592264
|
|
||||||
|
|
||||||
* Mon Jun 11 2018 Tomas Popela <tpopela@redhat.com> - 2.20.3-1
|
* Thu Aug 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.91-1
|
||||||
- Update to 2.20.3
|
- Update to 2.21.91
|
||||||
|
|
||||||
* Thu May 24 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-4
|
* Fri Jul 20 2018 Tomas Popela <tpopela@redhat.com> - 2.21.5-1
|
||||||
|
- Update to 2.21.5
|
||||||
|
|
||||||
|
* Mon Jul 16 2018 Tomas Popela <tpopela@redhat.com> - 2.21.4-4
|
||||||
|
- Fix the broken build due to python2 changes
|
||||||
|
|
||||||
|
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.21.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 2.21.4-2
|
||||||
|
- Rebuild for ICU 62
|
||||||
|
|
||||||
|
* Tue Jun 12 2018 Tomas Popela <tpopela@redhat.com> - 2.21.4-1
|
||||||
|
- Update to 2.21.4
|
||||||
|
|
||||||
|
* Mon May 28 2018 Tomas Popela <tpopela@redhat.com> - 2.21.3-1
|
||||||
|
- Update to 2.21.3
|
||||||
|
|
||||||
|
* Thu May 24 2018 Tomas Popela <tpopela@redhat.com> - 2.21.2-2
|
||||||
- Explicitly specify python2 over python and add python2 to BR
|
- Explicitly specify python2 over python and add python2 to BR
|
||||||
|
|
||||||
* Tue May 22 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-3
|
* Mon May 21 2018 Tomas Popela <tpopela@redhat.com> - 2.21.2-1
|
||||||
- aarch64 on RHEL 8 does have a 64kb page size
|
- Update to 2.21.2
|
||||||
- Resolves: rhbz#1578576
|
|
||||||
|
|
||||||
* Tue May 22 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-2
|
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 2.21.1-2
|
||||||
- Temporary disable JIT and BMalloc on aarch64 due to Gigacage problems
|
- Rebuild for ICU 61.1
|
||||||
- Resolves: rhbz#1578576
|
|
||||||
|
|
||||||
* Tue May 15 2018 Tomas Popela <tpopela@redhat.com> - 2.20.2-1
|
* Wed Apr 18 2018 Tomas Popela <tpopela@redhat.com> - 2.21.1-1
|
||||||
- Update to 2.20.2
|
- Update to 2.21.1
|
||||||
- Resolves: rhbz#1577388
|
|
||||||
|
|
||||||
* Tue Apr 10 2018 Tomas Popela <tpopela@redhat.com> - 2.20.1-1
|
* Tue Apr 10 2018 Tomas Popela <tpopela@redhat.com> - 2.20.1-1
|
||||||
- Update to 2.20.1
|
- Update to 2.20.1
|
||||||
|
Loading…
Reference in New Issue
Block a user