net-libs/webkit-gtk: tweak for gcc-6, bug #592048

Adopt Fedora patch to build successfully against gcc-6.1.0.

Bug: https://bugs.gentoo.org/show_bug.cgi?id=592048
Bug: https://bugs.webkit.org/show_bug.cgi?id=159124

Package-Manager: portage-2.3.0

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
new file mode 100644 (file)
index 0000000..bd8507c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
@@ -0,0 +1,29 @@
+Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity)
+https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+https://bugs.gentoo.org/show_bug.cgi?id=592048
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp       2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp    2016-02-07 11:30:42.392686308 -0700
+@@ -85,8 +85,8 @@
+     guint32 eventTime = getEventTime(event);
+ 
+     if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS)
+-        || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
+-            && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
++        || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance)
++            && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance)
+             && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime))
+             && (buttonEvent->button == m_previousClickButton)))
+         m_currentClickCount++;
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp   2015-05-20 03:03:24.000000000 -0600
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp        2016-02-07 11:49:36.384691005 -0700
+@@ -659,7 +659,7 @@
+     if (!std::isfinite(time))
+         return String::fromUTF8(_("indefinite time"));
+ 
+-    int seconds = static_cast<int>(abs(time));
++    int seconds = static_cast<int>(fabs(time));
+     int days = seconds / (60 * 60 * 24);
+     int hours = seconds / (60 * 60);
+     int minutes = (seconds / 60) % 60;

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
index cb799d5d9762bfc44618353c052549c300ceaa13..19135857b22d38e36f698d8294867bfcb6bfb068 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -173,6 +173,9 @@ src_prepare() {
        # https://bugs.webkit.org/show_bug.cgi?id=156510
        eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
 
+       # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+       eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
+
        AT_M4DIR=Source/autotools eautoreconf
 
        gnome2_src_prepare

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
index 10f845a5af02a151c5fc0dcaece0b280fccd0342..a92c6b1baa43a8fddb84d66ccd9b36dde005d906 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -158,6 +158,9 @@ src_prepare() {
        # https://bugs.webkit.org/show_bug.cgi?id=156510
        eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
 
+       # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+       eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
+
        AT_M4DIR=Source/autotools eautoreconf
 
        gnome2_src_prepare

diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index 2ffe8b292bc0180627f6382bfd9bb306aa68b92e..481850b1e9a4f65f4e399a35a75a7e5e66ede40a 100644 (file)
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -171,6 +171,9 @@ src_prepare() {
        # https://bugs.webkit.org/show_bug.cgi?id=156510
        eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
 
+       # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+       eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
+
        AT_M4DIR=Source/autotools eautoreconf
 
        gnome2_src_prepare