Update to 2.42.2

GLES needs to be available at runtime or we'll crash, #2240428.

It's not needed at runtime because it's only used via libepoxy. And
desktop GL is no longer used at all.

Fixes #2240428

.gitignore

@@ -1,3 +1,19 @@
 /webkitgtk-*.tar.xz
 /webkitgtk-2.37.1.tar.xz.asc
 /webkitgtk-2.37.90.tar.xz.asc
+/webkitgtk-2.37.91.tar.xz.asc
+/webkitgtk-2.38.0.tar.xz.asc
+/webkitgtk-2.38.1.tar.xz.asc
+/webkitgtk-2.38.2.tar.xz.asc
+/webkitgtk-2.38.3.tar.xz.asc
+/webkitgtk-2.38.4.tar.xz.asc
+/webkitgtk-2.38.5.tar.xz.asc
+/webkitgtk-2.40.0.tar.xz.asc
+/webkitgtk-2.40.1.tar.xz.asc
+/webkitgtk-2.40.2.tar.xz.asc
+/webkitgtk-2.40.3.tar.xz.asc
+/webkitgtk-2.40.4.tar.xz.asc
+/webkitgtk-2.40.5.tar.xz.asc
+/webkitgtk-2.42.0.tar.xz.asc
+/webkitgtk-2.42.1.tar.xz.asc
+/webkitgtk-2.42.2.tar.xz.asc

rpminspect.yaml

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

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.42.2.tar.xz) = 4cbd057c55c96bdc6b4f8ece89cb9803e8503146de62f74427cdcea8de5f2a644fa213160a02dfbb0df1529fbf84fd4cd73ba3953466d11d7b0b9cad04c3214f
+SHA512 (webkitgtk-2.42.2.tar.xz.asc) = 00af175e5b4a0f6f47ea552fd52d68eeeb431277424fb584a72d348cfbd99e7a05b877dfcc5abbe41f3aa78e35b075c17cda3f90e4d4081736a3d47755942c10

webkitgtk.spec

@@ -10,13 +10,15 @@
 %global with_gamepad 1
 %endif
 
+%global _lto_cflags %{nil}
+
 # 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
 
 Name:           webkitgtk
-Version:        2.37.90
+Version:        2.42.2
 Release:        %autorelease
 Summary:        GTK web content engine library
 
@@ -42,6 +44,7 @@ BuildRequires:  gperf
 BuildRequires:  hyphen-devel
 BuildRequires:  libatomic
 BuildRequires:  ninja-build
+BuildRequires:  openssl-devel
 BuildRequires:  perl(English)
 BuildRequires:  perl(FindBin)
 BuildRequires:  perl(JSON::PP)
@@ -49,6 +52,7 @@ BuildRequires:  python3
 BuildRequires:  ruby
 BuildRequires:  rubygems
 BuildRequires:  rubygem-json
+BuildRequires:  unifdef
 BuildRequires:  xdg-dbus-proxy
 
 BuildRequires:  pkgconfig(atspi-2)
@@ -57,19 +61,22 @@ BuildRequires:  pkgconfig(egl)
 BuildRequires:  pkgconfig(enchant-2)
 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)
@@ -97,16 +104,17 @@ 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\\.0/.*\\.so|%{_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
@@ -115,8 +123,9 @@ Recommends:     xdg-desktop-portal-gtk
 Provides:       bundled(angle)
 Provides:       bundled(pdfjs)
 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 +133,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
@@ -158,15 +168,16 @@ Provides:       webkit2gtk3 = %{version}-%{release}
 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}
+%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 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
@@ -193,18 +204,21 @@ 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.
+%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
 
 %description -n webkit2gtk4.1-doc
 This package contains developer documentation for webkit2gtk4.1.
@@ -217,23 +231,25 @@ Obsoletes:      webkitgtk4-doc < %{version}-%{release}
 Provides:       webkitgtk4-doc = %{version}-%{release}
 Obsoletes:      webkit2gtk3-doc < %{version}-%{release}
 Provides:       webkit2gtk3-doc = %{version}-%{release}
+Recommends:     gi-docgen-fonts
 
 %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
+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
 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
@@ -243,15 +259,16 @@ Obsoletes:      webkit2gtk3-jsc < %{version}-%{release}
 Provides:       webkit2gtk3-jsc = %{version}-%{release}
 
 %description -n javascriptcoregtk4.0
-This package contains JavaScript engine from webkit2gtk4.0.
+This package contains the 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}
+%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 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
@@ -280,26 +297,35 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
 
 %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 to avoid overwhelming non-x86_64
+# builders.
 # 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
 
-# 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 /')
+#
+# Do this for s390x too as a temporary measure.
+# https://pagure.io/fedora-infrastructure/issue/11000
+%ifarch %{ix86} s390x
+%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %endif
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
+# 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
+
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 %cmake \
   -GNinja \
   -DPORT=GTK \
@@ -313,8 +339,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
 %endif
 %if 0%{?rhel}
 %ifarch aarch64
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
+  -DUSE_64KB_PAGE_BLOCK=ON \
 %endif
 %endif
   %{nil}
@@ -324,6 +349,7 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
   -GNinja \
   -DPORT=GTK \
   -DCMAKE_BUILD_TYPE=Release \
+  -DENABLE_WEBDRIVER=OFF \
 %if %{without docs}
   -DENABLE_DOCUMENTATION=OFF \
 %endif
@@ -352,26 +378,25 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0
 %endif
 %if 0%{?rhel}
 %ifarch aarch64
-  -DENABLE_JIT=OFF \
-  -DUSE_SYSTEM_MALLOC=ON \
+  -DUSE_64KB_PAGE_BLOCK=ON \
 %endif
 %endif
   %{nil}
 
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 export NINJA_STATUS="[1/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+%cmake_build %limit_build -m 3072
 
 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
 export NINJA_STATUS="[2/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+%cmake_build %limit_build -m 3072
 
 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0
 export NINJA_STATUS="[3/3][%f/%t %es] "
-%cmake_build %limit_build -m 4096
+%cmake_build %limit_build -m 3072
 
 %install
-%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0
+%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0
 %cmake_install
 
 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1
@@ -380,14 +405,13 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %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
+%find_lang WebKitGTK-4.0
 
 # 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 +423,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,9 +451,8 @@ 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
+%files -n webkit2gtk4.0 -f WebKitGTK-4.0.lang
 %license _license_files/*ThirdParty*
 %license _license_files/*WebCore*
 %license _license_files/*WebInspectorUI*
@@ -443,17 +466,16 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %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
@@ -479,11 +501,11 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %{_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*
@@ -497,15 +519,14 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %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
@@ -528,12 +549,12 @@ export NINJA_STATUS="[3/3][%f/%t %es] "
 %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir
 
 %if %{with docs}
-%files -n webkit2gtk5.0-doc
+%files -n webkitgtk6.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/
+%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/
+%{_datadir}/gtk-doc/html/webkitgtk-6.0/
+%{_datadir}/gtk-doc/html/webkitgtk-web-process-extension-6.0/
 
 %files -n webkit2gtk4.1-doc
 %dir %{_datadir}/gtk-doc