Re: pkg/53777 (www/webkit24-gtk syntax errors -- fails to compile)

[Alexander Garvin <alexwgarvin%gmail.com@localhost>]

The following reply was made to PR pkg/53777; it has been noted by GNATS.

From: Alexander Garvin <alexwgarvin%gmail.com@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: pkg/53777 (www/webkit24-gtk syntax errors -- fails to compile)
Date: Tue, 11 Dec 2018 12:25:20 -0500

 This compiles for me, and is much cleaner:
 
 
 diff -ruN Source/WebCore/platform/gtk/GtkClickCounter.cpp 
 Source.patched/WebCore/platform/gtk/GtkClickCounter.cpp
 --- Source/WebCore/platform/gtk/GtkClickCounter.cpp    2018-12-11 
 14:44:31.858499388 +0000
 +++ Source.patched/WebCore/platform/gtk/GtkClickCounter.cpp 2018-12-11 
 17:20:24.793536184 +0000
 @@ -84,8 +84,8 @@
  Â Â Â Â  GdkEvent* event(reinterpret_cast<GdkEvent*>(buttonEvent));
  Â Â Â Â  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 -ruN Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 
 Source.patched/WebCore/platform/gtk/LocalizedStringsGtk.cpp
 --- Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2018-12-11 
 14:41:19.074446577 +0000
 +++ Source.patched/WebCore/platform/gtk/LocalizedStringsGtk.cpp 
 2018-12-11 17:20:34.322613686 +0000
 @@ -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;