From f0653593a0bae9755391f4f6594dc4801a47dbb4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 11 Mar 2017 20:37:31 +0100 Subject: [PATCH] - fix overloaded 'abs(gdouble)' is ambiguous error - rel 3 --- abs.patch | 26 ++++++++++++++++++++++++++ gtk-webkit3.spec | 4 +++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 abs.patch diff --git a/abs.patch b/abs.patch new file mode 100644 index 0000000..9a1c5f9 --- /dev/null +++ b/abs.patch @@ -0,0 +1,26 @@ +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(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(abs(time)); ++ int seconds = static_cast(fabs(time)); + int days = seconds / (60 * 60 * 24); + int hours = seconds / (60 * 60); + int minutes = (seconds / 60) % 60; diff --git a/gtk-webkit3.spec b/gtk-webkit3.spec index 7c91221..7de581a 100644 --- a/gtk-webkit3.spec +++ b/gtk-webkit3.spec @@ -11,13 +11,14 @@ Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit do GTK+ 3 Name: gtk-webkit3 # note: for 2.6.x series see gtk-webkit4 Version: 2.4.11 -Release: 2 +Release: 3 License: BSD-like Group: X11/Libraries Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz # Source0-md5: 24a25ccc30a7914ae50922aedf24b7bc Patch0: atomic-ops.patch Patch1: x32.patch +Patch2: abs.patch URL: http://webkitgtk.org/ BuildRequires: /usr/bin/ld.gold BuildRequires: EGL-devel @@ -140,6 +141,7 @@ Dokumentacja API WebKita. %patch0 -p1 %endif %patch1 -p1 +%patch2 -p1 %build %{__libtoolize} -- 2.44.0