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

[Felix Yan]

    Date: Friday, June 2, 2017 @ 08:13:55
  Author: felixonmars
Revision: 232965

upgpkg: deepin-qt5integration 0.1.9-1

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-02 08:02:03 UTC (rev 232964)
+++ PKGBUILD	2017-06-02 08:13:55 UTC (rev 232965)
@@ -2,8 +2,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-qt5integration
-pkgver=0.1.8
-pkgrel=2
+pkgver=0.1.9
+pkgrel=1
 pkgdesc='Deepin Qt5 platform plugin'
 arch=('i686' 'x86_64')
 url="http://github.com/linuxdeepin/qt5integration"
@@ -15,9 +15,9 @@
 groups=('deepin')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5integration/archive/$pkgver.tar.gz"
         use-system-qt5-headers.patch qt5.9.patch)
-sha512sums=('bb3d9f0b406ec97b9eee371485fcc5d6cb7371342c3e1e454bd8e2949ca428475d371bd330a2c395ad5e0537f210e7ddcd839262f9ae79160b9038dd7687f780'
+sha512sums=('f6936cc6a9a1d51c24d4be634cf38c97a42a926c7c92af74517a952163ad41ecf0ab105461d239035794651b303a71e1f85913242d698842b72dc66e3793f916'
             '29152204a36efc5fc2376b74be2ebe1d9cb253f9371ca8b0e9bf95c415c903f956d0d400eaffb3f708f81b19acd0a5383647af3a5a10cf6a61dfa586eb1bd57b'
-            '871d2c80511a6bf0adfa35cea784b313cfc5587dc24331e9f61b09e3284e870edd1ab60502d77b2676bcdb16dba5a76082818abed543c0eddbd5ffe582a8474e')
+            '83695d051d100ab6e8fa0aa73f9387f320f6bbaab39c8db835b27f5b24b1c38c993535ed3c5864975e5881231d0f3151d6e4eacb8cc9364f67febc6328bf5b01')
 
 prepare() {
   cd qt5integration-$pkgver

Deleted: qt5.9.patch
===================================================================
--- qt5.9.patch	2017-06-02 08:02:03 UTC (rev 232964)
+++ qt5.9.patch	2017-06-02 08:13:55 UTC (rev 232965)
@@ -1,25 +0,0 @@
-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);
- }
-