- started update to 2.40.1; gtk-webkit5 replaced by gtk-webkit6

diff --git a/gtk-webkit4.spec b/gtk-webkit4.spec
index 66a7450eb12935cf424a70570ff4b4a719400d87..d49fc9c56ce49164a74d29a1fee1d166369e945b 100644 (file)
--- a/gtk-webkit4.spec
+++ b/gtk-webkit4.spec
@@ -1,8 +1,8 @@
 # TODO: review configure options:
 # - FTL_JIT on !x86_64?
 # - WEB_RTC+MEDIA_STREAM (experimental; BR: openwebrtc)
-# - AVIF? (experimental; BR: libavif-devel >= 0.9.0)
 # - JPEGXL? (experimental; BR: libjxl-devel)
+# - SPEECH_SYNTHESIS? (experimental; BR: flite-devel >= 2.2)
 # - THUNDER? (BR: Thunder + ThunderClientLibraries)
 #
 # Conditional build:
@@ -10,7 +10,7 @@
 %bcond_without libsoup2        # webkit-4.0 (libsoup2 based) variant
 %bcond_without libsoup3        # webkit-4.1 (libsoup3 based) variant (HTTP/2 support)
 %bcond_without gtk3            # webkit-4.x (gtk3 based) variants
-%bcond_without gtk4            # webkit-5.0 (gtk4/libsoup3 based) variant
+%bcond_without gtk4            # webkit-6.0 (gtk4/libsoup3 based) variant
 %bcond_without wayland         # Wayland target (requires GTK+ wayland target)
 %bcond_with    lowmem          # try to reduce build memory usage by adjusting gcc gc
 %bcond_with    lowmem2         # try to reduce build memory usage by disabling unified build (long)
@@ -23,13 +23,13 @@
 Summary:       Port of WebKit embeddable web component to GTK+ 3
 Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK+ 3
 Name:          gtk-webkit4
-# NOTE: 2.38.x is stable, 2.39.x devel
-Version:       2.38.6
-Release:       4
+# NOTE: 2.40.x is stable, 2.41.x devel
+Version:       2.40.1
+Release:       1
 License:       BSD-like
 Group:         X11/Libraries
 Source0:       https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
-# Source0-md5: a50290fdc80842b1ae8be1e1147b5679
+# Source0-md5: 20aa14992701802a58bb5e333296a963
 Patch0:                x32.patch
 Patch1:                %{name}-icu59.patch
 Patch2:                parallel-gir.patch
@@ -49,11 +49,10 @@ BuildRequires:      docbook-dtd412-xml
 BuildRequires: enchant2-devel >= 2
 BuildRequires: fontconfig-devel >= 2.13.0
 BuildRequires: freetype-devel >= 1:2.9.0
-BuildRequires: gcc-c++ >= 6:7.3.0
 BuildRequires: gettext-devel
 BuildRequires: gettext-tools
 BuildRequires: gi-docgen
-BuildRequires: glib2-devel >= 1:2.67.1
+BuildRequires: glib2-devel >= 1:2.70.0
 BuildRequires: glibc-misc
 %{?with_introspection:BuildRequires:   gobject-introspection-devel >= 1.32.0}
 BuildRequires: gperf >= 3.0.1
@@ -70,6 +69,8 @@ BuildRequires:        harfbuzz-devel >= 1.4.2
 BuildRequires: harfbuzz-icu-devel >= 1.4.2
 BuildRequires: hyphen-devel
 BuildRequires: lcms2-devel >= 2
+BuildRequires: libavif-devel >= 0.9.0
+BuildRequires: libepoxy-devel >= 1.4.0
 BuildRequires: libgcrypt-devel >= 1.7.0
 BuildRequires: libicu-devel >= 61.2
 BuildRequires: libjpeg-devel
@@ -80,8 +81,8 @@ BuildRequires:        libseccomp-devel
 BuildRequires: libsecret-devel
 %{?with_libsoup2:BuildRequires:        libsoup-devel >= 2.54}
 %{?with_libsoup3:BuildRequires:        libsoup3-devel >= 3.0}
-# -std=c++2a
-BuildRequires: libstdc++-devel >= 6:8.3
+# -std=c++2a; WebKitCommon.cmake says gcc 9.3.0 is minimum, but 9.5.0 fails to build
+BuildRequires: libstdc++-devel >= 6:10
 BuildRequires: libtasn1-devel
 BuildRequires: libwebp-devel
 BuildRequires: libwpe-devel >= 1.3.0
@@ -94,11 +95,12 @@ BuildRequires:      pkgconfig
 BuildRequires: python >= 1:2.7.0
 BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.699
-BuildRequires: ruby >= 1:1.9
-BuildRequires: ruby-modules >= 1:1.9
+BuildRequires: ruby >= 1:2.5
+BuildRequires: ruby-modules >= 1:2.5
 BuildRequires: sqlite3-devel >= 3
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
+BuildRequires: unifdef
 %if %{with wayland}
 BuildRequires: wayland-devel
 BuildRequires: wayland-egl-devel
@@ -120,7 +122,7 @@ Requires:   atk >= 1:2.16.0
 Requires:      cairo >= 1.16.0
 Requires:      fontconfig-libs >= 2.13.0
 Requires:      freetype >= 1:2.9.0
-Requires:      glib2 >= 1:2.67.1
+Requires:      glib2 >= 1:2.70.0
 Requires:      gstreamer >= 1.2.3
 Requires:      gstreamer-plugins-base >= 1.2.3
 Requires:      gtk+3 >= 3.22.0
@@ -154,7 +156,7 @@ Summary:    Development files for WebKit for GTK+ 3
 Summary(pl.UTF-8):     Pliki programistyczne komponentu WebKit dla GTK+ 3
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.67.1
+Requires:      glib2-devel >= 1:2.70.0
 Requires:      gtk+3-devel >= 3.22.0
 Requires:      libsoup-devel >= 2.54
 Requires:      libstdc++-devel >= 6:8.3
@@ -187,7 +189,7 @@ Requires:   atk >= 1:2.16.0
 Requires:      cairo >= 1.16.0
 Requires:      fontconfig-libs >= 2.13.0
 Requires:      freetype >= 1:2.9.0
-Requires:      glib2 >= 1:2.67.1
+Requires:      glib2 >= 1:2.70.0
 Requires:      gstreamer >= 1.2.3
 Requires:      gstreamer-plugins-base >= 1.2.3
 Requires:      gtk+3 >= 3.22.0
@@ -215,7 +217,7 @@ Summary:    Development files for WebKit for GTK+ 3 with HTTP/2 support
 Summary(pl.UTF-8):     Pliki programistyczne komponentu WebKit dla GTK+ 3 z obsługą HTTP/2
 Group:         X11/Development/Libraries
 Requires:      gtk-webkit4.1 = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.67.1
+Requires:      glib2-devel >= 1:2.70.0
 Requires:      gtk+3-devel >= 3.22.0
 Requires:      libsoup3-devel >= 3.0
 Requires:      libstdc++-devel >= 6:8.3
@@ -239,7 +241,7 @@ API documentation for WebKit GTK+ 3 port with HTTP/2 support.
 %description -n gtk-webkit4.1-apidocs -l pl.UTF-8
 Dokumentacja API portu WebKitu do GTK+ 3 z obsługą HTTP/2.
 
-%package -n gtk-webkit5
+%package -n gtk-webkit6
 Summary:       Port of WebKit embeddable web component to GTK 4
 Summary(pl.UTF-8):     Port osadzalnego komponentu WWW WebKit do GTK 4
 Group:         X11/Libraries
@@ -248,7 +250,7 @@ Requires:   atk >= 1:2.16.0
 Requires:      cairo >= 1.16.0
 Requires:      fontconfig-libs >= 2.13.0
 Requires:      freetype >= 1:2.9.0
-Requires:      glib2 >= 1:2.67.1
+Requires:      glib2 >= 1:2.70.0
 Requires:      gstreamer >= 1.2.3
 Requires:      gstreamer-plugins-base >= 1.2.3
 Requires:      gtk4 >= 4.0
@@ -263,39 +265,39 @@ Requires: pango >= 1:1.32.0
 Requires:      woff2 >= 1.0.2
 Requires:      wpebackend-fdo >= 1.6.0
 
-%description -n gtk-webkit5
-gtk-webkit5 is a port of the WebKit embeddable web component to GTK 4.
+%description -n gtk-webkit6
+gtk-webkit6 is a port of the WebKit embeddable web component to GTK 4.
 
-%description -n gtk-webkit5 -l pl.UTF-8
-gtk-webkit5 to port osadzalnego komponentu WWW WebKit do GTK+ 4.
+%description -n gtk-webkit6 -l pl.UTF-8
+gtk-webkit6 to port osadzalnego komponentu WWW WebKit do GTK+ 4.
 
-%package -n gtk-webkit5-devel
+%package -n gtk-webkit6-devel
 Summary:       Development files for WebKit for GTK 4
 Summary(pl.UTF-8):     Pliki programistyczne komponentu WebKit dla GTK 4
 Group:         X11/Development/Libraries
-Requires:      gtk-webkit5 = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.67.1
+Requires:      gtk-webkit6 = %{version}-%{release}
+Requires:      glib2-devel >= 1:2.70.0
 Requires:      gtk4-devel >= 4.0
 Requires:      libsoup3-devel >= 3.0
 Requires:      libstdc++-devel >= 6:8.3
 
-%description -n gtk-webkit5-devel
+%description -n gtk-webkit6-devel
 Development files for WebKit for GTK 4.
 
-%description -n gtk-webkit5-devel -l pl.UTF-8
+%description -n gtk-webkit6-devel -l pl.UTF-8
 Pliki programistyczne komponentu WebKit dla GTK 4.
 
-%package -n gtk-webkit5-apidocs
+%package -n gtk-webkit6-apidocs
 Summary:       API documentation for WebKit GTK 4 port
 Summary(pl.UTF-8):     Dokumentacja API portu WebKitu do GTK 4
 Group:         Documentation
 Requires:      gtk-doc-common
 BuildArch:     noarch
 
-%description -n gtk-webkit5-apidocs
+%description -n gtk-webkit6-apidocs
 API documentation for WebKit GTK 4 port.
 
-%description -n gtk-webkit5-apidocs -l pl.UTF-8
+%description -n gtk-webkit6-apidocs -l pl.UTF-8
 Dokumentacja API portu WebKitu do GTK 4.
 
 %prep
@@ -311,7 +313,6 @@ Dokumentacja API portu WebKitu do GTK 4.
 CXXFLAGS="%{rpmcxxflags} --param ggc-min-expand=20 --param ggc-min-heapsize=65536"
 %endif
 for kind in %{?with_gtk3:%{?with_libsoup2:soup2} %{?with_libsoup3:soup3}} %{?with_gtk4:gtk4} ; do
-install -d build-${kind}
 %cmake -B build-${kind} \
        -DENABLE_GEOLOCATION=ON \
        -DENABLE_GTKDOC=ON \
@@ -350,9 +351,9 @@ install -d $RPM_BUILD_ROOT%{_gtkdocdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/* $RPM_BUILD_ROOT%{_gtkdocdir}
 %endif
 
-%{?with_gtk3:%{?with_libsoup2:%find_lang WebKit2GTK-4.0}}
-%{?with_gtk3:%{?with_libsoup3:%find_lang WebKit2GTK-4.1}}
-%{?with_gtk4:%find_lang WebKit2GTK-5.0}
+%{?with_gtk3:%{?with_libsoup2:%find_lang WebKitGTK-4.0}}
+%{?with_gtk3:%{?with_libsoup3:%find_lang WebKitGTK-4.1}}
+%{?with_gtk4:%find_lang WebKitGTK-6.0}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -363,11 +364,11 @@ rm -rf $RPM_BUILD_ROOT
 %post  -n gtk-webkit4.1 -p /sbin/ldconfig
 %postun        -n gtk-webkit4.1 -p /sbin/ldconfig
 
-%post  -n gtk-webkit5 -p /sbin/ldconfig
-%postun        -n gtk-webkit5 -p /sbin/ldconfig
+%post  -n gtk-webkit6 -p /sbin/ldconfig
+%postun        -n gtk-webkit6 -p /sbin/ldconfig
 
 %if %{with gtk3} && %{with libsoup2}
-%files -f WebKit2GTK-4.0.lang
+%files -f WebKitGTK-4.0.lang
 %defattr(644,root,root,755)
 %doc NEWS
 %attr(755,root,root) %{_bindir}/WebKitWebDriver-4.0
@@ -413,7 +414,7 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with gtk3} && %{with libsoup3}
-%files -n gtk-webkit4.1 -f WebKit2GTK-4.1.lang
+%files -n gtk-webkit4.1 -f WebKitGTK-4.1.lang
 %defattr(644,root,root,755)
 %doc NEWS
 %attr(755,root,root) %{_bindir}/WebKitWebDriver-4.1
@@ -459,47 +460,47 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %if %{with gtk4}
-%files -n gtk-webkit5 -f WebKit2GTK-5.0.lang
+%files -n gtk-webkit6 -f WebKitGTK-6.0.lang
 %defattr(644,root,root,755)
 %doc NEWS
-%attr(755,root,root) %{_bindir}/WebKitWebDriver-5.0
-%attr(755,root,root) %{_libdir}/libwebkit2gtk-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwebkit2gtk-5.0.so.0
-%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-5.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-5.0.so.0
+%attr(755,root,root) %{_bindir}/WebKitWebDriver-6.0
+%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-6.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libjavascriptcoregtk-6.0.so.1
+%attr(755,root,root) %{_libdir}/libwebkitgtk-6.0.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libwebkitgtk-6.0.so.4
 %if %{with introspection}
-%{_libdir}/girepository-1.0/JavaScriptCore-5.0.typelib
-%{_libdir}/girepository-1.0/WebKit2-5.0.typelib
-%{_libdir}/girepository-1.0/WebKit2WebExtension-5.0.typelib
+%{_libdir}/girepository-1.0/JavaScriptCore-6.0.typelib
+%{_libdir}/girepository-1.0/WebKit-6.0.typelib
+%{_libdir}/girepository-1.0/WebKitWebProcessExtension-6.0.typelib
 %endif
 %if "%{_libexecdir}" != "%{_libdir}"
-%dir %{_libexecdir}/webkit2gtk-5.0
+%dir %{_libexecdir}/webkitgtk-6.0
 %endif
-%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/MiniBrowser
-%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/WebKitNetworkProcess
-%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/WebKitWebProcess
-%attr(755,root,root) %{_libexecdir}/webkit2gtk-5.0/jsc
-%dir %{_libdir}/webkit2gtk-5.0
-%dir %{_libdir}/webkit2gtk-5.0/injected-bundle
-%attr(755,root,root) %{_libdir}/webkit2gtk-5.0/injected-bundle/libwebkit2gtkinjectedbundle.so
-
-%files -n gtk-webkit5-devel
+%attr(755,root,root) %{_libexecdir}/webkitgtk-6.0/MiniBrowser
+%attr(755,root,root) %{_libexecdir}/webkitgtk-6.0/WebKitNetworkProcess
+%attr(755,root,root) %{_libexecdir}/webkitgtk-6.0/WebKitWebProcess
+%attr(755,root,root) %{_libexecdir}/webkitgtk-6.0/jsc
+%dir %{_libdir}/webkitgtk-6.0
+%dir %{_libdir}/webkitgtk-6.0/injected-bundle
+%attr(755,root,root) %{_libdir}/webkitgtk-6.0/injected-bundle/libwebkitgtkinjectedbundle.so
+
+%files -n gtk-webkit6-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libwebkit2gtk-5.0.so
-%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-5.0.so
+%attr(755,root,root) %{_libdir}/libwebkitgtk-6.0.so
+%attr(755,root,root) %{_libdir}/libjavascriptcoregtk-6.0.so
 %if %{with introspection}
-%{_datadir}/gir-1.0/JavaScriptCore-5.0.gir
-%{_datadir}/gir-1.0/WebKit2-5.0.gir
-%{_datadir}/gir-1.0/WebKit2WebExtension-5.0.gir
+%{_datadir}/gir-1.0/JavaScriptCore-6.0.gir
+%{_datadir}/gir-1.0/WebKit-6.0.gir
+%{_datadir}/gir-1.0/WebKitWebProcessExtension-6.0.gir
 %endif
-%{_includedir}/webkitgtk-5.0
-%{_pkgconfigdir}/javascriptcoregtk-5.0.pc
-%{_pkgconfigdir}/webkit2gtk-5.0.pc
-%{_pkgconfigdir}/webkit2gtk-web-extension-5.0.pc
+%{_includedir}/webkitgtk-6.0
+%{_pkgconfigdir}/javascriptcoregtk-6.0.pc
+%{_pkgconfigdir}/webkitgtk-6.0.pc
+%{_pkgconfigdir}/webkitgtk-web-process-extension-6.0.pc
 
-%files -n gtk-webkit5-apidocs
+%files -n gtk-webkit6-apidocs
 %defattr(644,root,root,755)
-%{_gtkdocdir}/javascriptcoregtk-5.0
-%{_gtkdocdir}/webkit2gtk-5.0
-%{_gtkdocdir}/webkit2gtk-web-extension-5.0
+%{_gtkdocdir}/javascriptcoregtk-6.0
+%{_gtkdocdir}/webkitgtk-6.0
+%{_gtkdocdir}/webkitgtk-web-process-extension-6.0
 %endif