From ea792330aae305de936d512889687975b4ed54f8 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 16 Dec 2018 14:49:16 +0000 Subject: Update Qt5 to 5.12.0 http://blog.qt.io/blog/2018/12/06/qt-5-12-lts-released/ - This breaks support for libressl again. Patches are welcome. PR: 233705 Exp-run by: antoine --- graphics/qt5-wayland/Makefile | 1 - graphics/qt5-wayland/pkg-plist | 49 +++++++++++++++++++++++++++++++----------- 2 files changed, 37 insertions(+), 13 deletions(-) (limited to 'graphics/qt5-wayland') diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index 1c7627db206d..6d0f98ca6cbe 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -2,7 +2,6 @@ PORTNAME= wayland DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-wayland/pkg-plist b/graphics/qt5-wayland/pkg-plist index 8cf0073673b4..be9ee4b7f0ae 100644 --- a/graphics/qt5-wayland/pkg-plist +++ b/graphics/qt5-wayland/pkg-plist @@ -41,14 +41,6 @@ %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h %%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwlshellintegration_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwlshellsurface_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgpopup_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshell_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellintegration_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellv6_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgshellv6integration_p.h -%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandxdgsurface_p.h %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtension %%QT_INCDIR%%/QtWaylandClient/QWaylandClientExtensionTemplate %%QT_INCDIR%%/QtWaylandClient/QtWaylandClient @@ -63,12 +55,14 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-hardware-integration.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-ivi-application.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-key-unstable-v1.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qt-windowmanager.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-qtkey-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-server-buffer-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-text-input-unstable-v2.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-touch-extension.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-wayland.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-decoration-unstable-v1.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v5_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell-unstable-v6.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwayland-server-xdg-shell.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandcompositor_p.h @@ -96,6 +90,9 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandview_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshell_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandwlshellintegration_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgdecorationv1_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshell_p.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellintegration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellv5_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellv5integration_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwaylandxdgshellv6_p.h @@ -121,13 +118,15 @@ %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/qwlserverbufferintegrationplugin_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-hardware-integration-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-ivi-application-server-protocol.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-key-unstable-v1-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qt-windowmanager-server-protocol.h -%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-qtkey-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-server-buffer-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-text-input-unstable-v2-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-touch-extension-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-wayland-server-protocol.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-decoration-unstable-v1-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-server-protocol.h +%%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-unstable-v5-server-protocol_p.h %%QT_INCDIR%%/QtWaylandCompositor/%%FULLVER%%/QtWaylandCompositor/private/wayland-xdg-shell-unstable-v6-server-protocol.h %%QT_INCDIR%%/QtWaylandCompositor/QWaylandBufferRef %%QT_INCDIR%%/QtWaylandCompositor/QWaylandClient @@ -167,12 +166,17 @@ %%QT_INCDIR%%/QtWaylandCompositor/QWaylandView %%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShell %%QT_INCDIR%%/QtWaylandCompositor/QWaylandWlShellSurface +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgDecorationManagerV1 +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopup %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopupV5 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgPopupV6 +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgShell %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgShellV5 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgShellV6 +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgSurface %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgSurfaceV5 %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgSurfaceV6 +%%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgToplevel %%QT_INCDIR%%/QtWaylandCompositor/QWaylandXdgToplevelV6 %%QT_INCDIR%%/QtWaylandCompositor/QtWaylandCompositor %%QT_INCDIR%%/QtWaylandCompositor/QtWaylandCompositorDepends @@ -196,6 +200,7 @@ %%QT_INCDIR%%/QtWaylandCompositor/qwaylandoutputmode.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandpointer.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandqtwindowmanager.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickchildren.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickcompositor.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickextension.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandquickitem.h @@ -213,6 +218,8 @@ %%QT_INCDIR%%/QtWaylandCompositor/qwaylandtouch.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandview.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandwlshell.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgdecorationv1.h +%%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshell.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshellv5.h %%QT_INCDIR%%/QtWaylandCompositor/qwaylandxdgshellv6.h %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandEglPlatformIntegrationPlugin.cmake @@ -221,15 +228,21 @@ %%QT_CMAKEDIR%%/Qt5Gui/Qt5Gui_QWaylandXCompositeGlxPlatformIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClientConfig.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClientConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_DmaBufServerBufferPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_DrmEglServerBufferPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandBradientDecorationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandEglClientBufferPlugin.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 +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellIntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellV5IntegrationPlugin.cmake +%%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_QWaylandXdgShellV6IntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandClient/Qt5WaylandClient_ShmServerBufferPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfig.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositorConfigVersion.cmake +%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DmaBufServerBufferIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_DrmEglServerBufferIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandEglClientBufferIntegrationPlugin.cmake %%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_QWaylandXCompositeEglClientBufferIntegrationPlugin.cmake @@ -262,6 +275,8 @@ %%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 +%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdmabuf-server.so.debug %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdrm-egl-server.so %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libdrm-egl-server.so.debug %%QT_PLUGINDIR%%/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so @@ -272,6 +287,8 @@ %%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 +%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so +%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so.debug %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug %%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so @@ -284,11 +301,19 @@ %%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug %%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so %%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so.debug +%%QT_PLUGINDIR%%/wayland-shell-integration/libwl-shell.so +%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libwl-shell.so.debug +%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell-v5.so +%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell-v5.so.debug +%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell-v6.so +%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell-v6.so.debug +%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell.so +%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libxdg-shell.so.debug %%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/WaylandCursorItem.qml %%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/WaylandOutputWindow.qml %%QT_QMLDIR%%/QtWayland/Compositor/libqwaylandcompositorplugin.so %%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/libqwaylandcompositorplugin.so.debug -%%QT_QMLDIR%%/QtWayland/Compositor/plugins.qmltypes -%%QT_QMLDIR%%/QtWayland/Compositor/qmldir +%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/plugins.qmltypes +%%DEBUG%%%%QT_QMLDIR%%/QtWayland/Compositor/qmldir libdata/pkgconfig/Qt5WaylandClient.pc libdata/pkgconfig/Qt5WaylandCompositor.pc -- cgit v1.2.3