[arch-commits] Commit in (5 files)

Felix Yan felixonmars at archlinux.org
Tue Jun 16 13:24:40 UTC 2020


    Date: Tuesday, June 16, 2020 @ 13:24:40
  Author: felixonmars
Revision: 646189

addpkg: deepin-qt5platform-plugins 5.0.12-1

Added:
  deepin-qt5platform-plugins/
  deepin-qt5platform-plugins/repos/
  deepin-qt5platform-plugins/trunk/
  deepin-qt5platform-plugins/trunk/PKGBUILD
  deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch

-----------------------------------------+
 PKGBUILD                                |   45 +++++++++++
 deepin-qt5platform-plugins-qt5.15.patch |  119 ++++++++++++++++++++++++++++++
 2 files changed, 164 insertions(+)

Added: deepin-qt5platform-plugins/trunk/PKGBUILD
===================================================================
--- deepin-qt5platform-plugins/trunk/PKGBUILD	                        (rev 0)
+++ deepin-qt5platform-plugins/trunk/PKGBUILD	2020-06-16 13:24:40 UTC (rev 646189)
@@ -0,0 +1,45 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-qt5platform-plugins
+pkgver=5.0.12
+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' 'kwayland' 'qt5-wayland' 'qt5-x11extras')
+makedepends=('expac' 'qt5-xcb-private-headers' 'libglvnd' 'libxcb')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/qt5platform-plugins/archive/$pkgver.tar.gz"
+         deepin-qt5platform-plugins-qt5.15.patch)
+sha512sums=('bf2878619dda9412185107d40396c6983a39db4c0b264f0d3cd5953f3238e82d458f33824242770b3048e572b65b76241b6f711c18ed88d95a13be01ba48368b'
+            '92ef3be31a679a5df77ef6c9acf2325e7ef398eb255cdc950684e8ce2c7ecc9b4c1d9b3599bca788f06e55c984db26e94ec21094964e1719a5544dcf24df4775')
+
+prepare() {
+  cd qt5platform-plugins-$pkgver
+
+  rm -r xcb/libqt5xcbqpa-dev wayland/qtwayland-dev
+  # Disable wayland for now: https://github.com/linuxdeepin/qt5platform-plugins/issues/47
+  sed -i '/wayland/d' qt5platform-plugins.pro
+
+  sed -i 's|error(Not support Qt Version: .*)|INCLUDEPATH += /usr/include/qtxcb-private|' xcb/linux.pri
+  sed -i "/qtwayland-dev/a /usr/include/qt/QtWaylandClient/$(expac %v qt5-wayland | cut -d - -f 1) /usr/include/qt/QtXkbCommonSupport/$(expac %v qt5-base | cut -d - -f 1) \\\\" wayland/wayland.pro
+
+  patch -p1 -i ../deepin-qt5platform-plugins-qt5.15.patch # Fix build with Qt 5.15
+  # https://github.com/linuxdeepin/qt5platform-plugins/pull/48
+  sed -i 's/xcbWindow-/window-/' xcb/windoweventhook.cpp
+}
+
+build() {
+  cd qt5platform-plugins-$pkgver
+  qmake-qt5 PREFIX=/usr
+  make
+}
+
+package() {
+  cd qt5platform-plugins-$pkgver
+  make INSTALL_ROOT="$pkgdir" install
+}

Added: deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch
===================================================================
--- deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch	                        (rev 0)
+++ deepin-qt5platform-plugins/trunk/deepin-qt5platform-plugins-qt5.15.patch	2020-06-16 13:24:40 UTC (rev 646189)
@@ -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