diff --git a/.gitignore b/.gitignore index 55ebc5f..8ce7758 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/webkitgtk-2.32.4.tar.xz +SOURCES/webkitgtk-2.34.4.tar.xz +SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 75621e5..71ea432 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1 +1,2 @@ -f7255ffb488e727e9e250e0dae9f192266f50f01 SOURCES/webkitgtk-2.32.4.tar.xz +d7566cd7bbdd38ed3b4acce10043dca27e0a610e SOURCES/webkitgtk-2.34.4.tar.xz +cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/aarch64-page-size.patch b/SOURCES/aarch64-page-size.patch index 5606dca..d1e4f0e 100644 --- a/SOURCES/aarch64-page-size.patch +++ b/SOURCES/aarch64-page-size.patch @@ -1,16 +1,16 @@ diff --git a/Source/WTF/wtf/PageBlock.h b/Source/WTF/wtf/PageBlock.h -index c655a50c2c89..c4a6b8d09f16 100644 +index 8ff8443d0e25..f37666d35bf2 100644 --- a/Source/WTF/wtf/PageBlock.h +++ b/Source/WTF/wtf/PageBlock.h -@@ -49,9 +49,9 @@ namespace WTF { +@@ -46,9 +46,9 @@ namespace WTF { // Use 64 KiB for any unknown CPUs to be conservative. - #if OS(DARWIN) || PLATFORM(PLAYSTATION) + #if OS(DARWIN) || PLATFORM(PLAYSTATION) || CPU(MIPS) || CPU(MIPS64) constexpr size_t CeilingOnPageSize = 16 * KB; --#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) -+#elif USE(64KB_PAGE_BLOCK) || CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) +-#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) ++#elif CPU(PPC) || CPU(PPC64) || CPU(PPC64LE) || CPU(UNKNOWN) || CPU(ARM64) constexpr size_t CeilingOnPageSize = 64 * KB; --#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) -+#elif OS(WINDOWS) || CPU(MIPS) || CPU(MIPS64) || CPU(X86) || CPU(X86_64) || CPU(ARM) +-#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/evolution-shared-secondary-process.patch b/SOURCES/evolution-shared-secondary-process.patch index 07cf31d..22c2d00 100644 --- a/SOURCES/evolution-shared-secondary-process.patch +++ b/SOURCES/evolution-shared-secondary-process.patch @@ -1,10 +1,10 @@ diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -index 6dd9f20e4ff2..995f355f6ee3 100644 +index bd2d4d20206f..0fe471bde384 100644 --- a/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp +++ b/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp -@@ -400,6 +400,9 @@ static void webkitWebContextConstructed(GObject* object) - #endif - #endif +@@ -415,6 +415,9 @@ static void webkitWebContextConstructed(GObject* object) + g_clear_pointer(&priv->memoryPressureSettings, webkit_memory_pressure_settings_free); + } + if (!g_strcmp0(g_get_prgname(), "evolution")) + configuration.setUsesSingleWebProcess(true); diff --git a/SOURCES/icu60.patch b/SOURCES/icu60.patch new file mode 100644 index 0000000..eae0ea3 --- /dev/null +++ b/SOURCES/icu60.patch @@ -0,0 +1,56 @@ +--- a/Source/JavaScriptCore/runtime/IntlCache.cpp ++++ a/Source/JavaScriptCore/runtime/IntlCache.cpp +@@ -26,6 +26,7 @@ + #include "config.h" + #include "IntlCache.h" + ++#include "IntlDisplayNames.h" + #include + + namespace JSC { +@@ -53,6 +54,7 @@ Vector IntlCache::getBestDateTimePattern(const CString& locale, const + return patternBuffer; + } + ++#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES) + Vector IntlCache::getFieldDisplayName(const CString& locale, UDateTimePatternField field, UDateTimePGDisplayWidth width, UErrorCode& status) + { + auto sharedGenerator = getSharedPatternGenerator(locale, status); +@@ -64,5 +66,6 @@ Vector IntlCache::getFieldDisplayName(const CString& locale, UDateTim + return { }; + return buffer; + } ++#endif + + } // namespace JSC +--- a/Source/JavaScriptCore/runtime/IntlCache.h ++++ a/Source/JavaScriptCore/runtime/IntlCache.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include "IntlDisplayNames.h" + #include + #include + #include +@@ -39,7 +40,9 @@ public: + IntlCache() = default; + + Vector getBestDateTimePattern(const CString& locale, const UChar* skeleton, unsigned skeletonSize, UErrorCode&); ++#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES) + Vector getFieldDisplayName(const CString& locale, UDateTimePatternField, UDateTimePGDisplayWidth, UErrorCode&); ++#endif + + private: + UDateTimePatternGenerator* getSharedPatternGenerator(const CString& locale, UErrorCode& status) +--- a/Source/cmake/OptionsGTK.cmake ++++ a/Source/cmake/OptionsGTK.cmake +@@ -14,7 +14,7 @@ find_package(Freetype 2.4.2 REQUIRED) + find_package(LibGcrypt 1.6.0 REQUIRED) + find_package(GLIB 2.44.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) + find_package(HarfBuzz 0.9.18 REQUIRED COMPONENTS ICU) +-find_package(ICU 61.2 REQUIRED COMPONENTS data i18n uc) ++find_package(ICU 60.2 REQUIRED COMPONENTS data i18n uc) + find_package(JPEG REQUIRED) + find_package(LibXml2 2.8.0 REQUIRED) + find_package(PNG REQUIRED) diff --git a/SOURCES/webkitgtk-2.34.4.tar.xz.asc b/SOURCES/webkitgtk-2.34.4.tar.xz.asc new file mode 100644 index 0000000..4387158 --- /dev/null +++ b/SOURCES/webkitgtk-2.34.4.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYen0iQAKCRCRxVnb5MkS +OzbNAJ9ofbARjNc7mbA+DqyUXSPfu436pACeOmSi8vl7k8DVsBKWI4H64Lxr4Qk= +=BTBt +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index b620b6a..850eafb 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,13 +11,18 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.32.4 +Version: 2.34.4 Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 URL: http://www.webkitgtk.org/ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz +Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc +# Use the keys from https://webkitgtk.org/verifying.html +# $ gpg --import aperez.key carlosgc.key +# $ gpg --export --export-options export-minimal D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3 5AA3BC334FD7E3369E7C77B291C559DBE4C9123B > webkitgtk-keys.gpg +Source2: webkitgtk-keys.gpg # https://bugs.webkit.org/show_bug.cgi?id=193749 Patch0: evolution-shared-secondary-process.patch @@ -26,8 +31,10 @@ Patch0: evolution-shared-secondary-process.patch # https://bugs.webkit.org/show_bug.cgi?id=227905 Patch1: aarch64-page-size.patch +#https://bugs.webkit.org/show_bug.cgi?id=235367 +Patch2: icu60.patch + BuildRequires: bison -BuildRequires: bubblewrap BuildRequires: cmake BuildRequires: flex BuildRequires: gcc-c++ @@ -45,7 +52,6 @@ BuildRequires: python3 BuildRequires: ruby BuildRequires: rubygem-json BuildRequires: rubygems -#BuildRequires: xdg-dbus-proxy BuildRequires: pkgconfig(atspi-2) BuildRequires: pkgconfig(cairo) @@ -61,14 +67,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(gstreamer-plugins-bad-1.0) -BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(harfbuzz) +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(icu-uc) BuildRequires: pkgconfig(libjpeg) BuildRequires: pkgconfig(libnotify) @@ -79,6 +84,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) @@ -86,6 +92,7 @@ BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(upower-glib) BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) BuildRequires: pkgconfig(wayland-server) BuildRequires: pkgconfig(xt) @@ -166,6 +173,7 @@ The %{name}-jsc-devel package contains libraries, build data, and header files for developing applications that use JavaScript engine from %{name}. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n webkitgtk-%{version} -S git # Remove bundled libraries @@ -199,6 +207,7 @@ pushd %{_target_platform} -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ + -DUSE_SOUP2=ON \ %if %{with docs} -DENABLE_GTKDOC=ON \ %endif @@ -289,6 +298,10 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Fri Jan 21 2022 Michael Catanzaro - 2.34.4-1 +- Update to 2.34.4 +- Resolves: #1985042 + * Tue Sep 28 2021 Michael Catanzaro - 2.32.4-1 - Update to 2.32.4 - Related: #1985042