Date: Thursday, February 21, 2019 @ 10:34:29 Author: felixonmars Revision: 434939
upgpkg: deepin-qt5dxcb-plugin 1.1.23-3 update patch for qt 5.12.1 Modified: deepin-qt5dxcb-plugin/trunk/PKGBUILD deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.12.1.patch --------------------------------------+ PKGBUILD | 4 ++-- deepin-qt5dxcb-plugin-qt5.12.1.patch | 32 ++++++++++++++++++++++---------- 2 files changed, 24 insertions(+), 12 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-21 10:29:16 UTC (rev 434938) +++ PKGBUILD 2019-02-21 10:34:29 UTC (rev 434939) @@ -2,7 +2,7 @@ pkgname=deepin-qt5dxcb-plugin pkgver=1.1.23 -pkgrel=2 +pkgrel=3 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" deepin-qt5dxcb-plugin-qt5.12.1.patch) sha512sums=('d53f5635cf852ee0a271caf057e68853eb8fa9b24819bbf87ccac53e29fc255925c8d5b3fde68a6cc6ef7e5d8ba208e53d95ad1d9916e9e0b326feeaea46e8f1' - 'b6aacb3e321a53f2e6c8af43b901ff7c908346ffabbaf37d7008267b80dea79cafd65f6230fdd8b7be3a9e4b8b7d343864128543123931c0649ece9d846f385a') + '67151ced9c91b86f04953675dbfcba237fdd7569001d2460ccafe1de0fc577dc9575b93ed2b534eec95bac48d764ce3a49ca57cc92a90aebbf5cb30cf10ad239') prepare() { cd qt5dxcb-plugin-$pkgver Modified: deepin-qt5dxcb-plugin-qt5.12.1.patch =================================================================== --- deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-21 10:29:16 UTC (rev 434938) +++ deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-21 10:34:29 UTC (rev 434939) @@ -1,24 +1,36 @@ +From 1a9a05ef7942c91dafaf24023404aef9cbd77dbe Mon Sep 17 00:00:00 2001 +From: Felix Yan <felixonm...@archlinux.org> +Date: Sat, 16 Feb 2019 00:14:39 +0800 +Subject: [PATCH] fix: compatibility with Qt 5.12.1 + +Change-Id: I193b2c069e46251b6bed9fb0766d26287e46d0b4 +--- + diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp -index 925c0ed..4c0bb57 100644 +index d1b3772..09401e0 100644 --- a/platformplugin/dplatformwindowhelper.cpp +++ b/platformplugin/dplatformwindowhelper.cpp -@@ -320,9 +320,7 @@ void DPlatformWindowHelper::setVisible(bool visible) - Utility::setMotifWmHints(window->m_window, mwmhints); +@@ -321,7 +321,11 @@ Utility::setMotifWmHints(helper->m_nativeWindow->QNativeWindow::winId(), cw_hints); -- if (helper->m_nativeWindow->window()->modality() != Qt::NonModal) { -- window->setNetWmStates(window->netWmStates() | QNativeWindow::NetWmStateModal); -- } -+ window->setNetWmStateOnUnmappedWindow(); + if (helper->m_nativeWindow->window()->modality() != Qt::NonModal) { ++#if QT_VERSION < QT_VERSION_CHECK(5, 12, 1) + window->setNetWmStates(window->netWmStates() | QNativeWindow::NetWmStateModal); ++#else ++ window->setNetWmState(true, window->atom(QXcbAtom::_NET_WM_STATE_MODAL)); ++#endif + } #endif - #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) -@@ -362,7 +360,7 @@ void DPlatformWindowHelper::setWindowState(Qt::WindowStates state) +@@ -362,7 +366,11 @@ if (state == Qt::WindowMinimized && (window->m_windowState == Qt::WindowMaximized || window->m_windowState == Qt::WindowFullScreen)) { -- window->changeNetWmState(true, Utility::internAtom("_NET_WM_STATE_HIDDEN")); ++#if QT_VERSION < QT_VERSION_CHECK(5, 12, 1) + window->changeNetWmState(true, Utility::internAtom("_NET_WM_STATE_HIDDEN")); ++#else + window->setNetWmState(true, Utility::internAtom("_NET_WM_STATE_HIDDEN")); ++#endif Utility::XIconifyWindow(window->connection()->xlib_display(), window->m_window, window->connection()->primaryScreenNumber());