pool/libqt5-qtdeclarative
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 656553 from KDE:Qt5

Browse Source 
Qt 5.12.0 final

OBS-URL: https://build.opensuse.org/request/show/656553
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtdeclarative?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2018-12-14 19:50:47 +00:00 committed by Git OBS Bridge
parent 5e2037f050
commit 32a2b9e949
6 changed files with 122 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
libqt5-qtdeclarative.changes
View File

@ -1,3 +1,74 @@
-------------------------------------------------------------------
Thu Dec 6 13:35:28 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0:
* New feature release
* For more details please see:
* http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.12.0/?h=v5.12.0
-------------------------------------------------------------------
Mon Dec 3 08:16:24 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-rc2:
* New bugfix release
* Only important bugfixes
- Changelog for Qt 5.12.0:
* http://code.qt.io/cgit/qt/qtdeclarative.git/plain/dist/changes-5.12.0/?h=5.12.0
-------------------------------------------------------------------
Mon Nov 26 16:45:46 UTC 2018 - Fabian Vogt <fabian@ritter-vogt.de>
- Remove unneeded BuildReq on Xml modules (boo#1117316)
-------------------------------------------------------------------
Thu Nov 22 13:38:57 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-rc:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Thu Nov 8 15:24:30 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-beta4:
* New bugfix release
* No changelog available
- New Qt.labs.wavefrontmesh module
-------------------------------------------------------------------
Fri Oct 26 07:20:23 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-beta3:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Wed Oct 17 08:22:33 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-beta2:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Fri Oct 5 18:57:01 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-beta1:
* New bugfix release
* No changelog available
-------------------------------------------------------------------
Tue Oct 2 07:33:22 UTC 2018 - fabian@ritter-vogt.de
- Update to 5.12.0-alpha:
* New feature release
* For more details please see:
* http://wiki.qt.io/New_Features_in_Qt_5.12
- Refresh patches:
* qtdeclarative-switch-to-python3.patch
* sse2_nojit.patch
- Apply sse2_nojit.patch unconditionally
- Use %license
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 21 07:58:52 UTC 2018 - fabian@ritter-vogt.de Fri Sep 21 07:58:52 UTC 2018 - fabian@ritter-vogt.de

39
libqt5-qtdeclarative.spec
View File

@ -21,17 +21,17 @@
%define libname libQtQuick5 %define libname libQtQuick5
Name: libqt5-qtdeclarative Name: libqt5-qtdeclarative
Version: 5.11.2 Version: 5.12.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-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only
Group: Development/Libraries/X11 Group: Development/Libraries/X11
Url: https://www.qt.io Url: https://www.qt.io
%define base_name libqt5 %define base_name libqt5
%define real_version 5.11.2 %define real_version 5.12.0
%define so_version 5.11.2 %define so_version 5.12.0
%define tar_version qtdeclarative-everywhere-src-5.11.2 %define tar_version qtdeclarative-everywhere-src-5.12.0
Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz Source: https://download.qt.io/official_releases/qt/5.12/%{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
@ -48,8 +48,6 @@ 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}
BuildRequires: pkgconfig(Qt5Xml) >= %{version}
BuildRequires: pkgconfig(Qt5XmlPatterns) >= %{version}
%if %qt5_snapshot %if %qt5_snapshot
#to create the forwarding headers #to create the forwarding headers
BuildRequires: perl BuildRequires: perl
@ -62,8 +60,6 @@ BuildRequires: xz
%requires_ge libQt5Sql5 %requires_ge libQt5Sql5
%requires_ge libQt5Test5 %requires_ge libQt5Test5
%requires_ge libQt5Widgets5 %requires_ge libQt5Widgets5
%requires_ge libQt5XmlPatterns5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Qt is a set of libraries for developing applications. Qt is a set of libraries for developing applications.
@ -73,10 +69,7 @@ handling.
%prep %prep
%setup -q -n %{tar_version} %setup -q -n %{tar_version}
%ifarch %ix86 %autopatch -p1
%patch100 -p1
%endif
%patch102 -p1
%package -n %libname %package -n %libname
Summary: Qt 5 Declarative Library Summary: Qt 5 Declarative Library
@ -206,8 +199,7 @@ popd
%fdupes -s %{buildroot}%{_libqt5_examplesdir} %fdupes -s %{buildroot}%{_libqt5_examplesdir}
%files -n %libname %files -n %libname
%defattr(-,root,root,755) %license LICENSE.*
%doc 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
@ -221,26 +213,24 @@ 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/folderlistmodel %{_libqt5_archdatadir}/qml/Qt/labs/folderlistmodel/
%{_libqt5_archdatadir}/qml/Qt/labs/handlers/
%{_libqt5_archdatadir}/qml/Qt/labs/settings/ %{_libqt5_archdatadir}/qml/Qt/labs/settings/
%{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/ %{_libqt5_archdatadir}/qml/Qt/labs/sharedimage/
%{_libqt5_archdatadir}/qml/Qt/labs/qmlmodels/
%{_libqt5_archdatadir}/qml/Qt/labs/wavefrontmesh/
%{_libqt5_plugindir}/qmltooling %{_libqt5_plugindir}/qmltooling
%files private-headers-devel %files private-headers-devel
%defattr(-,root,root,755) %license LICENSE.*
%doc LICENSE.*
%{_libqt5_includedir}/Qt*/%{so_version} %{_libqt5_includedir}/Qt*/%{so_version}
%files tools %files tools
%defattr(-,root,root,755) %license LICENSE.*
%doc LICENSE.*
%{_bindir}/* %{_bindir}/*
%{_libqt5_bindir}/* %{_libqt5_bindir}/*
%files devel %files devel
%defattr(-,root,root,755) %license LICENSE.*
%doc LICENSE.*
%exclude %{_libqt5_includedir}/Qt*/%{so_version} %exclude %{_libqt5_includedir}/Qt*/%{so_version}
%{_libqt5_includedir}/Qt* %{_libqt5_includedir}/Qt*
%{_libqt5_libdir}/cmake/Qt5* %{_libqt5_libdir}/cmake/Qt5*
@ -254,8 +244,7 @@ popd
%{_libqt5_archdatadir}/qml/QtTest %{_libqt5_archdatadir}/qml/QtTest
%files examples %files examples
%defattr(-,root,root,755) %license LICENSE.*
%doc LICENSE.*
%{_libqt5_examplesdir}/ %{_libqt5_examplesdir}/
%changelog %changelog

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

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

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

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

28
qtdeclarative-switch-to-python3.patch
View File

@ -1,8 +1,10 @@
Subject: Make qtdeclarative build with python3 Subject: Make qtdeclarative build with python3
From: Max Lin <mlin@suse.com> From: Max Lin <mlin@suse.com>
From: Antonio Larrosa <alarrosa@suse.com> From: Antonio Larrosa <alarrosa@suse.com>
--- a/qtdeclarative.pro Index: qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative.pro
+++ b/qtdeclarative.pro ===================================================================
--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/qtdeclarative.pro
+++ qtdeclarative-everywhere-src-5.12.0-alpha/qtdeclarative.pro
@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need @@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need
load(qt_parts) load(qt_parts)
@ -12,8 +14,10 @@ From: Antonio Larrosa <alarrosa@suse.com>
!equals(py_out, 1): error("Building QtQml requires Python.") !equals(py_out, 1): error("Building QtQml requires Python.")
tmp = python_available tmp = python_available
CONFIG += $$tmp CONFIG += $$tmp
--- a/src/3rdparty/masm/masm.pri Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri ===================================================================
--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/3rdparty/masm/masm.pri
+++ qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/masm.pri
@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) { @@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
udis86.output = udis86_itab.h udis86.output = udis86_itab.h
udis86.input = ITAB udis86.input = ITAB
@ -23,8 +27,8 @@ From: Antonio Larrosa <alarrosa@suse.com>
QMAKE_EXTRA_COMPILERS += udis86 QMAKE_EXTRA_COMPILERS += udis86
udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
@@ -110,7 +110,7 @@ retgen.output = $$GENERATEDDIR/RegExpJit @@ -113,7 +113,7 @@ retgen.output = $$GENERATEDDIR/RegExpJit
retgen.script = $$PWD/create_regex_tables retgen.script = $$PWD/yarr/create_regex_tables
retgen.input = retgen.script retgen.input = retgen.script
retgen.CONFIG += no_link retgen.CONFIG += no_link
-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} -retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
@ -32,8 +36,10 @@ From: Antonio Larrosa <alarrosa@suse.com>
QMAKE_EXTRA_COMPILERS += retgen QMAKE_EXTRA_COMPILERS += retgen
# Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
--- a/src/3rdparty/masm/disassembler/udis86/itab.py Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/itab.py
+++ b/src/3rdparty/masm/disassembler/udis86/itab.py ===================================================================
--- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/3rdparty/masm/disassembler/udis86/itab.py
+++ qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/itab.py
@@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcod @@ -268,13 +268,13 @@ class UdItabGenerator( ud_opcode.UdOpcod
opr = e[ 'operands' ] opr = e[ 'operands' ]
for i in range(len(opr)): for i in range(len(opr)):
@ -50,10 +56,10 @@ From: Antonio Larrosa <alarrosa@suse.com>
pfx_c.append( self.PrefixDict[p] ) pfx_c.append( self.PrefixDict[p] )
if len(e['prefixes']) == 0: if len(e['prefixes']) == 0:
pfx_c.append( "P_none" ) pfx_c.append( "P_none" )
Index: qtdeclarative-opensource-src-5.9.4/src/3rdparty/masm/disassembler/udis86/ud_optable.py Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/ud_optable.py
=================================================================== ===================================================================
--- qtdeclarative-opensource-src-5.9.4.orig/src/3rdparty/masm/disassembler/udis86/ud_optable.py --- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/3rdparty/masm/disassembler/udis86/ud_optable.py
+++ qtdeclarative-opensource-src-5.9.4/src/3rdparty/masm/disassembler/udis86/ud_optable.py +++ qtdeclarative-everywhere-src-5.12.0-alpha/src/3rdparty/masm/disassembler/udis86/ud_optable.py
@@ -50,7 +50,7 @@ class UdOptableXmlParser: @@ -50,7 +50,7 @@ class UdOptableXmlParser:
elif def_node.localName == 'vendor': elif def_node.localName == 'vendor':
ven = ( def_node.firstChild.data ); ven = ( def_node.firstChild.data );

34
sse2_nojit.patch
View File

@ -1,8 +1,8 @@
diff --git a/src/qml/jsruntime/jsruntime.pri b/src/qml/jsruntime/jsruntime.pri Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/jsruntime.pri
index c27aaa9..05c86e8 100644 ===================================================================
--- a/src/qml/jsruntime/jsruntime.pri --- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/qml/jsruntime/jsruntime.pri
+++ b/src/qml/jsruntime/jsruntime.pri +++ qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/jsruntime.pri
@@ -115,6 +115,11 @@ SOURCES += \ @@ -154,6 +154,11 @@ SOURCES += \
$$PWD/qv4value.cpp \ $$PWD/qv4value.cpp \
$$PWD/qv4executableallocator.cpp $$PWD/qv4executableallocator.cpp
@ -14,11 +14,11 @@ index c27aaa9..05c86e8 100644
valgrind { valgrind {
DEFINES += V4_USE_VALGRIND DEFINES += V4_USE_VALGRIND
} }
diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/qv4global_p.h
index a58beb3..85e8dc0 100644 ===================================================================
--- a/src/qml/jsruntime/qv4global_p.h --- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/qml/jsruntime/qv4global_p.h
+++ b/src/qml/jsruntime/qv4global_p.h +++ qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/jsruntime/qv4global_p.h
@@ -117,7 +117,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } @@ -115,7 +115,7 @@ inline double trunc(double d) { return d
// Black list some platforms // Black list some platforms
#if defined(V4_ENABLE_JIT) #if defined(V4_ENABLE_JIT)
@ -27,16 +27,16 @@ index a58beb3..85e8dc0 100644
# undef V4_ENABLE_JIT # undef V4_ENABLE_JIT
#endif #endif
#endif #endif
diff --git a/src/qml/qml/v8/qv8engine.cpp b/src/qml/qml/v8/qv8engine.cpp Index: qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/qml/v8/qv8engine.cpp
index 39b816f..762ee61 100644 ===================================================================
--- a/src/qml/qml/v8/qv8engine.cpp --- qtdeclarative-everywhere-src-5.12.0-alpha.orig/src/qml/qml/v8/qv8engine.cpp
+++ b/src/qml/qml/v8/qv8engine.cpp +++ qtdeclarative-everywhere-src-5.12.0-alpha/src/qml/qml/v8/qv8engine.cpp
@@ -131,7 +131,7 @@ QV8Engine::QV8Engine(QJSEngine* qq) @@ -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 #ifdef Q_PROCESSOR_X86_32
if (!qCpuHasFeature(SSE2)) { if (!qCpuHasFeature(SSE2)) {
- qFatal("This program requires an X86 processor that supports SSE2 extension, at least a Pentium 4 or newer"); - 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!"); + 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
#endif