[arch-commits] Commit in deepin-qt5dxcb-plugin/trunk (2 files)
Antonio Rojas
arojas at archlinux.org
Tue May 26 13:56:13 UTC 2020
Date: Tuesday, May 26, 2020 @ 13:56:12
Author: arojas
Revision: 635087
Qt 5.15 rebuild
Added:
deepin-qt5dxcb-plugin/trunk/deepin-qt5dxcb-plugin-qt5.15.patch
Modified:
deepin-qt5dxcb-plugin/trunk/PKGBUILD
------------------------------------+
PKGBUILD | 18 +++--
deepin-qt5dxcb-plugin-qt5.15.patch | 119 +++++++++++++++++++++++++++++++++++
2 files changed, 130 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-05-26 13:53:04 UTC (rev 635086)
+++ PKGBUILD 2020-05-26 13:56:12 UTC (rev 635087)
@@ -2,33 +2,37 @@
pkgname=deepin-qt5dxcb-plugin
pkgver=5.0.11
-pkgrel=1
+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')
+makedepends=('qt5-xcb-private-headers' 'libglvnd' 'libxcb')
groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz")
-sha512sums=('a53a9445b8c84de47c3a1f50e111de11d43f3998638b0ead7deffc6766e0cc3f989f01835e77ac6dc78415805d49a6d17ca061783b9ced8617ded2d0849b808c')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5dxcb-plugin/archive/$pkgver.tar.gz"
+ deepin-qt5dxcb-plugin-qt5.15.patch)
+sha512sums=('54b401c24334e2d20db734b31f2d9e89595269a8679aba93362038d4af109581d261e79cef6e1fe030854e8e95ab109f6fe0c979f2f07684412e0de8507d0c7d'
+ '15a9edb6a1df30c68622260bad799dcb56514f1e4336ab8c12b2984c81ac710037ac00584b76a50aea0b7cf311dc6dc05df2441ec175d6041c1d054c2982de92')
prepare() {
- cd qt5dxcb-plugin-$pkgver
+ cd qt5platform-plugins-$pkgver
rm -r platformplugin/libqt5xcbqpa-dev
sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' platformplugin/linux.pri
sed -i 's/active = VtableHook::overrideVfptrFun.*/active = 1;/' platformplugin/dhighdpi.cpp
+
+ patch -p1 -i ../deepin-qt5dxcb-plugin-qt5.15.patch # Fix build with Qt 5.15
}
build() {
- cd qt5dxcb-plugin-$pkgver
+ cd qt5platform-plugins-$pkgver
qmake-qt5 PREFIX=/usr
make
}
package() {
- cd qt5dxcb-plugin-$pkgver
+ cd qt5platform-plugins-$pkgver
make INSTALL_ROOT="$pkgdir" install
}
Added: deepin-qt5dxcb-plugin-qt5.15.patch
===================================================================
--- deepin-qt5dxcb-plugin-qt5.15.patch (rev 0)
+++ deepin-qt5dxcb-plugin-qt5.15.patch 2020-05-26 13:56:12 UTC (rev 635087)
@@ -0,0 +1,119 @@
+diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp
+index de4478d..a85f14e 100644
+--- a/platformplugin/dplatformwindowhelper.cpp
++++ b/platformplugin/dplatformwindowhelper.cpp
+@@ -35,6 +35,8 @@
+ #include <private/qguiapplication_p.h>
+ #include <qpa/qplatformcursor.h>
+
++#include <QPainterPath>
++
+ Q_DECLARE_METATYPE(QPainterPath)
+ Q_DECLARE_METATYPE(QMargins)
+
+@@ -511,10 +513,17 @@ bool DPlatformWindowHelper::setWindowModified(bool modified)
+ return me()->m_frameWindow->handle()->setWindowModified(modified);
+ }
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ bool DPlatformWindowHelper::startSystemResize(const QPoint &pos, Qt::Corner corner)
+ {
+ return me()->m_frameWindow->handle()->startSystemResize(pos, corner);
+ }
++#else
++bool DPlatformWindowHelper::startSystemResize(Qt::Edges edges)
++{
++ return me()->m_frameWindow->handle()->startSystemResize(edges);
++}
++#endif
+
+ void DPlatformWindowHelper::setFrameStrutEventsEnabled(bool enabled)
+ {
+diff --git a/platformplugin/dplatformwindowhelper.h b/platformplugin/dplatformwindowhelper.h
+index 8d9fa14..e43809a 100644
+--- a/platformplugin/dplatformwindowhelper.h
++++ b/platformplugin/dplatformwindowhelper.h
+@@ -92,8 +92,12 @@ public:
+
+ bool setWindowModified(bool modified);
+
++#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ bool startSystemResize(const QPoint &pos, Qt::Corner corner);
+-
++#else
++ bool startSystemResize(Qt::Edges edges);
++#endif
++
+ void setFrameStrutEventsEnabled(bool enabled);
+ bool frameStrutEventsEnabled() const;
+
+diff --git a/platformplugin/linux.pri b/platformplugin/linux.pri
+index 3be1e5f..59e237a 100644
+--- a/platformplugin/linux.pri
++++ b/platformplugin/linux.pri
+@@ -30,26 +30,37 @@ contains(QT_CONFIG, xcb-xlib)|qtConfig(xcb-xlib) {
+ DEFINES += XCB_USE_XLIB
+ QMAKE_USE += xcb_xlib
+
+- greaterThan(QT_MINOR_VERSION, 11) {
+- contains(QT_CONFIG, xcb-xinput)|qtConfig(xcb-xinput) {
+- DEFINES += XCB_USE_XINPUT2 XCB_USE_XINPUT21 XCB_USE_XINPUT22
+- QMAKE_USE += xcb_xinput
++ greaterThan(QT_MINOR_VERSION, 14) {
++ DEFINES += XCB_USE_XINPUT2 XCB_USE_XINPUT21 XCB_USE_XINPUT22
++ QMAKE_USE += xcb_xinput
+
+- !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
+- DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
+- LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
+- LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
+- }
++ !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
++ DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
++ LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
++ LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
+ }
+ } else {
+- contains(QT_CONFIG, xinput2)|qtConfig(xinput2) {
+- DEFINES += XCB_USE_XINPUT2
+- QMAKE_USE += xinput2
++ greaterThan(QT_MINOR_VERSION, 11) {
++ contains(QT_CONFIG, xcb-xinput)|qtConfig(xcb-xinput) {
++ DEFINES += XCB_USE_XINPUT2 XCB_USE_XINPUT21 XCB_USE_XINPUT22
++ QMAKE_USE += xcb_xinput
++
++ !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
++ DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
++ LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
++ LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
++ }
++ }
++ } else {
++ contains(QT_CONFIG, xinput2)|qtConfig(xinput2) {
++ DEFINES += XCB_USE_XINPUT2
++ QMAKE_USE += xinput2
+
+- !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
+- DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
+- LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
+- LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
++ !isEmpty(QMAKE_LIBXI_VERSION_MAJOR) {
++ DEFINES += LIBXI_MAJOR=$$QMAKE_LIBXI_VERSION_MAJOR \
++ LIBXI_MINOR=$$QMAKE_LIBXI_VERSION_MINOR \
++ LIBXI_PATCH=$$QMAKE_LIBXI_VERSION_PATCH
++ }
+ }
+ }
+ }
+diff --git a/platformplugin/utility.h b/platformplugin/utility.h
+index 2e819e1..d3b2677 100644
+--- a/platformplugin/utility.h
++++ b/platformplugin/utility.h
+@@ -19,6 +19,7 @@
+ #define UTILITY_H
+
+ #include <QImage>
++#include <QPainterPath>
+
+ #include "global.h"
+
More information about the arch-commits
mailing list