gentoo resync : 03.11.2018

4 files changed, 57 insertions, 1 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 6327f9c1e30a..313cd63ec8a5 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtgui/Manifest b/dev-qt/qtgui/Manifest
index 652c90089d33..5f2fc9b07c0c 100644
--- a/dev-qt/qtgui/Manifest
+++ b/dev-qt/qtgui/Manifest
@@ -1,7 +1,8 @@
+AUX qtgui-5.11.2-qapplication-block.patch 1961 BLAKE2B ff509c7ddc68c3c330dc5ce3ff19a5fd53cc641052baba0696f6ad15d71a3c47b2516c93b3df7dde6df318d0ffd7f5f99d9ba0c99718975c4fb66017b307f97f SHA512 0651a91e6e09a9c85eb1361f9c8d94578092c2909f107fa3fb0bcb220240bd2ef24e679a84822d29114cd799623840ea130b08081fd58e1f8953c21983bf5156
 DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-everywhere-src-5.11.2.tar.xz 46954920 BLAKE2B 41685cf977df7bd10ef80ee7f3f1166fe9cc9a94cdb43b6b0b3b22f49d6bd8c5532666cf1b92f6fb845b000a16ffd11922892c30ced7b67753f0608fb6a09c00 SHA512 b2f14126caa1c664887203a9a98551b85b57630cf7745c17f76e1e8aaf464f0091fe2de5615a138506dac7c8fbb16e5f33f984aef8e61e23f0c3bf74f6ef0835
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
 EBUILD qtgui-5.11.1.ebuild 3577 BLAKE2B 4debbaadcec2d65932a9de0b88853686916498788edf2f9815b6f7056a6343d185fd4d52f391dddacd85b9783f6e0702493a2cec63d765da72bb738256cb21b9 SHA512 44e0251524ff3e8f50b9a85ba1272f304ae54b90582011faac76d006f59107f85bfce0a4aabeb8cbd6a76f058bdf1581399e38a351de13c6fde7a14cf916bd93
-EBUILD qtgui-5.11.2.ebuild 3579 BLAKE2B 8a184cab738d654a19c9a0b05133bd1682fb7eb5ed7b71fce057d3268d5fb9efa9f3f523213d6f7092b62c5ba5aa4315848a5d2015d2343a5e610d52c32f224f SHA512 60523f34083f85a9f6cc9f1e7544f8c755c71e622c330e071ef110bf00086235c39c38ef7b63f68b7feb18d326269683372df46507f3b64f5fae6bed3beb7edf
+EBUILD qtgui-5.11.2-r1.ebuild 3649 BLAKE2B cda2b2016f8832c9a109b61f25e0318a532d1073720db41d275223b9143a6ba283496ec2a9bed1955ede3bab1d6421362131919e250e5f6760a766b1b7a108f8 SHA512 b49c0c3c0add5aaef91dfc848890a57b12594c40806f6161115adb15cc339535e43225fa17b989e7748b17bdf1412d226a4e89710951e6f569271bd6fda8a4be
 EBUILD qtgui-5.9.6.ebuild 3560 BLAKE2B 8f85331e6c6ae16810f546a993a2b19ac94f358ff84a6610f49eef9184b42329b2c1b096f857bf958ff12c122d72baddfeb00e762a63d4219ecd0e4d601b054a SHA512 ff2e051a60f35b729827e57fbe5ff0d40449536cb3dd2f79658435b747bbc72fa356c4b42e44a9b76b4725483857af90037c0773b8a05d1854aa32bc7137a217
 MISC metadata.xml 1200 BLAKE2B 272e152cc1a9d596407c3d687fbb7b9f7b1b553cbf07e78e649031a427782f3377d3ee71d40e472b6f5978a8c1e9c2bfb9c0669edebcfcd1605d27973ba0ba1b SHA512 5ed40f7fdc6e289bd23bc5d4ce54794e58acf8c14863c45fe228d29c555e3afff84ee5b73f6f9e6be8b43e2ca28a96e4a73c22129ed2099262b5f682bf8b3aa6
diff --git a/dev-qt/qtgui/files/qtgui-5.11.2-qapplication-block.patch b/dev-qt/qtgui/files/qtgui-5.11.2-qapplication-block.patch
new file mode 100644
index 000000000000..115b42b8e93e
--- /dev/null
+++ b/dev-qt/qtgui/files/qtgui-5.11.2-qapplication-block.patch
@@ -0,0 +1,53 @@
+From d4e937a6280f34bc1cce8c8cea3806a741312fbc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?B=C5=82a=C5=BCej=20Szczygie=C5=82?= <spaz16@wp.pl>
+Date: Tue, 25 Sep 2018 18:45:10 +0200
+Subject: xcb: Don't get initial screen rotation
+
+"xcb_randr_get_screen_info" can be slow and in some configurations can
+cause short mouse cursor freezes (which will happen on Qt application
+startup).
+
+Initial screen rotation was used only to not handle possible redundant
+screen change event.
+
+Fixes: QTBUG-70760
+Change-Id: I9f01325a045d2c82c4dd2fce91a18a34e54a4bcd
+Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
+---
+ src/plugins/platforms/xcb/qxcbscreen.cpp | 7 -------
+ src/plugins/platforms/xcb/qxcbscreen.h   | 2 +-
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp
+index 7f2793b2b7..a696e2a311 100644
+--- a/src/plugins/platforms/xcb/qxcbscreen.cpp
++++ b/src/plugins/platforms/xcb/qxcbscreen.cpp
+@@ -118,13 +118,6 @@ QXcbVirtualDesktop::QXcbVirtualDesktop(QXcbConnection *connection, xcb_screen_t
+ 
+         xcb_depth_next(&depth_iterator);
+     }
+-
+-    if (connection->hasXRandr()) {
+-        xcb_connection_t *conn = connection->xcb_connection();
+-        auto screen_info = Q_XCB_REPLY(xcb_randr_get_screen_info, conn, screen->root);
+-        if (screen_info)
+-            m_rotation = screen_info->rotation;
+-    }
+ }
+ 
+ QXcbVirtualDesktop::~QXcbVirtualDesktop()
+diff --git a/src/plugins/platforms/xcb/qxcbscreen.h b/src/plugins/platforms/xcb/qxcbscreen.h
+index 6438669e7a..792aca4b06 100644
+--- a/src/plugins/platforms/xcb/qxcbscreen.h
++++ b/src/plugins/platforms/xcb/qxcbscreen.h
+@@ -220,7 +220,7 @@ private:
+     xcb_randr_crtc_t m_crtc;
+     xcb_randr_mode_t m_mode = XCB_NONE;
+     bool m_primary = false;
+-    uint8_t m_rotation = XCB_RANDR_ROTATION_ROTATE_0;
++    uint8_t m_rotation = 0;
+ 
+     QString m_outputName;
+     QSizeF m_outputSizeMillimeters;
+-- 
+cgit v1.2.1
diff --git a/dev-qt/qtgui/qtgui-5.11.2.ebuild b/dev-qt/qtgui/qtgui-5.11.2-r1.ebuild
index 8495f8faffad..f3b8dc42d1b8 100644
--- a/dev-qt/qtgui/qtgui-5.11.2.ebuild
+++ b/dev-qt/qtgui/qtgui-5.11.2-r1.ebuild
@@ -71,6 +71,8 @@ PDEPEND="
 	ibus? ( app-i18n/ibus )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-qapplication-block.patch ) # bug 668994
+
 QT5_TARGET_SUBDIRS=(
 	src/tools/qvkgen
 	src/gui