diff --git a/.gitignore b/.gitignore index 8ce7758..adf71be 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.34.4.tar.xz +SOURCES/webkitgtk-2.34.5.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 71ea432..78343fb 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -d7566cd7bbdd38ed3b4acce10043dca27e0a610e SOURCES/webkitgtk-2.34.4.tar.xz +f150cdd932db81f719606428aad7978e6c9d813f SOURCES/webkitgtk-2.34.5.tar.xz cf57cbbadf2a07c6ede1c886f9742b7d352460c0 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/icu60.patch b/SOURCES/icu60.patch deleted file mode 100644 index eae0ea3..0000000 --- a/SOURCES/icu60.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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 deleted file mode 100644 index 4387158..0000000 --- a/SOURCES/webkitgtk-2.34.4.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYen0iQAKCRCRxVnb5MkS -OzbNAJ9ofbARjNc7mbA+DqyUXSPfu436pACeOmSi8vl7k8DVsBKWI4H64Lxr4Qk= -=BTBt ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.34.5.tar.xz.asc b/SOURCES/webkitgtk-2.34.5.tar.xz.asc new file mode 100644 index 0000000..b0e4d75 --- /dev/null +++ b/SOURCES/webkitgtk-2.34.5.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYgL/CQAKCRCRxVnb5MkS +O9PRAJ4nQnid1jHjf5Oc3KRVIHBUYU4cRwCfY9brlRzYhDojNFK3C73j46VDVyY= +=oyBB +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 850eafb..f3d4525 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -11,7 +11,7 @@ %bcond_without docs Name: webkit2gtk3 -Version: 2.34.4 +Version: 2.34.5 Release: 1%{?dist} Summary: GTK Web content engine library @@ -31,9 +31,6 @@ 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: cmake BuildRequires: flex @@ -99,6 +96,10 @@ BuildRequires: pkgconfig(xt) # If Geoclue is not running, the geolocation API will not work. Recommends: geoclue2 +# Needed for various GStreamer elements. +Recommends: gstreamer1-plugins-bad-free +Recommends: gstreamer1-plugins-good + # Obsolete libwebkit2gtk from the webkitgtk3 package Obsoletes: libwebkit2gtk < 2.5.0 Provides: libwebkit2gtk = %{version}-%{release} @@ -298,6 +299,10 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Wed Feb 09 2022 Michael Catanzaro - 2.34.5-1 +- Update to 2.34.5 +- Related: #1985042 + * Fri Jan 21 2022 Michael Catanzaro - 2.34.4-1 - Update to 2.34.4 - Resolves: #1985042