import webkit2gtk3-2.34.5-1.el8

This commit is contained in:
CentOS Sources 2022-02-11 05:34:14 +00:00 committed by Stepan Oksanichenko
parent 94b2020891
commit f46e9a342e
6 changed files with 17 additions and 68 deletions

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/webkitgtk-2.34.4.tar.xz
SOURCES/webkitgtk-2.34.5.tar.xz
SOURCES/webkitgtk-keys.gpg

View File

@ -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

View File

@ -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 <wtf/Vector.h>
namespace JSC {
@@ -53,6 +54,7 @@ Vector<UChar, 32> IntlCache::getBestDateTimePattern(const CString& locale, const
return patternBuffer;
}
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
Vector<UChar, 32> IntlCache::getFieldDisplayName(const CString& locale, UDateTimePatternField field, UDateTimePGDisplayWidth width, UErrorCode& status)
{
auto sharedGenerator = getSharedPatternGenerator(locale, status);
@@ -64,5 +66,6 @@ Vector<UChar, 32> 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 <unicode/udatpg.h>
#include <wtf/Noncopyable.h>
#include <wtf/text/CString.h>
@@ -39,7 +40,9 @@ public:
IntlCache() = default;
Vector<UChar, 32> getBestDateTimePattern(const CString& locale, const UChar* skeleton, unsigned skeletonSize, UErrorCode&);
+#if HAVE(ICU_U_LOCALE_DISPLAY_NAMES)
Vector<UChar, 32> 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)

View File

@ -1,6 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYen0iQAKCRCRxVnb5MkS
OzbNAJ9ofbARjNc7mbA+DqyUXSPfu436pACeOmSi8vl7k8DVsBKWI4H64Lxr4Qk=
=BTBt
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,6 @@
-----BEGIN PGP SIGNATURE-----
iF0EABECAB0WIQRao7wzT9fjNp58d7KRxVnb5MkSOwUCYgL/CQAKCRCRxVnb5MkS
O9PRAJ4nQnid1jHjf5Oc3KRVIHBUYU4cRwCfY9brlRzYhDojNFK3C73j46VDVyY=
=oyBB
-----END PGP SIGNATURE-----

View File

@ -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 <mcatanzaro@redhat.com> - 2.34.5-1
- Update to 2.34.5
- Related: #1985042
* Fri Jan 21 2022 Michael Catanzaro <mcatanzaro@redhat.com> - 2.34.4-1
- Update to 2.34.4
- Resolves: #1985042