commit 41471675d527646eb1974076b84d444a1c7be356 Author: Danny Rawlins <monster.romster@gmail.com> Date: Wed Nov 22 15:17:32 2017 +1100 webkit-gtk3: fix for abs error and icu fixes diff --git a/webkit-gtk3/.md5sum b/webkit-gtk3/.md5sum index b11eb4f7..d21a865e 100644 --- a/webkit-gtk3/.md5sum +++ b/webkit-gtk3/.md5sum @@ -1 +1,3 @@ +7fa59525e921585f3ce2f9742a1c0c58 icu59.patch 24a25ccc30a7914ae50922aedf24b7bc webkitgtk-2.4.11.tar.xz +f5f1f913a4abd3bb9cff2055305ead16 webkitgtk-2.4.9-abs.patch diff --git a/webkit-gtk3/.signature b/webkit-gtk3/.signature index 384403ee..d861af56 100644 --- a/webkit-gtk3/.signature +++ b/webkit-gtk3/.signature @@ -1,5 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF33vvcnQ0Ge2162mMxipXtOOUimoYqE19VRdbQ2EDK4dCKQokNQJM/Sb5iJ3xJ1mOjZvH2u+e3BiXw1ZR1Q9fXgI= -SHA256 (Pkgfile) = 0be8b34eaf184f886abaa267b506ecfff334a38af8bac65603b44340cf77e639 +RWSagIOpLGJF3ywjn85vo/H6P2UNx+Zqnp0KlotbvVhHuDES+n+ntVzy8C8aqyNTh3V/AEtELix45QwwBEnIqAgrzTGLg44TAgM= +SHA256 (Pkgfile) = 1fef77461a60be2abfbf88d74691c464cce63f6f6f83350eca029ac2b73df976 SHA256 (.footprint) = 63316b56612c4a69720d8adeb1b9d7313cb81f7f59d1e8f7488c623c6f3ae7c2 SHA256 (webkitgtk-2.4.11.tar.xz) = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 +SHA256 (webkitgtk-2.4.9-abs.patch) = ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70 +SHA256 (icu59.patch) = eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d diff --git a/webkit-gtk3/Pkgfile b/webkit-gtk3/Pkgfile index 32166c5e..a9f0cf59 100644 --- a/webkit-gtk3/Pkgfile +++ b/webkit-gtk3/Pkgfile @@ -6,12 +6,17 @@ name=webkit-gtk3 version=2.4.11 -release=1 -source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz) +release=2 +source=(http://webkitgtk.org/releases/webkitgtk-$version.tar.xz + webkitgtk-2.4.9-abs.patch + icu59.patch) build() { cd webkitgtk-$version + patch -p1 -i $SRC/webkitgtk-2.4.9-abs.patch + patch -p1 -i $SRC/icu59.patch + install -d build cd build diff --git a/webkit-gtk3/icu59.patch b/webkit-gtk3/icu59.patch new file mode 100644 index 00000000..39ff89ee --- /dev/null +++ b/webkit-gtk3/icu59.patch @@ -0,0 +1,38 @@ +--- webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h.orig 2017-02-20 17:20:08.000000000 +0100 ++++ webkitgtk-2.16.1/Source/JavaScriptCore/API/JSStringRef.h 2017-04-22 14:35:00.926530142 +0200 +@@ -32,6 +32,7 @@ + #include <stdbool.h> + #endif + #include <stddef.h> /* for size_t */ ++#include <uchar.h> + + #ifdef __cplusplus + extern "C" { +@@ -46,7 +47,7 @@ + character. As with all scalar types, endianness depends on the underlying + architecture. + */ +- typedef unsigned short JSChar; ++ typedef char16_t JSChar; + #else + typedef wchar_t JSChar; + #endif +--- webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h.orig 2017-02-20 17:20:17.000000000 +0100 ++++ webkitgtk-2.16.1/Source/WebKit2/Shared/API/c/WKString.h 2017-04-22 14:35:56.853196170 +0200 +@@ -28,6 +28,7 @@ + + #include <WebKit/WKBase.h> + #include <stddef.h> ++#include <uchar.h> + + #ifndef __cplusplus + #include <stdbool.h> +@@ -39,7 +40,7 @@ + + #if !defined(WIN32) && !defined(_WIN32) \ + && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */ +- typedef unsigned short WKChar; ++ typedef char16_t WKChar; + #else + typedef wchar_t WKChar; + #endif diff --git a/webkit-gtk3/webkitgtk-2.4.9-abs.patch b/webkit-gtk3/webkitgtk-2.4.9-abs.patch new file mode 100644 index 00000000..9a1c5f99 --- /dev/null +++ b/webkit-gtk3/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<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;