Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/webkit2gtk3.git#7a0dcddc5c51e48e3446f9285548227959764014

.gitignore

@@ -59,3 +59,9 @@
 /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
+/webkitgtk-2.30.4.tar.xz
+/webkitgtk-2.30.4.tar.xz.asc
+/webkitgtk-2.31.1.tar.xz
+/webkitgtk-2.31.1.tar.xz.asc

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.30.2.tar.xz) = caecd765ce92942fc07d0d18b834b8f1acb13e6dc1e504ed9f104862285a6032a8824ab98a7439e6f8664d83dacb4ece2011f4ec822308e5b40d1f82ca601243
+SHA512 (webkitgtk-2.31.1.tar.xz) = 23a3d28f7cd95281b2b1dbd75b5522f9fea735e883d8d080d572e9124e6711ee7704635fd4de337a1d8a51a0a61cc47f016a082bf15360e36655de3f97b127ea
-SHA512 (webkitgtk-2.30.2.tar.xz.asc) = 1d4ddf2bd926f29b1f6d0f464b3e76774c111f2dc6480eb3f1f12efb10529071d29d9b1e7fd276898f29506a80b27133918d19919e2ef9c693661197072566d7
+SHA512 (webkitgtk-2.31.1.tar.xz.asc) = 3f816714f08de59da9a9935771aaa2f9b892766397a60fe987e2382a11d32a4d5e6bda2d923bad347505b7998eaafe9fca76689e1556f524a60369337f8d4c98

webkit-aarch64_page_size.patch

@@ -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!

webkit2gtk3-gcc11.patch

@@ -1,13 +0,0 @@
-diff --git a/Source/WTF/wtf/glib/WTFGType.h b/Source/WTF/wtf/glib/WTFGType.h
-index 203522e6..9953fe80 100644
---- a/Source/WTF/wtf/glib/WTFGType.h
-+++ b/Source/WTF/wtf/glib/WTFGType.h
-@@ -74,7 +74,7 @@ static void type_name##_init(TypeName* self, gpointer) \
- \
- GType type_name##_get_type(void) \
- { \
--    static volatile gsize g_define_type_id__volatile = 0; \
-+    static gsize g_define_type_id__volatile = 0; \
-     if (g_once_init_enter(&g_define_type_id__volatile)) { \
-         GType g_define_type_id = type_name##_get_type_once(); \
-         g_once_init_leave(&g_define_type_id__volatile, g_define_type_id); \

webkit2gtk3.spec

@@ -1,5 +1,3 @@
-%undefine __cmake_in_source_build
-
 ## NOTE: Lots of files in various subdirectories have the same name (such as
 ## "LICENSE") so this short macro allows us to distinguish them by using their
 ## directory names (from the source tree) as prefixes for the files.
@@ -13,8 +11,8 @@
 %bcond_without docs
 
 Name:           webkit2gtk3
-Version:        2.30.2
+Version:        2.31.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        GTK Web content engine library
 
 License:        LGPLv2
@@ -24,17 +22,6 @@ 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
-
 BuildRequires:  bison
 BuildRequires:  bubblewrap
 BuildRequires:  cmake
@@ -89,6 +76,7 @@ BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
+BuildRequires:  pkgconfig(manette-0.2)
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
@@ -191,7 +179,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,15 +200,11 @@ 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 \
   -DCMAKE_BUILD_TYPE=Release \
   -DENABLE_MINIBROWSER=ON \
-  -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
 %if %{with docs}
   -DENABLE_GTKDOC=ON \
 %endif
@@ -229,10 +213,7 @@ rm -rf Source/ThirdParty/qunit/
 %endif
 %if 0%{?rhel}
 %ifarch aarch64
-  -DENABLE_C_LOOP=ON \
+  -DUSE_64KB_PAGE_BLOCK=ON \
-  -DENABLE_JIT=OFF \
-  -DENABLE_SAMPLING_PROFILER=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
 %endif
 %endif
   %{nil}
@@ -315,6 +296,15 @@ export NINJA_STATUS="[%f/%t][%e] "
 %endif
 
 %changelog
+* Tue Jan 12 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.31.1-1
+- Update to 2.31.1
+
+* Tue Dec 15 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.4-1
+- Update to 2.30.4
+
+* Tue Nov 24 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.30.3-1
+- Update to 2.30.3
+
 * Wed Nov 11 2020 Jeff Law <law@redhat.com> - 2.30.2-2
 - Fix bogus volatile caught by gcc-11
 

wpebackend-fdo-soname.patch

@@ -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());
-