diff options
| author |   Matteo Bernardini <ponce@slackbuilds.org> | 2017-04-20 06:55:55 +0700 |
|---|---|---|
| committer |   Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-04-20 06:56:26 +0700 |
| commit | 797e0928610e67234c272c65b1d75302dc8830a8 (patch) | |
| tree | a9c1ea2440e7ee6a45521cb2b8b7553f6791b569 /libraries | |
| parent | 72844572c37b226d85f8c4cefd8722c7997361e4 (diff) | |
| download | slackbuilds-797e0928610e67234c272c65b1d75302dc8830a8.tar.gz slackbuilds-797e0928610e67234c272c65b1d75302dc8830a8.tar.xz | |
libraries/webkitgtk: Patch for gcc-6.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/webkitgtk/webkitgtk-2.4.9-abs.patch | 28 | ||||
| -rw-r--r-- | libraries/webkitgtk/webkitgtk.SlackBuild | 7 |
2 files changed, 33 insertions, 2 deletions
diff --git a/libraries/webkitgtk/webkitgtk-2.4.9-abs.patch b/libraries/webkitgtk/webkitgtk-2.4.9-abs.patch new file mode 100644 index 0000000000..5fadc28890 --- /dev/null +++ b/libraries/webkitgtk/webkitgtk-2.4.9-abs.patch @@ -0,0 +1,28 @@ +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/libraries/webkitgtk/webkitgtk.SlackBuild b/libraries/webkitgtk/webkitgtk.SlackBuild index 0cb86f4481..3d651f9ebf 100644 --- a/libraries/webkitgtk/webkitgtk.SlackBuild +++ b/libraries/webkitgtk/webkitgtk.SlackBuild @@ -72,8 +72,11 @@ find -L . \ # Check if geoclue is there if pkg-config --exists geoclue ; then GEOCLUE="yes" ; else GEOCLUE="no" ; fi -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# Fix for gcc-6.x +patch -p1 < $CWD/webkitgtk-2.4.9-abs.patch + +CFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \ +CXXFLAGS="$SLKCFLAGS -fno-delete-null-pointer-checks" \ ./configure \ --prefix=/usr \ --disable-static \ |