commit bdcbb327d763dc3b5b8663e7cd6738d39491c4c0
Author: Jan Rękorajski <[email protected]>
Date: Sat Mar 11 20:35:50 2017 +0100
- fix overloaded 'abs(gdouble)' is ambiguous error
- rel 3
abs.patch | 26 ++++++++++++++++++++++++++
gtk-webkit.spec | 4 +++-
2 files changed, 29 insertions(+), 1 deletion(-)
---
diff --git a/gtk-webkit.spec b/gtk-webkit.spec
index 5fdf991..4241298 100644
--- a/gtk-webkit.spec
+++ b/gtk-webkit.spec
@@ -7,12 +7,13 @@ Summary(pl.UTF-8): Port osadzalnego komponentu WWW WebKit
do GTK+ 2
Name: gtk-webkit
# note: 2.4.x is the last series with webkitgtk-1 API and GTK+ 2.x support
Version: 2.4.11
-Release: 2
+Release: 3
License: BSD-like
Group: X11/Libraries
Source0: http://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz
# Source0-md5: 24a25ccc30a7914ae50922aedf24b7bc
Patch0: x32.patch
+Patch1: abs.patch
URL: http://webkitgtk.org/
BuildRequires: /usr/bin/ld.gold
BuildRequires: EGL-devel
@@ -110,6 +111,7 @@ Pliki programistyczne komponentu WebKit dla GTK+ 2.
%prep
%setup -q -n webkitgtk-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__libtoolize}
diff --git a/abs.patch b/abs.patch
new file mode 100644
index 0000000..9a1c5f9
--- /dev/null
+++ b/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;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gtk-webkit.git/commitdiff/bdcbb327d763dc3b5b8663e7cd6738d39491c4c0
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
