diff --git a/.gitignore b/.gitignore index 7d80b44..035e196 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /webkitgtk-2.21.91.tar.xz /webkitgtk-2.21.92.tar.xz /webkitgtk-2.22.0.tar.xz +/webkitgtk-2.22.1.tar.xz diff --git a/sources b/sources index 1b5ba40..b18086e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (webkitgtk-2.22.0.tar.xz) = 1c5b79b31d952c18b5ddc5c98340d11400f6745ea6a3d3543ee86457b8845b6970de32fa7861fb232adb7cc087e23346b242f8cf2cd234d75a4693d87fcde399 +SHA512 (webkitgtk-2.22.1.tar.xz) = 67feeebbac5122ff81fb470b41cc9362c11732e0e76b997853d7d47f6ee49ccc76a858bfe7dcf8a41c910bdd5dec744e73e07137729487f5937fc8b75c0e2e46 diff --git a/webkit-jsc-use-ternary-operator.patch b/webkit-jsc-use-ternary-operator.patch deleted file mode 100644 index 39af8c5..0000000 --- a/webkit-jsc-use-ternary-operator.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9154ea477728797b9d33b32fb36940485f6927fa Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Thu, 30 Aug 2018 07:04:58 +0200 -Subject: [PATCH] Use ternary operator instead of std::max - ---- - Source/JavaScriptCore/heap/RegisterState.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Source/JavaScriptCore/heap/RegisterState.h b/Source/JavaScriptCore/heap/RegisterState.h -index baaef4c7..b3037dba 100644 ---- a/Source/JavaScriptCore/heap/RegisterState.h -+++ b/Source/JavaScriptCore/heap/RegisterState.h -@@ -166,7 +166,7 @@ using RegisterState = jmp_buf; - #pragma warning(disable: 4611) - #endif - #define ALLOCATE_AND_GET_REGISTER_STATE(registers) \ -- alignas(std::max(alignof(void*), alignof(RegisterState))) RegisterState registers; \ -+ alignas(alignof(void*) > alignof(RegisterState) ? alignof(void*) : alignof(RegisterState)) RegisterState registers; \ - setjmp(registers) - - #if COMPILER(MSVC) --- -2.17.1 - diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 7737615..71c3029 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -6,8 +6,8 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkit2gtk3 -Version: 2.22.0 -Release: 3%{?dist} +Version: 2.22.1 +Release: 1%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -23,8 +23,6 @@ Patch1: fedora-crypto-policy.patch Patch2: cloop-big-endians.patch # Explicitly specify python2 over python Patch3: python2.patch -# https://bugs.webkit.org/show_bug.cgi?id=189078 -Patch4: webkit-jsc-use-ternary-operator.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -276,6 +274,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Thu Sep 20 2018 Tomas Popela - 2.22.1-1 +- Update to 2.22.1 + * Fri Sep 07 2018 Kalev Lember - 2.22.0-3 - Rebuilt against fixed atk (#1626575)