Date: Saturday, February 2, 2019 @ 13:24:22 Author: arojas Revision: 429161
archrelease: copy trunk to community-staging-x86_64 Added: deepin-qt5dxcb-plugin/repos/community-staging-x86_64/ deepin-qt5dxcb-plugin/repos/community-staging-x86_64/PKGBUILD (from rev 429160, deepin-qt5dxcb-plugin/trunk/PKGBUILD) deepin-qt5dxcb-plugin/repos/community-staging-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch (from rev 429160, deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.12.1.patch) --------------------------------------+ PKGBUILD | 36 +++++++++++++++++++++++++++++++++ deepin-qt5dxcb-plugin-qt5.12.1.patch | 24 ++++++++++++++++++++++ 2 files changed, 60 insertions(+) Copied: deepin-qt5dxcb-plugin/repos/community-staging-x86_64/PKGBUILD (from rev 429160, deepin-qt5dxcb-plugin/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2019-02-02 13:24:22 UTC (rev 429161) @@ -0,0 +1,36 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=deepin-qt5dxcb-plugin +pkgver=1.1.23 +pkgrel=2 +pkgdesc='Qt platform plugins for DDE' +arch=('x86_64') +url="https://github.com/linuxdeepin/qt5dxcb-plugin" +license=('GPL3') +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' + 'b6aacb3e321a53f2e6c8af43b901ff7c908346ffabbaf37d7008267b80dea79cafd65f6230fdd8b7be3a9e4b8b7d343864128543123931c0649ece9d846f385a') + +prepare() { + cd qt5dxcb-plugin-$pkgver + + 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() { + cd qt5dxcb-plugin-$pkgver + qmake-qt5 PREFIX=/usr + make +} + +package() { + cd qt5dxcb-plugin-$pkgver + make INSTALL_ROOT="$pkgdir" install +} Copied: deepin-qt5dxcb-plugin/repos/community-staging-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch (from rev 429160, deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.12.1.patch) =================================================================== --- community-staging-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch (rev 0) +++ community-staging-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-02 13:24:22 UTC (rev 429161) @@ -0,0 +1,24 @@ +diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp +index 925c0ed..4c0bb57 100644 +--- a/platformplugin/dplatformwindowhelper.cpp ++++ b/platformplugin/dplatformwindowhelper.cpp +@@ -320,9 +320,7 @@ void DPlatformWindowHelper::setVisible(bool visible) + Utility::setMotifWmHints(window->m_window, mwmhints); + 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(); + #endif + + #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) +@@ -362,7 +360,7 @@ void DPlatformWindowHelper::setWindowState(Qt::WindowStates state) + if (state == Qt::WindowMinimized + && (window->m_windowState == Qt::WindowMaximized + || window->m_windowState == Qt::WindowFullScreen)) { +- window->changeNetWmState(true, Utility::internAtom("_NET_WM_STATE_HIDDEN")); ++ window->setNetWmState(true, Utility::internAtom("_NET_WM_STATE_HIDDEN")); + Utility::XIconifyWindow(window->connection()->xlib_display(), + window->m_window, + window->connection()->primaryScreenNumber());