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,114 +1,115 @@ PORTNAME= gui PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt graphical user interface module BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto \ ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ ${LOCALBASE}/include/xf86drm.h:graphics/libdrm \ at-spi2-core>=0:accessibility/at-spi2-core \ ${BUILD_DEPENDS_${ARCH}} BUILD_DEPENDS_armv6= as:devel/binutils BUILD_DEPENDS_armv7= as:devel/binutils LIB_DEPENDS= libdbus-1.so:devel/dbus \ libevdev.so:devel/libevdev \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libinput.so:x11/libinput \ libmtdev.so:devel/libmtdev \ libpng.so:graphics/png \ libxcb-icccm.so:x11/xcb-util-wm \ libxcb-image.so:x11/xcb-util-image \ libxcb-keysyms.so:x11/xcb-util-keysyms \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb.so:x11/libxcb \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= ${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \ xdg-open:devel/xdg-utils USES= compiler:c++11-lang gl gnome jpeg localbase \ perl5 qmake:no_env qt-dist:5,base USE_GL= egl gl USE_GNOME= glib20 USE_PERL5= extract USE_QT= core dbus network buildtools:build qmake:build QT_BINARIES= yes QT_CONFIG= accessibility accessibility-atspi-bridge dbus \ fontconfig glib opengl png system-freetype system-jpeg \ system-png xcb xcb-glx xcb-render xcb-xlib xinput2 xlib \ xrender QT_DEFINES= ACCESSIBILITY DBUS FONTCONFIG FREETYPE GLIB \ IMAGEFORMAT_PNG OPENGL SHAPE XCB XKB XKBCOMMON XRENDER USE_XORG= ice sm xi xrender HAS_CONFIGURE= yes CONFIGURE_ARGS= -no-eglfs \ -no-libudev \ -system-harfbuzz # Explicitly set to c++14 to avoid c++17/c++1z, since libX11's headers # are using the obsolete 'register' keyword. CONFIGURE_ARGS+= -c++std \ c++14 BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} OPTIONS_DEFINE= X11 OPTIONS_DEFAULT= X11 OPTIONS_SUB= yes X11_USES= xorg X11_USE= xorg=x11 # Build and install QtPlatformSupport and default QPA plugins (XCB, # minimal and offscreen). QtGui won't work without (one of) them, but # they depend on QtGui itself, so they can't be added as dependencies. # QtPlatformSupport doesn't need to be installed (it's a static # library), but might be needed by people porting Qt on new platforms. _MORE_WRKSRCS= src/platformheaders src/platformsupport src/plugins/platforms \ src/plugins/generic # Image formats are split through different tarballs, these are the # main ones; input contexts require no additional dependency. _MORE_WRKSRCS+= src/plugins/imageformats src/plugins/platforminputcontexts # openglextensions is the static library to use for further things like qtcanvas3d _MORE_WRKSRCS+= src/openglextensions # Inherited from Qt 4. .if defined(PACKAGE_BUILDING) RUN_DEPENDS+= ${LOCALBASE}/share/fonts/encodings/encodings.dir:x11-fonts/encodings \ xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype .endif post-configure: .for d in src/tools/qvkgen src/gui ${_MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: .for d in src/tools/qvkgen @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-build: .for d in ${_MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in src/tools/qvkgen ${_MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor .include 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 @@ -1,16 +1,16 @@ Regressed by https://github.com/KhronosGroup/EGL-Registry/commit/64aa561f1971 main.cpp:13:14: error: cannot initialize a variable of type 'Display *' (aka '_XDisplay *') with an rvalue of type 'EGLNativeDisplayType' (aka 'void *') 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" ], "main": [ "Display *dpy = EGL_DEFAULT_DISPLAY;", 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,14 +1,14 @@ ---- 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 #include -#ifdef Q_OS_FREEBSD -#include -#else #include -#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,14 +1,14 @@ ---- 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 -#ifdef Q_OS_FREEBSD -#include -#else #include -#endif - #include - + #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,72 +1,73 @@ PORTNAME= widgets PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- MAINTAINER= kde@FreeBSD.org COMMENT= Qt C++ widgets module USES= compiler:c++11-lang perl5 qmake:no_env qt-dist:5,base xorg USE_PERL5= extract USE_QT= core gui qmake:build buildtools:build USE_XORG= x11 HAS_CONFIGURE= yes BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME} INSTALL_WRKSRC= ${BUILD_WRKSRC} MORE_WRKSRCS= src/tools/uic QT_BINARIES= yes QT_DEFINES= ACCESSIBILITY WIDGETS XSYNC QT_CONFIG= accessibility accessibility-atspi-bridge xlib OPTIONS_DEFINE= GTK3 OPTIONS_SUB= YES GTK3_DESC= GTK-based Qt theme GTK3_USES= gnome GTK3_USE= GNOME=gtk30 QT=dbus GTK3_CONFIGURE_ON= -gtk GTK3_CONFIGURE_OFF= -no-gtk .include .if ${PORT_OPTIONS:MGTK3} QT_DEFINES+= STYLE_GTK QT_CONFIG+= gtk MORE_WRKSRCS+= src/plugins/platformthemes .else QT_DEFINES+= -STYLE_GTK QT_CONFIG+= -gtk .endif post-configure: .for d in src/tools/uic src/widgets ${MORE_WRKSRCS} ${MKDIR} ${WRKSRC}/${d} cd ${WRKSRC}/${d} && ${SETENV} ${QMAKE_ENV} ${_QMAKE} ${QMAKE_ARGS} ${WRKSRC}/${d} .endfor pre-build: cd ${WRKSRC}/src/tools/uic && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} post-build: .for d in ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} .endfor post-install: .for d in src/tools/uic ${MORE_WRKSRCS} @cd ${WRKSRC}/${d} && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \ ${MAKE_ARGS} ${INSTALL_TARGET} .endfor ${INSTALL_DATA} ${BUILD_WRKSRC}/dialogs/images/qtlogo-64.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/qt5logo.png ${RLN} ${STAGEDIR}${QT_BINDIR}/uic ${STAGEDIR}${PREFIX}/bin/uic-qt5 .include 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;