From b4e73f0801ebe565ebcfbff1b28252bd3e4c4910 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mar 22 2016 10:34:54 +0000 Subject: Update to 2.12.0 --- diff --git a/.gitignore b/.gitignore index 185d5ee..2a4ffda 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /webkitgtk-2.11.90.tar.xz /webkitgtk-2.11.91.tar.xz /webkitgtk-2.11.92.tar.xz +/webkitgtk-2.12.0.tar.xz diff --git a/sources b/sources index 6ec49cb..1859270 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c63c7ea90c71d25f787aafb030a055b1 webkitgtk-2.11.92.tar.xz +d233b5594c37a961308c230207d8b64f webkitgtk-2.12.0.tar.xz diff --git a/webkitgtk-2.11.92-gcc6.patch b/webkitgtk-2.11.92-gcc6.patch deleted file mode 100644 index 0f56a07..0000000 --- a/webkitgtk-2.11.92-gcc6.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 5bebc07..ef8b8d9 100644 --- a/webkitgtk4.spec +++ b/webkitgtk4.spec @@ -6,8 +6,8 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: webkitgtk4 -Version: 2.11.92 -Release: 3%{?dist} +Version: 2.12.0 +Release: 1%{?dist} Summary: GTK+ Web content engine library License: LGPLv2 @@ -18,8 +18,6 @@ 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 @@ -249,6 +247,9 @@ make %{?_smp_mflags} -C %{_target_platform} %{_datadir}/gtk-doc/html/webkitdomgtk-4.0/ %changelog +* Tue Mar 22 2016 Tomas Popela - 2.12.0-1 +- Update to 2.12.0 + * Sun Mar 20 2016 Igor Gnatenko - 2.11.92-3 - Add missing ldconfig call for jsc subpkg