Accepting request 877995 from KDE:Qt:6.0
Qt 6.0.2 OBS-URL: https://build.opensuse.org/request/show/877995 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/qt6-base?expand=0&rev=3
This commit is contained in:
Git OBS Bridge
commit
047e84272a
@ -1,103 +0,0 @@
|
||||
From 0189d88d3472fd32deaeeb53359716086afea679 Mon Sep 17 00:00:00 2001
|
||||
From: Alexandru Croitor <alexandru.croitor@qt.io>
|
||||
Date: Mon, 30 Nov 2020 16:54:17 +0100
|
||||
Subject: [PATCH] CMake: Fix conditions for some subarch features
|
||||
|
||||
The AES and SHA features were checking for the wrong TEST_subarch_foo
|
||||
variables.
|
||||
|
||||
Pick-to: 6.0
|
||||
Task-number: QTBUG-87376
|
||||
Change-Id: I46cd14d98832529aebac22cfcb01180330c5e091
|
||||
---
|
||||
.prev_configure.cmake | 6 +++---
|
||||
configure.cmake | 6 +++---
|
||||
util/cmake/configurejson2cmake.py | 6 +++---
|
||||
3 files changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/.prev_configure.cmake b/.prev_configure.cmake
|
||||
index 3390c85588..0e476eea01 100644
|
||||
--- a/.prev_configure.cmake
|
||||
+++ b/.prev_configure.cmake
|
||||
@@ -761,13 +761,13 @@ qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1")
|
||||
qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("aesni"
|
||||
LABEL "AES"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_aesni
|
||||
)
|
||||
qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1")
|
||||
qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("rdrnd"
|
||||
LABEL "RDRAND"
|
||||
- CONDITION TEST_subarch_rdseed
|
||||
+ CONDITION TEST_subarch_rdrnd
|
||||
)
|
||||
qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
|
||||
qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG)
|
||||
@@ -779,7 +779,7 @@ qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1")
|
||||
qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("shani"
|
||||
LABEL "SHA"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_shani
|
||||
)
|
||||
qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1")
|
||||
qt_feature_config("shani" QMAKE_PRIVATE_CONFIG)
|
||||
diff --git a/configure.cmake b/configure.cmake
|
||||
index 0aceaaf905..d65341aa1a 100644
|
||||
--- a/configure.cmake
|
||||
+++ b/configure.cmake
|
||||
@@ -774,13 +774,13 @@ qt_feature_definition("avx512vbmi" "QT_COMPILER_SUPPORTS_AVX512VBMI" VALUE "1")
|
||||
qt_feature_config("avx512vbmi" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("aesni"
|
||||
LABEL "AES"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_aes
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_aesni
|
||||
)
|
||||
qt_feature_definition("aesni" "QT_COMPILER_SUPPORTS_AES" VALUE "1")
|
||||
qt_feature_config("aesni" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("rdrnd"
|
||||
LABEL "RDRAND"
|
||||
- CONDITION TEST_subarch_rdseed
|
||||
+ CONDITION TEST_subarch_rdrnd
|
||||
)
|
||||
qt_feature_definition("rdrnd" "QT_COMPILER_SUPPORTS_RDRND" VALUE "1")
|
||||
qt_feature_config("rdrnd" QMAKE_PRIVATE_CONFIG)
|
||||
@@ -792,7 +792,7 @@ qt_feature_definition("rdseed" "QT_COMPILER_SUPPORTS_RDSEED" VALUE "1")
|
||||
qt_feature_config("rdseed" QMAKE_PRIVATE_CONFIG)
|
||||
qt_feature("shani"
|
||||
LABEL "SHA"
|
||||
- CONDITION QT_FEATURE_sse2 AND TEST_subarch_sha
|
||||
+ CONDITION QT_FEATURE_sse2 AND TEST_subarch_shani
|
||||
)
|
||||
qt_feature_definition("shani" "QT_COMPILER_SUPPORTS_SHA" VALUE "1")
|
||||
qt_feature_config("shani" QMAKE_PRIVATE_CONFIG)
|
||||
diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py
|
||||
index 7d7984b574..15dc067f26 100755
|
||||
--- a/util/cmake/configurejson2cmake.py
|
||||
+++ b/util/cmake/configurejson2cmake.py
|
||||
@@ -60,7 +60,7 @@ def map_tests(test: str) -> Optional[str]:
|
||||
"c99": "c_std_99 IN_LIST CMAKE_C_COMPILE_FEATURES",
|
||||
"c11": "c_std_11 IN_LIST CMAKE_C_COMPILE_FEATURES",
|
||||
"x86SimdAlways": "ON", # FIXME: Make this actually do a compile test.
|
||||
- "aesni": "TEST_subarch_aes",
|
||||
+ "aesni": "TEST_subarch_aesni",
|
||||
"avx": "TEST_subarch_avx",
|
||||
"avx2": "TEST_subarch_avx2",
|
||||
"avx512f": "TEST_subarch_avx512f",
|
||||
@@ -99,9 +99,9 @@ def map_tests(test: str) -> Optional[str]:
|
||||
"pdpid": "TEST_subarch_rdpid",
|
||||
"rdpid": "TEST_subarch_rdpid",
|
||||
"rdseed": "TEST_subarch_rdseed",
|
||||
- "rdrnd": "TEST_subarch_rdseed", # FIXME: Is this the right thing?
|
||||
+ "rdrnd": "TEST_subarch_rdrnd",
|
||||
"rtm": "TEST_subarch_rtm",
|
||||
- "shani": "TEST_subarch_sha",
|
||||
+ "shani": "TEST_subarch_shani",
|
||||
"shstk": "TEST_subarch_shstk",
|
||||
"sse2": "TEST_subarch_sse2",
|
||||
"sse3": "TEST_subarch_sse3",
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 72eee71d1693fc971fa4114e7df7642e5ea9c50f Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Mon, 30 Nov 2020 10:01:51 +0100
|
||||
Subject: [PATCH] CMake: strip the executable bit from
|
||||
qt-cmake-private-install.cmake
|
||||
|
||||
Despite being installed in the the binary directory, this
|
||||
CMake snippet cannot be executed.
|
||||
|
||||
Pick-to: 6.0
|
||||
Change-Id: Ibfd31e51184f0688d19ac063804cc200c95555a7
|
||||
---
|
||||
bin/qt-cmake-standalone-test.in | 0
|
||||
cmake/QtWrapperScriptHelpers.cmake | 2 +-
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
mode change 100755 => 100644 bin/qt-cmake-standalone-test.in
|
||||
|
||||
diff --git a/bin/qt-cmake-standalone-test.in b/bin/qt-cmake-standalone-test.in
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
diff --git a/cmake/QtWrapperScriptHelpers.cmake b/cmake/QtWrapperScriptHelpers.cmake
|
||||
index 63cb770131..803ed676ad 100644
|
||||
--- a/cmake/QtWrapperScriptHelpers.cmake
|
||||
+++ b/cmake/QtWrapperScriptHelpers.cmake
|
||||
@@ -121,7 +121,7 @@ function(qt_internal_create_wrapper_scripts)
|
||||
endif()
|
||||
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bin/${__qt_cmake_install_script_name}.in"
|
||||
"${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}" @ONLY)
|
||||
- qt_install(PROGRAMS "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
|
||||
+ qt_install(FILES "${QT_BUILD_DIR}/${INSTALL_BINDIR}/${__qt_cmake_install_script_name}"
|
||||
DESTINATION "${INSTALL_BINDIR}")
|
||||
|
||||
qt_internal_create_qt_configure_tests_wrapper_script()
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,124 +0,0 @@
|
||||
From 15b43b5ded62ad76776d69bc64ce2679ddfa8eb8 Mon Sep 17 00:00:00 2001
|
||||
From: Mårten Nordheim <marten.nordheim@qt.io>
|
||||
Date: Tue, 08 Dec 2020 15:47:47 +0100
|
||||
Subject: [PATCH] QCache: fix updating entries breaking the internal chain
|
||||
|
||||
After f08492c6fd9818c7d80b1725355453e179b4d85b was
|
||||
merged this bug would manifest as an entry appearing twice
|
||||
in the chain when a updating an existing entry (insert with
|
||||
an existing key). This could sometimes result in crashes later
|
||||
as the list filled up and the list was used in trim() to remove
|
||||
various entries.
|
||||
|
||||
Fixes: QTBUG-89176
|
||||
Pick-to: 6.0
|
||||
Change-Id: Ide80160fb4317dc0aefe79eec5dce7ec6813e790
|
||||
---
|
||||
|
||||
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
|
||||
index 74784af..41cf9ab 100644
|
||||
--- a/src/corelib/tools/qcache.h
|
||||
+++ b/src/corelib/tools/qcache.h
|
||||
@@ -247,14 +247,15 @@
|
||||
if (result.initialized) {
|
||||
cost -= n->value.cost;
|
||||
result.it.node()->emplace(object, cost);
|
||||
+ relink(key);
|
||||
} else {
|
||||
Node::createInPlace(n, key, object, cost);
|
||||
+ n->prev = &chain;
|
||||
+ n->next = chain.next;
|
||||
+ chain.next->prev = n;
|
||||
+ chain.next = n;
|
||||
}
|
||||
total += cost;
|
||||
- n->prev = &chain;
|
||||
- n->next = chain.next;
|
||||
- chain.next->prev = n;
|
||||
- chain.next = n;
|
||||
return true;
|
||||
}
|
||||
T *object(const Key &key) const noexcept
|
||||
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
|
||||
index b3d6844..8361470 100644
|
||||
--- a/src/network/kernel/qhostinfo.cpp
|
||||
+++ b/src/network/kernel/qhostinfo.cpp
|
||||
@@ -916,7 +916,7 @@
|
||||
QObject::connect(QCoreApplication::instance(), &QObject::destroyed,
|
||||
&threadPool, [&](QObject *) { threadPool.waitForDone(); },
|
||||
Qt::DirectConnection);
|
||||
- threadPool.setMaxThreadCount(20); // do up to 20 DNS lookups in parallel
|
||||
+ threadPool.setMaxThreadCount(100); // do up to 20 DNS lookups in parallel
|
||||
#endif
|
||||
}
|
||||
|
||||
diff --git a/tests/auto/corelib/tools/qcache/tst_qcache.cpp b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
|
||||
index f122e45..2d1ca0a 100644
|
||||
--- a/tests/auto/corelib/tools/qcache/tst_qcache.cpp
|
||||
+++ b/tests/auto/corelib/tools/qcache/tst_qcache.cpp
|
||||
@@ -48,6 +48,7 @@
|
||||
void take();
|
||||
void axioms_on_key_type();
|
||||
void largeCache();
|
||||
+ void internalChainHasFullOrder();
|
||||
};
|
||||
|
||||
|
||||
@@ -414,5 +415,18 @@
|
||||
QVERIFY(cache.size() == 0);
|
||||
}
|
||||
|
||||
+// The internal chain could lose track of some objects.
|
||||
+// Make sure it doesn't happen again.
|
||||
+void tst_QCache::internalChainHasFullOrder()
|
||||
+{
|
||||
+ QCache<QString, int> cache;
|
||||
+ cache.setMaxCost(20);
|
||||
+ cache.insert(QString::number(1), new int, 1);
|
||||
+ cache.insert(QString::number(2), new int, 1);
|
||||
+ cache.insert(QString::number(1), new int, 1);
|
||||
+ cache.setMaxCost(0);
|
||||
+ QCOMPARE(cache.size(), 0);
|
||||
+}
|
||||
+
|
||||
QTEST_APPLESS_MAIN(tst_QCache)
|
||||
#include "tst_qcache.moc"
|
||||
diff --git a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
|
||||
index 5390433..e895e94 100644
|
||||
--- a/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
|
||||
+++ b/tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
|
||||
@@ -106,6 +106,8 @@
|
||||
void cache();
|
||||
|
||||
void abortHostLookup();
|
||||
+
|
||||
+ void manylookup();
|
||||
protected slots:
|
||||
void resultsReady(const QHostInfo &);
|
||||
|
||||
@@ -731,5 +733,25 @@
|
||||
int id;
|
||||
};
|
||||
|
||||
+#include <QNetworkReply>
|
||||
+void tst_QHostInfo::manylookup()
|
||||
+{
|
||||
+ QNetworkAccessManager manager;
|
||||
+ auto reply = manager.get(QNetworkRequest(QUrl("https://raw.githubusercontent.com/opendns/public-domain-lists/master/opendns-top-domains.txt")));
|
||||
+ QTRY_VERIFY(reply->isFinished());
|
||||
+ auto domains = reply->readAll().split('\n');
|
||||
+ QTestEventLoop loop;
|
||||
+ int done = 0;
|
||||
+ for (int i = 0; i < domains.length(); ++i) {
|
||||
+ QHostInfo::lookupHost(QString::fromLatin1(domains[i]), &loop,
|
||||
+ [&done, &loop](const QHostInfo &h) {
|
||||
+ if (++done == 100)
|
||||
+ loop.exitLoop();
|
||||
+ });
|
||||
+ }
|
||||
+ loop.enterLoop(5000);
|
||||
+ QVERIFY(!loop.timeout());
|
||||
+}
|
||||
+
|
||||
QTEST_MAIN(tst_QHostInfo)
|
||||
#include "tst_qhostinfo.moc"
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 5 09:31:18 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.2:
|
||||
https://www.qt.io/blog/qt-6.0.2-released
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 16:54:58 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 6.0.1
|
||||
https://www.qt.io/blog/qt-6.0.1-released
|
||||
- Drop patches:
|
||||
* 0001-Fix-QCache-Crash.patch
|
||||
* 0001-CMake-Fix-conditions-for-some-subarch-features.patch
|
||||
* 0001-CMake-strip-the-executable-bit-from-qt-cmake-private.patch
|
||||
- Enable ltcg where possible.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Jan 23 20:24:22 UTC 2021 - Mykola Krachkovsky <w01dnick@gmail.com>
|
||||
|
||||
|
||||
@ -16,13 +16,12 @@
|
||||
#
|
||||
|
||||
|
||||
%define real_version 6.0.0
|
||||
%define real_version 6.0.2
|
||||
%define short_version 6.0
|
||||
%define tar_name qtbase-everywhere-src
|
||||
%define tar_suffix %{nil}
|
||||
#
|
||||
%global qt6_flavor @BUILD_FLAVOR@%{nil}
|
||||
# TODO replace with a ternary operator when rpm 4.16 is available
|
||||
%if "%{qt6_flavor}" == "docs"
|
||||
%define pkg_suffix -docs
|
||||
%endif
|
||||
@ -31,17 +30,14 @@
|
||||
%global with_gles 1
|
||||
%endif
|
||||
Name: qt6-base%{?pkg_suffix}
|
||||
Version: 6.0.0
|
||||
Version: 6.0.2
|
||||
Release: 0
|
||||
Summary: C++ program library, core components
|
||||
Summary: Qt 6 core components (Core, Gui, Widgets, Network...)
|
||||
License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only
|
||||
URL: https://www.qt.io
|
||||
Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz
|
||||
Source99: qt6-base-rpmlintrc
|
||||
# Patches 0-100 are upstream patches #
|
||||
Patch0: 0001-CMake-strip-the-executable-bit-from-qt-cmake-private.patch
|
||||
Patch1: 0001-CMake-Fix-conditions-for-some-subarch-features.patch
|
||||
Patch2: 0001-Fix-QCache-Crash.patch
|
||||
# Patches 100-200 are openSUSE and/or non-upstream(able) patches #
|
||||
Patch100: fix-fixqt4headers.patch
|
||||
Patch101: 0001-Tell-the-truth-about-private-API.patch
|
||||
@ -686,7 +682,11 @@ EOF
|
||||
%build
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
# NOTE: ltcg causes linker errors on ppc64
|
||||
%cmake_qt6 \
|
||||
%ifnarch ppc64
|
||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
||||
%endif
|
||||
-DQT_FEATURE_journald=ON \
|
||||
-DQT_FEATURE_libproxy=ON \
|
||||
-DQT_FEATURE_openssl_linked=ON \
|
||||
@ -745,6 +745,10 @@ rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_eglfs_kms_support_private.pri
|
||||
rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_openglwidgets_private.pri
|
||||
rm %{buildroot}%{_qt6_mkspecsdir}/modules/qt_lib_xcb_qpa_lib_private.pri
|
||||
|
||||
# These files are only useful for the Qt continuous integration
|
||||
rm %{buildroot}%{_qt6_libexecdir}/ensure_pro_file.cmake
|
||||
rm %{buildroot}%{_qt6_libexecdir}/android_*.sh
|
||||
|
||||
# This is only for Apple platforms and has a python2 dep
|
||||
rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
|
||||
|
||||
@ -827,7 +831,6 @@ rm -r %{buildroot}%{_qt6_mkspecsdir}/features/uikit
|
||||
%{_qt6_bindir}/uic
|
||||
%{_qt6_cmakedir}/Qt6/
|
||||
%{_qt6_cmakedir}/Qt6BuildInternals/Qt6BuildInternalsConfig.cmake
|
||||
%{_qt6_cmakedir}/Qt6BuildInternals/QtBuildInternalsAndroid.cmake
|
||||
%{_qt6_cmakedir}/Qt6BuildInternals/QtBuildInternalsExtra.cmake
|
||||
%{_qt6_cmakedir}/Qt6BuildInternals/QtStandaloneTestTemplateProject/
|
||||
%{_qt6_cmakedir}/Qt6BuildInternals/StandaloneTests/QtBaseTestsConfig.cmake
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ae227180272d199cbb15318e3353716afada5c57fd5185b812ae26912c958656
|
||||
size 46234820
|
||||
3
qtbase-everywhere-src-6.0.2.tar.xz
Normal file
3
qtbase-everywhere-src-6.0.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:991a0e4e123104e76563067fcfa58602050c03aba8c8bb0c6198347c707817f1
|
||||
size 46265472
|
||||
Loading…
x
Reference in New Issue
Block a user