Merge pull request #2865 from groni/master

webkit-gtk2 rebuild for new toolchain

network/misc/webkit-gtk2/files/fix-ftbfs-gcc6.patch

@@ -0,0 +1,32 @@
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Subject: Fix FTBFS with GCC 6
+Bug: https://bugs.webkit.org/show_bug.cgi?id=159124
+Bug-Debian: https://bugs.debian.org/828198
+Index: webkitgtk/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+===================================================================
+--- webkitgtk.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp
++++ webkitgtk/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+@@ -85,8 +85,8 @@ int GtkClickCounter::clickCountForGdkBut
+     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++;
+Index: webkitgtk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+===================================================================
+--- webkitgtk.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
++++ webkitgtk/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+@@ -659,7 +659,7 @@ String localizedMediaTimeDescription(flo
+     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; 

network/misc/webkit-gtk2/pspec.xml

@@ -48,7 +48,7 @@
         </BuildDependencies>
         <Patches>
             <Patch level="1">install-minibrowser.patch</Patch>
-            <!--<Patch>webkitgtk-2.4.8-gcc5.patch</Patch>-->
+            <Patch level="1">fix-ftbfs-gcc6.patch</Patch>-->
             <!--<Patch>webkitgtk-2.4.8-gmutexlocker.patch</Patch>-->
         </Patches>
     </Source>
@@ -121,6 +121,13 @@
     </Package>
 
     <History>
+        <Update release="4">
+            <Date>2017-02-17</Date>
+            <Version>2.4.11</Version>
+            <Comment>Rebuild for new toolchain</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-06-18</Date>
             <Version>2.4.11</Version>