[arch-commits] Commit in deepin-qt5dxcb-plugin/trunk (PKGBUILD qt-5.12.patch)

[Felix Yan]

    Date: Saturday, April 20, 2019 @ 19:17:17
  Author: felixonmars
Revision: 452278

upgpkg: deepin-qt5dxcb-plugin 1.1.26-2

fix patch

Modified:
  deepin-qt5dxcb-plugin/trunk/PKGBUILD
  deepin-qt5dxcb-plugin/trunk/qt-5.12.patch

---------------+
 PKGBUILD      |    4 ++--
 qt-5.12.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-20 19:16:51 UTC (rev 452277)
+++ PKGBUILD	2019-04-20 19:17:17 UTC (rev 452278)
@@ -2,7 +2,7 @@
 
 pkgname=deepin-qt5dxcb-plugin
 pkgver=1.1.26
-pkgrel=1
+pkgrel=2
 pkgdesc='Qt platform plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5dxcb-plugin"
@@ -13,7 +13,7 @@
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz"
         qt-5.12.patch)
 sha512sums=('8f796366d235437360c021c66c3532c2bb7e0f388acd89e1d4c20fbadf4734661d0aec19fdcf5ed4e299826d63cbdfb90def42305709ece10ba6efe55684e159'
-            'cd7ee42ab6b46ecf13b1f6e14bb33f0c1f241017307f716d6e38f3d330bd56ce0d78690e9d606a1da6a32aa4ab3684d3a792abea3dc7b8fe8d43a1bc43d6f24e')
+            '0fc5d30bd9541e79db8991a2332ad0db6640d95067416f7b11c4cd7b6c1be2788e8f13f1ef989ddcd5ca57e3b798ac76d15d0f3081a811b6a7b6af7e0d39b691')
 
 prepare() {
   cd qt5dxcb-plugin-$pkgver

Modified: qt-5.12.patch
===================================================================
--- qt-5.12.patch	2019-04-20 19:16:51 UTC (rev 452277)
+++ qt-5.12.patch	2019-04-20 19:17:17 UTC (rev 452278)
@@ -33,3 +33,36 @@
                  xcb_randr_notify_event_t *e = reinterpret_cast<xcb_randr_notify_event_t *>(event);
                  xcb_randr_output_change_t output = e->u.oc;
  
+commit f5fe61fb6a641f8f34f6e916b6dda27657266646
+Author: Felix Yan <felixonmars at archlinux.org>
+Date:   Sun Apr 21 03:15:51 2019 +0800
+
+    fix: do not use methods because symbols are not exported
+    
+    Change-Id: Icfd0ad87bc01f69a8e9cc2ec9e38ee27be54c016
+
+diff --git a/platformplugin/xcbnativeeventfilter.cpp b/platformplugin/xcbnativeeventfilter.cpp
+index fc3045a..abf3d0a 100644
+--- a/platformplugin/xcbnativeeventfilter.cpp
++++ b/platformplugin/xcbnativeeventfilter.cpp
+@@ -90,7 +90,8 @@ bool XcbNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *
+ #if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
+     if (response_type == m_connection->xfixes_first_event + XCB_XFIXES_SELECTION_NOTIFY) {
+ #else
+-    if (m_connection->isXFixesType(response_type, XCB_XFIXES_SELECTION_NOTIFY)) {
++    // cannot use isXFixesType because symbols from QXcbBasicConnection are not exported
++    if (response_type == m_connection->m_xfixesFirstEvent + XCB_XFIXES_SELECTION_NOTIFY) {
+ #endif
+         xcb_xfixes_selection_notify_event_t *xsn = (xcb_xfixes_selection_notify_event_t *)event;
+ 
+@@ -231,8 +232,9 @@ bool XcbNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *
+             if (updateScaleLogcailDpi && DPlatformIntegration::xcbConnection()->has_randr_extension
+                     && response_type == DPlatformIntegration::xcbConnection()->xrandr_first_event + XCB_RANDR_NOTIFY) {
+ #else
++            // cannot use isXRandrType because symbols from QXcbBasicConnection are not exported
+             if (updateScaleLogcailDpi && DPlatformIntegration::xcbConnection()->hasXRender()
+-                    && DPlatformIntegration::xcbConnection()->isXRandrType(response_type, XCB_RANDR_NOTIFY)) {
++                    && response_type == DPlatformIntegration::xcbConnection()->m_xrandrFirstEvent + XCB_RANDR_NOTIFY) {
+ #endif
+                 xcb_randr_notify_event_t *e = reinterpret_cast<xcb_randr_notify_event_t *>(event);
+                 xcb_randr_output_change_t output = e->u.oc;