Update to 2.46.2
Add patch to disable Evolution sandbox warning Resolves: RHEL-59181
This commit is contained in:
Michael Catanzaro
parent
d3a996e64d
commit
f4cd5c52b8
2
.gitignore
vendored
2
.gitignore
vendored
@ -147,3 +147,5 @@
|
||||
/webkitgtk-2.46.0.tar.xz.asc
|
||||
/webkitgtk-2.46.1.tar.xz
|
||||
/webkitgtk-2.46.1.tar.xz.asc
|
||||
/webkitgtk-2.46.2.tar.xz
|
||||
/webkitgtk-2.46.2.tar.xz.asc
|
||||
|
||||
14
evolution-sandbox-warning.patch
Normal file
14
evolution-sandbox-warning.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
index a2f3b582dcc5..1faf219c2adb 100644
|
||||
--- a/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
+++ b/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp
|
||||
@@ -91,7 +91,8 @@ void WebProcessPool::platformInitialize(NeedsGlobalStaticInitialization)
|
||||
else {
|
||||
static bool once = false;
|
||||
if (!once) {
|
||||
- g_warning("WEBKIT_FORCE_SANDBOX no longer allows disabling the sandbox. Use WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 instead.");
|
||||
+ if (g_strcmp0(g_get_prgname(), "evolution"))
|
||||
+ g_warning("WEBKIT_FORCE_SANDBOX no longer allows disabling the sandbox. Use WEBKIT_DISABLE_SANDBOX_THIS_IS_DANGEROUS=1 instead.");
|
||||
once = true;
|
||||
}
|
||||
}
|
||||
39823
simde.patch
39823
simde.patch
File diff suppressed because it is too large
Load Diff
@ -1,59 +0,0 @@
|
||||
diff --git a/Source/WTF/wtf/glib/GSocketMonitor.cpp b/Source/WTF/wtf/glib/GSocketMonitor.cpp
|
||||
index c88ea9f91ca49..f3e31efb50530 100644
|
||||
--- a/Source/WTF/wtf/glib/GSocketMonitor.cpp
|
||||
+++ b/Source/WTF/wtf/glib/GSocketMonitor.cpp
|
||||
@@ -33,6 +33,7 @@ namespace WTF {
|
||||
|
||||
GSocketMonitor::~GSocketMonitor()
|
||||
{
|
||||
+ RELEASE_ASSERT(!m_isExecutingCallback);
|
||||
stop();
|
||||
}
|
||||
|
||||
@@ -40,7 +41,17 @@ gboolean GSocketMonitor::socketSourceCallback(GSocket*, GIOCondition condition,
|
||||
{
|
||||
if (g_cancellable_is_cancelled(monitor->m_cancellable.get()))
|
||||
return G_SOURCE_REMOVE;
|
||||
- return monitor->m_callback(condition);
|
||||
+
|
||||
+ monitor->m_isExecutingCallback = true;
|
||||
+ gboolean result = monitor->m_callback(condition);
|
||||
+ monitor->m_isExecutingCallback = false;
|
||||
+
|
||||
+ if (monitor->m_shouldDestroyCallback) {
|
||||
+ monitor->m_callback = nullptr;
|
||||
+ monitor->m_shouldDestroyCallback = false;
|
||||
+ }
|
||||
+
|
||||
+ return result;
|
||||
}
|
||||
|
||||
void GSocketMonitor::start(GSocket* socket, GIOCondition condition, RunLoop& runLoop, Function<gboolean(GIOCondition)>&& callback)
|
||||
@@ -65,7 +76,13 @@ void GSocketMonitor::stop()
|
||||
m_cancellable = nullptr;
|
||||
g_source_destroy(m_source.get());
|
||||
m_source = nullptr;
|
||||
- m_callback = nullptr;
|
||||
+
|
||||
+ // It's normal to stop the socket monitor from inside its callback.
|
||||
+ // Don't destroy the callback while it's still executing.
|
||||
+ if (m_isExecutingCallback)
|
||||
+ m_shouldDestroyCallback = true;
|
||||
+ else
|
||||
+ m_callback = nullptr;
|
||||
}
|
||||
|
||||
} // namespace WTF
|
||||
diff --git a/Source/WTF/wtf/glib/GSocketMonitor.h b/Source/WTF/wtf/glib/GSocketMonitor.h
|
||||
index 7ec383a6e37c7..9393c546b5938 100644
|
||||
--- a/Source/WTF/wtf/glib/GSocketMonitor.h
|
||||
+++ b/Source/WTF/wtf/glib/GSocketMonitor.h
|
||||
@@ -51,6 +51,8 @@ class GSocketMonitor {
|
||||
GRefPtr<GSource> m_source;
|
||||
GRefPtr<GCancellable> m_cancellable;
|
||||
Function<gboolean(GIOCondition)> m_callback;
|
||||
+ bool m_isExecutingCallback { false };
|
||||
+ bool m_shouldDestroyCallback { false };
|
||||
};
|
||||
|
||||
} // namespace WTF
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (webkitgtk-2.46.1.tar.xz) = e1ac92305b1d1b034eea9be6aa22cfa260249562fa0af41f0ed5c76a36916bba432073e033f228978d84d0377f245642ff31cdec324565e83aa8c82d8ea0c1f5
|
||||
SHA512 (webkitgtk-2.46.1.tar.xz.asc) = a86b2f0d8dce366edeb15f64fd758a383e083224ecd98e3cc9635b590087444929f242ce83471611cb0cbda3227659758121aea46db34a8a3173f0c2f34243c9
|
||||
SHA512 (webkitgtk-2.46.2.tar.xz) = 2031b61a776135279cc557d4fcf4115e14e0c84b638f04871c3f8fd790b5f587cf1774ed93f42c72d4f60f17bd0488d94e49a101e12cda20c91548b858c26b1a
|
||||
SHA512 (webkitgtk-2.46.2.tar.xz.asc) = 034d95f628ddb231938a96fc61bdbc004b6b21ae517ceb6a8d1f4ac08c2cfecac8667f8b78dcaf43b89ff36b624540db5c0c3fe6b0517f099d741bb24dc0e074
|
||||
|
||||
@ -20,8 +20,8 @@
|
||||
%endif
|
||||
|
||||
Name: webkit2gtk3
|
||||
Version: 2.46.1
|
||||
Release: 2%{?dist}
|
||||
Version: 2.46.2
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK Web content engine library
|
||||
|
||||
License: LGPLv2
|
||||
@ -33,16 +33,8 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
|
||||
# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
|
||||
Source2: webkitgtk-keys.gpg
|
||||
|
||||
# Work around a missing implementation of musttail in clang for ppc64le
|
||||
# https://github.com/llvm/llvm-project/issues/108014
|
||||
Patch: webkitgtk-skia-musttail.patch
|
||||
|
||||
# https://bugs.webkit.org/show_bug.cgi?id=280044
|
||||
# Resolves: https://github.com/simd-everywhere/simde/issues/1211
|
||||
Patch: simde.patch
|
||||
|
||||
# Containing changes from: https://github.com/WebKit/WebKit/pull/34133
|
||||
Patch: socket-monitor.patch
|
||||
# Don't print warning about Evolution's use of WEBKIT_FORCE_SANDBOX
|
||||
Patch: evolution-sandbox-warning.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bubblewrap
|
||||
@ -316,6 +308,15 @@ export NINJA_STATUS="[%f/%t][%e] "
|
||||
%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
|
||||
|
||||
%changelog
|
||||
* Mon Oct 21 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.2-1
|
||||
- Update to 2.46.2
|
||||
- Add patch to disable Evolution sandbox warning
|
||||
Resolves: RHEL-59181
|
||||
|
||||
* Thu Oct 10 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.1-2
|
||||
- Add patch to keep GSocketMonitor callback alive
|
||||
Resolves: RHEL-59181
|
||||
|
||||
* Thu Oct 10 2024 Michael Catanzaro <mcatanzaro@redhat.com> - 2.46.1-2
|
||||
- Add patch to keep GSocketMonitor callback alive
|
||||
Resolves: RHEL-59181
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
diff -up webkitgtk-2.45.92/Source/ThirdParty/skia/include/private/base/SkFeatures.h.orig webkitgtk-2.45.92/Source/ThirdParty/skia/include/private/base/SkFeatures.h
|
||||
--- webkitgtk-2.45.92/Source/ThirdParty/skia/include/private/base/SkFeatures.h.orig 2024-09-12 08:22:24.667260964 +0000
|
||||
+++ webkitgtk-2.45.92/Source/ThirdParty/skia/include/private/base/SkFeatures.h 2024-09-12 08:22:46.616832364 +0000
|
||||
@@ -69,6 +69,10 @@
|
||||
#define SK_CPU_LOONGARCH 1
|
||||
#endif
|
||||
|
||||
+#if defined(__powerpc__) || defined (__powerpc64__)
|
||||
+ #define SK_CPU_PPC 1
|
||||
+#endif
|
||||
+
|
||||
/**
|
||||
* SK_CPU_SSE_LEVEL
|
||||
*
|
||||
diff -up webkitgtk-2.45.92/Source/ThirdParty/skia/src/core/SkRasterPipeline.h.orig webkitgtk-2.45.92/Source/ThirdParty/skia/src/core/SkRasterPipeline.h
|
||||
--- webkitgtk-2.45.92/Source/ThirdParty/skia/src/core/SkRasterPipeline.h.orig 2024-09-12 08:16:25.444163366 +0000
|
||||
+++ webkitgtk-2.45.92/Source/ThirdParty/skia/src/core/SkRasterPipeline.h 2024-09-12 08:16:43.603797893 +0000
|
||||
@@ -27,7 +27,7 @@ struct SkImageInfo;
|
||||
struct skcms_TransferFunction;
|
||||
|
||||
#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && \
|
||||
- !defined(SK_CPU_LOONGARCH)
|
||||
+ !defined(SK_CPU_LOONGARCH) && !defined(SK_CPU_PPC)
|
||||
#define SK_HAS_MUSTTAIL 1
|
||||
#else
|
||||
#define SK_HAS_MUSTTAIL 0
|
||||
diff -up webkitgtk-2.45.92/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h.orig webkitgtk-2.45.92/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h
|
||||
--- webkitgtk-2.45.92/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h.orig 2024-09-12 08:49:09.985808211 +0000
|
||||
+++ webkitgtk-2.45.92/Source/ThirdParty/skia/modules/skcms/src/skcms_internals.h 2024-09-12 08:49:19.835612828 +0000
|
||||
@@ -48,6 +48,7 @@ extern "C" {
|
||||
&& !defined(__arm__) \
|
||||
&& !defined(__riscv) \
|
||||
&& !defined(__loongarch__) \
|
||||
+ && !defined(__powerpc__) \
|
||||
&& !defined(_WIN32) && !defined(__SYMBIAN32__)
|
||||
#define SKCMS_HAS_MUSTTAIL 1
|
||||
#endif
|
||||
diff -up webkitgtk-2.45.92/Source/WTF/wtf/Compiler.h.orig webkitgtk-2.45.92/Source/WTF/wtf/Compiler.h
|
||||
--- webkitgtk-2.45.92/Source/WTF/wtf/Compiler.h.orig 2024-09-12 09:14:10.775885415 +0000
|
||||
+++ webkitgtk-2.45.92/Source/WTF/wtf/Compiler.h 2024-09-12 09:15:27.264379291 +0000
|
||||
@@ -271,7 +271,7 @@
|
||||
/* MUST_TAIL_CALL */
|
||||
|
||||
#if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
|
||||
-#if __has_cpp_attribute(clang::musttail)
|
||||
+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__)
|
||||
#define MUST_TAIL_CALL [[clang::musttail]]
|
||||
#endif
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user