[arch-commits] Commit in deepin-qt5dxcb-plugin/repos/community-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Thu Feb 21 10:34:45 UTC 2019
Date: Thursday, February 21, 2019 @ 10:34:44
Author: felixonmars
Revision: 434940
archrelease: copy trunk to community-x86_64
Added:
deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD
(from rev 434939, deepin-qt5dxcb-plugin/trunk/PKGBUILD)
deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch
(from rev 434939, deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.12.1.patch)
Deleted:
deepin-qt5dxcb-plugin/repos/community-x86_64/PKGBUILD
deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch
--------------------------------------+
PKGBUILD | 72 ++++++++++++++++-----------------
deepin-qt5dxcb-plugin-qt5.12.1.patch | 60 ++++++++++++++++-----------
2 files changed, 72 insertions(+), 60 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-02-21 10:34:29 UTC (rev 434939)
+++ PKGBUILD 2019-02-21 10:34:44 UTC (rev 434940)
@@ -1,36 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at 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-x86_64/PKGBUILD (from rev 434939, deepin-qt5dxcb-plugin/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-02-21 10:34:44 UTC (rev 434940)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5dxcb-plugin
+pkgver=1.1.23
+pkgrel=3
+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'
+ '67151ced9c91b86f04953675dbfcba237fdd7569001d2460ccafe1de0fc577dc9575b93ed2b534eec95bac48d764ce3a49ca57cc92a90aebbf5cb30cf10ad239')
+
+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
+}
Deleted: deepin-qt5dxcb-plugin-qt5.12.1.patch
===================================================================
--- deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-21 10:34:29 UTC (rev 434939)
+++ deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-21 10:34:44 UTC (rev 434940)
@@ -1,24 +0,0 @@
-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());
Copied: deepin-qt5dxcb-plugin/repos/community-x86_64/deepin-qt5dxcb-plugin-qt5.12.1.patch (from rev 434939, deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.12.1.patch)
===================================================================
--- deepin-qt5dxcb-plugin-qt5.12.1.patch (rev 0)
+++ deepin-qt5dxcb-plugin-qt5.12.1.patch 2019-02-21 10:34:44 UTC (rev 434940)
@@ -0,0 +1,36 @@
+From 1a9a05ef7942c91dafaf24023404aef9cbd77dbe Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars at 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 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());
More information about the arch-commits
mailing list