Commit 71d3f6e2 authored by Alexander Mikhaylenko's avatar Alexander Mikhaylenko
Browse files

Update patches

parent 9ecdf85c
Pipeline #59864 passed with stages
in 180 minutes and 9 seconds
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Thu, 4 Jul 2019 09:45:26 +0200
Subject: ScrollAnimationKinetic: Drop the deceleration friction
This makes WebKitGTK more comfortable on touch screens as it avoids to
scroll too much.
---
Source/WebCore/platform/ScrollAnimationKinetic.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Source/WebCore/platform/ScrollAnimationKinetic.cpp b/Source/WebCore/platform/ScrollAnimationKinetic.cpp
index 3ce55a1..5cca85e 100644
--- a/Source/WebCore/platform/ScrollAnimationKinetic.cpp
+++ b/Source/WebCore/platform/ScrollAnimationKinetic.cpp
@@ -65,7 +65,7 @@
* f2(x) = t exp(-mx / 2)
*/
-static const double decelFriction = 4;
+static const double decelFriction = 1;
static const double frameRate = 60;
static const Seconds tickTime = 1_s / frameRate;
static const Seconds minimumTimerInterval { 1_ms };
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Wed, 30 Sep 2020 17:22:42 +0500
Subject: Chassis type check fails if the value is quoted
https://bugs.webkit.org/show_bug.cgi?id=217123
Reviewed by NOBODY (OOPS!).
Sometimes the chassis type can be quoted, in this case we'll fail to
parse it and fall back to desktop type. Unquote the string before
attempting to parse it.
* wtf/glib/ChassisType.cpp:
(WTF::readMachineInfoChassisType):
---
Source/WTF/wtf/glib/ChassisType.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/Source/WTF/wtf/glib/ChassisType.cpp b/Source/WTF/wtf/glib/ChassisType.cpp
index 3fc326e..b8269de 100644
--- a/Source/WTF/wtf/glib/ChassisType.cpp
+++ b/Source/WTF/wtf/glib/ChassisType.cpp
@@ -46,7 +46,12 @@ static Optional<ChassisType> readMachineInfoChassisType()
for (int i = 0; split.get()[i]; ++i) {
if (g_str_has_prefix(split.get()[i], "CHASSIS=")) {
char* chassis = split.get()[i] + 8;
- if (!strcmp(chassis, "tablet") || !strcmp(chassis, "handset"))
+
+ GUniquePtr<char> unquoted(g_shell_unquote(chassis, &error.outPtr()));
+ if (error.get() != nullptr)
+ g_warning("Could not unquote chassis type %s: %s", chassis, error->message);
+
+ if (!strcmp(unquoted.get(), "tablet") || !strcmp(unquoted.get(), "handset"))
return ChassisType::Mobile;
return ChassisType::Desktop;
From: Alexander Mikhaylenko <alexm@gnome.org>
Date: Wed, 7 Oct 2020 15:30:23 +0500
Subject: librem5: Disable smooth scrolling for Nicosia async scrolling
See https://bugs.webkit.org/show_bug.cgi?id=210382#c22
---
.../scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp | 5 -----
.../scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp | 5 -----
2 files changed, 10 deletions(-)
diff --git a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
index 08b5e5e..d2c64de 100644
--- a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
+++ b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFrameScrollingNodeNicosia.cpp
@@ -188,17 +188,12 @@ WheelEventHandlingResult ScrollingTreeFrameScrollingNodeNicosia::handleWheelEven
}
}
-#if ENABLE(SMOOTH_SCROLLING)
- m_smoothAnimation->scroll(HorizontalScrollbar, ScrollByPixel, 1, -deltaX);
- m_smoothAnimation->scroll(VerticalScrollbar, ScrollByPixel, 1, -deltaY);
-#else
auto* scrollLayer = static_cast<Nicosia::PlatformLayer*>(scrolledContentsLayer());
ASSERT(scrollLayer);
auto& compositionLayer = downcast<Nicosia::CompositionLayer>(*scrollLayer);
auto updateScope = compositionLayer.createUpdateScope();
scrollBy({ -deltaX, -deltaY });
-#endif
return WheelEventHandlingResult::handled();
}
diff --git a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
index 069ad4f..04dba6f 100644
--- a/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
+++ b/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollingNodeNicosia.cpp
@@ -173,17 +173,12 @@ WheelEventHandlingResult ScrollingTreeOverflowScrollingNodeNicosia::handleWheelE
}
}
-#if ENABLE(SMOOTH_SCROLLING)
- m_smoothAnimation->scroll(HorizontalScrollbar, ScrollByPixel, 1, -deltaX);
- m_smoothAnimation->scroll(VerticalScrollbar, ScrollByPixel, 1, -deltaY);
-#else
auto* scrollLayer = static_cast<Nicosia::PlatformLayer*>(scrollContainerLayer());
ASSERT(scrollLayer);
auto& compositionLayer = downcast<Nicosia::CompositionLayer>(*scrollLayer);
auto updateScope = compositionLayer.createUpdateScope();
scrollBy({ -deltaX, -deltaY });
-#endif
return WheelEventHandlingResult::handled();
}
From: Alberto Garcia <berto@igalia.com>
Date: Fri, 16 Oct 2020 17:56:08 +0500
Subject: Don't check for SSE2 support on i386
Bug-Debian: https://bugs.debian.org/930935
Forwarded: no
Index: webkitgtk/Source/cmake/WebKitCompilerFlags.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/WebKitCompilerFlags.cmake
+++ webkitgtk/Source/cmake/WebKitCompilerFlags.cmake
---
Source/cmake/WebKitCompilerFlags.cmake | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/Source/cmake/WebKitCompilerFlags.cmake b/Source/cmake/WebKitCompilerFlags.cmake
index 4944664..d11a26f 100644
--- a/Source/cmake/WebKitCompilerFlags.cmake
+++ b/Source/cmake/WebKitCompilerFlags.cmake
@@ -138,15 +138,6 @@ if (COMPILER_IS_GCC_OR_CLANG)
if (CMAKE_COMPILER_IS_GNUCXX)
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-expansion-to-defined)
......
From: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
Date: Fri, 16 Oct 2020 17:56:07 +0500
Subject: Fix FTBFS on m68k
Bug-Debian: https://bugs.debian.org/868126
Last-Update: 2020-01-23
Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
---
Source/WTF/wtf/PlatformCPU.h | 5 +++++
Source/WebCore/css/CSSProperty.cpp | 4 ++++
Source/WebCore/dom/ElementRareData.cpp | 4 ++++
Source/WebCore/dom/NodeRareData.cpp | 4 ++++
Source/WebCore/dom/ShadowRoot.cpp | 4 ++++
Source/WebCore/platform/graphics/FontCascadeDescription.cpp | 4 ++++
Source/WebCore/rendering/style/RenderStyle.cpp | 8 ++++++++
Source/WebCore/rendering/style/StyleBoxData.cpp | 4 ++++
Source/WebCore/style/RuleData.cpp | 4 ++++
9 files changed, 41 insertions(+)
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index f6e9339..db4b055 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -35,6 +35,11 @@
/* ==== CPU() - the target CPU architecture ==== */
/* CPU(KNOWN) becomes true if we explicitly support a target CPU. */
......@@ -18,10 +34,10 @@ Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
/* CPU(MIPS) - MIPS 32-bit and 64-bit */
#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_) || defined(__mips64))
#if defined(_ABI64) && (_MIPS_SIM == _ABI64)
Index: webkitgtk/Source/WebCore/css/CSSProperty.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/css/CSSProperty.cpp
+++ webkitgtk/Source/WebCore/css/CSSProperty.cpp
diff --git a/Source/WebCore/css/CSSProperty.cpp b/Source/WebCore/css/CSSProperty.cpp
index fc00759..09c9ff1 100644
--- a/Source/WebCore/css/CSSProperty.cpp
+++ b/Source/WebCore/css/CSSProperty.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsCSSProperty {
void* value;
};
......@@ -34,11 +50,11 @@ Index: webkitgtk/Source/WebCore/css/CSSProperty.cpp
CSSPropertyID StylePropertyMetadata::shorthandID() const
{
Index: webkitgtk/Source/WebCore/dom/ElementRareData.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/dom/ElementRareData.cpp
+++ webkitgtk/Source/WebCore/dom/ElementRareData.cpp
@@ -56,6 +56,10 @@ struct SameSizeAsElementRareData : NodeR
diff --git a/Source/WebCore/dom/ElementRareData.cpp b/Source/WebCore/dom/ElementRareData.cpp
index 8aaeaec..038853a 100644
--- a/Source/WebCore/dom/ElementRareData.cpp
+++ b/Source/WebCore/dom/ElementRareData.cpp
@@ -56,6 +56,10 @@ struct SameSizeAsElementRareData : NodeRareData {
};
......@@ -49,10 +65,10 @@ Index: webkitgtk/Source/WebCore/dom/ElementRareData.cpp
+#endif
} // namespace WebCore
Index: webkitgtk/Source/WebCore/dom/NodeRareData.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/dom/NodeRareData.cpp
+++ webkitgtk/Source/WebCore/dom/NodeRareData.cpp
diff --git a/Source/WebCore/dom/NodeRareData.cpp b/Source/WebCore/dom/NodeRareData.cpp
index 4eb631c..cd8abcf 100644
--- a/Source/WebCore/dom/NodeRareData.cpp
+++ b/Source/WebCore/dom/NodeRareData.cpp
@@ -40,7 +40,11 @@ struct SameSizeAsNodeRareData {
void* m_pointer[2];
};
......@@ -65,11 +81,11 @@ Index: webkitgtk/Source/WebCore/dom/NodeRareData.cpp
// Ensure the 10 bits reserved for the m_connectedFrameCount cannot overflow
static_assert(Page::maxNumberOfFrames < 1024, "Frame limit should fit in rare data count");
Index: webkitgtk/Source/WebCore/dom/ShadowRoot.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/dom/ShadowRoot.cpp
+++ webkitgtk/Source/WebCore/dom/ShadowRoot.cpp
@@ -59,7 +59,11 @@ struct SameSizeAsShadowRoot : public Doc
diff --git a/Source/WebCore/dom/ShadowRoot.cpp b/Source/WebCore/dom/ShadowRoot.cpp
index 0a29de8..b1393cb 100644
--- a/Source/WebCore/dom/ShadowRoot.cpp
+++ b/Source/WebCore/dom/ShadowRoot.cpp
@@ -59,7 +59,11 @@ struct SameSizeAsShadowRoot : public DocumentFragment, public TreeScope {
Optional<HashMap<AtomString, AtomString>> partMappings;
};
......@@ -81,10 +97,26 @@ Index: webkitgtk/Source/WebCore/dom/ShadowRoot.cpp
ShadowRoot::ShadowRoot(Document& document, ShadowRootMode type, DelegatesFocus delegatesFocus)
: DocumentFragment(document, CreateShadowRoot)
Index: webkitgtk/Source/WebCore/rendering/style/RenderStyle.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/rendering/style/RenderStyle.cpp
+++ webkitgtk/Source/WebCore/rendering/style/RenderStyle.cpp
diff --git a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
index 14a96f7..1a0c51d 100644
--- a/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
+++ b/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
@@ -52,7 +52,11 @@ struct SameSizeAsFontCascadeDescription {
unsigned bitfields3 : 10;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(FontCascadeDescription) >= sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#else
COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#endif
FontCascadeDescription::FontCascadeDescription()
: m_isAbsoluteSize(false)
diff --git a/Source/WebCore/rendering/style/RenderStyle.cpp b/Source/WebCore/rendering/style/RenderStyle.cpp
index 7b75fae..77a44e9 100644
--- a/Source/WebCore/rendering/style/RenderStyle.cpp
+++ b/Source/WebCore/rendering/style/RenderStyle.cpp
@@ -65,7 +65,11 @@ struct SameSizeAsBorderValue {
int m_restBits;
};
......@@ -109,11 +141,11 @@ Index: webkitgtk/Source/WebCore/rendering/style/RenderStyle.cpp
DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(RenderStyle);
Index: webkitgtk/Source/WebCore/rendering/style/StyleBoxData.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/rendering/style/StyleBoxData.cpp
+++ webkitgtk/Source/WebCore/rendering/style/StyleBoxData.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsStyleBoxData : public R
diff --git a/Source/WebCore/rendering/style/StyleBoxData.cpp b/Source/WebCore/rendering/style/StyleBoxData.cpp
index db977a8..77ae85c 100644
--- a/Source/WebCore/rendering/style/StyleBoxData.cpp
+++ b/Source/WebCore/rendering/style/StyleBoxData.cpp
@@ -33,7 +33,11 @@ struct SameSizeAsStyleBoxData : public RefCounted<SameSizeAsStyleBoxData> {
uint32_t bitfields;
};
......@@ -125,26 +157,10 @@ Index: webkitgtk/Source/WebCore/rendering/style/StyleBoxData.cpp
DEFINE_ALLOCATOR_WITH_HEAP_IDENTIFIER(StyleBoxData);
Index: webkitgtk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
+++ webkitgtk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
@@ -52,7 +52,11 @@ struct SameSizeAsFontCascadeDescription
unsigned bitfields3 : 10;
};
+#if defined(__m68k__)
+COMPILE_ASSERT(sizeof(FontCascadeDescription) >= sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#else
COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
+#endif
FontCascadeDescription::FontCascadeDescription()
: m_isAbsoluteSize(false)
Index: webkitgtk/Source/WebCore/style/RuleData.cpp
===================================================================
--- webkitgtk.orig/Source/WebCore/style/RuleData.cpp
+++ webkitgtk/Source/WebCore/style/RuleData.cpp
diff --git a/Source/WebCore/style/RuleData.cpp b/Source/WebCore/style/RuleData.cpp
index 2129a67..26d415d 100644
--- a/Source/WebCore/style/RuleData.cpp
+++ b/Source/WebCore/style/RuleData.cpp
@@ -59,7 +59,11 @@ struct SameSizeAsRuleData {
unsigned d[4];
};
......
From: David Matthew Mattli <dmm@mattli.us>
Date: Fri, 16 Oct 2020 17:56:07 +0500
Subject: Fix FTBFS in sparc64
Bug-Debian: https://bugs.debian.org/806816
Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
---
Source/WTF/wtf/PlatformCPU.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index 0e711de..f6e9339 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -89,6 +89,11 @@
#define WTF_CPU_KNOWN 1
#endif
......
From: Alberto Garcia <berto@igalia.com>
Description: Use WTF_CPU_UNKNOWN when building for X32
WebKitGTK doesn't build on X32 even with the JIT disabled.
Treating the CPU as unknown is perhaps a bit severe, but it allows us
to get the build done until someone steps up to maintain this
properly.
Date: Fri, 16 Oct 2020 17:56:07 +0500
Subject: Use WTF_CPU_UNKNOWN when building for X32
Forwarded: no
Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
WebKitGTK doesn't build on X32 even with the JIT disabled.
Treating the CPU as unknown is perhaps a bit severe, but it allows us
to get the build done until someone steps up to maintain this
properly.
===================================================================
--- webkitgtk.orig/Source/WTF/wtf/PlatformCPU.h
+++ webkitgtk/Source/WTF/wtf/PlatformCPU.h
---
CMakeLists.txt | 2 ++
Source/WTF/wtf/PlatformCPU.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41a7736..caf427f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
set(WTF_CPU_MIPS64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
+elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
+ set(WTF_CPU_UNKNOWN 1)
elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(x64|x86_64|amd64)")
set(WTF_CPU_X86_64 1)
elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(i[3-6]86|x86)")
diff --git a/Source/WTF/wtf/PlatformCPU.h b/Source/WTF/wtf/PlatformCPU.h
index db4b055..6d4bae8 100644
--- a/Source/WTF/wtf/PlatformCPU.h
+++ b/Source/WTF/wtf/PlatformCPU.h
@@ -117,10 +117,12 @@
/* CPU(X86_64) - AMD64 / Intel64 / x86_64 64-bit */
#if defined(__x86_64__) \
......@@ -22,16 +44,3 @@ Index: webkitgtk/Source/WTF/wtf/PlatformCPU.h
/* CPU(ARM64) */
#if defined(__arm64__) || defined(__aarch64__)
Index: webkitgtk/CMakeLists.txt
===================================================================
--- webkitgtk.orig/CMakeLists.txt
+++ webkitgtk/CMakeLists.txt
@@ -97,6 +97,8 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
set(WTF_CPU_MIPS64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
+elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnux32")
+ set(WTF_CPU_UNKNOWN 1)
elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(x64|x86_64|amd64)")
set(WTF_CPU_X86_64 1)
elseif (CMAKE_CXX_LIBRARY_ARCHITECTURE MATCHES "(i[3-6]86|x86)")
From: Alberto Garcia <berto@igalia.com>
Date: Fri, 16 Oct 2020 17:56:07 +0500
Subject: Use CMAKE_CXX_LIBRARY_ARCHITECTURE to detect x86
Bug: https://bugs.webkit.org/show_bug.cgi?id=172799
Description: Use CMAKE_CXX_LIBRARY_ARCHITECTURE to detect x86
When building for x86 in a x86_64 host (e.g. with pbuilder) CMake
will set CMAKE_SYSTEM_PROCESSOR to x86_64, and WebKit will assume
that it's a 64-bit build. Let's use the C++ compiler architecture as
a temporary solution to detect x86 correctly.
Index: webkitgtk/CMakeLists.txt
When building for x86 in a x86_64 host (e.g. with pbuilder) CMake
will set CMAKE_SYSTEM_PROCESSOR to x86_64, and WebKit will assume
that it's a 64-bit build. Let's use the C++ compiler architecture as
a temporary solution to detect x86 correctly.
===================================================================
--- webkitgtk.orig/CMakeLists.txt
+++ webkitgtk/CMakeLists.txt
@@ -97,6 +97,10 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR
---
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0478d0c..41a7736 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,10 @@ elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips64")
set(WTF_CPU_MIPS64 1)
elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
set(WTF_CPU_MIPS 1)
......
From: Alberto Garcia <berto@igalia.com>
Date: Fri, 16 Oct 2020 17:56:08 +0500
Subject: Force the single-process mode in Evolution and Geary
Bug: https://bugs.webkit.org/show_bug.cgi?id=201033
Origin: https://mail.gnome.org/archives/distributor-list/2019-October/msg00000.html
Description: Force the single-process mode in Evolution and Geary
Since WebKitGTK 2.26 the single-process mode is considered a security
risk and the process limiting APIs have been completely disabled.
This change is transparent for most applications, but Geary and
particularly Evolution (see upstream bug #587) are known to have
problems in multi-process mode. This has already been fixed in Geary
3.33.91 and in Evolution 3.34.1.
.
Although the API to set the single-process model is no longer
available, it is still possible to do it internally. This patch does
that for Evolution and Geary.
.
This is a temporary workaround and it is especially meant for stable
distributions and security updates, where patching or updating the
affected apps is not an option.
Index: webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
Since WebKitGTK 2.26 the single-process mode is considered a security
risk and the process limiting APIs have been completely disabled.
This change is transparent for most applications, but Geary and
particularly Evolution (see upstream bug #587) are known to have
problems in multi-process mode. This has already been fixed in Geary
3.33.91 and in Evolution 3.34.1.
Although the API to set the single-process model is no longer
available, it is still possible to do it internally. This patch does
that for Evolution and Geary.
This is a temporary workaround and it is especially meant for stable
distributions and security updates, where patching or updating the
affected apps is not an option.
===================================================================
--- webkitgtk.orig/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ webkitgtk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -397,9 +397,17 @@ static void webkitWebContextConstructed(
---
Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
index af43f9a..662c2a3 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp
@@ -397,9 +397,17 @@ static void webkitWebContextConstructed(GObject* object)
configuration.setProcessSwapsOnNavigation(priv->psonEnabled);
if (!priv->psonEnabled) {
const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS");
......
From: Alberto Garcia <berto@igalia.com>
Description: Enable THREADS_PREFER_PTHREAD_FLAG
This fixes a FTBFS in riscv64
Date: Fri, 16 Oct 2020 17:56:07 +0500
Subject: Enable THREADS_PREFER_PTHREAD_FLAG
Bug: https://bugs.webkit.org/show_bug.cgi?id=182622
Bug-Debian: https://bugs.debian.org/895969
Origin: https://trac.webkit.org/changeset/231843
Index: webkitgtk/Source/cmake/OptionsGTK.cmake
This fixes a FTBFS in riscv64
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsGTK.cmake
+++ webkitgtk/Source/cmake/OptionsGTK.cmake
---
Source/cmake/OptionsGTK.cmake | 2 ++
Source/cmake/OptionsJSCOnly.cmake | 1 +
2 files changed, 3 insertions(+)
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 8732e93..edf4558 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -33,6 +33,8 @@ if (USER_AGENT_BRANDING)
add_definitions(-DUSER_AGENT_BRANDING="${USER_AGENT_BRANDING}")
endif ()
......@@ -17,10 +26,10 @@ Index: webkitgtk/Source/cmake/OptionsGTK.cmake
find_package(Cairo 1.14.0 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
find_package(Freetype 2.4.2 REQUIRED)
Index: webkitgtk/Source/cmake/OptionsJSCOnly.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsJSCOnly.cmake
+++ webkitgtk/Source/cmake/OptionsJSCOnly.cmake
diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
index 316c624..2f71260 100644
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -1,3 +1,4 @@
+set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
......
From: Alberto Garcia <berto@igalia.com>
Date: Fri, 16 Oct 2020 17:56:08 +0500
Subject: Reduce memory usage when not using the Gold linker
Bug-Debian: https://bugs.debian.org/949621
Forwarded: no
Index: webkitgtk/Source/cmake/OptionsCommon.cmake
===================================================================
--- webkitgtk.orig/Source/cmake/OptionsCommon.cmake
+++ webkitgtk/Source/cmake/OptionsCommon.cmake
---
Source/cmake/OptionsCommon.cmake | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Source/cmake/OptionsCommon.cmake b/Source/cmake/OptionsCommon.cmake
index 3cc8560..6b000a2 100644
--- a/Source/cmake/OptionsCommon.cmake
+++ b/Source/cmake/OptionsCommon.cmake
@@ -95,6 +95,12 @@ option(GCC_OFFLINEASM_SOURCE_MAP
"Produce debug line information for offlineasm-generated code"
${GCC_OFFLINEASM_SOURCE_MAP_DEFAULT})
......
......@@ -6,3 +6,7 @@ prefer-pthread.patch
dont-detect-sse2.patch
reduce-memory-overheads.patch
force-single-process.patch
0009-ScrollAnimationKinetic-Drop-the-deceleration-frictio.patch
0010-Chassis-type-check-fails-if-the-value-is-quoted-http.patch
0011-Add-support-for-smooth-scrolling-animation-with-asyn.patch
0012-librem5-Disable-smooth-scrolling-for-Nicosia-async-s.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment