diff --git a/.gitignore b/.gitignore index cc83147..6446386 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,5 @@ /webkitgtk-2.30.1.tar.xz.asc /webkitgtk-2.30.2.tar.xz /webkitgtk-2.30.2.tar.xz.asc +/webkitgtk-2.30.3.tar.xz +/webkitgtk-2.30.3.tar.xz.asc diff --git a/sources b/sources index ab6eb51..4978769 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (webkitgtk-2.30.2.tar.xz) = caecd765ce92942fc07d0d18b834b8f1acb13e6dc1e504ed9f104862285a6032a8824ab98a7439e6f8664d83dacb4ece2011f4ec822308e5b40d1f82ca601243 -SHA512 (webkitgtk-2.30.2.tar.xz.asc) = 1d4ddf2bd926f29b1f6d0f464b3e76774c111f2dc6480eb3f1f12efb10529071d29d9b1e7fd276898f29506a80b27133918d19919e2ef9c693661197072566d7 +SHA512 (webkitgtk-2.30.3.tar.xz) = cbb8298bdb791eb60a214c36ec9ced398fc5c07f580d60d001483ca3f616a309394013239affd16f6eefd8c2fb178bbf5b566ab4480fe3349e1856c80ec78ddf +SHA512 (webkitgtk-2.30.3.tar.xz.asc) = a6614652f35431e54a612a74e75e679a829dedffa4240cc8dde442adcb1606fd91bc400fe87109c618d2760c76927cdeaa1d0949f4038e6fac9cf7809d940ee8 diff --git a/webkit-aarch64_page_size.patch b/webkit-aarch64_page_size.patch deleted file mode 100644 index 4df6fdb..0000000 --- a/webkit-aarch64_page_size.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h -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) || 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) - constexpr size_t CeilingOnPageSize = 4 * KB; --#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) -+#elif CPU(UNKNOWN) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(ARM64) - constexpr size_t CeilingOnPageSize = 64 * KB; - #else - #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index aa81d35..f984a3b 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -13,8 +13,8 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.30.2 -Release: 2%{?dist} +Version: 2.30.3 +Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -24,16 +24,8 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3 Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg -%if 0%{?rhel} -# https://bugs.webkit.org/show_bug.cgi?id=217989 -Patch0: webkit-aarch64_page_size.patch -%endif - -# https://github.com/WebPlatformForEmbedded/libwpe/issues/59 -Patch1: wpebackend-fdo-soname.patch - # Fix bogus volatile use caught by gcc-11 -Patch2: %{name}-gcc11.patch +Patch0: %{name}-gcc11.patch BuildRequires: bison BuildRequires: bubblewrap @@ -191,7 +183,7 @@ rm -rf Source/ThirdParty/qunit/ %build # This package fails to build with LTO due to undefined symbols. LTO -# was disabled in OpenSuSE as well, but with no real explanation why +# was disabled in openSUSE as well, but with no real explanation why # beyond the undefined symbols. It really shold be investigated further. # Disable LTO %define _lto_cflags %{nil} @@ -212,9 +204,6 @@ rm -rf Source/ThirdParty/qunit/ %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -# 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. %cmake \ -GNinja \ -DPORT=GTK \ @@ -229,10 +218,7 @@ rm -rf Source/ThirdParty/qunit/ %endif %if 0%{?rhel} %ifarch aarch64 - -DENABLE_C_LOOP=ON \ - -DENABLE_JIT=OFF \ - -DENABLE_SAMPLING_PROFILER=OFF \ - -DUSE_SYSTEM_MALLOC=ON \ + -DUSE_64KB_PAGE_BLOCK=ON \ %endif %endif %{nil} @@ -315,6 +301,9 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Tue Nov 24 2020 Michael Catanzaro - 2.30.3-1 +- Update to 2.30.3 + * Wed Nov 11 2020 Jeff Law - 2.30.2-2 - Fix bogus volatile caught by gcc-11 diff --git a/wpebackend-fdo-soname.patch b/wpebackend-fdo-soname.patch deleted file mode 100644 index 43cabc7..0000000 --- a/wpebackend-fdo-soname.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: webkitgtk-2.29.92/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -=================================================================== ---- webkitgtk-2.29.92.orig/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -+++ webkitgtk-2.29.92/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp -@@ -115,7 +115,7 @@ void WebProcessPool::platformInitializeW - #if PLATFORM(WAYLAND) - if (WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::Wayland) { - #if USE(WPE_RENDERER) -- wpe_loader_init("libWPEBackend-fdo-1.0.so"); -+ wpe_loader_init("libWPEBackend-fdo-1.0.so.1"); - if (AcceleratedBackingStoreWayland::checkRequirements()) { - parameters.hostClientFileDescriptor = wpe_renderer_host_create_client(); - parameters.implementationLibraryName = FileSystem::fileSystemRepresentation(wpe_loader_get_loaded_implementation_library_name()); -