git: 8fb94b4b4f02 - 2024Q4 - PySide2: Add workaround for devel/shiboken2 issues with LLVM >= 16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 12 Nov 2024 05:32:44 UTC
The branch 2024Q4 has been updated by jhale:
URL: https://cgit.FreeBSD.org/ports/commit/?id=8fb94b4b4f0221def7b63600400f47609703c07b
commit 8fb94b4b4f0221def7b63600400f47609703c07b
Author: Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2024-11-11 08:51:11 +0000
Commit: Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2024-11-12 05:32:22 +0000
PySide2: Add workaround for devel/shiboken2 issues with LLVM >= 16
Shiboken2 itself builds fine, but the code it generates for devel/pyside2
is broken.
In file included from /wrkdirs/usr/ports/devel/pyside2/work-py311/.build/PySide2/QtGui/PySide2/QtGui/qdragmoveevent_wrapper.cpp:63:
/wrkdirs/usr/ports/devel/pyside2/work-py311/.build/PySide2/QtGui/PySide2/QtGui/qdragmoveevent_wrapper.h:55:220:
error: no member named 'DragMove' in 'QOpenGLShader'; did you mean simply 'DragMove'?
PR: 270715, 282433
Obtained from: OpenMandriva
MFH: 2024Q4
(cherry picked from commit 1c4bdeedd071d370e693f36fb18b0735a1734f1a)
---
x11-toolkits/qt5-gui/Makefile | 1 +
.../qt5-gui/files/patch-src_gui_configure.json | 8 +--
.../qt5-gui/files/patch-src_gui_kernel_qevent.h | 76 ++++++++++++++++++++++
...t_input_evdevkeyboard_qevdevkeyboardhandler.cpp | 6 +-
...support_input_evdevtouch_qevdevtouchhandler.cpp | 8 +--
x11-toolkits/qt5-widgets/Makefile | 1 +
...-src_widgets_graphicsview_qgraphicssceneevent.h | 56 ++++++++++++++++
7 files changed, 145 insertions(+), 11 deletions(-)
diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile
index ee7445e79643..ce2af9d1c15a 100644
--- a/x11-toolkits/qt5-gui/Makefile
+++ b/x11-toolkits/qt5-gui/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gui
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION= 1
CATEGORIES= x11-toolkits graphics
PKGNAMEPREFIX= qt5-
diff --git a/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json b/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json
index bef635ebd78d..06a73f280b51 100644
--- a/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json
+++ b/x11-toolkits/qt5-gui/files/patch-src_gui_configure.json
@@ -4,11 +4,11 @@ main.cpp:13:14: error: cannot initialize a variable of type 'Display *' (aka '_X
Display *dpy = EGL_DEFAULT_DISPLAY;
^ ~~~~~~~~~~~~~~~~~~~
---- src/gui/configure.json.orig 2020-10-27 08:02:11 UTC
+--- src/gui/configure.json.orig 2024-08-30 14:45:12 UTC
+++ src/gui/configure.json
-@@ -845,6 +845,7 @@
- "// window and pixmap types will be different than what an X-based platform",
- "// plugin would expect."
+@@ -837,6 +837,7 @@
+ "// plugin would expect.",
+ "#define USE_X11"
],
+ "head": [ "#define USE_X11" ],
"include": [ "EGL/egl.h", "X11/Xlib.h" ],
diff --git a/x11-toolkits/qt5-gui/files/patch-src_gui_kernel_qevent.h b/x11-toolkits/qt5-gui/files/patch-src_gui_kernel_qevent.h
new file mode 100644
index 000000000000..a0f21b0825fe
--- /dev/null
+++ b/x11-toolkits/qt5-gui/files/patch-src_gui_kernel_qevent.h
@@ -0,0 +1,76 @@
+--- src/gui/kernel/qevent.h.orig 2024-08-30 14:45:12 UTC
++++ src/gui/kernel/qevent.h
+@@ -104,15 +104,15 @@ class Q_GUI_EXPORT QMouseEvent : public QInputEvent (p
+ 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 @@ class Q_GUI_EXPORT QHoverEvent : public QInputEvent (p
+ 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 @@ class Q_GUI_EXPORT QTabletEvent : public QInputEvent (
+ #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 @@ class Q_GUI_EXPORT QKeyEvent : public QInputEvent (pub
+ 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 @@ class Q_GUI_EXPORT QKeyEvent : public QInputEvent (pub
+
+ // 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 : public QDropEvent
+ {
+ 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 --git a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp
index bdc2a37893ef..6a3a8a7f53b4 100644
--- a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp
+++ b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevkeyboard_qevdevkeyboardhandler.cpp
@@ -1,4 +1,4 @@
---- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2019-06-13 04:18:18 UTC
+--- src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp.orig 2024-08-30 14:45:12 UTC
+++ src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp
@@ -52,11 +52,7 @@
#include <QtGui/private/qguiapplication_p.h>
@@ -10,5 +10,5 @@
#include <linux/input.h>
-#endif
- QT_BEGIN_NAMESPACE
-
+ #ifndef input_event_sec
+ #define input_event_sec time.tv_sec
diff --git a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
index c5993e806c92..eec1992d8a3f 100644
--- a/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
+++ b/x11-toolkits/qt5-gui/files/patch-src_platformsupport_input_evdevtouch_qevdevtouchhandler.cpp
@@ -1,5 +1,5 @@
---- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2019-12-31 20:34:48.636796000 +0100
-+++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp 2019-12-31 20:35:13.274140000 +0100
+--- src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp.orig 2024-08-30 14:45:12 UTC
++++ src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
@@ -52,11 +52,7 @@
#include <mutex>
@@ -10,5 +10,5 @@
#include <linux/input.h>
-#endif
- #include <math.h>
-
+ #ifndef input_event_sec
+ #define input_event_sec time.tv_sec
diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile
index a22e410ea354..a0f6b7012b40 100644
--- a/x11-toolkits/qt5-widgets/Makefile
+++ b/x11-toolkits/qt5-widgets/Makefile
@@ -1,5 +1,6 @@
PORTNAME= widgets
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
+PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
diff --git a/x11-toolkits/qt5-widgets/files/patch-src_widgets_graphicsview_qgraphicssceneevent.h b/x11-toolkits/qt5-widgets/files/patch-src_widgets_graphicsview_qgraphicssceneevent.h
new file mode 100644
index 000000000000..aa79e05d65e7
--- /dev/null
+++ b/x11-toolkits/qt5-widgets/files/patch-src_widgets_graphicsview_qgraphicssceneevent.h
@@ -0,0 +1,56 @@
+--- src/widgets/graphicsview/qgraphicssceneevent.h.orig 2024-08-30 14:45:12 UTC
++++ src/widgets/graphicsview/qgraphicssceneevent.h
+@@ -82,7 +82,7 @@ class Q_WIDGETS_EXPORT QGraphicsSceneMouseEvent : publ
+ 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 Q_WIDGETS_EXPORT QGraphicsSceneWheelEvent : publ
+ 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 QGraphicsSceneContextMenuEvent
+ 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 Q_WIDGETS_EXPORT QGraphicsSceneHoverEvent : publ
+ 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 Q_WIDGETS_EXPORT QGraphicsSceneHelpEvent : publi
+ 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 Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : p
+ class Q_WIDGETS_EXPORT QGraphicsSceneDragDropEvent : public QGraphicsSceneEvent
+ {
+ public:
+- explicit QGraphicsSceneDragDropEvent(Type type = None);
++ explicit QGraphicsSceneDragDropEvent(QEvent::Type type = QEvent::None);
+ ~QGraphicsSceneDragDropEvent();
+
+ QPointF pos() const;