diff --git a/.gitignore b/.gitignore index 981aa21..3fe7dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/webkitgtk-2.28.4.tar.xz +SOURCES/webkitgtk-2.30.1.tar.xz diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 092c9f9..86573e4 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1 +1 @@ -70e9dd80647b30eaaf8a7f5b30d8869cd1254056 SOURCES/webkitgtk-2.28.4.tar.xz +23dd526e95399f97c758f8796e8cb184e9465eb7 SOURCES/webkitgtk-2.30.1.tar.xz diff --git a/SOURCES/evolution-shared-secondary-process.patch b/SOURCES/evolution-shared-secondary-process.patch index a506c0e..827d257 100644 --- a/SOURCES/evolution-shared-secondary-process.patch +++ b/SOURCES/evolution-shared-secondary-process.patch @@ -1,15 +1,13 @@ diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index da25d96e35b5..242ce8c00eeb 100644 +index af43f9acfd24..3ac762417a98 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -381,6 +381,10 @@ static void webkitWebContextConstructed(GObject* object) +@@ -397,7 +397,7 @@ static void webkitWebContextConstructed(GObject* object) + configuration.setProcessSwapsOnNavigation(priv->psonEnabled); + if (!priv->psonEnabled) { const char* useSingleWebProcess = getenv("WEBKIT_USE_SINGLE_WEB_PROCESS"); - if (useSingleWebProcess && strcmp(useSingleWebProcess, "0")) +- if (useSingleWebProcess && strcmp(useSingleWebProcess, "0")) ++ if ((useSingleWebProcess && strcmp(useSingleWebProcess, "0")) || !g_strcmp0(g_get_prgname(), "evolution")) configuration.setUsesSingleWebProcess(true); -+ else { -+ if (!g_strcmp0(g_get_prgname(), "evolution")) -+ configuration.setUsesSingleWebProcess(true); -+ } } - #endif diff --git a/SOURCES/webkit-aarch64_page_size.patch b/SOURCES/webkit-aarch64_page_size.patch index 6baf138..4df6fdb 100644 --- a/SOURCES/webkit-aarch64_page_size.patch +++ b/SOURCES/webkit-aarch64_page_size.patch @@ -1,10 +1,10 @@ diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h -index 33d9118d..3e99decf 100644 +index cf5cf31b2c93..412ab0836209 100644 --- a/Source/WTF/wtf/PageBlock.h +++ b/Source/WTF/wtf/PageBlock.h @@ -49,9 +49,9 @@ namespace WTF { // Use 64 KiB for any unknown CPUs to be conservative. - #if OS(DARWIN) + #if OS(DARWIN) || PLATFORM(PLAYSTATION) constexpr size_t CeilingOnPageSize = 16 * KB; -#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) +#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index f1ac082..7ac9fd8 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkit2gtk3 -Version: 2.28.4 +Version: 2.30.1 Release: 1%{?dist} Summary: GTK Web content engine library @@ -51,7 +51,6 @@ BuildRequires: pkgconfig(enchant-2) %endif BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(geoclue-2.0) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glesv2) @@ -72,6 +71,7 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxslt) @@ -82,10 +82,18 @@ BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xt) -Requires: bubblewrap -Requires: geoclue2 +# These are hard requirements of WebKit's bubblewrap sandbox. +#Requires: bubblewrap #Requires: xdg-dbus-proxy +# If Geoclue is not running, the geolocation API will not work. +Recommends: geoclue2 + +# 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 Obsoletes: libwebkit2gtk < 2.5.0 Provides: libwebkit2gtk = %{version}-%{release} @@ -181,8 +189,9 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -# BMalloc and JIT are disabled on aarch64, because of the non-standard page size -# that's causing problems there (it's enabled on Fedora). +# bmalloc and JIT are disabled on aarch64 only in RHEL because of the nonstandard +# page size that's causing problems there. WebKit's build system sets appropriate +# defaults for all other architectures, and all other distros except RHEL. # # TODO: Package xdg-dbus-proxy for RHEL so we can enable bubblewrap sandbox. # TODO: Package libwpe and wpebackend-fdo for RHEL so we can enable WPE renderer. @@ -197,18 +206,22 @@ pushd %{_target_platform} -DENABLE_MINIBROWSER=ON \ -DUSE_WPE_RENDERER=OFF \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -%ifarch s390x %{power64} aarch64 +%if 0%{?rhel} +%ifarch aarch64 + -DENABLE_C_LOOP=ON \ -DENABLE_JIT=OFF \ + -DENABLE_SAMPLING_PROFILER=OFF \ -DUSE_SYSTEM_MALLOC=ON \ %endif +%endif .. popd # Show the build time in the status export NINJA_STATUS="[%f/%t][%e] " -# brew has run out of memory building WebKitGTK 2.28.4 with -j6, so -# use -j3 to reduce maximum memory usage. -%ninja_build -C %{_target_platform} -j3 +# brew has run out of memory building WebKitGTK 2.30.1 with -j3, so +# use -j1 to reduce maximum memory usage as far as we can go. +%ninja_build -C %{_target_platform} -j1 %install %ninja_install -C %{_target_platform} @@ -217,12 +230,10 @@ export NINJA_STATUS="[%f/%t][%e] " # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB -%add_to_license_files Source/JavaScriptCore/icu/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/compiler/LICENSE %add_to_license_files Source/ThirdParty/ANGLE/src/third_party/libXNVCtrl/LICENSE -%add_to_license_files Source/WebCore/icu/LICENSE %add_to_license_files Source/WebCore/LICENSE-APPLE %add_to_license_files Source/WebCore/LICENSE-LGPL-2 %add_to_license_files Source/WebCore/LICENSE-LGPL-2.1 @@ -281,6 +292,10 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Tue Oct 20 2020 Michael Catanzaro - 2.30.1-1 +- Update to 2.30.1 +- Related: #1883304 + * Mon Aug 03 2020 Michael Catanzaro - 2.28.4-1 - Update to 2.28.4 - Related: #1817143