[arch-commits] Commit in webkitgtk/trunk (PKGBUILD webkitgtk-2.4.9-abs.patch)

[Jan de Groot]

    Date: Wednesday, June 15, 2016 @ 12:11:24
  Author: jgc
Revision: 269989

Add patch to fix build with gcc6 (FS#49565), taken from Fedora instead

Added:
  webkitgtk/trunk/webkitgtk-2.4.9-abs.patch
Modified:
  webkitgtk/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    9 +++++++--
 webkitgtk-2.4.9-abs.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-15 10:52:55 UTC (rev 269988)
+++ PKGBUILD	2016-06-15 12:11:24 UTC (rev 269989)
@@ -16,12 +16,17 @@
             'gst-plugins-good: media decoding'
             'gst-libav: nonfree media decoding')
 options=(!emptydirs)
-source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz)
-sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7')
+source=(http://webkitgtk.org/releases/$pkgbase-${pkgver}.tar.xz
+        webkitgtk-2.4.9-abs.patch)
+sha256sums=('588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7'
+            'ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70')
 
 prepare() {
   mkdir build-gtk{,2} path
   ln -s /usr/bin/python2 path/python
+
+  cd $pkgbase-$pkgver
+  patch -Np1 -i ../webkitgtk-2.4.9-abs.patch
 }
 
 _build() (

Added: webkitgtk-2.4.9-abs.patch
===================================================================
--- webkitgtk-2.4.9-abs.patch	                        (rev 0)
+++ webkitgtk-2.4.9-abs.patch	2016-06-15 12:11:24 UTC (rev 269989)
@@ -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<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;