From 5d9f4626d9d1b896b2a0c3e81ab4ab142232ef67 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Sep 2023 20:42:01 +0000 Subject: [PATCH] import CS webkit2gtk3-2.40.5-1.el9 --- .gitignore | 2 +- .webkit2gtk3.metadata | 2 +- SOURCES/webkitgtk-2.38.5.tar.xz.asc | 6 ----- SOURCES/webkitgtk-2.40.5.tar.xz.asc | 6 +++++ SPECS/webkit2gtk3.spec | 42 ++++++++++++++++++++++++----- 5 files changed, 43 insertions(+), 15 deletions(-) delete mode 100644 SOURCES/webkitgtk-2.38.5.tar.xz.asc create mode 100644 SOURCES/webkitgtk-2.40.5.tar.xz.asc diff --git a/.gitignore b/.gitignore index 6604850..2a925d8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.38.5.tar.xz +SOURCES/webkitgtk-2.40.5.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 3cff2b7..6a421f0 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -1774390c628bb3a524d4ed76f11de4a878078db6 SOURCES/webkitgtk-2.38.5.tar.xz +2f4d06b021115eb4106177f7d5f534f45b5d3b2e SOURCES/webkitgtk-2.40.5.tar.xz cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/webkitgtk-2.38.5.tar.xz.asc b/SOURCES/webkitgtk-2.38.5.tar.xz.asc deleted file mode 100644 index a285466..0000000 --- a/SOURCES/webkitgtk-2.38.5.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCY+yu2QAKCRDz0yLQ7EWC -w7UkAKCS0EoptKZRn3/Z+WgGerHQEQXaFQCg51h2++dwb1bqVZ05Q1YtHmoT2gk= -=or/S ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.40.5.tar.xz.asc b/SOURCES/webkitgtk-2.40.5.tar.xz.asc new file mode 100644 index 0000000..4dc018d --- /dev/null +++ b/SOURCES/webkitgtk-2.40.5.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCZMjRYQAKCRDz0yLQ7EWC +wwPPAJ0XUmEmSr4IFQWpbDfPOR9keXY+lwCfVLyOFL8T55psriGN4vkxVZqq+EM= +=nGCs +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 3dbfc73..afb880f 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,7 +11,7 @@ %endif Name: webkit2gtk3 -Version: 2.38.5 +Version: 2.40.5 Release: 1%{?dist} Summary: GTK Web content engine library @@ -36,6 +36,7 @@ BuildRequires: gperf BuildRequires: hyphen-devel BuildRequires: libatomic BuildRequires: ninja-build +BuildRequires: openssl-devel BuildRequires: perl(English) BuildRequires: perl(FindBin) BuildRequires: perl(JSON::PP) @@ -43,6 +44,7 @@ BuildRequires: python3 BuildRequires: ruby BuildRequires: rubygems BuildRequires: rubygem-json +BuildRequires: unifdef BuildRequires: xdg-dbus-proxy BuildRequires: pkgconfig(atspi-2) @@ -51,16 +53,19 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(gl) 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(harfbuzz) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libgcrypt) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libnotify) @@ -204,14 +209,14 @@ rm -rf Source/ThirdParty/qunit/ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_JIT=OFF \ -DUSE_SOUP2=ON \ + -DUSE_AVIF=OFF \ -DENABLE_DOCUMENTATION=OFF \ + -DUSE_GSTREAMER_TRANSCODER=OFF \ %if !0%{?with_gamepad} -DENABLE_GAMEPAD=OFF \ %endif -%if 0%{?fedora} - -DUSER_AGENT_BRANDING="Fedora" \ -%endif %if 0%{?rhel} %ifarch aarch64 -DUSE_64KB_PAGE_BLOCK=ON \ @@ -226,12 +231,11 @@ export NINJA_STATUS="[%f/%t][%e] " %install %cmake_install -%find_lang WebKit2GTK-4.0 +%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 @@ -243,7 +247,7 @@ export NINJA_STATUS="[%f/%t][%e] " %add_to_license_files Source/WTF/wtf/dtoa/COPYING %add_to_license_files Source/WTF/wtf/dtoa/LICENSE -%files -f WebKit2GTK-4.0.lang +%files -f WebKitGTK-4.0.lang %license _license_files/*ThirdParty* %license _license_files/*WebCore* %license _license_files/*WebInspectorUI* @@ -287,6 +291,30 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Tue Aug 01 2023 Michael Catanzaro - 2.40.5-1 +- Update to 2.40.5 + Related: #2176270 + +* Fri Jul 21 2023 Michael Catanzaro - 2.40.4-1 +- Update to 2.40.4 + Related: #2176270 + +* Tue Jul 11 2023 Michael Catanzaro - 2.40.3-2 +- Disable JIT + Related: #2176270 + +* Wed Jun 28 2023 Michael Catanzaro - 2.40.3-1 +- Update to 2.40.3 + Related: #2176270 + +* Tue May 30 2023 Michael Catanzaro - 2.40.2-1 +- Update to 2.40.2 + Related: #2176270 + +* Thu May 04 2023 Michael Catanzaro - 2.40.1-1 +- Upgrade to 2.40.1 + Resolves: #2176270 + * Wed Feb 15 2023 Michael Catanzaro - 2.38.5-1 - Update to 2.38.5 Related: #2127467