Update to 2.53.92

https://docs.fedoraproject.org/en-US/legal/license-field/#_source_package_files_not_included_in_binary_rpm

https://gitlab.com/fedora/legal/fedora-license-data/-/work_items/729

.gitignore

@@ -1,3 +1,2 @@
 /webkitgtk-*.tar.xz
-/webkitgtk-2.37.1.tar.xz.asc
-/webkitgtk-2.37.90.tar.xz.asc
+/webkitgtk-*.tar.xz.asc

monitoring.toml

@@ -0,0 +1,13 @@
+# Enable/disable monitoring
+monitoring = false
+# Enable/disable filling bugzilla ticket for new release
+# When disabled it will also disable scratch builds
+bugzilla = true
+# Enable/disable reporting only stable versions
+# Stable versions are recognized based on release-monitoring.org project settings
+stable_only = false
+# Enable/disable reporting all new versions instead of the latest one
+# Enabling this will disable scratch builds
+all_versions = false
+# Enable/disable scratch build for newly opened version
+scratch_build = false

rpminspect.yaml

@@ -1,4 +1,5 @@
 ---
 inspections:
+    abidiff: off
     changedfiles: off
     filesize: off

skia-s390x.patch

@@ -0,0 +1,82 @@
+diff --git a/Source/ThirdParty/skia/include/core/SkTypes.h b/Source/ThirdParty/skia/include/core/SkTypes.h
+index 79644da049ff..fc0646e21772 100644
+--- a/Source/ThirdParty/skia/include/core/SkTypes.h
++++ b/Source/ThirdParty/skia/include/core/SkTypes.h
+@@ -33,6 +33,8 @@
+ #  undef SK_DIRECT3D
+ #endif
+ 
++#if !defined(SK_R32_SHIFT) || !defined(SK_G32_SHIFT) || !defined(SK_B32_SHIFT) || !defined(SK_A32_SHIFT)
++
+ // If SK_R32_SHIFT is set, we'll use that to choose RGBA or BGRA.
+ // If not, we'll default to RGBA everywhere except BGRA on Windows.
+ #if defined(SK_R32_SHIFT)
+@@ -52,6 +54,8 @@
+ #define SK_G32_SHIFT 8
+ #define SK_A32_SHIFT 24
+ 
++#endif
++
+ /**
+  * SK_PMCOLOR_BYTE_ORDER can be used to query the byte order of SkPMColor at compile time.
+  */
+diff --git a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
+index c321fb77c0ae..a0a01cccd58a 100644
+--- a/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
++++ b/Source/ThirdParty/skia/src/codec/SkCodecPriv.h
+@@ -14,6 +14,7 @@
+ #include "include/core/SkTypes.h"
+ #include "include/private/SkEncodedInfo.h"
+ #include "modules/skcms/skcms.h"
++#include "src/core/SkEndian.h"
+ #include "src/codec/SkColorPalette.h"
+ #include "src/core/SkColorData.h"
+ 
+diff --git a/Source/ThirdParty/skia/src/core/Sk4px.h b/Source/ThirdParty/skia/src/core/Sk4px.h
+index d5d481e7e300..c7ef0bcd0ed0 100644
+--- a/Source/ThirdParty/skia/src/core/Sk4px.h
++++ b/Source/ThirdParty/skia/src/core/Sk4px.h
+@@ -27,7 +27,9 @@ public:
+ 
+     // RGBA rgba XYZW xyzw -> AAAA aaaa WWWW wwww
+     Sk4px alphas() const {
++#ifdef SK_CPU_LENDIAN
+         static_assert(SK_A32_SHIFT == 24, "This method assumes little-endian.");
++#endif
+         return Sk4px(skvx::shuffle<3,3,3,3, 7,7,7,7, 11,11,11,11, 15,15,15,15>(fV));
+     }
+     Sk4px inv() const { return Sk4px(skvx::byte16(255) - fV); }
+diff --git a/Source/ThirdParty/skia/src/core/SkColorPriv.h b/Source/ThirdParty/skia/src/core/SkColorPriv.h
+index 45471c25529e..319fec78069b 100644
+--- a/Source/ThirdParty/skia/src/core/SkColorPriv.h
++++ b/Source/ThirdParty/skia/src/core/SkColorPriv.h
+@@ -64,6 +64,20 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
+  *  Here we enforce this constraint.
+  */
+ 
++#ifdef SK_CPU_BENDIAN
++
++#define SK_RGBA_R32_SHIFT   24
++#define SK_RGBA_G32_SHIFT   16
++#define SK_RGBA_B32_SHIFT   8
++#define SK_RGBA_A32_SHIFT   0
++
++#define SK_BGRA_B32_SHIFT   24
++#define SK_BGRA_G32_SHIFT   16
++#define SK_BGRA_R32_SHIFT   8
++#define SK_BGRA_A32_SHIFT   0
++
++#else
++
+ #define SK_RGBA_R32_SHIFT   0
+ #define SK_RGBA_G32_SHIFT   8
+ #define SK_RGBA_B32_SHIFT   16
+@@ -74,6 +88,8 @@ static inline U8CPU SkUnitScalarClampToByte(SkScalar x) {
+ #define SK_BGRA_R32_SHIFT   16
+ #define SK_BGRA_A32_SHIFT   24
+ 
++#endif
++
+ #if defined(SK_PMCOLOR_IS_RGBA) || defined(SK_PMCOLOR_IS_BGRA)
+     #error "Configure PMCOLOR by setting SK_R32_SHIFT."
+ #endif

sources

@@ -1,2 +1,2 @@
-SHA512 (webkitgtk-2.37.90.tar.xz) = 7ed8945ca2036b9eb91ebf4cf021f37e04d4a0d3c710348639f246db234f8b6058938edf2d873c8b1d4ab60d840bd4684775d34b0b470b274f622d5ea6a9cbcd
-SHA512 (webkitgtk-2.37.90.tar.xz.asc) = 3ff793a2580e320d83824ffb2126290f32693a5e11080206e9693d71dcaf16f5d5ee268cd0ad80e25123ba5628844ec47ff945dbf291ef9785feb5e4161f2869
+SHA512 (webkitgtk-2.53.92.tar.xz) = 2be95cb351b300a1ec248b518861d31fd55f25f83d6ab05a12a0612b3f83a64f903404d40dfcd8e06558c562f5926c98b2e3995bed43741852c8ede65f416d08
+SHA512 (webkitgtk-2.53.92.tar.xz.asc) = 9a632b0fa3c3a6324be99d3141cd7fd4c2fb4c4dabc6adf27204b843a3478bc3c699ad2727b122621d2cdae9bc6de02327ba1cc07aa66a8e16429070914e6633

webkitgtk.spec

@@ -5,35 +5,65 @@
         mkdir -p _license_files ; \
         cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')
 
-# No libmanette in RHEL
-%if !0%{?rhel}
-%global with_gamepad 1
-%endif
-
 # Build documentation by default (use `rpmbuild --without docs` to override it).
 # This is used by Coverity. Coverity injects custom compiler warnings, but
 # any warning during WebKit docs build is fatal!
 %bcond_without docs
 
+# Clang is preferred: https://skia.org/docs/user/build/#supported-and-preferred-compilers
+%global toolchain clang
+
+# We run out of memory if building with LTO enabled on i686.
+%ifarch %{ix86}
+%global _lto_cflags %{nil}
+%endif
+
 Name:           webkitgtk
-Version:        2.37.90
+Version:        2.53.92
 Release:        %autorelease
 Summary:        GTK web content engine library
 
-License:        LGPLv2
+# Source/bmalloc/bmalloc/*.h is BSD-2-Clause
+# Source/bmalloc/bmalloc/CryptoRandom.cpp is ISC
+# Source/bmalloc/bmalloc/valgrind.h is is bzip2-1.0.6
+# Source/bmalloc/libpas/src/test/RedBlackTreeTests.cpp is BSD-3-Clause
+# Source/JavaScriptCore/config.h is LGPL-2.0-or-later
+# Source/JavaScriptCore/b3/B3ComputeDivisionMagic.h is NCSA
+# Source/JavaScriptCore/disassembler/zydis/* is MIT
+# Source/JavaScriptCore/runtime/JSDateMath.h is MPL 1.1/GPL 2.0/LGPL 2.1
+# Source/JavaScriptCore/runtime/MathCommon.cpp is SunPro
+# Source/JavaScriptCore/ucd/CaseFolding.txt is Unicode-TOU, which is unapproved, but the only copyrightable part is the comment at the top of the file, so seems safe to omit it
+# Source/ThirdParty/ANGLE/include/CL/cl_d3d10.h is Apache-2.0
+# Source/ThirdParty/ANGLE/include/GLES/gl.h is MIT-Khronos (not on list see https://github.com/spdx/license-list-XML/issues/2017)
+# Source/ThirdParty/ANGLE/src/compiler/preprocessor/preprocessor_tab_autogen.cpp is GPL-3.0-or-later WITH Bison-exception-2.2
+# Source/ThirdParty/pdfjs/web/images/annotation-paperclip.svg is MPL-2.0i
+# Source/ThirdParty/pdfjs/web/standard_fonts/LICENSE_LIBERATION is OFL-1.1
+# Source/ThirdParty/xdgmime/ is AFL-2.0 OR GPL-2.0-or-later
+# Source/WebCore/dom/PseudoElement.h is BSD-Source-Code
+# Source/WebCore/dom/SecurityContext.cpp is BSD-2-Clause-Views
+# Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp is LGPL-2.1-or-later
+# Source/WTF/LICENSE-libc++.txt is NCSA OR MIT
+# Source/WTF/LICENSE-LLVM.txt is Apache-2.0 WITH LLVM-exception
+# Source/WTF/wtf/Markable.h is BSL-1.0
+# The license tag and above comment is up to date as of WebKitGTK 2.42.2.
+License:        LGPL-2.1-only AND BSD-2-Clause AND BSD-3-Clause AND ISC AND bzip2-1.0.6 AND NCSA AND MIT AND GPL-2.0-only AND MPL-1.1 AND SunPro AND Apache-2.0 AND GPL-3.0-or-later WITH Bison-exception-2.2 AND MPL-2.0 AND OFL-1.1 AND (AFL-2.0 OR GPL-2.0-or-later) AND BSD-Source-Code AND BSD-2-Clause-Views AND LGPL-2.1-or-later AND (NCSA OR MIT) AND Apache-2.0 WITH LLVM-exception AND BSL-1.0
 URL:            https://www.webkitgtk.org/
 Source0:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
 Source1:        https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc
 # Use the keys from https://webkitgtk.org/verifying.html
 # $ gpg --import aperez.key carlosgc.key
-# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
+# $ gpg --export --export-options export-minimal 013A0127AC9C65B34FFA62526C1009B693975393 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg
 Source2:        webkitgtk-keys.gpg
 
+# https://bugs.webkit.org/show_bug.cgi?id=312677
+Patch:          skia-s390x.patch
+
 BuildRequires:  bison
 BuildRequires:  bubblewrap
+BuildRequires:  clang
 BuildRequires:  cmake
 BuildRequires:  flex
-BuildRequires:  gcc-c++
+BuildRequires:  flite-devel
 BuildRequires:  gettext
 BuildRequires:  gi-docgen
 BuildRequires:  git
@@ -42,71 +72,75 @@ BuildRequires:  gperf
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
+BuildRequires:  openssl-devel
 BuildRequires:  perl(English)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
+BuildRequires:  perl(bigint)
 BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
+BuildRequires:  rubygem(getoptlong)
 BuildRequires:  rubygem-json
+BuildRequires:  unifdef
 BuildRequires:  xdg-dbus-proxy
 
 BuildRequires:  pkgconfig(atspi-2)
 BuildRequires:  pkgconfig(cairo)
 BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enchant-2)
+BuildRequires:  pkgconfig(epoxy)
+BuildRequires:  pkgconfig(expat)
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
-BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gstreamer-1.0)
+BuildRequires:  pkgconfig(gstreamer-plugins-bad-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(gtk4)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-uc)
 BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libavif)
+BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(libgcrypt)
 BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libjxl)
 BuildRequires:  pkgconfig(libnotify)
-BuildRequires:  pkgconfig(libopenjp2)
-BuildRequires:  pkgconfig(libpcre)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libsecret-1)
-BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  pkgconfig(libsoup-3.0)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libtasn1)
 BuildRequires:  pkgconfig(libwebp)
 BuildRequires:  pkgconfig(libwoff2dec)
 BuildRequires:  pkgconfig(libxslt)
-%if 0%{?with_gamepad}	
 BuildRequires:  pkgconfig(manette-0.2)
-%endif
 BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(sysprof-capture-4)
 BuildRequires:  pkgconfig(upower-glib)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-protocols)
 BuildRequires:  pkgconfig(wayland-server)
-BuildRequires:  pkgconfig(wpe-1.0)
-BuildRequires:  pkgconfig(wpebackend-fdo-1.0)
 BuildRequires:  pkgconfig(xt)
 
 # Filter out provides for private libraries
-%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkit2gtk-5\\.0/.*\\.so)$
+%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$
 
 %description
 WebKitGTK is the port of the WebKit web rendering engine to the
 GTK platform.
 
-%package -n     webkit2gtk5.0
+%package -n     webkitgtk6.0
 Summary:        WebKitGTK for GTK 4
-Requires:       javascriptcoregtk5.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
 Requires:       bubblewrap
+Requires:       libGLES
 Requires:       xdg-dbus-proxy
 Recommends:     geoclue2
 Recommends:     gstreamer1-plugins-bad-free
@@ -114,9 +148,11 @@ Recommends:     gstreamer1-plugins-good
 Recommends:     xdg-desktop-portal-gtk
 Provides:       bundled(angle)
 Provides:       bundled(pdfjs)
+Provides:       bundled(skia)
 Provides:       bundled(xdgmime)
+Obsoletes:      webkit2gtk5.0 < %{version}-%{release}
 
-%description -n webkit2gtk5.0
+%description -n webkitgtk6.0
 WebKitGTK is the port of the WebKit web rendering engine to the
 GTK platform. This package contains WebKitGTK for GTK 4.
 
@@ -124,6 +160,7 @@ GTK platform. This package contains WebKitGTK for GTK 4.
 Summary:        WebKitGTK for GTK 3 and libsoup 3
 Requires:       javascriptcoregtk4.1%{?_isa} = %{version}-%{release}
 Requires:       bubblewrap
+Requires:       libGLES
 Requires:       xdg-dbus-proxy
 Recommends:     geoclue2
 Recommends:     gstreamer1-plugins-bad-free
@@ -131,42 +168,23 @@ Recommends:     gstreamer1-plugins-good
 Recommends:     xdg-desktop-portal-gtk
 Provides:       bundled(angle)
 Provides:       bundled(pdfjs)
+Provides:       bundled(skia)
 Provides:       bundled(xdgmime)
 
 %description -n webkit2gtk4.1
 WebKitGTK is the port of the WebKit web rendering engine to the
 GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3.
 
-%package -n     webkit2gtk4.0
-Summary:        WebKitGTK for GTK 3 and libsoup 2
-Requires:       javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
-Requires:       bubblewrap
-Requires:       xdg-dbus-proxy
-Recommends:     geoclue2
-Recommends:     gstreamer1-plugins-bad-free
-Recommends:     gstreamer1-plugins-good
-Recommends:     xdg-desktop-portal-gtk
-Provides:       bundled(angle)
-Provides:       bundled(pdfjs)
-Provides:       bundled(xdgmime)
-Obsoletes:      webkitgtk4 < %{version}-%{release}
-Provides:       webkitgtk4 = %{version}-%{release}
-Obsoletes:      webkit2gtk3 < %{version}-%{release}
-Provides:       webkit2gtk3 = %{version}-%{release}
+%package -n     webkitgtk6.0-devel
+Summary:        Development files for webkitgtk6.0
+Requires:       webkitgtk6.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
+Requires:       javascriptcoregtk6.0-devel%{?_isa} = %{version}-%{release}
+Obsoletes:      webkit2gtk5.0-devel < %{version}-%{release}
 
-%description -n webkit2gtk4.0
-WebKitGTK is the port of the WebKit web rendering engine to the
-GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2.
-
-%package -n     webkit2gtk5.0-devel
-Summary:        Development files for webkit2gtk5.0
-Requires:       webkit2gtk5.0%{?_isa} = %{version}-%{release}
-Requires:       javascriptcoregtk5.0%{?_isa} = %{version}-%{release}
-Requires:       javascriptcoregtk5.0-devel%{?_isa} = %{version}-%{release}
-
-%description -n webkit2gtk5.0-devel
-The webkit2gtk5.0-devel package contains libraries, build data, and header
-files for developing applications that use webkit2gtk5.0.
+%description -n webkitgtk6.0-devel
+The webkitgtk6.0-devel package contains libraries, build data, and header
+files for developing applications that use webkitgtk6.0.
 
 %package -n     webkit2gtk4.1-devel
 Summary:        Development files for webkit2gtk4.1
@@ -178,80 +196,71 @@ Requires:       javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release}
 The webkit2gtk4.1-devel package contains libraries, build data, and header
 files for developing applications that use webkit2gtk4.1.
 
-%package -n     webkit2gtk4.0-devel
-Summary:        Development files for webkit2gtk4.0
-Requires:       webkit2gtk4.0%{?_isa} = %{version}-%{release}
-Requires:       javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
-Requires:       javascriptcoregtk4.0-devel%{?_isa} = %{version}-%{release}
-Obsoletes:      webkitgtk4-devel < %{version}-%{release}
-Provides:       webkitgtk4-devel = %{version}-%{release}
-Obsoletes:      webkit2gtk3-devel < %{version}-%{release}
-Provides:       webkit2gtk3-devel = %{version}-%{release}
-
-%description -n webkit2gtk4.0-devel
-The webkit2gtk4.0-devel package contains libraries, build data, and header
-files for developing applications that use webkit2gtk4.0.
-
 %if %{with docs}
-%package -n     webkit2gtk5.0-doc
+%package -n     webkitgtk6.0-doc
 Summary:        Documentation files for webkit2gtk5.0
 BuildArch:      noarch
-Requires:       webkit2gtk5.0 = %{version}-%{release}
+Requires:       webkitgtk6.0 = %{version}-%{release}
+Obsoletes:      webkit2gtk5.0-doc < %{version}-%{release}
+Recommends:     gi-docgen-fonts
 
-%description -n webkit2gtk5.0-doc
-This package contains developer documentation for webkit2gtk5.0.
+# Documentation/jsc-glib-4.1/fzy.js is MIT
+# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later
+# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1
+# Documentation/webkit2gtk-4.1/*html is  BSD, LGPL-2.1
+# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1
+# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT
+# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later
+License:        MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later)
+
+%description -n webkitgtk6.0-doc
+This package contains developer documentation for webkitgtk6.0.
 
 %package -n     webkit2gtk4.1-doc
 Summary:        Documentation files for webkit2gtk4.1
 BuildArch:      noarch
 Requires:       webkit2gtk4.1 = %{version}-%{release}
+Recommends:     gi-docgen-fonts
+
+# Documentation/jsc-glib-4.1/fzy.js is MIT
+# Documentation/jsc-glib-4.1/*.js and *css is Apache-2.0 OR GPL-3.0-or-later
+# Documentation/jsc-glib-4.1/*html is BSD, LGPL-2.1
+# Documentation/webkit2gtk-4.1/*html is  BSD, LGPL-2.1
+# Documentation/webkit2gtk-web-extension-4.1/*html is BSD, LGPL-2.1
+# Documentation/webkit2gtk-web-extension-4.1/solarized* is MIT
+# Documentation/webkit2gtk-web-extension-4.1/style.css is Apache-2.0 OR GPL-3.0-or-later
+License:        MIT AND LGPL-2.1-only AND BSD-3-Clause AND (Apache-2.0 OR GPL-3.0-or-later)
 
 %description -n webkit2gtk4.1-doc
 This package contains developer documentation for webkit2gtk4.1.
-
-%package -n     webkit2gtk4.0-doc
-Summary:        Documentation files for webkit2gtk4.0
-BuildArch:      noarch
-Requires:       webkit2gtk4.0 = %{version}-%{release}
-Obsoletes:      webkitgtk4-doc < %{version}-%{release}
-Provides:       webkitgtk4-doc = %{version}-%{release}
-Obsoletes:      webkit2gtk3-doc < %{version}-%{release}
-Provides:       webkit2gtk3-doc = %{version}-%{release}
-
-%description -n webkit2gtk4.0-doc
-This package contains developer documentation for webkit2gtk4.0.
 %endif
 
-%package -n     javascriptcoregtk5.0
-Summary:        JavaScript engine from webkit2gtk5.0
+%package -n     javascriptcoregtk6.0
+Summary:        JavaScript engine from webkitgtk6.0
+Provides:       bundled(simde)
+Provides:       bundled(simdutf)
+Obsoletes:      javascriptcoregtk5.0 < %{version}-%{release}
 
-%description -n javascriptcoregtk5.0
-This package contains JavaScript engine from webkit2gtk5.0.
+%description -n javascriptcoregtk6.0
+This package contains the JavaScript engine from webkitgtk6.0.
 
 %package -n     javascriptcoregtk4.1
 Summary:        JavaScript engine from webkit2gtk4.1
+Provides:       bundled(simde)
+Provides:       bundled(simdutf)
 Obsoletes:      webkit2gtk4.1-jsc < %{version}-%{release}
 
 %description -n javascriptcoregtk4.1
-This package contains JavaScript engine from webkit2gtk4.1.
+This package contains the JavaScript engine from webkit2gtk4.1.
 
-%package -n     javascriptcoregtk4.0
-Summary:        JavaScript engine from webkit2gtk4.0
-Obsoletes:      webkitgtk4-jsc < %{version}-%{release}
-Provides:       webkitgtk4-jsc = %{version}-%{release}
-Obsoletes:      webkit2gtk3-jsc < %{version}-%{release}
-Provides:       webkit2gtk3-jsc = %{version}-%{release}
+%package -n     javascriptcoregtk6.0-devel
+Summary:        Development files for JavaScript engine from webkitgtk6.0
+Requires:       javascriptcoregtk6.0%{?_isa} = %{version}-%{release}
+Obsoletes:      javascriptcoregtk5.0-devel < %{version}-%{release}
 
-%description -n javascriptcoregtk4.0
-This package contains JavaScript engine from webkit2gtk4.0.
-
-%package -n     javascriptcoregtk5.0-devel
-Summary:        Development files for JavaScript engine from webkit2gtk5.0
-Requires:       javascriptcoregtk5.0%{?_isa} = %{version}-%{release}
-
-%description -n javascriptcoregtk5.0-devel
-The javascriptcoregtk5.0-devel package contains libraries, build data, and header
-files for developing applications that use JavaScript engine from webkit2gtk-5.0.
+%description -n javascriptcoregtk6.0-devel
+The javascriptcoregtk6.0-devel package contains libraries, build data, and header
+files for developing applications that use JavaScript engine from webkitgtk-6.0.
 
 %package -n     javascriptcoregtk4.1-devel
 Summary:        Development files for JavaScript engine from webkit2gtk4.1
@@ -262,132 +271,92 @@ Obsoletes:      webkit2gtk4.1-jsc-devel < %{version}-%{release}
 The javascriptcoregtk4.1-devel package contains libraries, build data, and header
 files for developing applications that use JavaScript engine from webkit2gtk-4.1.
 
-%package -n     javascriptcoregtk4.0-devel
-Summary:        Development files for JavaScript engine from webkit2gtk4.0
-Requires:       javascriptcoregtk4.0%{?_isa} = %{version}-%{release}
-Obsoletes:      webkitgtk4-jsc-devel < %{version}-%{release}
-Provides:       webkitgtk4-jsc-devel = %{version}-%{release}
-Obsoletes:      webkit2gtk3-jsc-devel < %{version}-%{release}
-Provides:       webkit2gtk3-jsc-devel = %{version}-%{release}
-
-%description -n javascriptcoregtk4.0-devel
-The javascriptcoregtk4.0-devel package contains libraries, build data, and header
-files for developing applications that use JavaScript engine from webkit2gtk-4.0.
-
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1 -n webkitgtk-%{version}
 
 %build
 # Increase the DIE limit so our debuginfo packages can be size-optimized.
-# Decreases the size for x86_64 from ~5G to ~1.1G.
+# This previously decreased the size for x86_64 from ~5G to ~1.1G, but as of
+# 2022 it's more like 850 MB -> 675 MB. This requires lots of RAM on the
+# builders, so only do this for x86_64 and aarch64 to avoid overwhelming
+# builders with less RAM.
 # https://bugzilla.redhat.com/show_bug.cgi?id=1456261
-%global _dwz_max_die_limit 250000000
-
-# On x86_64, the _dwz_max_die_limit is overridden by the arch-specific limit
-# from redhat-rpm-config.
 %global _dwz_max_die_limit_x86_64 250000000
+%global _dwz_max_die_limit_aarch64 250000000
 
-# Require 8 GB of RAM per vCPU for debuginfo processing
-%global _find_debuginfo_opts %limit_build -m 8192
+# Require 32 GB of RAM per vCPU for debuginfo processing. 16 GB is not enough.
+%global _find_debuginfo_opts %limit_build -m 32768
 
-# Remove debuginfo from 32-bit builds to reduce memory consumption:
+# Reduce debuginfo verbosity 32-bit builds to reduce memory consumption even more.
 # https://bugs.webkit.org/show_bug.cgi?id=140176
 # https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/I6IVNA52TXTBRQLKW45CJ5K4RA4WNGMI/
 %ifarch %{ix86}
-%global debug_package %{nil}
-%global optflags %(echo %{optflags} | sed 's/-g /-g0 /')
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
-%cmake \
+# JIT is broken on ARM systems with new ARMv8.5 BTI extension at the moment
+# Cf. https://bugzilla.redhat.com/show_bug.cgi?id=2130009
+# Cf. https://bugs.webkit.org/show_bug.cgi?id=245697
+# Disable BTI until this is fixed upstream.
+%ifarch aarch64
+%global optflags %(echo %{optflags} | sed 's/-mbranch-protection=standard /-mbranch-protection=pac-ret /')
+%endif
+
+mkdir webkitgtk-6.0
+pushd webkitgtk-6.0
+%cmake -S .. \
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
   -DUSE_GTK4=ON \
+  -DUSE_LIBBACKTRACE=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
-%endif
-%if !0%{?with_gamepad}
-  -DENABLE_GAMEPAD=OFF \
-%endif
-%if 0%{?rhel}
-%ifarch aarch64
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
-%endif
 %endif
   %{nil}
+popd
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
-%cmake \
+mkdir webkit2gtk-4.1
+pushd webkit2gtk-4.1
+%cmake -S .. \
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
-%if %{without docs}
-  -DENABLE_DOCUMENTATION=OFF \
-%endif
-%if !0%{?with_gamepad}
-  -DENABLE_GAMEPAD=OFF \
-%endif
-%if 0%{?rhel}
-%ifarch aarch64
-  -DUSE_64KB_PAGE_BLOCK=ON \
-%endif
-%endif
-  %{nil}
-
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
-%cmake \
-  -GNinja \
-  -DPORT=GTK \
-  -DCMAKE_BUILD_TYPE=Release \
-  -DUSE_SOUP2=ON \
+  -DUSE_GTK4=OFF \
+  -DUSE_LIBBACKTRACE=OFF \
   -DENABLE_WEBDRIVER=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
-%endif
-%if !0%{?with_gamepad}
-  -DENABLE_GAMEPAD=OFF \
-%endif
-%if 0%{?rhel}
-%ifarch aarch64
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
-%endif
 %endif
   %{nil}
+popd
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
-export NINJA_STATUS="[1/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+pushd webkitgtk-6.0
+export NINJA_STATUS="[1/2][%f/%t %es] "
+%cmake_build %limit_build -m 3072
+popd
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
-export NINJA_STATUS="[2/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
-
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
-export NINJA_STATUS="[3/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+pushd webkit2gtk-4.1
+export NINJA_STATUS="[2/2][%f/%t %es] "
+%cmake_build %limit_build -m 3072
+popd
 
 %install
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
+pushd webkitgtk-6.0
 %cmake_install
+popd
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
+pushd webkit2gtk-4.1
 %cmake_install
+popd
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
-%cmake_install
-
-%find_lang WebKit2GTK-5.0
-%find_lang WebKit2GTK-4.1
-%find_lang WebKit2GTK-4.0
+%find_lang WebKitGTK-6.0
+%find_lang WebKitGTK-4.1
 
 # Finally, copy over and rename various files for %%license inclusion
 %add_to_license_files Source/JavaScriptCore/COPYING.LIB
 %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/libXNVCtrl/LICENSE
 %add_to_license_files Source/WebCore/LICENSE-APPLE
 %add_to_license_files Source/WebCore/LICENSE-LGPL-2
@@ -399,22 +368,22 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %add_to_license_files Source/WTF/wtf/dtoa/COPYING
 %add_to_license_files Source/WTF/wtf/dtoa/LICENSE
 
-%files -n webkit2gtk5.0 -f WebKit2GTK-5.0.lang
+%files -n webkitgtk6.0 -f WebKitGTK-6.0.lang
 %license _license_files/*ThirdParty*
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
 %license _license_files/*WTF*
-%{_libdir}/libwebkit2gtk-5.0.so.0*
+%{_libdir}/libwebkitgtk-6.0.so.4*
 %dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/WebKit2-5.0.typelib
-%{_libdir}/girepository-1.0/WebKit2WebExtension-5.0.typelib
-%{_libdir}/webkit2gtk-5.0/
-%{_libexecdir}/webkit2gtk-5.0/
-%exclude %{_libexecdir}/webkit2gtk-5.0/MiniBrowser
-%exclude %{_libexecdir}/webkit2gtk-5.0/jsc
+%{_libdir}/girepository-1.0/WebKit-6.0.typelib
+%{_libdir}/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
+%{_libdir}/webkitgtk-6.0/
+%{_libexecdir}/webkitgtk-6.0/
+%exclude %{_libexecdir}/webkitgtk-6.0/MiniBrowser
+%exclude %{_libexecdir}/webkitgtk-6.0/jsc
 %{_bindir}/WebKitWebDriver
 
-%files -n webkit2gtk4.1 -f WebKit2GTK-4.1.lang
+%files -n webkit2gtk4.1 -f WebKitGTK-4.1.lang
 %license _license_files/*ThirdParty*
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
@@ -427,33 +396,17 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %{_libexecdir}/webkit2gtk-4.1/
 %exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
 %exclude %{_libexecdir}/webkit2gtk-4.1/jsc
-%{_bindir}/WebKitWebDriver
 
-%files -n webkit2gtk4.0 -f WebKit2GTK-4.0.lang
-%license _license_files/*ThirdParty*
-%license _license_files/*WebCore*
-%license _license_files/*WebInspectorUI*
-%license _license_files/*WTF*
-%{_libdir}/libwebkit2gtk-4.0.so.37*
-%dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/WebKit2-4.0.typelib
-%{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib
-%{_libdir}/webkit2gtk-4.0/
-%{_libexecdir}/webkit2gtk-4.0/
-%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser
-%exclude %{_libexecdir}/webkit2gtk-4.0/jsc
-
-%files -n webkit2gtk5.0-devel
-%{_libexecdir}/webkit2gtk-5.0/MiniBrowser
-%{_includedir}/webkitgtk-5.0/
-%exclude %{_includedir}/webkitgtk-5.0/JavaScriptCore
-%exclude %{_includedir}/webkitgtk-5.0/jsc
-%{_libdir}/libwebkit2gtk-5.0.so
-%{_libdir}/pkgconfig/webkit2gtk-5.0.pc
-%{_libdir}/pkgconfig/webkit2gtk-web-extension-5.0.pc
+%files -n webkitgtk6.0-devel
+%{_libexecdir}/webkitgtk-6.0/MiniBrowser
+%{_includedir}/webkitgtk-6.0/
+%exclude %{_includedir}/webkitgtk-6.0/jsc
+%{_libdir}/libwebkitgtk-6.0.so
+%{_libdir}/pkgconfig/webkitgtk-6.0.pc
+%{_libdir}/pkgconfig/webkitgtk-web-process-extension-6.0.pc
 %dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/WebKit2-5.0.gir
-%{_datadir}/gir-1.0/WebKit2WebExtension-5.0.gir
+%{_datadir}/gir-1.0/WebKit-6.0.gir
+%{_datadir}/gir-1.0/WebKitWebProcessExtension-6.0.gir
 
 %files -n webkit2gtk4.1-devel
 %{_libexecdir}/webkit2gtk-4.1/MiniBrowser
@@ -467,23 +420,11 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %{_datadir}/gir-1.0/WebKit2-4.1.gir
 %{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir
 
-%files -n webkit2gtk4.0-devel
-%{_libexecdir}/webkit2gtk-4.0/MiniBrowser
-%{_includedir}/webkitgtk-4.0/
-%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore
-%exclude %{_includedir}/webkitgtk-4.0/jsc
-%{_libdir}/libwebkit2gtk-4.0.so
-%{_libdir}/pkgconfig/webkit2gtk-4.0.pc
-%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc
-%dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/WebKit2-4.0.gir
-%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir
-
-%files -n javascriptcoregtk5.0
+%files -n javascriptcoregtk6.0
 %license _license_files/*JavaScriptCore*
-%{_libdir}/libjavascriptcoregtk-5.0.so.0*
+%{_libdir}/libjavascriptcoregtk-6.0.so.1*
 %dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/JavaScriptCore-5.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-6.0.typelib
 
 %files -n javascriptcoregtk4.1
 %license _license_files/*JavaScriptCore*
@@ -491,21 +432,14 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib
 
-%files -n javascriptcoregtk4.0
-%license _license_files/*JavaScriptCore*
-%{_libdir}/libjavascriptcoregtk-4.0.so.18*
-%dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib
-
-%files -n javascriptcoregtk5.0-devel
-%{_libexecdir}/webkit2gtk-5.0/jsc
-%dir %{_includedir}/webkitgtk-5.0
-%{_includedir}/webkitgtk-5.0/JavaScriptCore/
-%{_includedir}/webkitgtk-5.0/jsc/
-%{_libdir}/libjavascriptcoregtk-5.0.so
-%{_libdir}/pkgconfig/javascriptcoregtk-5.0.pc
+%files -n javascriptcoregtk6.0-devel
+%{_libexecdir}/webkitgtk-6.0/jsc
+%dir %{_includedir}/webkitgtk-6.0
+%{_includedir}/webkitgtk-6.0/jsc/
+%{_libdir}/libjavascriptcoregtk-6.0.so
+%{_libdir}/pkgconfig/javascriptcoregtk-6.0.pc
 %dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/JavaScriptCore-5.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-6.0.gir
 
 %files -n javascriptcoregtk4.1-devel
 %{_libexecdir}/webkit2gtk-4.1/jsc
@@ -517,37 +451,18 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %dir %{_datadir}/gir-1.0
 %{_datadir}/gir-1.0/JavaScriptCore-4.1.gir
 
-%files -n javascriptcoregtk4.0-devel
-%{_libexecdir}/webkit2gtk-4.0/jsc
-%dir %{_includedir}/webkitgtk-4.0
-%{_includedir}/webkitgtk-4.0/JavaScriptCore/
-%{_includedir}/webkitgtk-4.0/jsc/
-%{_libdir}/libjavascriptcoregtk-4.0.so
-%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc
-%dir %{_datadir}/gir-1.0
-%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
-
 %if %{with docs}
-%files -n webkit2gtk5.0-doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-5.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-5.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-5.0/
+%files -n webkitgtk6.0-doc
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-6.0/
+%{_datadir}/doc/webkitgtk-6.0/
+%{_datadir}/doc/webkitgtk-web-process-extension-6.0/
 
 %files -n webkit2gtk4.1-doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/
-%{_datadir}/gtk-doc/html/webkit2gtk-4.1/
-%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/
-
-%files -n webkit2gtk4.0-doc
-%dir %{_datadir}/gtk-doc
-%dir %{_datadir}/gtk-doc/html
-%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-4.0/
-%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/
+%dir %{_datadir}/doc
+%{_datadir}/doc/javascriptcoregtk-4.1/
+%{_datadir}/doc/webkit2gtk-4.1/
+%{_datadir}/doc/webkit2gtk-web-extension-4.1/
 %endif
 
 %changelog