[arch-commits] Commit in deepin-qt5dxcb-plugin/trunk (2 files)

[Antonio Rojas]

    Date: Saturday, June 22, 2019 @ 08:45:59
  Author: arojas
Revision: 482703

Qt 5.13 rebuild

Added:
  deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.13.patch
Modified:
  deepin-qt5dxcb-plugin/trunk/PKGBUILD

------------------------------------+
 PKGBUILD                           |    9 ++++++---
 deepin-qt5dxcb-plugin-qt5.13.patch |   22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-22 08:43:10 UTC (rev 482702)
+++ PKGBUILD	2019-06-22 08:45:59 UTC (rev 482703)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-qt5dxcb-plugin
 pkgver=1.2.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Qt platform plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5dxcb-plugin"
@@ -10,8 +10,10 @@
 depends=('cairo' 'qt5-x11extras')
 makedepends=('qt5-xcb-private-headers' 'libglvnd')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz")
-sha512sums=('1889804d45fbb325be0dec6f40150a7190c1850a8343b8e3964c51fe1354455a88707ca684d1db28baa910aef9e5218129b6159a079d82f29adbb1a24e754daa')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz"
+        deepin-qt5dxcb-plugin-qt5.13.patch)
+sha512sums=('1889804d45fbb325be0dec6f40150a7190c1850a8343b8e3964c51fe1354455a88707ca684d1db28baa910aef9e5218129b6159a079d82f29adbb1a24e754daa'
+            '6ff5dc34d32a923a390b65e01270e7fa186dac3dd1562a1d9be3a292666ef2392574105483c8f8150a7ab9a98ffcaa21c0b65ad44f2e8314804bed28aa0b8073')
 
 prepare() {
   cd qt5dxcb-plugin-$pkgver
@@ -18,6 +20,7 @@
 
   rm -r platformplugin/libqt5xcbqpa-dev
   sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
+  patch -p1 -i ../deepin-qt5dxcb-plugin-qt5.13.patch # Fix build with Qt 5.13
 }
 
 build() {

Added: deepin-qt5dxcb-plugin-qt5.13.patch
===================================================================
--- deepin-qt5dxcb-plugin-qt5.13.patch	                        (rev 0)
+++ deepin-qt5dxcb-plugin-qt5.13.patch	2019-06-22 08:45:59 UTC (rev 482703)
@@ -0,0 +1,22 @@
+diff --git a/platformplugin/windoweventhook.cpp b/platformplugin/windoweventhook.cpp
+index 742b41d..428dcb0 100644
+--- a/platformplugin/windoweventhook.cpp
++++ b/platformplugin/windoweventhook.cpp
+@@ -359,6 +359,8 @@ void WindowEventHook::handleFocusInEvent(const xcb_focus_in_event_t *event)
+     if (relayFocusToModalWindow(w, xcbWindow->connection()))
+         return;
+ 
++    xcbWindow->connection()->focusInTimer().stop();
++
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
+     xcbWindow->connection()->setFocusWindow(w);
+ #else
+@@ -433,7 +435,7 @@ void WindowEventHook::handleFocusOutEvent(const xcb_focus_out_event_t *event)
+     // Do not set the active window to 0 if there is a FocusIn coming.
+     // There is however no equivalent for XPutBackEvent so register a
+     // callback for QXcbConnection instead.
+-    xcbWindow->connection()->addPeekFunc(focusInPeeker);
++    xcbWindow->connection()->focusInTimer().start(400);
+ }
+ 
+ void WindowEventHook::handlePropertyNotifyEvent(const xcb_property_notify_event_t *event)