diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2016-07-22 21:59:09 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2016-07-22 21:59:15 +0200 |
| commit | 4243b683ee663e059e36c2c8a95c344ba05555b8 (patch) | |
| tree | 71547a861cbc59db3d929ba35bc4b6bf7efcd11a | |
| parent | 42dbaf42dd7fc2da93cafc33288c60aa3cf39b04 (diff) | |
| download | aports-4243b683ee663e059e36c2c8a95c344ba05555b8.tar.bz2 aports-4243b683ee663e059e36c2c8a95c344ba05555b8.tar.xz | |
community/webkitgtk: fix ambiguous abs call
| -rw-r--r-- | community/webkitgtk/APKBUILD | 10 | ||||
| -rw-r--r-- | community/webkitgtk/webkitgtk-2.4.9-abs.patch | 26 |
2 files changed, 33 insertions, 3 deletions
diff --git a/community/webkitgtk/APKBUILD b/community/webkitgtk/APKBUILD index b8356f4a9b..026816ab63 100644 --- a/community/webkitgtk/APKBUILD +++ b/community/webkitgtk/APKBUILD @@ -51,6 +51,7 @@ source="http://webkitgtk.org/releases/webkitgtk-$pkgver.tar.xz harfbuzz.patch fix-execinfo.patch disallow-ctype.patch + webkitgtk-2.4.9-abs.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -146,16 +147,19 @@ de77a3e7e61753e7f1cce3f4bd00a3f6 webkit-gtk-1.7.90-parallel-make-hack.patch 9ace721086b25f0f32d7f76b29789f67 webkitgtk-1.10-textrels.patch b1f455b3ea4db1598b60f5aa59f27fd5 harfbuzz.patch c114751c30cdcaede5a7ed5568b2b0d4 fix-execinfo.patch -f5b41e756d2dfdc2bbee034d4f2d2e66 disallow-ctype.patch" +f5b41e756d2dfdc2bbee034d4f2d2e66 disallow-ctype.patch +f5f1f913a4abd3bb9cff2055305ead16 webkitgtk-2.4.9-abs.patch" sha256sums="588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 webkitgtk-2.4.11.tar.xz e20d7d45e6230308f7d4a7aac1095cb1fe8d9c7eb0f3e65b061acf8bc4bbaf73 webkit-gtk-1.7.90-parallel-make-hack.patch 754bbf13c7a6c9bd745f642367ff884156020dd2ea7611c3d20a509c6685c836 webkitgtk-1.10-textrels.patch 0b7c1ce7e0e8548507eed8911c73d4a06434e5ca3b84275e785013f8b04433a2 harfbuzz.patch b2bc9e03fd5d968d6df4531a7d102496139120e666e6fed397a19ae4026751c6 fix-execinfo.patch -6e972b5cb3f1101be646d1a018ff61c0e6614310a971eb392c4fd0fee5623455 disallow-ctype.patch" +6e972b5cb3f1101be646d1a018ff61c0e6614310a971eb392c4fd0fee5623455 disallow-ctype.patch +ec294bbb5588a1802a68e3615c6718486b22f922645c5fef686d3d103014bf70 webkitgtk-2.4.9-abs.patch" sha512sums="2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb webkitgtk-2.4.11.tar.xz 907356faab08ebf65da8760ad11ee8ecd4e97274b1c00c1e207fd52e479d64a0545ba66859b1a79bd150a95da4a9e8724b3c461a24f803fb341b8242566b5cc0 webkit-gtk-1.7.90-parallel-make-hack.patch c3502a11ce4777abc164209c0087ec7cb6c28b376056bee52651b4e4bd2d49f2d6e4a74422f21d9bce848479a4a1b02052935b3c9397f1d43a59b3de22ef2758 webkitgtk-1.10-textrels.patch 8eb77ed1a1c60aac44fb00cfa6ddd46a23c4701fd6a24eac901d07eb49e0191080f7410fa3801115da5448b514e5d2095a4c4072a8c1e9f8c668eebb78afe6a1 harfbuzz.patch 602630468ee80b9f9bb53ee7808f4b2f2c86d1d4db14ac9c244b3e2e79a245510a289eb321cb7dbefd3b7a2dde13cf444b8ecf7cd46f23eaa5c0f04670914e42 fix-execinfo.patch -40a213548d4f76152d2cae57c15c6fb079b64a681a2b033b0c8265c5dbe2653818c898d1ac76ae59298cbf568dc4b811f86c3913e9d2c3d3f33e5cb8c1bd217e disallow-ctype.patch" +40a213548d4f76152d2cae57c15c6fb079b64a681a2b033b0c8265c5dbe2653818c898d1ac76ae59298cbf568dc4b811f86c3913e9d2c3d3f33e5cb8c1bd217e disallow-ctype.patch +64ec41fc02d6bfc4e6cdc13cc2560aaefcf2b5c9c6ac62a6e3d3b85221487b44bf8b7edbf972635d1628f1d3919f96f4dd417774b8d39691b3b0d7925e499f82 webkitgtk-2.4.9-abs.patch" diff --git a/community/webkitgtk/webkitgtk-2.4.9-abs.patch b/community/webkitgtk/webkitgtk-2.4.9-abs.patch new file mode 100644 index 0000000000..9a1c5f990d --- /dev/null +++ b/community/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<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; |