diff --git a/.gitignore b/.gitignore index 00f18dc..5e71e54 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/webkitgtk-2.32.3.tar.xz +SOURCES/webkitgtk-2.34.2.tar.xz diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 26448bb..e119a5a 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1 +1 @@ -9c9b2cb2638ea40706765768dd5cb3c95ab46dcb SOURCES/webkitgtk-2.32.3.tar.xz +18b3bb61524d543c59d5018062f3139568332a1e SOURCES/webkitgtk-2.34.2.tar.xz diff --git a/SOURCES/aarch64-page-size.patch b/SOURCES/aarch64-page-size.patch new file mode 100644 index 0000000..dfee197 --- /dev/null +++ b/SOURCES/aarch64-page-size.patch @@ -0,0 +1,16 @@ +diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h +index 8ff8443d0e25..2fa880a97d1d 100644 +--- a/Source/WTF/wtf/PageBlock.h ++++ b/Source/WTF/wtf/PageBlock.h +@@ -46,9 +46,9 @@ namespace WTF { + // Use 64 KiB for any unknown CPUs to be conservative. + #if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) + constexpr size_t CeilingOnPageSize = 16 * KB; +-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) ++#elif CPU(ARM64) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) + constexpr size_t CeilingOnPageSize = 64 * KB; +-#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(RISCV64) ++#elif OS(WINDOWS) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(RISCV64) + constexpr size_t CeilingOnPageSize = 4 * KB; + #else + #error Must set CeilingOnPageSize in PageBlock.h when adding a new CPU architecture! diff --git a/SOURCES/webkitgtk-2.32.3.tar.xz.asc b/SOURCES/webkitgtk-2.32.3.tar.xz.asc deleted file mode 100644 index d8d3593..0000000 --- a/SOURCES/webkitgtk-2.32.3.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYPqiRwAKCRDz0yLQ7EWC -w5R2AKC02Ps4OAdfYFAj7HnLkKqciDD+TwCfWfDGotwqJSzpc80qUF/qAosm9iM= -=3q32 ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.34.2.tar.xz.asc b/SOURCES/webkitgtk-2.34.2.tar.xz.asc new file mode 100644 index 0000000..8b752dd --- /dev/null +++ b/SOURCES/webkitgtk-2.34.2.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYZ4NMgAKCRDz0yLQ7EWC +w8dDAJ0XlodXEOu4mMkcTEkMi4zbGIvsmgCfdFSkmaAmrr+hSSh5/975VJzhj4M= +=zndL +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 55aa2d7..28d3002 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -16,8 +16,8 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.32.3 -Release: 2%{?dist} +Version: 2.34.2 +Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -27,6 +27,10 @@ Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc # Created from http://hkps.pool.sks-keyservers.net/pks/lookup?op=get&search=0xF3D322D0EC4582C3 Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg +# https://bugs.webkit.org/show_bug.cgi?id=217989 +# https://bugs.webkit.org/show_bug.cgi?id=227905 +Patch0: aarch64-page-size.patch + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake @@ -60,13 +64,13 @@ BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glesv2) -BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-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(libgcrypt) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libnotify) @@ -77,6 +81,7 @@ BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libtasn1) BuildRequires: pkgconfig(libwebp) BuildRequires: pkgconfig(libwoff2dec) BuildRequires: pkgconfig(libxslt) @@ -188,12 +193,6 @@ rm -rf Source/ThirdParty/gtest/ rm -rf Source/ThirdParty/qunit/ %build -# This package fails to build with LTO due to undefined symbols. LTO -# was disabled in openSUSE as well, but with no real explanation why -# beyond the undefined symbols. It really shold be investigated further. -# Disable LTO -%define _lto_cflags %{nil} - # Increase the DIE limit so our debuginfo packages could be size optimized. # Decreases the size for x86_64 from ~5G to ~1.1G. # https://bugzilla.redhat.com/show_bug.cgi?id=1456261 @@ -215,6 +214,7 @@ rm -rf Source/ThirdParty/qunit/ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_MINIBROWSER=ON \ + -DUSE_SOUP2=ON \ %if %{with docs} -DENABLE_GTKDOC=ON \ %endif @@ -226,7 +226,8 @@ rm -rf Source/ThirdParty/qunit/ %endif %if 0%{?rhel} %ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ + -DENABLE_JIT=OFF \ + -DUSE_SYSTEM_MALLOC=ON \ %endif %endif %{nil} @@ -309,6 +310,21 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Wed Nov 24 2021 Michael Catanzaro - 2.34.2-1 +- Update to 2.34.2 + Related: #1985041 + +* Tue Oct 26 2021 Michael Catanzaro - 2.34.1-1 +- Update to 2.34.1 + Related: #1985041 + +* Wed Sep 29 2021 Michael Catanzaro - 2.34.0-1 +- Update to 2.34.0 + Related: #1985041 + Resolves: #2006423 +- Enable LTO + Resolves: #1990111 + * Tue Aug 10 2021 Mohan Boddu - 2.32.3-2 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688