From: Jan Palus Date: Thu, 14 Mar 2019 17:56:16 +0000 (+0100) Subject: up to 5.12.2 X-Git-Tag: auto/th/qt5-qtdeclarative-5.12.2-1 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=refs%2Ftags%2Fauto%2Fth%2Fqt5-qtdeclarative-5.12.2-1;p=packages%2Fqt5-qtdeclarative.git up to 5.12.2 --- diff --git a/qt5-qtdeclarative.spec b/qt5-qtdeclarative.spec index 342707f..793bdf6 100644 --- a/qt5-qtdeclarative.spec +++ b/qt5-qtdeclarative.spec @@ -16,14 +16,14 @@ Summary: The Qt5 Declarative libraries Summary(pl.UTF-8): Biblioteki Qt5 Declarative Name: qt5-%{orgname} -Version: 5.12.1 +Version: 5.12.2 Release: 1 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.12/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz -# Source0-md5: bd9c6fda177de800da11c176f90189e2 +# Source0-md5: 7b6abe476da9368ae73de430def58c53 Source1: http://download.qt.io/official_releases/qt/5.12/%{version}/submodules/qttranslations-everywhere-src-%{version}.tar.xz -# Source1-md5: 045ad1eda4d3a272b24b6c60a06b313f +# Source1-md5: 298e993499be31ab95162b61456a4b25 Patch0: x32-no-jit.patch URL: http://www.qt.io/ BuildRequires: OpenGL-devel diff --git a/x32-no-jit.patch b/x32-no-jit.patch index 40cdcb8..93e4690 100644 --- a/x32-no-jit.patch +++ b/x32-no-jit.patch @@ -4,8 +4,8 @@ // // 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) \ +-#if defined(Q_PROCESSOR_X86_32) && (QT_POINTER_SIZE == 4) \ ++#if defined(Q_PROCESSOR_X86_32) && !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) \