Attachment 224847 Details for Bug 255790 – patch

[patch] patch

qt5-wayland.patch (text/plain), 7.27 KB, created by Name on 2021-05-11 13:36:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Name

Created: 2021-05-11 13:36:01 UTC

Size: 7.27 KB

patch

obsolete

>diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile
>index c38213d03370..5bc746a9e677 100644
>--- a/graphics/qt5-wayland/Makefile
>+++ b/graphics/qt5-wayland/Makefile
>@@ -14,14 +14,20 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libxkbcommon.so:x11/libxkbcommon
> 
> USES=		compiler:c++11-lang gl gnome pkgconfig qmake:norecursive \
>-		qt-dist:5,wayland xorg
>-USE_GL=		egl gl
>+		qt-dist:5,wayland
>+USE_GL=		egl
> USE_GNOME=	glib20
> USE_QT=		core dbus gui declarative \
> 		buildtools_build qmake_build
>-USE_XORG=       x11 xcomposite
>-
> 
> QT_BINARIES=	yes
> 
>+OPTIONS_DEFINE=	X11
>+OPTIONS_DEFAULT=X11
>+OPTIONS_SUB=	yes
>+
>+X11_USES=	xorg
>+X11_USE=	XORG=x11,xcomposite
>+X11_VARS=	USE_GL+=gl
>+
> .include <bsd.port.mk>
>diff --git a/graphics/qt5-wayland/pkg-plist b/graphics/qt5-wayland/pkg-plist
>index fbf742b39cd4..956f26715e15 100644
>--- a/graphics/qt5-wayland/pkg-plist
>+++ b/graphics/qt5-wayland/pkg-plist
>@@ -280,8 +280,8 @@
> %%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshellv6.h
> %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandEglPlatformIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandIntegrationPlugin.cmake
>-%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeEglPlatformIntegrationPlugin.cmake
>-%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeGlxPlatformIntegrationPlugin.cmake
>+%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeEglPlatformIntegrationPlugin.cmake
>+%%X11%%%%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeGlxPlatformIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClientConfig.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClientConfigVersion.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_DmaBufServerBufferPlugin.cmake
>@@ -291,8 +291,8 @@
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandFullScreenShellV1IntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandIviShellIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandWlShellIntegrationPlugin.cmake
>-%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeEglClientBufferPlugin.cmake
>-%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeGlxClientBufferPlugin.cmake
>+%%X11%%%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeEglClientBufferPlugin.cmake
>+%%X11%%%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXCompositeGlxClientBufferPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellV5IntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellV6IntegrationPlugin.cmake
>@@ -305,8 +305,8 @@
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandDmabufClientBufferIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglClientBufferIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglStreamBufferIntegrationPlugin.cmake
>-%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake
>-%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeGlxClientBufferIntegrationPlugin.cmake
>+%%X11%%%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake
>+%%X11%%%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeGlxClientBufferIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
> %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
> %%QT_BINDIR%%/qtwaylandscanner
>@@ -331,10 +331,10 @@
> %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-egl.so.debug
> %%QT_PLUGINDIR%%/platforms/libqwayland-generic.so
> %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-generic.so.debug
>-%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-egl.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-egl.so.debug
>-%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-glx.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-glx.so.debug
>+%%X11%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-egl.so
>+%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-egl.so.debug
>+%%X11%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-glx.so
>+%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqwayland-xcomposite-glx.so.debug
> %%QT_PLUGINDIR%%/wayland-decoration-client/libbradient.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-decoration-client/libbradient.so.debug
> %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdmabuf-server.so
>@@ -347,10 +347,10 @@
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libshm-emulation-server.so.debug
> %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libvulkan-server.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libvulkan-server.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
>+%%X11%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so
>+%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
>+%%X11%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
>+%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
> %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so.debug
> %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so
>@@ -365,10 +365,10 @@
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so.debug
> %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so.debug
>-%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so
>-%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so.debug
>+%%X11%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so
>+%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so.debug
>+%%X11%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so
>+%%X11%%%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so.debug
> %%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
> %%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
> %%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so

Actions: View | Diff

Attachments on bug 255790: 224847