From f8de62b1dc1b8a241b45fe8eeeca3ab28ffa0fa667efdb3ea0d67abb4335866d Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Thu, 19 Sep 2019 08:36:30 +0000 Subject: [PATCH] Accepting request 731882 from home:Vogtinator:qt5.13 - Add patch to fix focus in some cases (QTBUG-77364): * 0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch - Add patches to improve OOTB experience with HiDPI (boo#1089932): - Includes fix to prevent crash with pixmap cursors on XRender-less X servers (bsc#1108889, QTBUG-66935) - Includes fix to load libGL.so.1 library if there's no libGL.so symlink (boo#1099874, QTBUG-67537) - Includes fix to allow to disable logging of XCB errors (boo#1115541, QTBUG-55167) (QT_DISABLE_PRINTER_DISCOVERY is no longer used) (fixes boo#1064872) - Add patch to fix plugin loading with newer MariaDB versions (boo#1080048): after dragging an icon on the desktop in plasma (QTBUG-66103, boo#1080044). OBS-URL: https://build.opensuse.org/request/show/731882 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.13/libqt5-qtbase?expand=0&rev=21 --- ...usProxy-adjust-focus-widget-properly.patch | 31 +++++++++++++++++++ libqt5-qtbase.changes | 20 +++++++++--- libqt5-qtbase.spec | 2 ++ 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch diff --git a/0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch b/0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch new file mode 100644 index 0000000..ca83877 --- /dev/null +++ b/0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch @@ -0,0 +1,31 @@ +From c09cf578bd7267b867326101cd2d0f39e7c814fe Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Mon, 9 Sep 2019 18:12:26 +0200 +Subject: [PATCH] QWidget::setFocusProxy: adjust focus widget properly + +My commit 3e7463411e adjusted the focus widget by setting +QApplicationPrivate::focus_widget directly, while there is a method for +doing this properly, including setFocus_sys() and emitting signals. + +Fixes: QTBUG-77364 +Change-Id: I218acf7a9de39173d282ced46def4f65594f80b4 +--- + src/widgets/kernel/qwidget.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp +index cf5a81c204..6889c2e9e5 100644 +--- a/src/widgets/kernel/qwidget.cpp ++++ b/src/widgets/kernel/qwidget.cpp +@@ -6204,7 +6204,7 @@ void QWidget::setFocusProxy(QWidget * w) + + if (changingAppFocusWidget) { + QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy(); +- QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this; ++ QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason); + } + } + +-- +2.22.0 + diff --git a/libqt5-qtbase.changes b/libqt5-qtbase.changes index 2636944..776d3a2 100644 --- a/libqt5-qtbase.changes +++ b/libqt5-qtbase.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 19 08:08:00 UTC 2019 - Fabian Vogt + +- Add patch to fix focus in some cases (QTBUG-77364): + * 0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch + ------------------------------------------------------------------- Fri Sep 6 08:03:13 UTC 2019 - Fabian Vogt @@ -381,7 +387,7 @@ Fri Jun 29 07:21:37 UTC 2018 - fabian@ritter-vogt.de ------------------------------------------------------------------- Sat Jun 23 14:03:04 UTC 2018 - fabian@ritter-vogt.de -- Add patches to improve OOTB experience with HiDPI: +- Add patches to improve OOTB experience with HiDPI (boo#1089932): * 0001-Sanitize-QXcbScreen-s-pixelDensity-values.patch * 0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch @@ -429,6 +435,12 @@ Tue May 22 15:06:56 CEST 2018 - fabian@ritter-vogt.de * 0001-sqlite-Check-that-there-are-values-to-be-set-when-bi.patch * 0002-sqlite-Bind-duplicated-named-placeholders-correctly.patch * 0003-sqlite-Prevent-a-crash-when-sqlite-does-not-detect-a.patch +- Includes fix to prevent crash with pixmap cursors on XRender-less + X servers (bsc#1108889, QTBUG-66935) +- Includes fix to load libGL.so.1 library if there's no libGL.so symlink + (boo#1099874, QTBUG-67537) +- Includes fix to allow to disable logging of XCB errors (boo#1115541, + QTBUG-55167) ------------------------------------------------------------------- Tue May 8 10:59:01 CEST 2018 - fabian@ritter-vogt.de @@ -504,7 +516,7 @@ Thu Mar 1 12:14:13 UTC 2018 - alarrosa@suse.com - Rework 0001-Add-remote-print-queue-support.patch so now the remote print queue discovery is disabled by default and is only enabled when the QT_ENABLE_PRINTER_DISCOVERY environment variable is set - (QT_DISABLE_PRINTER_DISCOVERY is no longer used). + (QT_DISABLE_PRINTER_DISCOVERY is no longer used) (fixes boo#1064872) ------------------------------------------------------------------- Thu Mar 1 09:54:43 CET 2018 - fabian@ritter-vogt.de @@ -614,7 +626,7 @@ Mon Feb 12 09:23:59 UTC 2018 - fvogt@suse.com ------------------------------------------------------------------- Thu Feb 8 08:48:37 UTC 2018 - fabian@ritter-vogt.de -- Add patch to fix plugin loading with newer MariaDB versions: +- Add patch to fix plugin loading with newer MariaDB versions (boo#1080048): * 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch ------------------------------------------------------------------- @@ -622,7 +634,7 @@ Fri Feb 2 08:10:28 UTC 2018 - alarrosa@suse.com - Add 0001-QSimpleDrag-Fix-mouse-release-coords-for-delayed-eve.patch to fix a bug causing the wrong desktop icon to look hovered - after dragging an icon on the desktop in plasma (QTBUG-66103). + after dragging an icon on the desktop in plasma (QTBUG-66103, boo#1080044). ------------------------------------------------------------------- Fri Jan 26 11:21:54 UTC 2018 - alarrosa@suse.com diff --git a/libqt5-qtbase.spec b/libqt5-qtbase.spec index 9efbef5..c6af9b5 100644 --- a/libqt5-qtbase.spec +++ b/libqt5-qtbase.spec @@ -83,6 +83,8 @@ Patch2000: 0001-Fix-notification-of-QDockWidget-when-it-gets-undocke.patch Patch2001: 0002-Synthesize-Enter-LeaveEvent-for-accepted-QTabletEven.patch # Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/273050 Patch2002: 0001-Fix-CMake-config-files-for-libdir-different-from-lib.patch +# Not accepted yet, https://codereview.qt-project.org/c/qt/qtbase/+/273365 +Patch2003: 0001-QWidget-setFocusProxy-adjust-focus-widget-properly.patch BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel