[arch-commits] Commit in deepin-qt5integration/trunk (PKGBUILD qt5.9.patch)

[Felix Yan]

    Date: Friday, June 2, 2017 @ 07:07:54
  Author: felixonmars
Revision: 232915

upgpkg: deepin-qt5integration 0.1.8-2

Qt 5.9 rebuild

Added:
  deepin-qt5integration/trunk/qt5.9.patch
Modified:
  deepin-qt5integration/trunk/PKGBUILD

-------------+
 PKGBUILD    |    8 +++++---
 qt5.9.patch |   25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-02 07:07:51 UTC (rev 232914)
+++ PKGBUILD	2017-06-02 07:07:54 UTC (rev 232915)
@@ -3,7 +3,7 @@
 
 pkgname=deepin-qt5integration
 pkgver=0.1.8
-pkgrel=1
+pkgrel=2
 pkgdesc='Deepin Qt5 platform plugin'
 arch=('i686' 'x86_64')
 url="http://github.com/linuxdeepin/qt5integration"
@@ -14,12 +14,14 @@
 conflicts=('qt5dxcb-plugin')
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"
-        use-system-qt5-headers.patch)
+        use-system-qt5-headers.patch qt5.9.patch)
 sha512sums=('bb3d9f0b406ec97b9eee371485fcc5d6cb7371342c3e1e454bd8e2949ca428475d371bd330a2c395ad5e0537f210e7ddcd839262f9ae79160b9038dd7687f780'
-            '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b')
+            '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
+            '871d2c80511a6bf0adfa35cea784b313cfc5587dc24331e9f61b09e3284e870edd1ab60502d77b2676bcdb16dba5a76082818abed543c0eddbd5ffe582a8474e')
 
 prepare() {
   cd qt5integration-$pkgver
+  patch -p1 -i ../qt5.9.patch
   patch -p1 -i ../use-system-qt5-headers.patch
 }
 

Added: qt5.9.patch
===================================================================
--- qt5.9.patch	                        (rev 0)
+++ qt5.9.patch	2017-06-02 07:07:54 UTC (rev 232915)
@@ -0,0 +1,25 @@
+commit ae539894500a744ec87d9a7f2d6aca5306fc26a1
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Fri Jun 2 15:03:59 2017 +0800
+
+    Add support for Qt 5.9+
+    
+    Change-Id: I5596a429ed3e0f4e7522a479cd420c57f0a88dc9
+
+diff --git a/platformplugin/windoweventhook.cpp b/platformplugin/windoweventhook.cpp
+index 2bf3e36..92ae529 100644
+--- a/platformplugin/windoweventhook.cpp
++++ b/platformplugin/windoweventhook.cpp
+@@ -204,7 +204,12 @@ void WindowEventHook::handleFocusInEvent(const xcb_focus_in_event_t *event)
+     if (relayFocusToModalWindow(w, xcbWindow->connection()))
+         return;
+ 
++#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
++    xcbWindow->connection()->setFocusWindow(w);
++#else
+     xcbWindow->connection()->setFocusWindow(static_cast<QXcbWindow *>(w->handle()));
++#endif
++
+     QWindowSystemInterface::handleWindowActivated(w, Qt::ActiveWindowFocusReason);
+ }
+