rpms/qt5-qtdeclarative
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use system double-converstion (#1078524)

Browse Source
This commit is contained in:
Rex Dieter 2016-05-20 11:55:03 -05:00
parent 474c5e8885
commit 84cba589ec
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qt5-qtdeclarative.spec
View File

@ -18,7 +18,7 @@
Summary: Qt5 - QtDeclarative component Summary: Qt5 - QtDeclarative component
Name: qt5-%{qt_module} Name: qt5-%{qt_module}
Version: 5.6.0 Version: 5.6.0
Release: 8%{?prerelease:.%{prerelease}}%{?dist} Release: 9%{?prerelease:.%{prerelease}}%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
License: LGPLv2 with exceptions or GPLv3 with exceptions License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -39,6 +39,14 @@ Patch8: 0008-Fix-crash-when-Canvas-has-negative-width-or-height.patch
Patch19: 0019-Revert-Fix-crash-on-QQmlEngine-destruction.patch Patch19: 0019-Revert-Fix-crash-on-QQmlEngine-destruction.patch
Patch29: 0029-Avoid-div-by-zero-when-nothing-is-rendered.patch Patch29: 0029-Avoid-div-by-zero-when-nothing-is-rendered.patch
## upstreamable patches
# use system double-conversation
%if 0%{?fedora} || 0%{?rhel} > 6
%global system_doubleconv 1
BuildRequires: double-conversion-devel
%endif
Patch100: qtdeclarative-system_doubleconv.patch
## upstream patches under review ## upstream patches under review
# Check-for-NULL-from-glGetStrin # Check-for-NULL-from-glGetStrin
Patch500: Check-for-NULL-from-glGetString.patch Patch500: Check-for-NULL-from-glGetString.patch
@ -108,6 +116,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%patch19 -p1 -b .0019 %patch19 -p1 -b .0019
%patch29 -p1 -b .0029 %patch29 -p1 -b .0029
%if 0%{?system_doubleconv}
%patch100 -p1 -b .system_doubleconv
rm -rfv src/3rdparty/double-conversion
%endif
%patch500 -p1 -b .Check-for-NULL-from-glGetString %patch500 -p1 -b .Check-for-NULL-from-glGetString
@ -246,6 +259,9 @@ make check -k -C %{_target_platform}/tests ||:
%changelog %changelog
* Fri May 20 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-9
- Use system double-converstion (#1078524)
* Thu May 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-8 * Thu May 19 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.6.0-8
- -devel: don't own libQt5QuickWidgets.so.5 (#1337621) - -devel: don't own libQt5QuickWidgets.so.5 (#1337621)

22
qtdeclarative-system_doubleconv.patch Normal file
View File

@ -0,0 +1,22 @@
diff -up qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/jsruntime.pri.system_doubleconv qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/jsruntime.pri
--- qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/jsruntime.pri.system_doubleconv 2016-05-20 08:25:07.986878324 -0500
+++ qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/jsruntime.pri 2016-05-20 11:21:05.059471545 -0500
@@ -118,4 +118,5 @@ valgrind {
ios: DEFINES += ENABLE_ASSEMBLER_WX_EXCLUSIVE=1
-include(../../3rdparty/double-conversion/double-conversion.pri)
+INCLUDEPATH += /usr/include/double-conversion
+LIBS += -ldouble-conversion
diff -up qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/qv4runtime.cpp.system_doubleconv qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/qv4runtime.cpp
--- qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/qv4runtime.cpp.system_doubleconv 2016-02-26 03:34:34.000000000 -0600
+++ qtdeclarative-opensource-src-5.6.0/src/qml/jsruntime/qv4runtime.cpp 2016-05-20 11:22:00.603641534 -0500
@@ -60,7 +60,7 @@
#include <wtf/MathExtras.h>
-#include "../../3rdparty/double-conversion/double-conversion.h"
+#include <double-conversion.h>
#ifdef QV4_COUNT_RUNTIME_FUNCTIONS
# include <QtCore/QBuffer>