From aee338b1237c62d13c7b5df9e9c4e7775b2b00cf Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mar 18 2016 06:07:38 +0000 Subject: Fix the build with gcc 6 --- diff --git a/webkitgtk-2.11.92-gcc6.patch b/webkitgtk-2.11.92-gcc6.patch new file mode 100644 index 0000000..0f56a07 --- /dev/null +++ b/webkitgtk-2.11.92-gcc6.patch @@ -0,0 +1,32 @@ +diff --git a/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp b/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp +index e03d5f42c140692b1140a15d92c0d7990c18780e..96e741e61a2e780d84e7ea1603952572868b7fbd 100644 +--- a/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp ++++ b/Source/JavaScriptCore/b3/B3LowerMacrosAfterOptimizations.cpp +@@ -92,9 +92,10 @@ class LowerMacros { + break; + + Value* functionAddress = nullptr; +- if (m_value->type() == Double) +- functionAddress = m_insertionSet.insert(m_index, m_origin, ceil); +- else if (m_value->type() == Float) ++ if (m_value->type() == Double) { ++ double (*ceilDouble)(double) = ceil; ++ functionAddress = m_insertionSet.insert(m_index, m_origin, ceilDouble); ++ } else if (m_value->type() == Float) + functionAddress = m_insertionSet.insert(m_index, m_origin, ceilf); + else + RELEASE_ASSERT_NOT_REACHED(); +@@ -113,9 +114,10 @@ class LowerMacros { + break; + + Value* functionAddress = nullptr; +- if (m_value->type() == Double) +- functionAddress = m_insertionSet.insert(m_index, m_origin, floor); +- else if (m_value->type() == Float) ++ if (m_value->type() == Double) { ++ double (*floorDouble)(double) = floor; ++ functionAddress = m_insertionSet.insert(m_index, m_origin, floorDouble); ++ } else if (m_value->type() == Float) + functionAddress = m_insertionSet.insert(m_index, m_origin, floorf); + else + RELEASE_ASSERT_NOT_REACHED(); diff --git a/webkitgtk4.spec b/webkitgtk4.spec index 5ae52bb..f95e71c 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -7,7 +7,7 @@ Name: webkitgtk4 Version: 2.11.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -18,6 +18,8 @@ Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Patch0: webkitgtk-2.7.90-user-agent-branding.patch # https://bugs.webkit.org/show_bug.cgi?id=135972 Patch1: webkitgtk-2.11.5-youtube.patch +# https://bugs.webkit.org/show_bug.cgi?id=155044 +Patch2: webkitgtk-2.11.92-gcc6.patch BuildRequires: at-spi2-core-devel BuildRequires: bison @@ -232,6 +234,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Thu Mar 17 2016 Tomas Popela - 2.11.92-2 +- Fix the build with gcc6 + * Thu Mar 17 2016 Tomas Popela - 2.11.92-1 - Update to 2.11.92