rpms/webkitgtk
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add patch to fix FTBFS

Browse Source
This commit is contained in:
Kevin Fenzi 2016-02-07 15:10:45 -07:00
parent fa15a128bb
commit 6e07a1f388
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
webkitgtk-2.4.9-abs.patch Normal file
View File

@ -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;

7
webkitgtk.spec
View File

@ -10,7 +10,7 @@
Name: webkitgtk Name: webkitgtk
Version: 2.4.9 Version: 2.4.9
Release: 8%{?dist} Release: 9%{?dist}
Summary: GTK+ Web content engine library Summary: GTK+ Web content engine library
Group: Development/Libraries Group: Development/Libraries
@ -27,6 +27,7 @@ Patch3: webkitgtk-2.4.1-ppc64_align.patch
Patch4: webkitgtk-2.4.8-user-agent.patch Patch4: webkitgtk-2.4.8-user-agent.patch
# http://trac.webkit.org/changeset/169665 # http://trac.webkit.org/changeset/169665
Patch5: webkitgtk-2.4.9-sql_initialize_string.patch Patch5: webkitgtk-2.4.9-sql_initialize_string.patch
Patch6: webkitgtk-2.4.9-abs.patch
BuildRequires: bison BuildRequires: bison
BuildRequires: chrpath BuildRequires: chrpath
@ -93,6 +94,7 @@ This package contains developer documentation for %{name}.
%patch1 -p1 -b .cloop_fix %patch1 -p1 -b .cloop_fix
%patch4 -p1 -b .user_agent %patch4 -p1 -b .user_agent
%patch5 -p1 -b .sql_initialize_string %patch5 -p1 -b .sql_initialize_string
%patch6 -p1
# required for 32-bit big-endians # required for 32-bit big-endians
%ifarch ppc s390 mips %ifarch ppc s390 mips
%patch2 -p1 -b .cloop_fix_32 %patch2 -p1 -b .cloop_fix_32
@ -215,6 +217,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/webkitgtk %{_datadir}/gtk-doc/html/webkitgtk
%changelog %changelog
* Sun Feb 07 2016 Kevin Fenzi <kevin@scrye.com> - 2.4.9-9
- Add patch to fix FTBFS
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.9-8 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.9-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild