diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index bc91f67fa..838a10efc 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -5,6 +5,7 @@ # - use --disable-jit to solve segfaults # - use --disable-gtk-doc to solve html docs breaking the build # - AArch64 fixes +# - abs/fabs patch from Fedora highmem=1 @@ -23,8 +24,10 @@ optdepends=('gst-plugins-base: free media decoding' '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 @@ -36,6 +39,7 @@ prepare() { CFLAGS+=" -DENABLE_YARR_JIT=0" CXXFLAGS+=" -DENABLE_YARR_JIT=0" fi + patch -p1 -i ../webkitgtk-2.4.9-abs.patch } _build() ( diff --git a/extra/webkitgtk/webkitgtk-2.4.9-abs.patch b/extra/webkitgtk/webkitgtk-2.4.9-abs.patch new file mode 100644 index 000000000..9a1c5f990 --- /dev/null +++ b/extra/webkitgtk/webkitgtk-2.4.9-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;