diff --git a/webkitgtk.spec b/webkitgtk.spec index b287f7a219cd860b24e8273e1d52bf3c3c040bf9..6edffcf58fbde3c03a1298a4618b1ff84044d902 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 ## 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. @@ -6,6 +6,7 @@ mkdir -p _license_files ; \ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') +%global with_gamepad 0 %global _lto_cflags %{nil} %bcond_without docs @@ -13,14 +14,17 @@ %global with_gamepad 0 Name: webkitgtk -Version: 2.42.3 +Version: 2.44.0 Release: %{anolis_release}%{?dist} 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 Patch0: webkitgtk-2.42.1-reduce-memory-overheads.patch +Source2: webkitgtk-keys.gpg +Patch1: i686-build.patch BuildRequires: bison BuildRequires: bubblewrap @@ -36,6 +40,7 @@ BuildRequires: hyphen-devel BuildRequires: libatomic BuildRequires: ninja-build BuildRequires: openssl-devel +BuildRequires: perl(bigint) BuildRequires: perl(English) BuildRequires: perl(FindBin) BuildRequires: perl(JSON::PP) @@ -46,49 +51,36 @@ 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) >= 0.7.0 +BuildRequires: pkgconfig(libjxl) BuildRequires: pkgconfig(libnotify) -BuildRequires: pkgconfig(libopenjp2) >= 2.2.0 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) @@ -103,8 +95,6 @@ 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 @@ -294,6 +284,7 @@ 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 @@ -322,8 +313,9 @@ rm -rf Source/ThirdParty/qunit/ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_GTK4=ON \ -%if %{with docs} - -DENABLE_GTKDOC=ON \ + -DUSE_LIBBACKTRACE=OFF \ +%if %{without docs} + -DENABLE_DOCUMENTATION=OFF \ %endif %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ @@ -545,28 +537,28 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %if %{with docs} %files -n webkitgtk6.0-doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-6.0/ -%{_datadir}/gtk-doc/html/webkitgtk-6.0/ -%{_datadir}/gtk-doc/html/webkitgtk-web-process-extension-6.0/ +%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/ +%dir %{_datadir}/doc +%{_datadir}/doc/javascriptcoregtk-4.1/ +%{_datadir}/doc/webkit2gtk-4.1/ +%{_datadir}/doc/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.0/ +%{_datadir}/doc/webkit2gtk-4.0/ +%{_datadir}/doc/webkit2gtk-web-extension-4.0/ %endif %changelog +* Thu May 9 2024 Cui lichen - 2.44.0-2 +- Fix CVE-2023-42950 + * Mon Dec 11 2023 Funda Wang - 2.42.3-1 - New version 2.42.3