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

[Felix Yan]

    Date: Tuesday, April 23, 2019 @ 18:29:12
  Author: felixonmars
Revision: 453196

upgpkg: deepin-qt5dxcb-plugin 1.1.27-1

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

---------------+
 PKGBUILD      |   11 +++------
 qt-5.12.patch |   68 --------------------------------------------------------
 2 files changed, 4 insertions(+), 75 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-23 18:25:04 UTC (rev 453195)
+++ PKGBUILD	2019-04-23 18:29:12 UTC (rev 453196)
@@ -1,8 +1,8 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=deepin-qt5dxcb-plugin
-pkgver=1.1.26.1
-pkgrel=2
+pkgver=1.1.27
+pkgrel=1
 pkgdesc='Qt platform plugins for DDE'
 arch=('x86_64')
 url="https://github.com/linuxdeepin/qt5dxcb-plugin"
@@ -10,14 +10,11 @@
 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"
-        qt-5.12.patch)
-sha512sums=('2ea04b16b24f8284df7a76bf15c361a134bc326ac674d5e85fc9a5aaa34cf4026746e5d62374c0381a6e30fb87d5c4ce051ff42195a73f5b7707cf6b9282db0f'
-            '0fc5d30bd9541e79db8991a2332ad0db6640d95067416f7b11c4cd7b6c1be2788e8f13f1ef989ddcd5ca57e3b798ac76d15d0f3081a811b6a7b6af7e0d39b691')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz")
+sha512sums=('2048a66cb1eb3253ebdd84f7f7196823483f080cd3c3e92e693e468a8930e1178b29ad91fa1e297632855e2ad037233a348d916b9c8516ee2b8182e9397e1244')
 
 prepare() {
   cd qt5dxcb-plugin-$pkgver
-  patch -p1 -i ../qt-5.12.patch
 
   rm -r platformplugin/libqt5xcbqpa-dev
   sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri

Deleted: qt-5.12.patch
===================================================================
--- qt-5.12.patch	2019-04-23 18:25:04 UTC (rev 453195)
+++ qt-5.12.patch	2019-04-23 18:29:12 UTC (rev 453196)
@@ -1,68 +0,0 @@
-commit 1caec58eff37ae23a9461c74362a1c31ef0d2d86
-Author: Felix Yan <felixonmars at archlinux.org>
-Date:   Sun Apr 21 03:01:16 2019 +0800
-
-    fix: compatibility with Qt 5.12+
-    
-    Change-Id: Ied6745da56fa3a873d66a2d8e5385cd17c2fb273
-
-diff --git a/platformplugin/xcbnativeeventfilter.cpp b/platformplugin/xcbnativeeventfilter.cpp
-index 9df7d33..fc3045a 100644
---- a/platformplugin/xcbnativeeventfilter.cpp
-+++ b/platformplugin/xcbnativeeventfilter.cpp
-@@ -90,7 +90,7 @@ 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 (response_type == m_connection->m_xfixesFirstEvent + XCB_XFIXES_SELECTION_NOTIFY) {
-+    if (m_connection->isXFixesType(response_type, XCB_XFIXES_SELECTION_NOTIFY)) {
- #endif
-         xcb_xfixes_selection_notify_event_t *xsn = (xcb_xfixes_selection_notify_event_t *)event;
- 
-@@ -227,8 +227,13 @@ bool XcbNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *
- #endif
-         default:
-             static auto updateScaleLogcailDpi = qApp->property("_d_updateScaleLogcailDpi").toULongLong();
-+#if QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-             if (updateScaleLogcailDpi && DPlatformIntegration::xcbConnection()->has_randr_extension
-                     && response_type == DPlatformIntegration::xcbConnection()->xrandr_first_event + XCB_RANDR_NOTIFY) {
-+#else
-+            if (updateScaleLogcailDpi && DPlatformIntegration::xcbConnection()->hasXRender()
-+                    && DPlatformIntegration::xcbConnection()->isXRandrType(response_type, 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;
- 
-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;