From 0b12a9d29c45d02d41a8a65a372346bd7f6cd2dc Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Feb 27 2020 23:22:41 +0000 Subject: Update to 2.27.91 --- diff --git a/.gitignore b/.gitignore index 769549a..ebc7c19 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /webkitgtk-2.27.4.tar.xz /webkitgtk-2.27.90.tar.xz /webkitgtk-2.27.90.tar.xz.asc +/webkitgtk-2.27.91.tar.xz diff --git a/horrible-const_cast.patch b/horrible-const_cast.patch deleted file mode 100644 index 22255a6..0000000 --- a/horrible-const_cast.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- webkitgtk-2.27.4/Source/ThirdParty/ANGLE/src/common/PackedEnums.h.horrible-const_cast 2019-12-23 11:50:53.000000000 +0100 -+++ webkitgtk-2.27.4/Source/ThirdParty/ANGLE/src/common/PackedEnums.h 2020-02-07 20:22:56.848827817 +0100 -@@ -83,10 +83,7 @@ class PackedEnumMap - // We use a for loop instead of range-for to work around a limitation in MSVC. - for (const InitPair *it = init.begin(); it != init.end(); ++it) - { -- // This horrible const_cast pattern is necessary to work around a constexpr limitation. -- // See https://stackoverflow.com/q/34199774/ . Note that it should be fixed with C++17. -- const_cast(const_cast( -- mPrivateData)[static_cast(it->first)]) = it->second; -+ mPrivateData[static_cast(it->first)] = it->second; - } - } - diff --git a/include-stdlib.patch b/include-stdlib.patch deleted file mode 100644 index 86cc523..0000000 --- a/include-stdlib.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- webkitgtk-2.27.4/Source/ThirdParty/ANGLE/include/platform/Platform.h.include-stdlib 2019-12-23 11:50:53.000000000 +0100 -+++ webkitgtk-2.27.4/Source/ThirdParty/ANGLE/include/platform/Platform.h 2020-02-07 20:40:59.621910605 +0100 -@@ -9,6 +9,7 @@ - #ifndef ANGLE_PLATFORM_H - #define ANGLE_PLATFORM_H - -+#include - #include - #include - diff --git a/move-Wno-noexcept-type-to-cxx-flags.patch b/move-Wno-noexcept-type-to-cxx-flags.patch deleted file mode 100644 index a9b8c8f..0000000 --- a/move-Wno-noexcept-type-to-cxx-flags.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- webkitgtk-2.27.4/Source/cmake/WebKitCompilerFlags.cmake.move-Wno-noexcept-type-to-cxx-flags 2019-06-27 11:07:30.000000000 +0200 -+++ webkitgtk-2.27.4/Source/cmake/WebKitCompilerFlags.cmake 2020-02-10 15:01:32.491635599 +0100 -@@ -123,10 +123,11 @@ if (COMPILER_IS_GCC_OR_CLANG) - # FIXME: We should probably not be disabling -Wno-maybe-uninitialized? - WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Qunused-arguments - -Wno-maybe-uninitialized -- -Wno-noexcept-type - -Wno-parentheses-equality - -Wno-psabi) - -+ WEBKIT_PREPEND_GLOBAL_CXX_FLAGS(-Wno-noexcept-type) -+ - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80947 - if (${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS "8.0" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang") - WEBKIT_PREPEND_GLOBAL_CXX_FLAGS(-Wno-attributes) diff --git a/sources b/sources index 480a659..7d56de1 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (webkitgtk-2.27.90.tar.xz) = 6dd6e66888d95d4d23f0a7ab544192de538b9b93f8b2a583c8fc8ea559beb6a055228ba3fabab4b08d9990c704dc87e150873d9365bd2d404094999780a07f9c -SHA512 (webkitgtk-2.27.90.tar.xz.asc) = e7b3817c62f494fe839fe7546c82893791c62e18069fa1d4a33b5f60928609ce5a45c87c1c0bdd16354e781b18be1873842e030fddd4b7985d8207dd25495670 -SHA512 (gpg-key-D7FCF61CF9A2DEAB31D81BD3F3D322D0EC4582C3.gpg) = 412f4334600f71594b9d47678cf725030c19ba7351d979e460912fc96b96f44df1251a28f44e6e0d1dc30edbffd0abffd0ac7894a6117c067110dbd85563a619 +SHA512 (webkitgtk-2.27.91.tar.xz) = 0135b9f0e86e465fc2679c4a4261f3326079012b71018de428fa1d2c3f8d5db53300d9cb1f43380059b7721e002b41c1f73592465b818d73fe0314c1c3b56db3 diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 4723315..59e510d 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.27.90 -Release: 2%{?dist} +Version: 2.27.91 +Release: 1%{?dist} Summary: GTK Web content engine library License: LGPLv2 @@ -21,11 +21,6 @@ Source2: https://people.gnome.org/~mcatanzaro/gpg-key-D7FCF61CF9A2DEAB31D Patch0: user-agent-branding.patch # Don't use the shebang, but point straight to python 3 Patch1: no-env-shebang.patch -# https://bugs.webkit.org/show_bug.cgi?id=207365 -Patch2: include-stdlib.patch -Patch3: horrible-const_cast.patch -# https://bugs.webkit.org/show_bug.cgi?id=207468 -Patch4: move-Wno-noexcept-type-to-cxx-flags.patch BuildRequires: bison BuildRequires: bubblewrap @@ -278,6 +273,9 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Thu Feb 27 2020 Michael Catanzaro - 2.27.91-1 +- Update to 2.27.91 + * Mon Feb 10 2020 Michael Catanzaro - 2.27.90-2 - Add GPG verification during prep diff --git a/webkitgtk-2.27.91.tar.xz.asc b/webkitgtk-2.27.91.tar.xz.asc new file mode 100644 index 0000000..dec5d6f --- /dev/null +++ b/webkitgtk-2.27.91.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCXleTSQAKCRDz0yLQ7EWC +w7olAKCEFAkjuk1K9D52v5mnYt+i59NlAQCgp4ttIHgs5/HzhvEODgaqjSu0at0= +=r558 +-----END PGP SIGNATURE-----