tek/contrib-tek
1
0
Fork 0
forked from ports/contrib
Code Pull Requests Activity

webkit-gtk2: fix for abs error and icu fixes

Browse Source
This commit is contained in:
Danny Rawlins 2017-11-22 16:24:16 +11:00
parent 41471675d5
commit dec1f1fbae
5 changed files with 77 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webkit-gtk2/.md5sum
View File

@ -1 +1,3 @@
7fa59525e921585f3ce2f9742a1c0c58 icu59.patch
24a25ccc30a7914ae50922aedf24b7bc webkitgtk-2.4.11.tar.xz
f5f1f913a4abd3bb9cff2055305ead16 webkitgtk-2.4.9-abs.patch

6
webkit-gtk2/.signature
View File

@ -1,5 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3zLKht/2Tr1EcHZ7xn+w1tsy6+iTF5mb4GhDFpmyXVoNm2bQ3VWUN9xo6KzIpLUs85R65VoPUqnZgw9CXWoNmQI=
SHA256 (Pkgfile) = 674f2caedeafb893806607b3906a6a6f2cd4b87a55dc45e7812a0d7ad3f567f5
RWSagIOpLGJF373hlT5QYr/gJI62+7aYYsjWoUHsUagVHM3v2AzdUMADqm24LYUxJgXwKJlNcvbbBelGjcgzS4rvDvjcSD3nEw0=
SHA256 (Pkgfile) = 28b8c6b387d95d20f2683248068bf7b4f66ee19a9fae350f14e9defa9721b49c
SHA256 (.footprint) = ac6e9e70a03330e1a0e149436645417ab4045d14f28b1c52d8f19a26f4891cb6
SHA256 (webkitgtk-2.4.11.tar.xz) = 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7
SHA256 (webkitgtk-2.4.9-abs.patch) = ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70
SHA256 (icu59.patch) = eb791b9c8dcb84996904846dedf8c3ddf1a5fde32330177f3f0071510bd8ca6d

9
webkit-gtk2/Pkgfile
View File

@ -6,12 +6,17 @@
name=webkit-gtk2
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

38
webkit-gtk2/icu59.patch Normal file
View File

@ -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

26
webkit-gtk2/webkitgtk-2.4.9-abs.patch Normal file
View File

@ -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;