diff --git a/gcc7.patch b/gcc7.patch new file mode 100644 index 0000000..cc972a7 --- /dev/null +++ b/gcc7.patch @@ -0,0 +1,25 @@ +diff -up webkitgtk-2.15.4/Source/cmake/OptionsCommon.cmake.gcc7 webkitgtk-2.15.4/Source/cmake/OptionsCommon.cmake +--- webkitgtk-2.15.4/Source/cmake/OptionsCommon.cmake.gcc7 2017-02-01 08:19:21.694981976 +0100 ++++ webkitgtk-2.15.4/Source/cmake/OptionsCommon.cmake 2017-02-01 08:21:27.255494123 +0100 +@@ -40,7 +40,8 @@ define_property(TARGET PROPERTY FOLDER I + if (COMPILER_IS_GCC_OR_CLANG) + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-exceptions -fno-strict-aliasing -fno-rtti") +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-expansion-to-defined") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-expansion-to-defined") + endif () + + if (COMPILER_IS_CLANG AND CMAKE_GENERATOR STREQUAL "Ninja") +diff -up webkitgtk-2.15.4/Source/JavaScriptCore/runtime/JSArrayBufferView.h.gcc7 webkitgtk-2.15.4/Source/JavaScriptCore/runtime/JSArrayBufferView.h +--- webkitgtk-2.15.4/Source/JavaScriptCore/runtime/JSArrayBufferView.h.gcc7 2017-02-01 08:23:15.678072858 +0100 ++++ webkitgtk-2.15.4/Source/JavaScriptCore/runtime/JSArrayBufferView.h 2017-02-01 08:23:37.171989345 +0100 +@@ -167,7 +167,7 @@ public: + bool isNeutered() { return hasArrayBuffer() && !vector(); } + void neuter(); + +- void* vector() { return m_vector.get(); } ++ void* vector() const { return m_vector.get(); } + + unsigned byteOffset(); + unsigned length() const { return m_length; } diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 6e15293..7c2b6b0 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -7,7 +7,7 @@ Name: webkitgtk4 Version: 2.15.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -19,6 +19,9 @@ Patch0: webkitgtk-2.14.1-user-agent-branding.patch # https://fedoraproject.org/wiki/Packaging:CryptoPolicies # https://bugs.webkit.org/show_bug.cgi?id=158785 Patch1: fedora-crypto-policy.patch +# https://bugs.webkit.org/show_bug.cgi?id=167642 +# https://bugs.webkit.org/show_bug.cgi?id=167643 +Patch2: gcc7.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -253,6 +256,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Wed Feb 02 2017 Tomas Popela - 2.15.4-3 +- Push gcc7 fixes, only buildable with gcc-7.0.1-0.5.fc26 and higher + * Wed Feb 01 2017 Sandro Mani - 2.15.4-2 - Rebuild (libwebp)