diff --git a/webkitgtk-2.40.5.tar.xz b/webkitgtk-2.42.1.tar.xz similarity index 75% rename from webkitgtk-2.40.5.tar.xz rename to webkitgtk-2.42.1.tar.xz index a0a79eb13775047ecc52cc41d269310599b5d10b..a59c71e01528a276a24c05c1c3473f52a9ddfbc8 100644 Binary files a/webkitgtk-2.40.5.tar.xz and b/webkitgtk-2.42.1.tar.xz differ diff --git a/webkitgtk-2.42.1.tar.xz.asc b/webkitgtk-2.42.1.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..a3e7c2cd3c6cbe4bbe215f8de0f8a76c6dd319a6 --- /dev/null +++ b/webkitgtk-2.42.1.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZRPnswAKCRDz0yLQ7EWC +w3i9AJ9zJ2PmUPXpxO1hgRRrouSUCCwr0QCdF6IiNCwrnbnULOcRFSsE89bOotw= +=wubx +-----END PGP SIGNATURE----- diff --git a/webkitgtk-keys.gpg b/webkitgtk-keys.gpg new file mode 100644 index 0000000000000000000000000000000000000000..180e358ac0e97fa8d910e5e8c44ad83a2abba1ec Binary files /dev/null and b/webkitgtk-keys.gpg differ diff --git a/webkitgtk.spec b/webkitgtk.spec index 6e03901a313a2d57bece1f49b53ee56d7a70a6c3..a93955d6c24174650f20a9a61c2014015f21ae71 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -10,14 +10,23 @@ %global with_gamepad 0 +%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.40.5 +Version: 2.42.1 Release: %{anolis_release}%{?dist} -Summary: GTK Web content engine library +Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz +Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc +Source2: webkitgtk-keys.gpg BuildRequires: bison BuildRequires: bubblewrap @@ -43,48 +52,37 @@ BuildRequires: rubygem-json BuildRequires: unifdef BuildRequires: xdg-dbus-proxy -BuildRequires: pkgconfig(atspi-2) >= 2.5.3 -BuildRequires: pkgconfig(cairo) >= 1.14.0 +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) -BuildRequires: pkgconfig(fontconfig) >= 2.8.0 -BuildRequires: pkgconfig(freetype2) >= 2.4.2 -BuildRequires: pkgconfig(gl) -BuildRequires: pkgconfig(glib-2.0) >= 2.56.4 -BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(fontconfig) +BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gbm) +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gstreamer-1.0) >= 1.16.2 +BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) -BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-allocators-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-app-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-audio-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-fft-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-gl-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-pbutils-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-rtp-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-sdp-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-tag-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-transcoder-1.0) >= 1.16.2 -BuildRequires: pkgconfig(gstreamer-video-1.0) >= 1.16.2 - -BuildRequires: pkgconfig(gtk+-3.0) >= 3.22.0 +BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) +BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk4) -BuildRequires: pkgconfig(harfbuzz) >= 0.9.18 -BuildRequires: pkgconfig(icu-uc) >= 61.2 +BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libavif) -BuildRequires: pkgconfig(libgcrypt) >= 1.6.0 +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libopenjp2) >= 2.2.0 +BuildRequires: pkgconfig(libopenjp2) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.54.0 -BuildRequires: pkgconfig(libsoup-3.0) >= 3.0.4 +BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libsoup-3.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libtasn1) BuildRequires: pkgconfig(libwebp) @@ -107,13 +105,14 @@ BuildRequires: pkgconfig(xt) %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 portable web rendering engine WebKit to the +WebKitGTK is the port of the WebKit web rendering engine to the GTK platform. %package -n webkitgtk6.0 Summary: WebKitGTK for GTK 4 Requires: javascriptcoregtk6.0 = %{version}-%{release} Requires: bubblewrap +Requires: libGLES Requires: xdg-dbus-proxy Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free @@ -132,6 +131,7 @@ GTK platform. This package contains WebKitGTK for GTK 4. Summary: WebKitGTK for GTK 3 and libsoup 3 Requires: javascriptcoregtk4.1 = %{version}-%{release} Requires: bubblewrap +Requires: libGLES Requires: xdg-dbus-proxy Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free @@ -290,15 +290,16 @@ The javascriptcoregtk4.0-devel package contains libraries, build data, and heade 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} -# Remove bundled libraries -rm -rf Source/ThirdParty/gtest/ -rm -rf Source/ThirdParty/qunit/ - %build -# Increase the DIE limit so our debuginfo packages could be size optimized. -# Decreases the size for x86_64 from ~5G to ~1.1G. +# Increase the DIE limit so our debuginfo packages can be size-optimized. +# 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_x86_64 250000000 %global _dwz_max_die_limit_aarch64 250000000 @@ -306,6 +307,7 @@ rm -rf Source/ThirdParty/qunit/ %global _find_debuginfo_opts %limit_build -m 32768 # 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 @@ -318,8 +320,8 @@ rm -rf Source/ThirdParty/qunit/ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_GTK4=ON \ -%if %{with docs} - -DENABLE_GTKDOC=ON \ +%if %{without docs} + -DENABLE_DOCUMENTATION=OFF \ %endif %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ @@ -366,15 +368,15 @@ rm -rf Source/ThirdParty/qunit/ %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 export NINJA_STATUS="[1/3][%f/%t %es] " -%cmake_build +%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 +%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 +%cmake_build %limit_build -m 3072 %install %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 @@ -419,7 +421,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %exclude %{_libexecdir}/webkitgtk-6.0/jsc %{_bindir}/WebKitWebDriver - %files -n webkit2gtk4.1 -f WebKitGTK-4.1.lang %license _license_files/*ThirdParty* %license _license_files/*WebCore* @@ -448,7 +449,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.0/jsc - %files -n webkitgtk6.0-devel %{_libexecdir}/webkitgtk-6.0/MiniBrowser %{_includedir}/webkitgtk-6.0/ @@ -460,7 +460,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_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 %{_includedir}/webkitgtk-4.1/ @@ -473,7 +472,6 @@ 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/ @@ -486,28 +484,24 @@ 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 javascriptcoregtk6.0 %license _license_files/*JavaScriptCore* %{_libdir}/libjavascriptcoregtk-6.0.so.1* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/JavaScriptCore-6.0.typelib - %files -n javascriptcoregtk4.1 %license _license_files/*JavaScriptCore* %{_libdir}/libjavascriptcoregtk-4.1.so.0* %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 javascriptcoregtk6.0-devel %{_libexecdir}/webkitgtk-6.0/jsc %dir %{_includedir}/webkitgtk-6.0 @@ -517,7 +511,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %dir %{_datadir}/gir-1.0 %{_datadir}/gir-1.0/JavaScriptCore-6.0.gir - %files -n javascriptcoregtk4.1-devel %{_libexecdir}/webkit2gtk-4.1/jsc %dir %{_includedir}/webkitgtk-4.1 @@ -528,7 +521,6 @@ 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 @@ -563,6 +555,9 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %endif %changelog +* Fri Nov 03 2023 mgb01105731 - 2.42.1-1 +- Update to 2.42.1 + * Wed Aug 2 2023 Funda Wang - 2.40.5-1 - New version 2.40.5