snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions 1 Activity

qt5dxcb-plugin: update to 5.0.11. 

[ci skip]
This commit is contained in:
John 2020-06-13 18:59:51 +02:00
parent 4ca98f7b48
commit d0dcef052f
2 changed files with 127 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
srcpkgs/qt5dxcb-plugin/patches/deepin-qt5dxcb-plugin-qt5.15.patch Normal file
View File

@ -0,0 +1,119 @@
diff --git a/platformplugin/dplatformwindowhelper.cpp b/platformplugin/dplatformwindowhelper.cpp
index de4478d..a85f14e 100644
--- platformplugin/dplatformwindowhelper.cpp
+++ 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
--- platformplugin/dplatformwindowhelper.h
+++ 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
--- platformplugin/linux.pri
+++ 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
--- platformplugin/utility.h
+++ platformplugin/utility.h
@@ -19,6 +19,7 @@
#define UTILITY_H
#include <QImage>
+#include <QPainterPath>
#include "global.h"

15
srcpkgs/qt5dxcb-plugin/template
View File

@ -1,21 +1,21 @@
# Template file for 'qt5dxcb-plugin'
pkgname=qt5dxcb-plugin
version=5.0.1
revision=4
version=5.0.11
revision=1
wrksrc="qt5platform-plugins-${version}"
build_style=qmake
make_build_args="VERSION=${version}"
hostmakedepends="pkg-config qt5-qmake"
makedepends="cairo-devel libSM-devel libXi-devel libxkbcommon-devel
qt5-x11extras-devel xcb-util-image-devel xcb-util-keysyms-devel
xcb-util-renderutil-devel xcb-util-wm-devel qt5-xcb-private-headers"
depends="qt5-core>=5.14.2<5.14.3"
depends="qt5-core>=5.15.0<5.15.1"
short_desc="Qt platform plugins for DDE"
maintainer="John <johnz@posteo.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/linuxdeepin/qt5dxcb-plugin/"
changelog="https://github.com/linuxdeepin/qt5dxcb-plugin/blob/master/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/qt5dxcb-plugin/archive/${version}.tar.gz"
checksum=b19253f9f577b2a9d86774ba95d252318f3d692ab92d2e62fbf0578d56db453d
homepage="https://github.com/linuxdeepin/qt5platform-plugins"
distfiles="https://github.com/linuxdeepin/qt5platform-plugins/archive/${version}.tar.gz"
checksum=46b55b3114a2b028c64f5e88bdc01db31670a33f00969acc1ce8eb98af8a089c
pre_configure() {
_qt5_dep_ver="${depends#*>=}"
@ -29,6 +29,7 @@ pre_configure() {
exit 1
fi
sed -i "s|error(Not support Qt Version: .*)|INCLUDEPATH += ${XBPS_CROSS_BASE}/usr/include/qt5xcb-private|" platformplugin/linux.pri
sed -i 's/active = VtableHook::overrideVfptrFun.*/active = 1;/' platformplugin/dhighdpi.cpp
}
if [ "$CROSS_BUILD" ]; then