Hello community,
here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2020-05-29 21:13:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase"
Fri May 29 21:13:53 2020 rev:106 rq:809287 version:5.15.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2020-04-29 20:42:29.499659742 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.3606/libqt5-qtbase.changes 2020-05-29 21:14:13.598487679 +0200
@@ -1,0 +2,30 @@
+Wed May 27 08:48:52 UTC 2020 - Fabian Vogt
+
+- Add patch to avoid behaviour change causing crashes (kde#419526):
+ * 0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch
+
+-------------------------------------------------------------------
+Tue May 26 09:44:55 UTC 2020 - Callum Farmer
+
+- Update to 5.15.0:
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 20 15:38:18 UTC 2020 - Callum Farmer
+
+- Update to 5.15.0-rc2
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed May 6 11:26:35 UTC 2020 - Fabian Vogt
+
+- Update to 5.15.0-rc:
+ * New bugfix release
+ * For the changes between 5.14.2 and 5.15.0 please see:
+ http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.15.0/?h=5.15.0
+- Drop patches, now upstream:
+ * 0001-QTextMarkdownImporter-fix-use-after-free-add-fuzz-ge.patch
+- Add patch to fix build on Leap 15.1:
+ * fix-build-openssl-1.1.0.patch
+
+-------------------------------------------------------------------
@@ -5,0 +36,44 @@
+
+-------------------------------------------------------------------
+Fri Apr 24 07:11:04 UTC 2020 - Fabian Vogt
+
+- Update to 5.15.0-beta4:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Tue Apr 14 06:47:19 UTC 2020 - Fabian Vogt
+
+- Update to 5.15.0-beta3:
+ * New bugfix release
+ * No changelog available
+- Add patch to fix build on Leap 15.1:
+ * 0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
+
+-------------------------------------------------------------------
+Tue Mar 24 12:13:29 UTC 2020 - Fabian Vogt
+
+- Update to 5.15.0-beta2:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Fri Feb 28 09:58:42 UTC 2020 - Fabian Vogt
+
+- Update to 5.15.0-beta1:
+ * New bugfix release
+ * No changelog available
+
+-------------------------------------------------------------------
+Wed Feb 19 10:16:14 UTC 2020 - Fabian Vogt
+
+- Update to 5.15.0-alpha:
+ * New feature release
+ * For more details please see:
+ https://wiki.qt.io/New_Features_in_Qt_5.15
+- Replace patches with single patch
+ 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch:
+ * 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch
+ * 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch:
+ * 0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
+- Refresh 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
Old:
----
0001-QTextMarkdownImporter-fix-use-after-free-add-fuzz-ge.patch
0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch
0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch
0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
qtbase-everywhere-src-5.14.1.tar.xz
New:
----
0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch
fix-build-openssl-1.1.0.patch
qtbase-everywhere-src-5.15.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtbase.spec ++++++
--- /var/tmp/diff_new_pack.GqngZd/_old 2020-05-29 21:14:17.030498023 +0200
+++ /var/tmp/diff_new_pack.GqngZd/_new 2020-05-29 21:14:17.034498035 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libqt5-qtbase
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# 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/
#
@@ -36,23 +36,26 @@
%endif
Name: libqt5-qtbase
-Version: 5.14.1
+Version: 5.15.0
Release: 0
Summary: C++ Program Library, Core Components
License: LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1
Group: System/Libraries
Url: https://www.qt.io
%define base_name libqt5
-%define real_version 5.14.1
-%define so_version 5.14.1
-%define tar_version qtbase-everywhere-src-5.14.1
-Source: https://download.qt.io/official_releases/qt/5.14/%{real_version}/submodules/%{tar_version}.tar.xz
+%define real_version 5.15.0
+%define so_version 5.15.0
+%define tar_version qtbase-everywhere-src-5.15.0
+Source: https://download.qt.io/official_releases/qt/5.15/%{real_version}/submodules/%{tar_version}.tar.xz
# to get mtime of file:
Source1: libqt5-qtbase.changes
Source2: macros.qt5
Source3: baselibs.conf
Source99: libqt5-qtbase-rpmlintrc
# patches 0-1000 are openSUSE and/or non-upstream(able) patches #
+Patch1: 0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch
+Patch2: fix-build-openssl-1.1.0.patch
+Patch3: 0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch
# PATCH-FIX-OPENSUSE disable-rc4-ciphers-bnc865241.diff bnc#865241-- Exclude rc4 ciphers from being used by default
Patch6: disable-rc4-ciphers-bnc865241.diff
Patch8: tell-the-truth-about-private-api.patch
@@ -61,12 +64,9 @@
# PATCH-FEATURE-OPENSUSE 0001-Add-remote-print-queue-support.patch fate#322052 -- Automatically recognize and allow printing to remote cups servers
Patch12: 0001-Add-remote-print-queue-support.patch
# PATCH-FIX-OPENSUSE
-Patch21: 0001-Revert-Blacklist-nouveau-and-llvmpipe-for-multithrea.patch
-Patch22: 0002-Revert-qtlite-Fix-build-libs-with-no-feature-regular.patch
-Patch23: 0003-Revert-White-list-more-recent-Mesa-version-for-multi.patch
+Patch21: 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch
Patch24: fix-fixqt4headers.patch
# patches 1000-2000 and above from upstream 5.14 branch #
-Patch1000: 0001-QTextMarkdownImporter-fix-use-after-free-add-fuzz-ge.patch
# patches 2000-3000 and above from upstream 5.15/dev branch #
# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/255384
Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch
@@ -868,7 +868,8 @@
-no-separate-debug-info \
-force-debug-info \
-shared \
- -xkb \
+ -xkbcommon \
+ -no-bundled-xcb-xinput \
-dbus-linked \
-sm \
-no-rpath \
@@ -1059,6 +1060,8 @@
%{libqt5_libdir}/cmake/Qt5/
%{libqt5_libdir}/pkgconfig/Qt5Core.pc
%{libqt5_includedir}/QtCore/
+%dir %{libqt5_libdir}/metatypes/
+%{libqt5_libdir}/metatypes/qt5core_metatypes.json
%exclude %{libqt5_includedir}/QtCore/%{so_version}
%{libqt5_docdir}
@@ -1186,6 +1189,7 @@
%{libqt5_libdir}/cmake/Qt5Widgets/
%{libqt5_libdir}/pkgconfig/Qt5Widgets.pc
%{libqt5_includedir}/QtWidgets/
+%{libqt5_libdir}/metatypes/qt5widgets_metatypes.json
%exclude %{libqt5_includedir}/QtWidgets/%{so_version}
%files -n libQt5Gui5
@@ -1238,6 +1242,7 @@
%{libqt5_includedir}/QtGui/
%{libqt5_includedir}/QtEglFSDeviceIntegration/
%{libqt5_includedir}/QtXkbCommonSupport
+%{libqt5_libdir}/metatypes/qt5gui_metatypes.json
%exclude %{libqt5_includedir}/QtGui/%{so_version}
%exclude %{libqt5_includedir}/QtEglFSDeviceIntegration/%{so_version}
%exclude %{libqt5_includedir}/QtXkbCommonSupport/%{so_version}
++++++ 0001-Don-t-white-list-recent-Mesa-versions-for-multithrea.patch ++++++
From 8a053986b4c43a133f6824f839bd78a476d183e3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Wed, 19 Feb 2020 11:42:06 +0100
Subject: [PATCH] Don't white-list recent Mesa versions for multithreading
It's not stable.
---
.../gl_integrations/xcb_glx/qglxintegration.cpp | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
index 75189a9c80..e328ea2d4b 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -764,22 +764,6 @@ void QGLXContext::queryDummyContext()
m_supportsThreading = false;
}
- if (mesaVersionStr) {
- // The issue was fixed in Xcb 1.11, but we can't check for that
- // at runtime, so instead assume it fixed with recent Mesa versions
- // released several years after the Xcb fix.
-#if QT_CONFIG(regularexpression)
- QRegularExpression versionTest(QStringLiteral("Mesa (\\d+)"));
- QRegularExpressionMatch result = versionTest.match(QString::fromLatin1(mesaVersionStr));
- int versionNr = 0;
- if (result.hasMatch())
- versionNr = result.captured(1).toInt();
- if (versionNr >= 17) {
- // White-listed
- m_supportsThreading = true;
- }
-#endif
- }
if (!m_supportsThreading) {
qCDebug(lcQpaGl).nospace() << "Multithreaded OpenGL disabled: "
"blacklisted vendor \"Mesa Project\"";
--
2.23.0
++++++ 0001-Lower-required-version-of-OpenSSL-to-1.1.0.patch ++++++
From 5fbcd6b8f1635916c0a2669649d3c96312b54288 Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Tue, 14 Apr 2020 11:33:23 +0200
Subject: [PATCH] Lower required version of OpenSSL to 1.1.0
SLE 15 until SP2 (so Leap < 15.2) ships 1.1.0 which won't get upgraded.
---
src/network/configure.json | 4 ++--
src/network/ssl/qsslsocket_openssl.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/network/configure.json b/src/network/configure.json
index 289d84fbb4..c414e729d7 100644
--- a/src/network/configure.json
+++ b/src/network/configure.json
@@ -61,8 +61,8 @@
"export": "openssl",
"test": {
"tail": [
- "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10101000L",
- "# error OpenSSL >= 1.1.1 is required",
+ "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L",
+ "# error OpenSSL >= 1.1.0 is required",
"#endif",
"#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)",
"# error OpenSSL was reported as >= 1.1.1 but is missing required features, possibly it's libressl which is unsupported",
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 9b28d52e21..daddea1feb 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -1943,8 +1943,8 @@ bool QSslSocketPrivate::ensureLibraryLoaded()
if (q_OPENSSL_init_ssl(0, nullptr) != 1)
return false;
- if (q_OpenSSL_version_num() < 0x10101000L) {
- qCWarning(lcSsl, "QSslSocket: OpenSSL >= 1.1.1 is required; %s was found instead", q_OpenSSL_version(OPENSSL_VERSION));
+ if (q_OpenSSL_version_num() < 0x10100000L) {
+ qCWarning(lcSsl, "QSslSocket: OpenSSL >= 1.1.0 is required; %s was found instead", q_OpenSSL_version(OPENSSL_VERSION));
return false;
}
--
2.25.1
++++++ 0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch ++++++
From 9928d66764337494d0e99208a3418fcd01ac3e66 Mon Sep 17 00:00:00 2001
From: Fabian Vogt
Date: Wed, 27 May 2020 10:48:45 +0200
Subject: [PATCH] Revert "QMenu: hide when a QWidgetAction fires the trigged
signal"
This reverts commit b4669b919048c1dbdac2b3e9b2e79f3d023aa078.
---
src/widgets/widgets/qmenu.cpp | 9 +--
.../auto/widgets/widgets/qmenu/tst_qmenu.cpp | 79 -------------------
2 files changed, 4 insertions(+), 84 deletions(-)
diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp
index 865e3b2fb6..2878344f07 100644
--- a/src/widgets/widgets/qmenu.cpp
+++ b/src/widgets/widgets/qmenu.cpp
@@ -1470,9 +1470,6 @@ void QMenuPrivate::_q_actionTriggered()
}
}
activateCausedStack(list, action, QAction::Trigger, false);
- // if a widget action fires, we need to hide the menu explicitly
- if (qobject_cast(action))
- hideUpToMenuBar();
}
}
}
@@ -1640,8 +1637,10 @@ void QMenu::initStyleOption(QStyleOptionMenuItem *option, const QAction *action)
Widgets can be inserted into menus with the QWidgetAction class.
Instances of this class are used to hold widgets, and are inserted
- into menus with the addAction() overload that takes a QAction. If the
- QWidgetAction fires the triggered() signal, the menu will close.
+ into menus with the addAction() overload that takes a QAction.
+
+ Conversely, actions can be added to widgets with the addAction(),
+ addActions() and insertAction() functions.
\warning To make QMenu visible on the screen, exec() or popup() should be
used instead of show().
diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index 5a24995caf..22494f3d24 100644
--- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
@@ -116,7 +116,6 @@ private slots:
void QTBUG20403_nested_popup_on_shortcut_trigger();
void QTBUG47515_widgetActionEnterLeave();
void QTBUG8122_widgetActionCrashOnClose();
- void widgetActionTriggerClosesMenu();
void QTBUG_10735_crashWithDialog();
#ifdef Q_OS_MAC
@@ -1408,84 +1407,6 @@ void tst_QMenu::QTBUG8122_widgetActionCrashOnClose()
QTRY_VERIFY(menu->isHidden());
}
-/*!
- Test that a QWidgetAction that fires closes the menus that it is in.
-*/
-void tst_QMenu::widgetActionTriggerClosesMenu()
-{
- class ButtonAction : public QWidgetAction
- {
- public:
- ButtonAction()
- : QWidgetAction(nullptr)
- {}
-
- void click()
- {
- if (pushButton)
- pushButton->click();
- }
-
- protected:
- QWidget *createWidget(QWidget *parent)
- {
- QPushButton *button = new QPushButton(QLatin1String("Button"), parent);
- connect(button, &QPushButton::clicked, this, &QAction::trigger);
-
- if (!pushButton)
- pushButton = button;
- return button;
- }
-
- private:
- QPointer<QPushButton> pushButton;
- };
-
- QMenu menu;
- QMenu submenu;
-
- int menuTriggeredCount = 0;
- int menuAboutToHideCount = 0;
- QAction *actionTriggered = nullptr;
-
- connect(&menu, &QMenu::triggered, this, [&](QAction *action){
- ++menuTriggeredCount;
- actionTriggered = action;
- });
- connect (&menu, &QMenu::aboutToHide, this, [&](){
- ++menuAboutToHideCount;
- });
-
- QAction regularAction(QLatin1String("Action"));
- ButtonAction widgetAction;
-
- submenu.addAction(®ularAction);
- submenu.addAction(&widgetAction);
-
- menu.addMenu(&submenu);
- menu.addAction(®ularAction);
- menu.addAction(&widgetAction);
-
- menu.popup(QPoint(200,200));
- submenu.popup(QPoint(250,250));
- if (!QTest::qWaitForWindowExposed(&menu) || !QTest::qWaitForWindowExposed(&submenu))
- QSKIP("Failed to show menus, aborting test");
-
- regularAction.trigger();
- QVERIFY(menu.isVisible());
- QVERIFY(submenu.isVisible());
- QCOMPARE(menuTriggeredCount, 1);
- QCOMPARE(actionTriggered, ®ularAction);
- menuTriggeredCount = 0;
- actionTriggered = nullptr;
-
- widgetAction.click();
- QVERIFY(!menu.isVisible());
- QVERIFY(!submenu.isVisible());
- QCOMPARE(menuTriggeredCount, 1);
- QCOMPARE(menuAboutToHideCount, 1);
- QCOMPARE(actionTriggered, &widgetAction);
-}
class MyMenu : public QMenu
{
--
2.25.1
++++++ 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch ++++++
--- /var/tmp/diff_new_pack.GqngZd/_old 2020-05-29 21:14:17.070498144 +0200
+++ /var/tmp/diff_new_pack.GqngZd/_new 2020-05-29 21:14:17.070498144 +0200
@@ -22,11 +22,11 @@
src/widgets/kernel/qwidgetwindow.cpp | 12 ++++++++++++
1 file changed, 12 insertions(+)
-diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp
-index fbc71cd0ea..729a7f701a 100644
---- a/src/widgets/kernel/qwidgetwindow.cpp
-+++ b/src/widgets/kernel/qwidgetwindow.cpp
-@@ -1051,6 +1051,18 @@ void QWidgetWindow::handleTabletEvent(QTabletEvent *event)
+Index: qtbase-everywhere-src-5.15.0-alpha/src/widgets/kernel/qwidgetwindow.cpp
+===================================================================
+--- qtbase-everywhere-src-5.15.0-alpha.orig/src/widgets/kernel/qwidgetwindow.cpp
++++ qtbase-everywhere-src-5.15.0-alpha/src/widgets/kernel/qwidgetwindow.cpp
+@@ -1075,6 +1075,18 @@ void QWidgetWindow::handleTabletEvent(QT
event->setAccepted(ev.isAccepted());
}
@@ -43,8 +43,5 @@
+ }
+
if (event->type() == QEvent::TabletRelease && event->buttons() == Qt::NoButton)
- qt_tablet_target = 0;
+ qt_tablet_target = nullptr;
}
---
-2.21.0
-
++++++ fix-build-openssl-1.1.0.patch ++++++
From: Fabian Vogt
Subject: Fix build against OpenSSL 1.1.0
Leap 15.1 still has it and we can't switch away without breaking the world.
Index: qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols.cpp
===================================================================
--- qtbase-everywhere-src-5.15.0-rc.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -373,7 +373,7 @@ DEFINEFUNC3(void, SSL_set_bio, SSL *a, a
DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(void, SSL_set_connect_state, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(int, SSL_shutdown, SSL *a, a, return -1, return)
-DEFINEFUNC(int, SSL_in_init, const SSL *a, a, return 0, return)
+DEFINEFUNC(int, SSL_in_init, SSL *a, a, return 0, return)
DEFINEFUNC(int, SSL_get_shutdown, const SSL *ssl, ssl, return 0, return)
DEFINEFUNC2(int, SSL_set_session, SSL* to, to, SSL_SESSION *session, session, return -1, return)
DEFINEFUNC(void, SSL_SESSION_free, SSL_SESSION *ses, ses, return, DUMMYARG)
Index: qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols_p.h
===================================================================
--- qtbase-everywhere-src-5.15.0-rc.orig/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ qtbase-everywhere-src-5.15.0-rc/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -516,7 +516,7 @@ void q_SSL_set_bio(SSL *a, BIO *b, BIO *
void q_SSL_set_accept_state(SSL *a);
void q_SSL_set_connect_state(SSL *a);
int q_SSL_shutdown(SSL *a);
-int q_SSL_in_init(const SSL *s);
+int q_SSL_in_init(SSL *s);
int q_SSL_get_shutdown(const SSL *ssl);
int q_SSL_set_session(SSL *to, SSL_SESSION *session);
void q_SSL_SESSION_free(SSL_SESSION *ses);
++++++ qtbase-everywhere-src-5.14.1.tar.xz -> qtbase-everywhere-src-5.15.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-everywhere-src-5.14.1.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.3606/qtbase-everywhere-src-5.15.0.tar.xz differ: char 25, line 1