rpm/libqt5-qtdeclarative
SHA256
1
0
Fork 0
forked from pool/libqt5-qtdeclarative
Code Pull Requests Activity

Accepting request 757291 from KDE:Qt:5.14

Browse Source 
5.14.0

OBS-URL: https://build.opensuse.org/request/show/757291
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=57
This commit is contained in:
Dominique Leuenberger 2020-01-19 19:54:18 +00:00 committed by Git OBS Bridge
commit b87c3a5005
5 changed files with 136 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
libqt5-qtdeclarative.changes
View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Mon Dec 16 09:53:10 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
- Update the license tags.
-------------------------------------------------------------------
Thu Dec 12 12:41:44 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0:
* New bugfix release
* For the changes between 5.13.2 and 5.14.0 please see:
https://code.qt.io/cgit/qt/qtdeclarative.git/tree/dist/changes-5.14.0?h=v5.14.0
* For the changes between 5.13.1 and 5.13.2 please see:
https://code.qt.io/cgit/qt/qtdeclarative.git/tree/dist/changes-5.13.2?h=v5.14.0
-------------------------------------------------------------------
Wed Dec 4 14:37:36 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-rc:
* New bugfix release
* No changelog available
* For more details please see:
* For more details about Qt 5.14 please see:
https://wiki.qt.io/New_Features_in_Qt_5.14
-------------------------------------------------------------------
Tue Nov 12 13:00:58 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-beta3:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Thu Oct 24 13:22:31 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-beta2:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Tue Oct 15 12:34:25 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-beta1:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Mon Sep 30 13:30:01 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.14.0-alpha:
* New feature release
* No changelog available
* For more details about Qt 5.14 please see:
https://wiki.qt.io/New_Features_in_Qt_5.14
- Refresh sse2_nojit.patch:
* Basically a rewrite, needed for the new config system
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 6 08:03:38 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de> Fri Sep 6 08:03:38 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
@ -189,6 +246,8 @@ Tue May 22 15:18:09 CEST 2018 - fabian@ritter-vogt.de
* New bugfix release * New bugfix release
* For more details please see: * For more details please see:
* http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.11.0/?h=v5.11.0 * http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.11.0/?h=v5.11.0
- Includes fix for various issues with the JS/QML Date object
(boo#1114570, QTBUG-72109, QTBUG-56787)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 8 10:59:23 CEST 2018 - fabian@ritter-vogt.de Tue May 8 10:59:23 CEST 2018 - fabian@ritter-vogt.de

64
libqt5-qtdeclarative.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libqt5-qtdeclarative # spec file for package libqt5-qtdeclarative
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,26 +12,24 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
%define qt5_snapshot 0 %define qt5_snapshot 0
%define libname libQtQuick5 %define libname libQtQuick5
%define base_name libqt5
%define real_version 5.14.0
%define so_version 5.14.0
%define tar_version qtdeclarative-everywhere-src-5.14.0
Name: libqt5-qtdeclarative Name: libqt5-qtdeclarative
Version: 5.13.1 Version: 5.14.0
Release: 0 Release: 0
Summary: Qt 5 Declarative Library Summary: Qt 5 Declarative Library
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: https://www.qt.io URL: https://www.qt.io
%define base_name libqt5 Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
%define real_version 5.13.1
%define so_version 5.13.1
%define tar_version qtdeclarative-everywhere-src-5.13.1
Source: https://download.qt.io/official_releases/qt/5.13/%{real_version}/submodules/%{tar_version}.tar.xz
Source1: baselibs.conf Source1: baselibs.conf
# PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case # PATCH-FIX-OPENSUSE sse2_nojit.patch -- enable JIT and sse2 only on sse2 case
Patch100: sse2_nojit.patch Patch100: sse2_nojit.patch
@ -42,17 +40,19 @@ BuildRequires: libQt5Core-private-headers-devel >= %{version}
BuildRequires: libQt5Gui-private-headers-devel >= %{version} BuildRequires: libQt5Gui-private-headers-devel >= %{version}
BuildRequires: libQt5Test-private-headers-devel >= %{version} BuildRequires: libQt5Test-private-headers-devel >= %{version}
BuildRequires: libQt5Widgets-private-headers-devel >= %{version} BuildRequires: libQt5Widgets-private-headers-devel >= %{version}
BuildRequires: pkgconfig
BuildRequires: python3-base BuildRequires: python3-base
BuildRequires: xz
BuildRequires: pkgconfig(Qt5Core) >= %{version} BuildRequires: pkgconfig(Qt5Core) >= %{version}
BuildRequires: pkgconfig(Qt5Gui) >= %{version} BuildRequires: pkgconfig(Qt5Gui) >= %{version}
BuildRequires: pkgconfig(Qt5Network) >= %{version} BuildRequires: pkgconfig(Qt5Network) >= %{version}
BuildRequires: pkgconfig(Qt5Sql) >= %{version} BuildRequires: pkgconfig(Qt5Sql) >= %{version}
BuildRequires: pkgconfig(Qt5Widgets) >= %{version} BuildRequires: pkgconfig(Qt5Widgets) >= %{version}
%if %qt5_snapshot %if %{qt5_snapshot}
#to create the forwarding headers #to create the forwarding headers
BuildRequires: perl BuildRequires: perl
%endif %endif
BuildRequires: xz
# NOTE recheck this once/if this package gets further splitted # NOTE recheck this once/if this package gets further splitted
%requires_ge libQt5Core5 %requires_ge libQt5Core5
%requires_ge libQt5Gui5 %requires_ge libQt5Gui5
@ -71,13 +71,13 @@ handling.
%setup -q -n %{tar_version} %setup -q -n %{tar_version}
%autopatch -p1 %autopatch -p1
%package -n %libname %package -n %{libname}
Summary: Qt 5 Declarative Library Summary: Qt 5 Declarative Library
Group: Development/Libraries/X11 Group: Development/Libraries/X11
# Used by QtQuick.LocalStorage # Used by QtQuick.LocalStorage
Requires: libQt5Sql5-sqlite Requires: libQt5Sql5-sqlite
%description -n %libname %description -n %{libname}
Qt is a set of libraries for developing applications. Qt is a set of libraries for developing applications.
This package contains base tools, like string, xml, and network This package contains base tools, like string, xml, and network
@ -86,7 +86,7 @@ handling.
%package devel %package devel
Summary: Qt Development Kit Summary: Qt Development Kit
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Requires: %libname = %{version} Requires: %{libname} = %{version}
Requires: %{name}-tools = %{version} Requires: %{name}-tools = %{version}
Provides: libQt5Quick-devel = %{version} Provides: libQt5Quick-devel = %{version}
Obsoletes: libQt5Quick-devel < %{version} Obsoletes: libQt5Quick-devel < %{version}
@ -97,6 +97,7 @@ You need this package, if you want to compile programs with qtdeclarative.
%package tools %package tools
Summary: Qt 5 Declarative Tools Summary: Qt 5 Declarative Tools
Group: Development/Tools/Debuggers Group: Development/Tools/Debuggers
License: GPL-3.0-only
%description tools %description tools
Qt is a set of libraries for developing applications. Qt is a set of libraries for developing applications.
@ -106,7 +107,6 @@ This package contains aditional tools for inspecting, testing, viewing, etc, QML
%package private-headers-devel %package private-headers-devel
Summary: Non-ABI stable experimental API Summary: Non-ABI stable experimental API
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
BuildArch: noarch
Requires: %{name}-devel = %{version} Requires: %{name}-devel = %{version}
Requires: libQt5Core-private-headers-devel >= %{version} Requires: libQt5Core-private-headers-devel >= %{version}
Requires: libQt5Gui-private-headers-devel >= %{version} Requires: libQt5Gui-private-headers-devel >= %{version}
@ -114,6 +114,7 @@ Requires: libQt5Test-private-headers-devel >= %{version}
Requires: libQt5Widgets-private-headers-devel >= %{version} Requires: libQt5Widgets-private-headers-devel >= %{version}
Provides: libQt5Quick-private-headers-devel = %{version} Provides: libQt5Quick-private-headers-devel = %{version}
Obsoletes: libQt5Quick-private-headers-devel < %{version} Obsoletes: libQt5Quick-private-headers-devel < %{version}
BuildArch: noarch
%description private-headers-devel %description private-headers-devel
This package provides private headers of libqt5-qtdeclarative that are normally This package provides private headers of libqt5-qtdeclarative that are normally
@ -124,37 +125,37 @@ the exact Qt version.
%package examples %package examples
Summary: Qt5 quick/qml examples Summary: Qt5 quick/qml examples
Group: Development/Libraries/X11 Group: Development/Libraries/X11
License: BSD-3-Clause
Recommends: %{name}-devel Recommends: %{name}-devel
Recommends: %{name}-tools Recommends: %{name}-tools
%description examples %description examples
Examples for libqt5-qtdeclarative (quick/qml) modules. Examples for libqt5-qtdeclarative (quick/qml) modules.
%post -n %libname -p /sbin/ldconfig %post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
%postun -n %libname -p /sbin/ldconfig
%build %build
%if %qt5_snapshot %if %{qt5_snapshot}
#force the configure script to generate the forwarding headers (it checks whether .git directory exists) #force the configure script to generate the forwarding headers (it checks whether .git directory exists)
mkdir .git mkdir .git
%endif %endif
mkdir -p %{_target_platform} mkdir -p %{_target_platform}
pushd %{_target_platform} pushd %{_target_platform}
qmake-qt5 .. qmake-qt5 .. -- -qml-jit
popd popd
%{__make} %{?_smp_mflags} VERBOSE=1 -C %{_target_platform} make %{?_smp_mflags} VERBOSE=1 -C %{_target_platform}
%ifarch %ix86 %ifarch %{ix86}
%if 0%{?sle_version:%sle_version} < 150000 %if 0%{?sle_version:%sle_version} < 150000
# build libQt5Qml with no_sse2 # build libQt5Qml with no_sse2
mkdir -p %{_target_platform}-no_sse2 mkdir -p %{_target_platform}-no_sse2
pushd %{_target_platform}-no_sse2 pushd %{_target_platform}-no_sse2
%qmake5 -config no_sse2 .. %qmake5 -config no_sse2 .. -- -no-qml-jit
make sub-src-clean make %{?_smp_mflags} sub-src-clean
%{__make} %{?_smp_mflags} VERBOSE=1 -C src/qml make %{?_smp_mflags} VERBOSE=1 -C src/qml
popd popd
%endif %endif
%endif %endif
@ -164,7 +165,7 @@ pushd %{_target_platform}
%qmake5_install %qmake5_install
popd popd
%ifarch %ix86 %ifarch %{ix86}
%if 0%{?sle_version:%sle_version} < 150000 %if 0%{?sle_version:%sle_version} < 150000
mkdir -p %{buildroot}%{_libqt5_libdir}//sse2 mkdir -p %{buildroot}%{_libqt5_libdir}//sse2
mv %{buildroot}%{_libqt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_libqt5_libdir}/sse2/ mv %{buildroot}%{_libqt5_libdir}/libQt5Qml.so.5* %{buildroot}%{_libqt5_libdir}/sse2/
@ -199,10 +200,10 @@ popd
%fdupes -s %{buildroot}%{_libqt5_includedir} %fdupes -s %{buildroot}%{_libqt5_includedir}
%fdupes -s %{buildroot}%{_libqt5_examplesdir} %fdupes -s %{buildroot}%{_libqt5_examplesdir}
%files -n %libname %files -n %{libname}
%license LICENSE.* %license LICENSE.*
%{_libqt5_libdir}/libQt5Q*.so.* %{_libqt5_libdir}/libQt5Q*.so.*
%ifarch %ix86 %ifarch %{ix86}
%if 0%{?sle_version:%sle_version} < 150000 %if 0%{?sle_version:%sle_version} < 150000
%{_libqt5_libdir}/sse2/libQt5Q*.so.* %{_libqt5_libdir}/sse2/libQt5Q*.so.*
%endif %endif
@ -214,6 +215,7 @@ popd
%{_libqt5_archdatadir}/qml/QtQml %{_libqt5_archdatadir}/qml/QtQml
%{_libqt5_archdatadir}/qml/builtins.qmltypes %{_libqt5_archdatadir}/qml/builtins.qmltypes
%dir %{_libqt5_archdatadir}/qml/Qt/labs %dir %{_libqt5_archdatadir}/qml/Qt/labs
%{_libqt5_archdatadir}/qml/Qt/labs/animation/
%{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel/ %{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel/
%{_libqt5_archdatadir}/qml/Qt/labs/settings/ %{_libqt5_archdatadir}/qml/Qt/labs/settings/
%{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/ %{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/

3
qtdeclarative-everywhere-src-5.13.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae3477401b13d6b31e8569629d3f73b3e81e27cec27595988ffd320eaec7f0e2
size 20918916

3
qtdeclarative-everywhere-src-5.14.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bbf11ee33d6f0d6bd6c4dc641d4f2aafbc7c6cd3b421a658955302d441dc9d8e
size 21250100

67
sse2_nojit.patch
View File

@ -1,42 +1,45 @@
Index: qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/jsruntime.pri From: Fabian Vogt <fabian@ritter-vogt.de>
=================================================================== Subject: Allow building with and without JIT on i586
--- qtdeclarative-everywhere-src-5.13.0-beta1.orig/src/qml/jsruntime/jsruntime.pri
+++ qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/jsruntime.pri
@@ -174,6 +174,11 @@ qmldevtools_build {
}
For i586, the default Qt does not have sse2 enabled, but for sse2 capable systems
we'd like to have it use the JIT. Do some patching in the configuration system
to allow toggling it from the qmake call.
Originally written by Wolfgang Bauer <wbauer@tmo.at>
Index: qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/jsruntime/jsruntime.pri
===================================================================
--- qtdeclarative-everywhere-src-5.14.0-alpha.orig/src/qml/jsruntime/jsruntime.pri
+++ qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/jsruntime/jsruntime.pri
@@ -164,6 +164,10 @@ win32 {
$$PWD/qv4functiontable_unix.cpp
}
+linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 { +linux-g++*:isEqual(QT_ARCH,i386):!no_sse2 {
+ QMAKE_CFLAGS += -msse2 -mfpmath=sse + QMAKE_CFLAGS += -msse2 -mfpmath=sse
+ QMAKE_CXXFLAGS += -msse2 -mfpmath=sse + QMAKE_CXXFLAGS += -msse2 -mfpmath=sse
+} +}
+
valgrind { valgrind {
DEFINES += V4_USE_VALGRIND DEFINES += V4_USE_VALGRIND
} Index: qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/configure.json
Index: qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/qv4global_p.h
=================================================================== ===================================================================
--- qtdeclarative-everywhere-src-5.13.0-beta1.orig/src/qml/jsruntime/qv4global_p.h --- qtdeclarative-everywhere-src-5.14.0-alpha.orig/src/qml/configure.json
+++ qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/jsruntime/qv4global_p.h +++ qtdeclarative-everywhere-src-5.14.0-alpha/src/qml/configure.json
@@ -115,7 +115,7 @@ inline double trunc(double d) { return d @@ -8,6 +8,7 @@
"commandline": {
// Black list some platforms "options": {
#if defined(V4_ENABLE_JIT) "qml-network": "boolean",
-#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) + "qml-jit": "boolean",
+#if defined(Q_OS_IOS) || defined(Q_OS_TVOS) || (defined(Q_PROCESSOR_X86) && !defined(__SSE2__)) "qml-debug": "boolean"
# undef V4_ENABLE_JIT
#endif
#endif
Index: qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/qml/v8/qv8engine.cpp
===================================================================
--- qtdeclarative-everywhere-src-5.13.0-beta1.orig/src/qml/qml/v8/qv8engine.cpp
+++ qtdeclarative-everywhere-src-5.13.0-beta1/src/qml/qml/v8/qv8engine.cpp
@@ -141,7 +141,7 @@ QV8Engine::QV8Engine(QV4::ExecutionEngin
#ifndef Q_OS_WASM // wasm does not have working simd QTBUG-63924
#ifdef Q_PROCESSOR_X86_32
if (!qCpuHasFeature(SSE2)) {
- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer");
+ qDebug("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer, processors missing the extension are NOT supported to run QML2 code!");
} }
#endif },
#endif @@ -90,7 +91,7 @@
"purpose": "Provides a JIT for QML and JavaScript",
"section": "QML",
"condition": [
- " (arch.i386 && tests.pointer_32bit && features.sse2)
+ " (arch.i386 && tests.pointer_32bit)
|| (arch.x86_64 && tests.pointer_64bit && features.sse2)
|| (arch.arm && tests.pointer_32bit && tests.arm_fp && tests.arm_thumb
&& (config.linux || config.ios || config.tvos || config.qnx))