From cbac0bf777d4887a50ff1eb96c51fcd0d0eb2689 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 25 Sep 2019 13:47:52 +0200 Subject: [PATCH 1/3] qt5: update to 5.13.1. --- srcpkgs/qt5/patches/0048-qtbug-76742.patch | 25 --------------------- srcpkgs/qt5/patches/0100-qtbug-77364.patch | 26 ++++++++++++++++++++++ srcpkgs/qt5/template | 6 ++--- 3 files changed, 29 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/qt5/patches/0048-qtbug-76742.patch create mode 100644 srcpkgs/qt5/patches/0100-qtbug-77364.patch diff --git a/srcpkgs/qt5/patches/0048-qtbug-76742.patch b/srcpkgs/qt5/patches/0048-qtbug-76742.patch deleted file mode 100644 index 311ad55e4d4..00000000000 --- a/srcpkgs/qt5/patches/0048-qtbug-76742.patch +++ /dev/null @@ -1,25 +0,0 @@ -Source: https://codereview.qt-project.org/c/qt/qtbase/+/267242 -Upstream: yes -Reason: fix focus stealing in applications (e.g. VirtualBox) - ---- qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp 2019-06-13 06:18:18.000000000 +0200 -+++ qtbase/src/plugins/platforms/xcb/qxcbconnection.cpp 2019-07-21 11:56:22.250127747 +0200 -@@ -133,6 +133,7 @@ - qunsetenv("DESKTOP_STARTUP_ID"); - - m_focusInTimer.setSingleShot(true); -+ m_focusInTimer.setInterval(100); - m_focusInTimer.callOnTimeout([]() { - // No FocusIn events for us, proceed with FocusOut normally. - QWindowSystemInterface::handleWindowActivated(nullptr, Qt::ActiveWindowFocusReason); ---- qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp 2019-06-13 06:18:18.000000000 +0200 -+++ qtbase/src/plugins/platforms/xcb/qxcbwindow.cpp 2019-07-21 11:58:00.255122346 +0200 -@@ -848,7 +848,7 @@ - connection()->setFocusWindow(nullptr); - relayFocusToModalWindow(); - // Do not set the active window to nullptr if there is a FocusIn coming. -- connection()->focusInTimer().start(400); -+ connection()->focusInTimer().start(); - } - - struct QtMotifWmHints { diff --git a/srcpkgs/qt5/patches/0100-qtbug-77364.patch b/srcpkgs/qt5/patches/0100-qtbug-77364.patch new file mode 100644 index 00000000000..5a3629bf0b7 --- /dev/null +++ b/srcpkgs/qt5/patches/0100-qtbug-77364.patch @@ -0,0 +1,26 @@ +From c09cf578bd7267b867326101cd2d0f39e7c814fe Mon Sep 17 00:00:00 2001 +From: David Faure +Date: Mon, 09 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 +--- + +diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp +index cf5a81c..6889c2e 100644 +--- qtbase/src/widgets/kernel/qwidget.cpp ++++ qtbase/src/widgets/kernel/qwidget.cpp +@@ -6204,7 +6204,7 @@ + + if (changingAppFocusWidget) { + QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy(); +- QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this; ++ QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason); + } + } + diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 610b2a88b07..9711b7933c3 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -1,7 +1,7 @@ # Template file for 'qt5' pkgname=qt5 -version=5.13.0 -revision=4 +version=5.13.1 +revision=1 wrksrc="qt-everywhere-src-${version}" build_style=gnu-configure hostmakedepends="cmake clang flex git glib-devel gperf ninja pkg-config @@ -21,7 +21,7 @@ maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/single/qt-everywhere-src-${version}.tar.xz" -checksum=2cba31e410e169bd5cdae159f839640e672532a4687ea0f265f686421e0e86d6 +checksum=adf00266dc38352a166a9739f1a24a1e36f1be9c04bf72e16e142a256436974e replaces="qt5-doc<5.6.0 qt5-quick1<5.6.0 qt5-quick1-devel<5.6.0 qt5-webkit<5.6.0 qt5-webkit-devel<5.6.0 qt5-enginio<5.7.1 qt5-enginio-devel<5.7.1 qt5-plugin-gtk<5.7.1 qt5-canvas3d<5.13.0" From 9134b688e582e81984f15a38a52d67f2a6fc75bf Mon Sep 17 00:00:00 2001 From: John Date: Wed, 25 Sep 2019 13:50:15 +0200 Subject: [PATCH 2/3] telegram-desktop: rebuild against qt-5.13.1 --- srcpkgs/telegram-desktop/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/telegram-desktop/template b/srcpkgs/telegram-desktop/template index 47c73c597fb..e6ffd524aba 100644 --- a/srcpkgs/telegram-desktop/template +++ b/srcpkgs/telegram-desktop/template @@ -1,7 +1,7 @@ # Template file for 'telegram-desktop' pkgname=telegram-desktop version=1.8.8 -revision=1 +revision=2 _libtgvoip_commit=d4a0f719ffd8d29e88474f67abc9fc862661c3b9 _GSL_commit=d846fe50a3f0bb7767c7e087a05f4be95f4da0ec _variant_commit=550ac2f159ca883d360c196149b466955c77a573 @@ -18,7 +18,7 @@ makedepends="alsa-lib-devel ffmpeg-devel gtk+3-devel libappindicator-devel libdbusmenu-glib-devel libopenal-devel minizip-devel opus-devel xxHash-devel $(vopt_if pulseaudio 'pulseaudio-devel') qt5-devel range-v3 libva-devel rapidjson liblz4-devel rlottie-devel" -depends="qt5-imageformats qt5>=5.13.0<5.13.1" +depends="qt5-imageformats qt5>=5.13.1<5.13.2" short_desc="Telegram Desktop messaging app" maintainer="John " license="GPL-3.0-or-later WITH OpenSSL" From b9749ca1cf2aecbb07a17848383f08f978580a71 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 25 Sep 2019 14:31:42 +0200 Subject: [PATCH 3/3] fixup! qt5: update to 5.13.1. [ci skip] --- srcpkgs/qt5/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template index 9711b7933c3..0b74add5101 100644 --- a/srcpkgs/qt5/template +++ b/srcpkgs/qt5/template @@ -412,6 +412,7 @@ do_configure() { } do_build() { + export NINJAJOBS=${makejobs} # Run make twice because sometimes a file "chrome/grit/generated_resources.h" # is not yet ready when it is to be included. Repeating make works around that # problem without having to resort to disable_parallel_build=yes