[gimp] build: update webkit patch for flatpak build.
- From: Jehan Pagès <jehanp src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] build: update webkit patch for flatpak build.
- Date: Sat, 23 Sep 2017 12:03:50 +0000 (UTC)
commit 40fe08b8c16e74c8df792c2840d26a4f16d33d17
Author: Jehan <jehan girinstud io>
Date: Sat Sep 23 03:28:36 2017 +0200
build: update webkit patch for flatpak build.
Not sure why, because flatpak-builder used to compile webkitgtk just
fine, but not anymore. I get now a "call of overloaded ‘abs(gdouble)’ is
ambiguous" error. It looks like some header may have been updated in the
flatpak environment and causing multiple abs definitions. Using fabs()
instead works around the issue.
build/flatpak/patches/webkitgtk-2.4.11.patch | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
---
diff --git a/build/flatpak/patches/webkitgtk-2.4.11.patch b/build/flatpak/patches/webkitgtk-2.4.11.patch
index 85e9ad5..3a63e65 100644
--- a/build/flatpak/patches/webkitgtk-2.4.11.patch
+++ b/build/flatpak/patches/webkitgtk-2.4.11.patch
@@ -1,6 +1,20 @@
-diff -ru webkitgtk-2.4.11/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
webkitgtk-2.4.11.raw.patched/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
+diff -ru webkitgtk-2.4.11/Source/WebCore/platform/gtk/GtkClickCounter.cpp
webkitgtk-2.4.11-patched/Source/WebCore/platform/gtk/GtkClickCounter.cpp
+--- webkitgtk-2.4.11/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2016-04-10 08:48:37.000000000 +0200
++++ webkitgtk-2.4.11-patched/Source/WebCore/platform/gtk/GtkClickCounter.cpp 2017-09-21 01:59:09.359098267
+0200
+@@ -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 -ru webkitgtk-2.4.11/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
webkitgtk-2.4.11-patched/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp
--- webkitgtk-2.4.11/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2016-04-10 08:48:37.000000000 +0200
-+++ webkitgtk-2.4.11.raw.patched/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2017-01-30
23:43:13.427189343 +0100
++++ webkitgtk-2.4.11-patched/Source/WebCore/platform/gtk/RenderThemeGtk2.cpp 2017-09-21 01:57:56.114814372
+0200
@@ -40,6 +40,7 @@
#include "PaintInfo.h"
#include "PlatformContextCairo.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]