qt5-base: add patch to fix pyside2 build
This commit is contained in:
Christoph Reiter
parent
0772ac274e
commit
d0a9be26e6
134
mingw-w64-qt5-base/0028-work-around-pyside2-brokenness.patch
Normal file
134
mingw-w64-qt5-base/0028-work-around-pyside2-brokenness.patch
Normal file
@ -0,0 +1,134 @@
|
||||
diff -up qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h
|
||||
--- qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h.5~ 2023-03-23 20:06:47.000000000 +0100
|
||||
+++ qtbase-everywhere-src-5.15.9/src/gui/kernel/qevent.h 2023-04-15 23:23:40.599956996 +0200
|
||||
@@ -104,15 +104,15 @@ protected:
|
||||
class Q_GUI_EXPORT QMouseEvent : public QInputEvent
|
||||
{
|
||||
public:
|
||||
- QMouseEvent(Type type, const QPointF &localPos, Qt::MouseButton button,
|
||||
+ QMouseEvent(QEvent::Type type, const QPointF &localPos, Qt::MouseButton button,
|
||||
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
|
||||
- QMouseEvent(Type type, const QPointF &localPos, const QPointF &screenPos,
|
||||
+ QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &screenPos,
|
||||
Qt::MouseButton button, Qt::MouseButtons buttons,
|
||||
Qt::KeyboardModifiers modifiers);
|
||||
- QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
|
||||
+ QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
|
||||
Qt::MouseButton button, Qt::MouseButtons buttons,
|
||||
Qt::KeyboardModifiers modifiers);
|
||||
- QMouseEvent(Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
|
||||
+ QMouseEvent(QEvent::Type type, const QPointF &localPos, const QPointF &windowPos, const QPointF &screenPos,
|
||||
Qt::MouseButton button, Qt::MouseButtons buttons,
|
||||
Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source);
|
||||
~QMouseEvent();
|
||||
@@ -154,7 +154,7 @@ protected:
|
||||
class Q_GUI_EXPORT QHoverEvent : public QInputEvent
|
||||
{
|
||||
public:
|
||||
- QHoverEvent(Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
|
||||
+ QHoverEvent(QEvent::Type type, const QPointF &pos, const QPointF &oldPos, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
|
||||
~QHoverEvent();
|
||||
|
||||
#ifndef QT_NO_INTEGER_EVENT_COORDINATES
|
||||
@@ -282,12 +282,12 @@ public:
|
||||
#if QT_DEPRECATED_SINCE(5, 15)
|
||||
// Actually deprecated since 5.4, in docs
|
||||
QT_DEPRECATED_VERSION_X_5_15("Use the other QTabletEvent constructor")
|
||||
- QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
|
||||
+ QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
|
||||
int device, int pointerType, qreal pressure, int xTilt, int yTilt,
|
||||
qreal tangentialPressure, qreal rotation, int z,
|
||||
Qt::KeyboardModifiers keyState, qint64 uniqueID); // ### remove in Qt 6
|
||||
#endif
|
||||
- QTabletEvent(Type t, const QPointF &pos, const QPointF &globalPos,
|
||||
+ QTabletEvent(QEvent::Type t, const QPointF &pos, const QPointF &globalPos,
|
||||
int device, int pointerType, qreal pressure, int xTilt, int yTilt,
|
||||
qreal tangentialPressure, qreal rotation, int z,
|
||||
Qt::KeyboardModifiers keyState, qint64 uniqueID,
|
||||
@@ -377,9 +377,9 @@ protected:
|
||||
class Q_GUI_EXPORT QKeyEvent : public QInputEvent
|
||||
{
|
||||
public:
|
||||
- QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
|
||||
+ QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text = QString(),
|
||||
bool autorep = false, ushort count = 1);
|
||||
- QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
|
||||
+ QKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
|
||||
quint32 nativeScanCode, quint32 nativeVirtualKey, quint32 nativeModifiers,
|
||||
const QString &text = QString(), bool autorep = false, ushort count = 1);
|
||||
~QKeyEvent();
|
||||
@@ -399,7 +399,7 @@ public:
|
||||
|
||||
// Functions for the extended key event information
|
||||
#if QT_DEPRECATED_SINCE(5, 0)
|
||||
- static inline QKeyEvent *createExtendedKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers,
|
||||
+ static inline QKeyEvent *createExtendedKeyEvent(QEvent::Type type, int key, Qt::KeyboardModifiers modifiers,
|
||||
quint32 nativeScanCode, quint32 nativeVirtualKey,
|
||||
quint32 nativeModifiers,
|
||||
const QString& text = QString(), bool autorep = false,
|
||||
@@ -682,7 +682,7 @@ class Q_GUI_EXPORT QDragMoveEvent : publ
|
||||
{
|
||||
public:
|
||||
QDragMoveEvent(const QPoint &pos, Qt::DropActions actions, const QMimeData *data,
|
||||
- Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Type type = DragMove);
|
||||
+ Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, QEvent::Type type = QEvent::DragMove);
|
||||
~QDragMoveEvent();
|
||||
|
||||
inline QRect answerRect() const { return rect; }
|
||||
diff -up qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h
|
||||
--- qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h.5~ 2023-03-23 20:06:47.000000000 +0100
|
||||
+++ qtbase-everywhere-src-5.15.9/src/widgets/graphicsview/qgraphicssceneevent.h 2023-04-15 23:22:38.038387091 +0200
|
||||
@@ -82,7 +82,7 @@ class QGraphicsSceneMouseEventPrivate;
|
||||
class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : public QGraphicsSceneEvent
|
||||
{
|
||||
public:
|
||||
- explicit QGraphicsSceneMouseEvent(Type type = None);
|
||||
+ explicit QGraphicsSceneMouseEvent(QEvent::Type type = QEvent::None);
|
||||
~QGraphicsSceneMouseEvent();
|
||||
|
||||
QPointF pos() const;
|
||||
@@ -136,7 +136,7 @@ class QGraphicsSceneWheelEventPrivate;
|
||||
class Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : public QGraphicsSceneEvent
|
||||
{
|
||||
public:
|
||||
- explicit QGraphicsSceneWheelEvent(Type type = None);
|
||||
+ explicit QGraphicsSceneWheelEvent(QEvent::Type type = QEvent::None);
|
||||
~QGraphicsSceneWheelEvent();
|
||||
|
||||
QPointF pos() const;
|
||||
@@ -171,7 +171,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneCon
|
||||
public:
|
||||
enum Reason { Mouse, Keyboard, Other };
|
||||
|
||||
- explicit QGraphicsSceneContextMenuEvent(Type type = None);
|
||||
+ explicit QGraphicsSceneContextMenuEvent(QEvent::Type type = QEvent::None);
|
||||
~QGraphicsSceneContextMenuEvent();
|
||||
|
||||
QPointF pos() const;
|
||||
@@ -198,7 +198,7 @@ class QGraphicsSceneHoverEventPrivate;
|
||||
class Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : public QGraphicsSceneEvent
|
||||
{
|
||||
public:
|
||||
- explicit QGraphicsSceneHoverEvent(Type type = None);
|
||||
+ explicit QGraphicsSceneHoverEvent(QEvent::Type type = QEvent::None);
|
||||
~QGraphicsSceneHoverEvent();
|
||||
|
||||
QPointF pos() const;
|
||||
@@ -231,7 +231,7 @@ class QGraphicsSceneHelpEventPrivate;
|
||||
class Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : public QGraphicsSceneEvent
|
||||
{
|
||||
public:
|
||||
- explicit QGraphicsSceneHelpEvent(Type type = None);
|
||||
+ explicit QGraphicsSceneHelpEvent(QEvent::Type type = QEvent::None);
|
||||
~QGraphicsSceneHelpEvent();
|
||||
|
||||
QPointF scenePos() const;
|
||||
@@ -249,7 +249,7 @@ class QGraphicsSceneDragDropEventPrivate
|
||||
class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
|
||||
{
|
||||
public:
|
||||
- explicit QGraphicsSceneDragDropEvent(Type type = None);
|
||||
+ explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
|
||||
~QGraphicsSceneDragDropEvent();
|
||||
|
||||
QPointF pos() const;
|
||||
@ -13,7 +13,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
"${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
|
||||
_qtver=5.15.10
|
||||
pkgver=${_qtver}+kde+r129
|
||||
pkgrel=1
|
||||
pkgrel=2
|
||||
_commit=e8d9e68d25f4bf305f8b3ca5d678594ee4681baa
|
||||
arch=('any')
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
|
||||
@ -69,7 +69,8 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfn#commit=$_commit
|
||||
0024-fix-synqt-with-git-build.patch
|
||||
0025-enable-avx-support.patch
|
||||
0026-fix-mingw-win32-winnt-detection.patch
|
||||
0027-qt-5.7.0-qdbus-manager-quit.patch)
|
||||
0027-qt-5.7.0-qdbus-manager-quit.patch
|
||||
0028-work-around-pyside2-brokenness.patch)
|
||||
sha256sums=('SKIP'
|
||||
'a74eec5be1aee1bd3a37af0955b7c5f3d36d54bc64c07e4c2edd5526cdc3cad5'
|
||||
'e0a535278057f42e43952405e567c23cc493ef6badeeb3bbce0154953cd545a5'
|
||||
@ -96,7 +97,8 @@ sha256sums=('SKIP'
|
||||
'18b3dccd9141773026b2a13a79df42ec9196bc6ad77f5feedcbd304b02fa0e6f'
|
||||
'e5d22486bf809d9422103471766f4a11d3090acaf9104cfaf333bad1aa1dcc6c'
|
||||
'6ceed12f98254c37fb3b1ab68a84214c922bd2c402fea89fa65638d56e567bbb'
|
||||
'03dc899326676cc6e9e6b4e77634ccea3693449bf8627653dc7fdb74378ad264')
|
||||
'03dc899326676cc6e9e6b4e77634ccea3693449bf8627653dc7fdb74378ad264'
|
||||
'8dd074ab427ccd439e34f50ed8b03228d71c09a5375050ad5d47064ff6b00d8f')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
@ -147,6 +149,10 @@ prepare() {
|
||||
apply_patch_with_msg \
|
||||
0027-qt-5.7.0-qdbus-manager-quit.patch
|
||||
|
||||
# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/IJQ3KMKJFIKEVY4WX5WMQFYUGAVB2G2M/#TPQFP6W22XACTGIBLDL3TG6HA322HWPR
|
||||
apply_patch_with_msg \
|
||||
0028-work-around-pyside2-brokenness.patch
|
||||
|
||||
local _ARCH_TUNE=
|
||||
case ${MINGW_CHOST} in
|
||||
i686*)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user