From 1e1e1a120b8fa08e6c88671039fb49367e8780be9ec38f48d2d011677989a578 Mon Sep 17 00:00:00 2001 From: Christophe Marin Date: Mon, 3 Apr 2023 11:47:41 +0000 Subject: [PATCH] Accepting request 1076895 from home:Vogtinator:qt5.15 - Update to version 5.15.8+kde185: * QFSFileEngine: fix overflow bug when using lseek64 * Add QImage null check when QOpenGLTexture converts - Add patch to fix return key handling in QGroupBox on GNOME (bsc#1209364): * 0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch OBS-URL: https://build.opensuse.org/request/show/1076895 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtbase?expand=0&rev=47 --- ...me-Allow-Space-Return-Enter-and-Sele.patch | 30 +++++++++++++++++++ _servicedata | 2 +- libqt5-qtbase.changes | 9 ++++++ libqt5-qtbase.spec | 3 +- qtbase-everywhere-src-5.15.8+kde183.obscpio | 3 -- qtbase-everywhere-src-5.15.8+kde185.obscpio | 3 ++ qtbase-everywhere-src.obsinfo | 6 ++-- 7 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch delete mode 100644 qtbase-everywhere-src-5.15.8+kde183.obscpio create mode 100644 qtbase-everywhere-src-5.15.8+kde185.obscpio diff --git a/0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch b/0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch new file mode 100644 index 0000000..08856ba --- /dev/null +++ b/0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch @@ -0,0 +1,30 @@ +From c9b74bceb38b662c1e112611b45e389e9d38b22b Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Mon, 3 Apr 2023 12:45:02 +0200 +Subject: [PATCH] Revert "QGnomeTheme: Allow Space, Return, Enter and Select to + press buttons" + +Workaround for https://bugreports.qt.io/browse/QTBUG-112523 + +This reverts commit f2eab01eb9f95f9eebc10bbe96e6c4810cd654b1. +--- + src/platformsupport/themes/genericunix/qgenericunixthemes.cpp | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +index 6e01af052c..cb1b39db64 100644 +--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp ++++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp +@@ -755,9 +755,6 @@ QVariant QGnomeTheme::themeHint(QPlatformTheme::ThemeHint hint) const + return QVariant(QChar(0x2022)); + case QPlatformTheme::UiEffects: + return QVariant(int(HoverEffect)); +- case QPlatformTheme::ButtonPressKeys: +- return QVariant::fromValue( +- QList({ Qt::Key_Space, Qt::Key_Return, Qt::Key_Enter, Qt::Key_Select })); + default: + break; + } +-- +2.40.0 + diff --git a/_servicedata b/_servicedata index 2b942d6..8543a6c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://invent.kde.org/qt/qt/qtbase.git - 38c54b3ff58972fa16810740fc43933620b6dc0d \ No newline at end of file + 6c09620dc84900c31a2d307a8640dbc15b1fcfdd \ No newline at end of file diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index cc35091..b330d37 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Apr 03 10:48:53 UTC 2023 - Fabian Vogt + +- Update to version 5.15.8+kde185: + * QFSFileEngine: fix overflow bug when using lseek64 + * Add QImage null check when QOpenGLTexture converts +- Add patch to fix return key handling in QGroupBox on GNOME (bsc#1209364): + * 0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch + ------------------------------------------------------------------- Thu Mar 16 08:04:12 UTC 2023 - Fabian Vogt diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 8811034..0096948 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -29,7 +29,7 @@ %bcond_without harfbuzz Name: libqt5-qtbase -Version: 5.15.8+kde183 +Version: 5.15.8+kde185 Release: 0 Summary: C++ Program Library, Core Components License: LGPL-3.0-only or GPL-3.0-with-Qt-Company-Qt-exception-1.1 @@ -47,6 +47,7 @@ Source3: baselibs.conf Source4: qtlogging.ini Source99: libqt5-qtbase-rpmlintrc # patches 0-999 are openSUSE and/or non-upstream(able) patches # +Patch1: 0001-Revert-QGnomeTheme-Allow-Space-Return-Enter-and-Sele.patch Patch3: 0001-Revert-QMenu-hide-when-a-QWidgetAction-fires-the-tri.patch # Proposed: https://bugreports.qt.io/browse/QTBUG-88491 Patch4: 0001-Avoid-SIGABRT-on-platform-plugin-initialization-fail.patch diff --git a/qtbase-everywhere-src-5.15.8+kde183.obscpio b/qtbase-everywhere-src-5.15.8+kde183.obscpio deleted file mode 100644 index c365930..0000000 --- a/qtbase-everywhere-src-5.15.8+kde183.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f67b6fd6acf4d78594706823d52765f00ffedd44f8413acd7ac5abf17350e458 -size 293213198 diff --git a/qtbase-everywhere-src-5.15.8+kde185.obscpio b/qtbase-everywhere-src-5.15.8+kde185.obscpio new file mode 100644 index 0000000..5fe41ec --- /dev/null +++ b/qtbase-everywhere-src-5.15.8+kde185.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b3df7af16720f81980f057b60657dd464ddb0c0f2b87c45ea3d4a3e685c5d2b4 +size 293213198 diff --git a/qtbase-everywhere-src.obsinfo b/qtbase-everywhere-src.obsinfo index 621826d..e5c9821 100644 --- a/qtbase-everywhere-src.obsinfo +++ b/qtbase-everywhere-src.obsinfo @@ -1,4 +1,4 @@ name: qtbase-everywhere-src -version: 5.15.8+kde183 -mtime: 1678880953 -commit: 38c54b3ff58972fa16810740fc43933620b6dc0d +version: 5.15.8+kde185 +mtime: 1679710430 +commit: 6c09620dc84900c31a2d307a8640dbc15b1fcfdd