Date: Tuesday, March 21, 2023 @ 10:06:29
Author: felixonmars
Revision: 1424646
archrelease: copy trunk to community-x86_64
Added:
deepin-qt5platform-plugins/repos/community-x86_64/PKGBUILD
(from rev 1424645, deepin-qt5platform-plugins/trunk/PKGBUILD)
deepin-qt5platform-plugins/repos/community-x86_64/deepin-qt5platform-plugins-qt5.15.patch
(from rev 1424645,
deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch)
Deleted:
deepin-qt5platform-plugins/repos/community-x86_64/PKGBUILD
deepin-qt5platform-plugins/repos/community-x86_64/deepin-qt5platform-plugins-qt5.15.patch
-----------------------------------------+
PKGBUILD | 68 ++++----
deepin-qt5platform-plugins-qt5.15.patch | 238 +++++++++++++++---------------
2 files changed, 153 insertions(+), 153 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-21 10:06:14 UTC (rev 1424645)
+++ PKGBUILD 2023-03-21 10:06:29 UTC (rev 1424646)
@@ -1,34 +0,0 @@
-# Maintainer: Felix Yan <[email protected]>
-
-pkgname=deepin-qt5platform-plugins
-pkgver=5.6.5
-_commit=965122fa305412037a9b877a18432a967d1341b7
-pkgrel=1
-pkgdesc='Qt platform plugins for DDE'
-arch=('x86_64')
-url="https://github.com/linuxdeepin/qt5platform-plugins";
-license=('LGPL3')
-provides=('deepin-qt5dxcb-plugin')
-conflicts=('deepin-qt5dxcb-plugin')
-replaces=('deepin-qt5dxcb-plugin')
-depends=('cairo' 'deepin-wayland' 'kwayland' 'qt5-x11extras')
-makedepends=('git' 'expac' 'qt5-xcb-private-headers' 'libglvnd' 'libxcb')
-groups=('deepin')
-source=("git+https://github.com/linuxdeepin/qt5platform-plugins.git#commit=$_commit";)
-sha512sums=('SKIP')
-
-prepare() {
- cd qt5platform-plugins
- rm -r xcb/libqt5xcbqpa-dev wayland/qtwayland-dev
-}
-
-build() {
- cd qt5platform-plugins
- qmake-qt5 PREFIX=/usr QT_XCB_PRIVATE_INCLUDE=/usr/include/qtxcb-private
- make
-}
-
-package() {
- cd qt5platform-plugins
- make INSTALL_ROOT="$pkgdir" install
-}
Copied: deepin-qt5platform-plugins/repos/community-x86_64/PKGBUILD (from rev
1424645, deepin-qt5platform-plugins/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2023-03-21 10:06:29 UTC (rev 1424646)
@@ -0,0 +1,34 @@
+# Maintainer: Felix Yan <[email protected]>
+
+pkgname=deepin-qt5platform-plugins
+pkgver=5.6.5
+_commit=965122fa305412037a9b877a18432a967d1341b7
+pkgrel=2
+pkgdesc='Qt platform plugins for DDE'
+arch=('x86_64')
+url="https://github.com/linuxdeepin/qt5platform-plugins";
+license=('LGPL3')
+provides=('deepin-qt5dxcb-plugin')
+conflicts=('deepin-qt5dxcb-plugin')
+replaces=('deepin-qt5dxcb-plugin')
+depends=('cairo' 'qt5-x11extras')
+makedepends=('git' 'expac' 'qt5-xcb-private-headers' 'libglvnd' 'libxcb')
+groups=('deepin')
+source=("git+https://github.com/linuxdeepin/qt5platform-plugins.git#commit=$_commit";)
+sha512sums=('SKIP')
+
+prepare() {
+ cd qt5platform-plugins
+ rm -r xcb/libqt5xcbqpa-dev wayland/qtwayland-dev
+}
+
+build() {
+ cd qt5platform-plugins
+ qmake-qt5 PREFIX=/usr QT_XCB_PRIVATE_INCLUDE=/usr/include/qtxcb-private
CONFIG+=DISABLE_WAYLAND
+ make
+}
+
+package() {
+ cd qt5platform-plugins
+ make INSTALL_ROOT="$pkgdir" install
+}
Deleted: deepin-qt5platform-plugins-qt5.15.patch
===================================================================
--- deepin-qt5platform-plugins-qt5.15.patch 2023-03-21 10:06:14 UTC (rev
1424645)
+++ deepin-qt5platform-plugins-qt5.15.patch 2023-03-21 10:06:29 UTC (rev
1424646)
@@ -1,119 +0,0 @@
-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"
-
Copied:
deepin-qt5platform-plugins/repos/community-x86_64/deepin-qt5platform-plugins-qt5.15.patch
(from rev 1424645,
deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch)
===================================================================
--- deepin-qt5platform-plugins-qt5.15.patch (rev 0)
+++ deepin-qt5platform-plugins-qt5.15.patch 2023-03-21 10:06:29 UTC (rev
1424646)
@@ -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"
+
