import qt5-qtdeclarative-5.12.5-1.el8

2020-01-21 16:47:23 -05:00 · 2020-01-21 16:47:23 -05:00 · 3ecda26958
commit 3ecda26958
parent e1ddcca5da
5 changed files with 157 additions and 44 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/qtdeclarative-everywhere-src-5.11.1.tar.xz
+SOURCES/qtdeclarative-everywhere-src-5.12.5.tar.xz
--- a/.qt5-qtdeclarative.metadata
+++ b/.qt5-qtdeclarative.metadata
@ -1 +1 @@
-3bb4d97b8b2f40a6e6e21aa4d77a165007ee9af4 SOURCES/qtdeclarative-everywhere-src-5.11.1.tar.xz
+fc51d3bc7e0d6de30a67a4047875602441b8b277 SOURCES/qtdeclarative-everywhere-src-5.12.5.tar.xz
--- a/SOURCES/qtdeclarative-python-shebang.patch
+++ b/SOURCES/qtdeclarative-python-shebang.patch
@ -0,0 +1,110 @@
+diff --git a/tests/auto/qml/ecmascripttests/test262.py b/tests/auto/qml/ecmascripttests/test262.py
+index 19551e3b..fb06e9ef 100755
+--- a/tests/auto/qml/ecmascripttests/test262.py
+++ b/tests/auto/qml/ecmascripttests/test262.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ #############################################################################
+ ##
+ ## Copyright (C) 2017 The Qt Company Ltd.
+diff --git a/tests/auto/qml/ecmascripttests/test262/make.py b/tests/auto/qml/ecmascripttests/test262/make.py
+index 6594c5c5..c8ed7587 100755
+--- a/tests/auto/qml/ecmascripttests/test262/make.py
+++ b/tests/auto/qml/ecmascripttests/test262/make.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ # Copyright (C) 2016 the V8 project authors. All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+ 
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/generation/generator.py b/tests/auto/qml/ecmascripttests/test262/tools/generation/generator.py
+index 64a0ccf0..dda1d92f 100755
+--- a/tests/auto/qml/ecmascripttests/test262/tools/generation/generator.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/generation/generator.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ # Copyright (C) 2016 the V8 project authors. All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+ 
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/generation/test/run.py b/tests/auto/qml/ecmascripttests/test262/tools/generation/test/run.py
+index c21efa1b..e86e59b5 100755
+--- a/tests/auto/qml/ecmascripttests/test262/tools/generation/test/run.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/generation/test/run.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ # Copyright (C) 2016 the V8 project authors. All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+ 
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/lint/lint.py b/tests/auto/qml/ecmascripttests/test262/tools/lint/lint.py
+index 979616a5..e1aff4df 100755
+--- a/tests/auto/qml/ecmascripttests/test262/tools/lint/lint.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/lint/lint.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ # Copyright (C) 2017 Mike Pennisi. All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+ 
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/lint/test/run.py b/tests/auto/qml/ecmascripttests/test262/tools/lint/test/run.py
+index 9c83c794..f17f3892 100755
+--- a/tests/auto/qml/ecmascripttests/test262/tools/lint/test/run.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/lint/test/run.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ # Copyright (C) 2017 Mike Pennisi. All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+ 
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/packaging/monkeyYaml.py b/tests/auto/qml/ecmascripttests/test262/tools/packaging/monkeyYaml.py
+index 21c3fa42..21f0a236 100644
+--- a/tests/auto/qml/ecmascripttests/test262/tools/packaging/monkeyYaml.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/packaging/monkeyYaml.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ # Copyright 2014 by Sam Mikes.  All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+ 
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py b/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+index 681039d3..2a3ffb2c 100644
+--- a/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/packaging/parseTestRecord.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ 
+ # Copyright 2011 by Google, Inc.  All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_common.py b/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_common.py
+index 0d6600b7..7b2e36a3 100644
+--- a/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_common.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_common.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ 
+ # Copyright 2014 by Sam Mikes.  All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py b/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+index 92d4e613..3b76a9bc 100644
+--- a/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_monkeyYaml.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ 
+ # Copyright 2014 by Sam Mikes.  All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
+diff --git a/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_parseTestRecord.py b/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_parseTestRecord.py
+index 7d1e9a64..689f1211 100644
+--- a/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_parseTestRecord.py
+++ b/tests/auto/qml/ecmascripttests/test262/tools/packaging/test/test_parseTestRecord.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
+#!/usr/bin/python3
+ 
+ # Copyright 2014 by Sam Mikes.  All rights reserved.
+ # This code is governed by the BSD license found in the LICENSE file.
--- a/SOURCES/qtdeclarative-use-python3.patch
+++ b/SOURCES/qtdeclarative-use-python3.patch
@ -1,35 +0,0 @@
-diff --git a/qtdeclarative.pro b/qtdeclarative.pro
-index 5b94da9b..0e3496ce 100644
--- a/qtdeclarative.pro
-+++ b/qtdeclarative.pro
-@@ -2,7 +2,7 @@ CONFIG += tests_need_tools examples_need_tools
- load(qt_parts)
- 
- !python_available {
-    py_out = $$system('python -c "print(1)"')
-+    py_out = $$system('python3 -c "print(1)"')
-     !equals(py_out, 1): error("Building QtQml requires Python.")
-     tmp = python_available
-     CONFIG += $$tmp
-diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
-index 7dfb24f4..d4b87eb3 100644
--- a/src/3rdparty/masm/masm.pri
-+++ b/src/3rdparty/masm/masm.pri
-@@ -58,7 +58,7 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
-     udis86.output = udis86_itab.h
-     udis86.input = ITAB
-     udis86.CONFIG += no_link
-    udis86.commands = python $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-+    udis86.commands = python3 $$PWD/disassembler/udis86/itab.py ${QMAKE_FILE_IN}
-     QMAKE_EXTRA_COMPILERS += udis86
- 
-     udis86_tab_cfile.target = $$OUT_PWD/udis86_itab.c
-@@ -110,7 +110,7 @@ retgen.output = $$GENERATEDDIR/RegExpJitTables.h
- retgen.script = $$PWD/create_regex_tables
- retgen.input = retgen.script
- retgen.CONFIG += no_link
-retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT}
-+retgen.commands = python3 $$retgen.script > ${QMAKE_FILE_OUT}
- QMAKE_EXTRA_COMPILERS += retgen
- 
- # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf
--- a/SPECS/qt5-qtdeclarative.spec
+++ b/SPECS/qt5-qtdeclarative.spec
@ -3,10 +3,12 @@
 # definition borrowed from qtbase
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9

+%global build_tests 1
+
 Summary: Qt5 - QtDeclarative component
 Name:    qt5-%{qt_module}
-Version: 5.11.1
-Release: 3%{?dist}
+Version: 5.12.5
+Release: 1%{?dist}

 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@ -18,7 +20,7 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod
 # https://bugzilla.redhat.com/show_bug.cgi?id=1441343
 Source5: qv4global_p-multilib.h

-Patch0: qtdeclarative-use-python3.patch
+Patch0:  qtdeclarative-python-shebang.patch

 # filter qml provides
 %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
@ -31,10 +33,9 @@ BuildRequires: qt5-rpm-macros >= %{version}
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-BuildRequires: qt5-qtxmlpatterns-devel >= %{version}
-BuildRequires: %{_bindir}/python3
+BuildRequires: python%{python3_pkgversion}

-%if 0%{?tests}
+%if 0%{?build_tests}
 BuildRequires: dbus-x11
 BuildRequires: mesa-dri-drivers
 BuildRequires: time
@ -66,21 +67,49 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %{summary}.

+%if 0%{?build_tests}
+%package tests
+Summary: Unit tests for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description tests
+%{summary}.
+%endif

 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{version}

-%patch0 -p1 -b .qtdeclarative-use-python3
+%patch0 -p1

 %build
+# HACK so calls to "python" get what we want
+ln -s %{__python3} python
+export PATH=`pwd`:$PATH
 # no shadow builds until fixed: https://bugreports.qt.io/browse/QTBUG-37417
 %qmake_qt5

 %make_build

+%if 0%{?build_tests}
+make sub-tests %{?_smp_mflags} -k ||:
+%endif
+
 %install
 %make_install INSTALL_ROOT=%{buildroot}

+%if 0%{?build_tests}
+# Install tests for gating
+mkdir -p %{buildroot}%{_qt5_libdir}/qt5
+find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -type d | while read LINE
+do
+    mkdir -p "%{buildroot}%{_qt5_libdir}/qt5/$LINE"
+done
+find ./tests -not -path '*/\.*' -not -name '*.h' -not -name '*.cpp' -not -name '*.pro' -not -name 'uic_wrapper.sh' -not -name 'Makefile' -not -name 'target_wrapper.sh' -type f | while read LINE
+do
+    cp -r --parents "$LINE" %{buildroot}%{_qt5_libdir}/qt5/
+done
+%endif
+
 %ifarch %{multilib_archs}
 # multilib: qv4global_p.h
  mv %{buildroot}%{_qt5_headerdir}/QtQml/%{version}/QtQml/private/qv4global_p.h \
@ -143,6 +172,7 @@ make check -k -C tests ||:
 %{_qt5_libdir}/libQt5Quick.so.5*
 %{_qt5_libdir}/libQt5QuickWidgets.so.5*
 %{_qt5_libdir}/libQt5QuickParticles.so.5*
+%{_qt5_libdir}/libQt5QuickShapes.so.5*
 %{_qt5_libdir}/libQt5QuickTest.so.5*
 %{_qt5_plugindir}/qmltooling/
 %{_qt5_archdatadir}/qml/
@ -174,8 +204,16 @@ make check -k -C tests ||:
 %files examples
 %{_qt5_examplesdir}/

+%if 0%{?build_tests}
+%files tests
+%{_qt5_libdir}/qt5/tests
+%endif

 %changelog
+* Tue Oct 29 2019 Jan Grulich <jgrulich@redhat.com> - 5.12-5-1
+- 5.12.5
+  Resolves: bz#1733139
+
 * Mon Dec 10 2018 Jan Grulich <jgrulich@redhat.com> - 5.11.1-3
 - Rebuild to fix CET notes
  Resolves: bz#1657232