diff --git a/srcpkgs/webkitgtk/patches/fix-ambigous_abs.patch b/srcpkgs/webkitgtk/patches/fix-ambigous_abs.patch new file mode 100644 index 00000000000..bb44f438a5e --- /dev/null +++ b/srcpkgs/webkitgtk/patches/fix-ambigous_abs.patch @@ -0,0 +1,26 @@ +Disambiguate abs() for gcc6 build. + +--- Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-04-10 08:48:37.000000000 +0200 ++++ Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-09-12 23:01:44.285579470 +0200 +@@ -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) ++ || ((abs((int)(buttonEvent->x - m_previousClickPoint.x())) < doubleClickDistance) ++ && (abs((int)(buttonEvent->y - m_previousClickPoint.y())) < doubleClickDistance) + && (eventTime - m_previousClickTime < static_cast(doubleClickTime)) + && (buttonEvent->button == m_previousClickButton))) + m_currentClickCount++; +--- Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-04-10 08:48:37.000000000 +0200 ++++ Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-09-12 23:05:01.712760609 +0200 +@@ -659,7 +659,7 @@ + if (!std::isfinite(time)) + return String::fromUTF8(_("indefinite time")); + +- int seconds = static_cast(abs(time)); ++ int seconds = abs(static_cast(time)); + int days = seconds / (60 * 60 * 24); + int hours = seconds / (60 * 60); + int minutes = (seconds / 60) % 60; diff --git a/srcpkgs/webkitgtk/template b/srcpkgs/webkitgtk/template index aaeb82256c6..802b4815a69 100644 --- a/srcpkgs/webkitgtk/template +++ b/srcpkgs/webkitgtk/template @@ -1,7 +1,7 @@ # Template file for 'webkitgtk' pkgname=webkitgtk version=2.4.11 -revision=2 +revision=3 build_style=gnu-configure configure_args="--disable-gtk-doc --disable-schemas-compile --enable-accelerated-compositing $(vopt_enable gir introspection)