| 1 |
commit: bfe97a5ba14edaafe8694f6a74aa026506eacc68 |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 27 17:41:16 2016 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 27 20:20:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe97a5b |
| 7 |
|
| 8 |
net-libs/webkit-gtk: tweak for gcc-6, bug #592048 |
| 9 |
|
| 10 |
Adopt Fedora patch to build successfully against gcc-6.1.0. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=592048 |
| 13 |
Bug: https://bugs.webkit.org/show_bug.cgi?id=159124 |
| 14 |
|
| 15 |
Package-Manager: portage-2.3.0 |
| 16 |
|
| 17 |
.../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch | 29 ++++++++++++++++++++++ |
| 18 |
net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild | 3 +++ |
| 19 |
net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 3 +++ |
| 20 |
net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild | 3 +++ |
| 21 |
4 files changed, 38 insertions(+) |
| 22 |
|
| 23 |
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch |
| 24 |
new file mode 100644 |
| 25 |
index 00000000..bd8507c |
| 26 |
--- /dev/null |
| 27 |
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch |
| 28 |
@@ -0,0 +1,29 @@ |
| 29 |
+Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity) |
| 30 |
+https://bugs.webkit.org/show_bug.cgi?id=159124#c1 |
| 31 |
+https://bugs.gentoo.org/show_bug.cgi?id=592048 |
| 32 |
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp |
| 33 |
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2015-05-20 03:03:24.000000000 -0600 |
| 34 |
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-02-07 11:30:42.392686308 -0700 |
| 35 |
+@@ -85,8 +85,8 @@ |
| 36 |
+ guint32 eventTime = getEventTime(event); |
| 37 |
+ |
| 38 |
+ if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) |
| 39 |
+- || ((abs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) |
| 40 |
+- && (abs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) |
| 41 |
++ || ((fabs(buttonEvent->x - m_previousClickPoint.x()) < doubleClickDistance) |
| 42 |
++ && (fabs(buttonEvent->y - m_previousClickPoint.y()) < doubleClickDistance) |
| 43 |
+ && (eventTime - m_previousClickTime < static_cast<guint>(doubleClickTime)) |
| 44 |
+ && (buttonEvent->button == m_previousClickButton))) |
| 45 |
+ m_currentClickCount++; |
| 46 |
+diff -Nur webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp |
| 47 |
+--- webkitgtk-2.4.9.orig/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2015-05-20 03:03:24.000000000 -0600 |
| 48 |
++++ webkitgtk-2.4.9/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp 2016-02-07 11:49:36.384691005 -0700 |
| 49 |
+@@ -659,7 +659,7 @@ |
| 50 |
+ if (!std::isfinite(time)) |
| 51 |
+ return String::fromUTF8(_("indefinite time")); |
| 52 |
+ |
| 53 |
+- int seconds = static_cast<int>(abs(time)); |
| 54 |
++ int seconds = static_cast<int>(fabs(time)); |
| 55 |
+ int days = seconds / (60 * 60 * 24); |
| 56 |
+ int hours = seconds / (60 * 60); |
| 57 |
+ int minutes = (seconds / 60) % 60; |
| 58 |
|
| 59 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild |
| 60 |
index cb799d5..1913585 100644 |
| 61 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild |
| 62 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild |
| 63 |
@@ -173,6 +173,9 @@ src_prepare() { |
| 64 |
# https://bugs.webkit.org/show_bug.cgi?id=156510 |
| 65 |
eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch |
| 66 |
|
| 67 |
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 |
| 68 |
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch |
| 69 |
+ |
| 70 |
AT_M4DIR=Source/autotools eautoreconf |
| 71 |
|
| 72 |
gnome2_src_prepare |
| 73 |
|
| 74 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild |
| 75 |
index 10f845a..a92c6b1 100644 |
| 76 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild |
| 77 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild |
| 78 |
@@ -158,6 +158,9 @@ src_prepare() { |
| 79 |
# https://bugs.webkit.org/show_bug.cgi?id=156510 |
| 80 |
eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch |
| 81 |
|
| 82 |
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 |
| 83 |
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch |
| 84 |
+ |
| 85 |
AT_M4DIR=Source/autotools eautoreconf |
| 86 |
|
| 87 |
gnome2_src_prepare |
| 88 |
|
| 89 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild |
| 90 |
index 2ffe8b2..481850b 100644 |
| 91 |
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild |
| 92 |
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild |
| 93 |
@@ -171,6 +171,9 @@ src_prepare() { |
| 94 |
# https://bugs.webkit.org/show_bug.cgi?id=156510 |
| 95 |
eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch |
| 96 |
|
| 97 |
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1 |
| 98 |
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch |
| 99 |
+ |
| 100 |
AT_M4DIR=Source/autotools eautoreconf |
| 101 |
|
| 102 |
gnome2_src_prepare |
Archives