[packages/qt5-qtdeclarative] - rel 2; disable jit on x32

arekm arekm at pld-linux.org
Mon Aug 6 09:37:43 CEST 2018


commit d0369829c6fe6198148b2f72e50ef858cc9f1b0a
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Aug 6 09:37:35 2018 +0200

    - rel 2; disable jit on x32

 qt5-qtdeclarative.spec |  4 +++-
 x32-no-jit.patch       | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec
index 3a563c6..53f50e3 100644
--- a/qt5-qtdeclarative.spec
+++ b/qt5-qtdeclarative.spec
@@ -20,13 +20,14 @@ Summary:	The Qt5 Declarative libraries
 Summary(pl.UTF-8):	Biblioteki Qt5 Declarative
 Name:		qt5-%{orgname}
 Version:	5.11.1
-Release:	1
+Release:	2
 License:	LGPL v2.1 with Digia Qt LGPL Exception v1.1 or GPL v3.0
 Group:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5:	cc655aaa10c47a84c41e8f0eb3bce112
 Source1:	http://download.qt.io/official_releases/qt/5.11/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz
 # Source1-md5:	67c0dbd61c2b92552b5339d82a94b1a8
+Patch0:		x32-no-jit.patch
 URL:		http://www.qt.io/
 BuildRequires:	OpenGL-devel
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
@@ -241,6 +242,7 @@ Przykłady do bibliotek Qt5 Declarative.
 
 %prep
 %setup -q -n %{orgname}-everywhere-src-%{version} %{?with_qm:-a1}
+%patch0 -p1
 
 %build
 qmake-qt5
diff --git a/x32-no-jit.patch b/x32-no-jit.patch
new file mode 100644
index 0000000..40cdcb8
--- /dev/null
+++ b/x32-no-jit.patch
@@ -0,0 +1,11 @@
+--- qtdeclarative-everywhere-src-5.11.1/src/qml/jsruntime/qv4global_p.h~	2018-06-15 13:30:15.000000000 +0200
++++ qtdeclarative-everywhere-src-5.11.1/src/qml/jsruntime/qv4global_p.h	2018-08-06 09:12:27.950201394 +0200
+@@ -88,7 +88,7 @@ inline double trunc(double d) { return d
+ //
+ // NOTE: This should match the logic in qv4targetplatform_p.h!
+ 
+-#if defined(Q_PROCESSOR_X86) && (QT_POINTER_SIZE == 4) \
++#if defined(Q_PROCESSOR_X86) && !defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 4) \
+     && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD))
+ #  define V4_ENABLE_JIT
+ #elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtdeclarative.git/commitdiff/d0369829c6fe6198148b2f72e50ef858cc9f1b0a



More information about the pld-cvs-commit mailing list