[arch-commits] Commit in deepin-qt5platform-plugins/repos (3 files)
Felix Yan
felixonmars at gemini.archlinux.org
Tue Aug 17 10:19:30 UTC 2021
Date: Tuesday, August 17, 2021 @ 10:19:30
Author: felixonmars
Revision: 1001300
archrelease: copy trunk to community-testing-x86_64
Added:
deepin-qt5platform-plugins/repos/community-testing-x86_64/
deepin-qt5platform-plugins/repos/community-testing-x86_64/PKGBUILD
(from rev 1001299, deepin-qt5platform-plugins/trunk/PKGBUILD)
deepin-qt5platform-plugins/repos/community-testing-x86_64/deepin-qt5platform-plugins-qt5.15.patch
(from rev 1001299, deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch)
-----------------------------------------+
PKGBUILD | 36 +++++++++
deepin-qt5platform-plugins-qt5.15.patch | 119 ++++++++++++++++++++++++++++++
2 files changed, 155 insertions(+)
Copied: deepin-qt5platform-plugins/repos/community-testing-x86_64/PKGBUILD (from rev 1001299, deepin-qt5platform-plugins/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2021-08-17 10:19:30 UTC (rev 1001300)
@@ -0,0 +1,36 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5platform-plugins
+pkgver=5.0.40
+pkgrel=1
+pkgdesc='Qt platform plugins for DDE'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/qt5platform-plugins"
+license=('GPL3')
+provides=('deepin-qt5dxcb-plugin')
+conflicts=('deepin-qt5dxcb-plugin')
+replaces=('deepin-qt5dxcb-plugin')
+depends=('cairo' 'deepin-wayland' 'kwayland' 'qt5-x11extras')
+makedepends=('expac' 'qt5-xcb-private-headers' 'libglvnd' 'libxcb')
+groups=('deepin')
+source=("https://github.com/linuxdeepin/qt5platform-plugins/archive/$pkgver/$pkgname-$pkgver.tar.gz")
+sha512sums=('7541454b267c3cb3162a632b8fa20142226debc6360b6491db668610040c0773d21f85d9128455260a6d9c1f94a45f6d7b8b37ba18bd51b33fbf505d901ae88e')
+
+prepare() {
+ cd qt5platform-plugins-$pkgver
+
+ rm -r xcb/libqt5xcbqpa-dev wayland/qtwayland-dev
+
+ sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' xcb/linux.pri
+}
+
+build() {
+ cd qt5platform-plugins-$pkgver
+ qmake-qt5 PREFIX=/usr
+ make
+}
+
+package() {
+ cd qt5platform-plugins-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+}
Copied: deepin-qt5platform-plugins/repos/community-testing-x86_64/deepin-qt5platform-plugins-qt5.15.patch (from rev 1001299, deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch)
===================================================================
--- community-testing-x86_64/deepin-qt5platform-plugins-qt5.15.patch (rev 0)
+++ community-testing-x86_64/deepin-qt5platform-plugins-qt5.15.patch 2021-08-17 10:19:30 UTC (rev 1001300)
@@ -0,0 +1,119 @@
+diff --git a/xcb/dplatformwindowhelper.cpp b/xcb/dplatformwindowhelper.cpp
+index de4478d..a85f14e 100644
+--- a/xcb/dplatformwindowhelper.cpp
++++ b/xcb/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/xcb/dplatformwindowhelper.h b/xcb/dplatformwindowhelper.h
+index 8d9fa14..e43809a 100644
+--- a/xcb/dplatformwindowhelper.h
++++ b/xcb/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/xcb/linux.pri b/xcb/linux.pri
+index 3be1e5f..59e237a 100644
+--- a/xcb/linux.pri
++++ b/xcb/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/xcb/utility.h b/xcb/utility.h
+index 2e819e1..d3b2677 100644
+--- a/xcb/utility.h
++++ b/xcb/utility.h
+@@ -19,6 +19,7 @@
+ #define UTILITY_H
+
+ #include <QImage>
++#include <QPainterPath>
+
+ #include "global.h"
+
More information about the arch-commits
mailing list