Compare commits

...

3 Commits

Author SHA1 Message Date
David Abdurachmanov 2c749702c2
Disable LTO on riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-04-30 08:45:35 +03:00
David Abdurachmanov 3850d83108 Merge remote-tracking branch 'up/f38' into f38-riscv64 2023-04-30 08:44:54 +03:00
Michael Catanzaro 5f66bc79b1 Update to 2.40.1 2023-04-19 18:16:03 -05:00
5 changed files with 29 additions and 55 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@
/webkitgtk-2.39.90.tar.xz.asc
/webkitgtk-2.39.91.tar.xz.asc
/webkitgtk-2.40.0.tar.xz.asc
/webkitgtk-2.40.1.tar.xz.asc

19
build.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/Source/WebCore/platform/graphics/SourceBrush.cpp b/Source/WebCore/platform/graphics/SourceBrush.cpp
index f4d299be82f1..4bf4d6842aea 100644
--- a/Source/WebCore/platform/graphics/SourceBrush.cpp
+++ b/Source/WebCore/platform/graphics/SourceBrush.cpp
@@ -65,12 +65,12 @@ Pattern* SourceBrush::pattern() const
void SourceBrush::setGradient(Ref<Gradient>&& gradient, const AffineTransform& spaceTransform)
{
- m_brush = { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
+ m_brush = Brush { Brush::LogicalGradient { WTFMove(gradient), spaceTransform } };
}
void SourceBrush::setPattern(Ref<Pattern>&& pattern)
{
- m_brush = { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
+ m_brush = Brush { Brush::Variant { std::in_place_type<Ref<Pattern>>, WTFMove(pattern) } };
}
WTF::TextStream& operator<<(TextStream& ts, const SourceBrush& brush)

View File

@ -1,2 +1,2 @@
SHA512 (webkitgtk-2.40.0.tar.xz) = 550dafb31d71edf984d6b7636366f839d31f6b244b87f83c6efe7af17efe3f2f63268d2c39a6a3c474afadf2b30df868efaefcf38197b30cc6b11c63de7d2ddc
SHA512 (webkitgtk-2.40.0.tar.xz.asc) = 782887d27adad7791dd4dc8e070c9c10c711da70907bddf988b739d03c3e2f3d49f433e3afc325801cf42aebe9689110122d6145b69d9696bf8eef5ae525062c
SHA512 (webkitgtk-2.40.1.tar.xz) = e94b9a651b3c120e3dc918831c8a7fcfbd35f6760a53b7b39a07c7d792ddf99082030bf8b44a522001df4a7368c2b9145606f7a1cc8e0ed60498a0b78325bc5c
SHA512 (webkitgtk-2.40.1.tar.xz.asc) = 105496359f3fdb2e4ab97696c5db8efcf55d17a4d560fa62f59febd62e1bba5094ad700e837a19ead15e5654e7ffbc4275761c70983d8cd81f8175bd5a446252

View File

@ -1,35 +0,0 @@
From 7bcb97382f2f347dc348c3c31416ae7fd760ce6b Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 17 Mar 2023 15:39:52 -0500
Subject: [PATCH] REGRESSION(261320@main): [GLib] Broke
WebKitUserContentManager::script-message-received
https://bugs.webkit.org/show_bug.cgi?id=254089
Reviewed by NOBODY (OOPS!).
I forgot to update the marshaller used by
WebKitUserContentManager::script-message-received. It worked perfectly
fine in my development environment for whatever reason, but was broken
in at least Ephy Tech Preview.
* Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp:
---
Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
index af2d963bb3b3..f778b19bc816 100644
--- a/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
+++ b/Source/WebKit/UIProcess/API/glib/WebKitUserContentManager.cpp
@@ -106,7 +106,11 @@ static void webkit_user_content_manager_class_init(WebKitUserContentManagerClass
G_TYPE_FROM_CLASS(gObjectClass),
static_cast<GSignalFlags>(G_SIGNAL_RUN_LAST | G_SIGNAL_DETAILED),
0, nullptr, nullptr,
+#if ENABLE(2022_GLIB_API)
+ g_cclosure_marshal_VOID__OBJECT,
+#else
g_cclosure_marshal_VOID__BOXED,
+#endif
G_TYPE_NONE, 1,
#if ENABLE(2022_GLIB_API)
JSC_TYPE_VALUE);

View File

@ -15,8 +15,12 @@
# any warning during WebKit docs build is fatal!
%bcond_without docs
%ifarch riscv64
%global _lto_cflags %{nil}
%endif
Name: webkitgtk
Version: 2.40.0
Version: 2.40.1
Release: %autorelease -e 0.riscv64
Summary: GTK web content engine library
@ -29,8 +33,8 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
Source2: webkitgtk-keys.gpg
# https://github.com/WebKit/WebKit/pull/11664
Patch0: unbreak-script-message-received.patch
# https://commits.webkit.org/262434@main
Patch0: build.patch
BuildRequires: bison
BuildRequires: bubblewrap
@ -338,11 +342,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%ifarch riscv64
-DENABLE_JIT=OFF \
-DENABLE_C_LOOP=ON \
-DENABLE_SAMPLING_PROFILER=OFF \
%endif
%{nil}
@ -362,11 +361,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%ifarch riscv64
-DENABLE_JIT=OFF \
-DENABLE_C_LOOP=ON \
-DENABLE_SAMPLING_PROFILER=OFF \
%endif
%{nil}
@ -387,11 +381,6 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
%ifarch aarch64
-DUSE_64KB_PAGE_BLOCK=ON \
%endif
%endif
%ifarch riscv64
-DENABLE_JIT=OFF \
-DENABLE_C_LOOP=ON \
-DENABLE_SAMPLING_PROFILER=OFF \
%endif
%{nil}