Date: Tuesday, February 26, 2019 @ 13:23:31 Author: felixonmars Revision: 436142
upgpkg: deepin-qt5dxcb-plugin 1.1.24-1 Modified: deepin-qt5dxcb-plugin/trunk/PKGBUILD Deleted: deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.12.1.patch --------------------------------------+ PKGBUILD | 12 +++-------- deepin-qt5dxcb-plugin-qt5.12.1.patch | 36 --------------------------------- 2 files changed, 4 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-02-26 13:22:49 UTC (rev 436141) +++ PKGBUILD 2019-02-26 13:23:31 UTC (rev 436142) @@ -1,8 +1,8 @@ # Maintainer: Felix Yan <[email protected]> pkgname=deepin-qt5dxcb-plugin -pkgver=1.1.23 -pkgrel=3 +pkgver=1.1.24 +pkgrel=1 pkgdesc='Qt platform plugins for DDE' arch=('x86_64') url="https://github.com/linuxdeepin/qt5dxcb-plugin"; @@ -10,10 +10,8 @@ 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"; - deepin-qt5dxcb-plugin-qt5.12.1.patch) -sha512sums=('d53f5635cf852ee0a271caf057e68853eb8fa9b24819bbf87ccac53e29fc255925c8d5b3fde68a6cc6ef7e5d8ba208e53d95ad1d9916e9e0b326feeaea46e8f1' - '67151ced9c91b86f04953675dbfcba237fdd7569001d2460ccafe1de0fc577dc9575b93ed2b534eec95bac48d764ce3a49ca57cc92a90aebbf5cb30cf10ad239') +source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz";) +sha512sums=('cd555bad95a3b51f04f1d119f053c40aa48213073a13d88299a2d334ad6da8fec58a205c52e0fe7efc6f0879dcb7faf20e8ed345fc9b574621748d4a4cf63a19') prepare() { cd qt5dxcb-plugin-$pkgver @@ -20,8 +18,6 @@ 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.12.1.patch # Fix build with Qt 5.12.1 } build() { Deleted: deepin-qt5dxcb-plugin-qt5.12.1.patch =================================================================== --- deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-26 13:22:49 UTC (rev 436141) +++ deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-26 13:23:31 UTC (rev 436142) @@ -1,36 +0,0 @@ -From 1a9a05ef7942c91dafaf24023404aef9cbd77dbe Mon Sep 17 00:00:00 2001 -From: Felix Yan <[email protected]> -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 d1b3772..09401e0 100644 ---- a/platformplugin/dplatformwindowhelper.cpp -+++ b/platformplugin/dplatformwindowhelper.cpp -@@ -321,7 +321,11 @@ - Utility::setMotifWmHints(helper->m_nativeWindow->QNativeWindow::winId(), cw_hints); - - 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 - -@@ -362,7 +366,11 @@ - if (state == Qt::WindowMinimized - && (window->m_windowState == Qt::WindowMaximized - || window->m_windowState == Qt::WindowFullScreen)) { -+#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());
