summaryrefslogtreecommitdiff
path: root/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
diff options
context:
space:
mode:
authordakkar <dakkar@thenautilus.net>2018-01-29 06:36:15 +0000
committerdakkar <dakkar@thenautilus.net>2018-01-29 06:36:15 +0000
commit604261627ef2ac502b5da70bc5db32af5c3e6bf2 (patch)
treeec4f7fb84a14afd1760fc60a49c0c34010fde8f1 /net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
parentlet's keep using old webkit for claws (diff)
downloadgentoo-overlay-604261627ef2ac502b5da70bc5db32af5c3e6bf2.tar.gz
gentoo-overlay-604261627ef2ac502b5da70bc5db32af5c3e6bf2.tar.bz2
gentoo-overlay-604261627ef2ac502b5da70bc5db32af5c3e6bf2.zip
add webkit files
Diffstat (limited to 'net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch')
-rw-r--r--net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch29
1 files changed, 29 insertions, 0 deletions
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
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;