[gnome-apps-nightly/stable] geary: Fix the webkitgtk3 build
- From: Mathieu Bridon <mbridon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-apps-nightly/stable] geary: Fix the webkitgtk3 build
- Date: Sun, 21 May 2017 19:57:01 +0000 (UTC)
commit 09fc967a6d1bb2b4da2c8219ea9676a1a93888df
Author: Mathieu Bridon <bochecha daitauha fr>
Date: Sun May 21 19:52:31 2017 +0200
geary: Fix the webkitgtk3 build
org.gnome.Geary.json | 4 ++
webkitgtk3-Fix-the-build-with-newer-GCC.patch | 42 +++++++++++++++++++++++++
2 files changed, 46 insertions(+), 0 deletions(-)
---
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 62c9abb..69b222e 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -93,6 +93,10 @@
"type": "archive",
"url": "http://webkitgtk.org/releases/webkitgtk-2.4.11.tar.xz",
"sha256": "588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7"
+ },
+ {
+ "type": "patch",
+ "path": "webkitgtk3-Fix-the-build-with-newer-GCC.patch"
}
]
},
diff --git a/webkitgtk3-Fix-the-build-with-newer-GCC.patch b/webkitgtk3-Fix-the-build-with-newer-GCC.patch
new file mode 100644
index 0000000..a8086e9
--- /dev/null
+++ b/webkitgtk3-Fix-the-build-with-newer-GCC.patch
@@ -0,0 +1,42 @@
+From 72a6305671f2a4dc404705612fbc39f28ac76e73 Mon Sep 17 00:00:00 2001
+From: Mathieu Bridon <bochecha daitauha fr>
+Date: Sun, 21 May 2017 17:33:59 +0200
+Subject: [PATCH] Fix the build with newer GCC
+
+This is a patch from Fedora.
+---
+ Source/WebCore/platform/gtk/GtkClickCounter.cpp | 4 ++--
+ Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Source/WebCore/platform/gtk/GtkClickCounter.cpp
b/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+index baa8917..7db658c 100644
+--- a/Source/WebCore/platform/gtk/GtkClickCounter.cpp
++++ b/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+@@ -85,8 +85,8 @@ int GtkClickCounter::clickCountForGdkButtonEvent(GtkWidget* widget, GdkEventButt
+ 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 --git a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+index 30d7d13..2563be6 100644
+--- a/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
++++ b/Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+@@ -659,7 +659,7 @@ String localizedMediaTimeDescription(float time)
+ 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;
+--
+2.9.4
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]