From: "Sergei Trofimovich" <slyfox@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/
Date: Sat, 27 Aug 2016 20:20:49 +0000 (UTC) [thread overview]
Message-ID: <1472329223.bfe97a5ba14edaafe8694f6a74aa026506eacc68.slyfox@gentoo> (raw)
commit: bfe97a5ba14edaafe8694f6a74aa026506eacc68
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 17:41:16 2016 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 20:20:23 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe97a5b
net-libs/webkit-gtk: tweak for gcc-6, bug #592048
Adopt Fedora patch to build successfully against gcc-6.1.0.
Bug: https://bugs.gentoo.org/show_bug.cgi?id=592048
Bug: https://bugs.webkit.org/show_bug.cgi?id=159124
Package-Manager: portage-2.3.0
.../webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch | 29 ++++++++++++++++++++++
net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild | 3 +++
net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild | 3 +++
net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild | 3 +++
4 files changed, 38 insertions(+)
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
new file mode 100644
index 00000000..bd8507c
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-2.4.9-gcc-6.patch
@@ -0,0 +1,29 @@
+Fedora patch fixes build failure for gcc-6 (abs/fabs ambifuity)
+https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+https://bugs.gentoo.org/show_bug.cgi?id=592048
+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;
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
index cb799d5..1913585 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r1.ebuild
@@ -173,6 +173,9 @@ src_prepare() {
# https://bugs.webkit.org/show_bug.cgi?id=156510
eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
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
index 10f845a..a92c6b1 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11-r200.ebuild
@@ -158,6 +158,9 @@ src_prepare() {
# https://bugs.webkit.org/show_bug.cgi?id=156510
eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
index 2ffe8b2..481850b 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.11.ebuild
@@ -171,6 +171,9 @@ src_prepare() {
# https://bugs.webkit.org/show_bug.cgi?id=156510
eapply "${FILESDIR}"/${PN}-2.4.11-video-web-audio.patch
+ # https://bugs.webkit.org/show_bug.cgi?id=159124#c1
+ eapply "${FILESDIR}"/${PN}-2.4.9-gcc-6.patch
+
AT_M4DIR=Source/autotools eautoreconf
gnome2_src_prepare
next reply other threads:[~2016-08-27 20:20 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-27 20:20 Sergei Trofimovich [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-06 11:18 [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/, net-libs/webkit-gtk/files/ Sam James
2024-10-09 15:09 Michael Orlitzky
2024-06-25 16:45 Jakov Smolić
2024-04-20 11:42 Mart Raudsepp
2024-02-23 19:07 Sam James
2023-08-09 18:07 Matt Turner
2023-07-16 14:38 Matt Turner
2023-04-25 21:38 Matt Turner
2023-04-22 3:08 Matt Turner
2023-01-30 4:01 Sam James
2022-08-02 20:17 Matt Turner
2022-05-13 12:27 Matt Turner
2022-01-18 21:39 Mart Raudsepp
2022-01-05 16:22 Mart Raudsepp
2022-01-02 22:46 Mart Raudsepp
2021-05-31 2:00 Matt Turner
2021-05-12 22:00 Matt Turner
2020-11-27 20:54 Mart Raudsepp
2020-07-29 14:09 Mart Raudsepp
2020-07-19 6:00 Mart Raudsepp
2020-07-11 13:34 Mart Raudsepp
2020-01-31 19:19 Mart Raudsepp
2020-01-19 18:49 Mart Raudsepp
2019-11-23 19:28 Matt Turner
2019-10-29 22:22 Andreas Sturmlechner
2018-07-25 16:47 Mart Raudsepp
2017-10-29 22:11 Mart Raudsepp
2017-04-17 8:10 Mart Raudsepp
2015-08-25 0:45 Alexandre Rostovtsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472329223.bfe97a5ba14edaafe8694f6a74aa026506eacc68.slyfox@gentoo \
--to=slyfox@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox