Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-wayland for openSUSE:Factory checked in at 2022-02-04 21:49:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-wayland (Old) and /work/SRC/openSUSE:Factory/.qt6-wayland.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-wayland" Fri Feb 4 21:49:28 2022 rev:12 rq:951583 version:6.2.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-wayland/qt6-wayland.changes 2022-02-02 22:45:01.534062970 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-wayland.new.1898/qt6-wayland.changes 2022-02-04 21:52:50.454968207 +0100 @@ -1,0 +2,6 @@ +Fri Feb 4 13:21:07 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Add patch to fix features detection: + * 0001-CMake-Fix-qtwayland-feature-detection.patch + +------------------------------------------------------------------- New: ---- 0001-CMake-Fix-qtwayland-feature-detection.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-wayland.spec ++++++ --- /var/tmp/diff_new_pack.V2yeJB/_old 2022-02-04 21:52:50.926964960 +0100 +++ /var/tmp/diff_new_pack.V2yeJB/_new 2022-02-04 21:52:50.930964933 +0100 @@ -38,6 +38,8 @@ URL: https://www.qt.io Source: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-wayland-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-CMake-Fix-qtwayland-feature-detection.patch BuildRequires: pkgconfig BuildRequires: qt6-core-private-devel BuildRequires: qt6-gui-private-devel ++++++ 0001-CMake-Fix-qtwayland-feature-detection.patch ++++++ >From 48ed4d4b3678506fea17086bc89744d447c9eb2f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Fri, 4 Feb 2022 13:08:01 +0100 Subject: [PATCH] CMake: Fix qtwayland feature detection The dmabuf_server_buffer test links to EGL and libdrm and the vulkan_server_buffer one needs to link to wayland-client Fixes: QTBUG-100475 Pick-to: 6.3 6.2 Change-Id: Idbcef88bba0a9d5ef7bfeaa55668c94caee6ab83 --- src/client/configure.cmake | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/client/configure.cmake b/src/client/configure.cmake index 5a11bd1..21d9dd0 100644 --- a/src/client/configure.cmake +++ b/src/client/configure.cmake @@ -17,7 +17,6 @@ if((LINUX) OR QT_FIND_ALL_PACKAGES_ALWAYS) qt_find_package(Wayland PROVIDED_TARGETS Wayland::Egl MODULE_NAME waylandclient QMAKE_LIB wayland-egl) endif() qt_find_package(XComposite PROVIDED_TARGETS PkgConfig::XComposite MODULE_NAME waylandclient QMAKE_LIB xcomposite) -# special case begin # X11 is not a public dependency of QtGui anymore, so we need to find it manually in a shared build. # In a static build the dependency is still propagated, so check for the target existence to prevent # the 'Attempt to promote imported target "X11::X11" to global scope' issue. @@ -28,7 +27,10 @@ endif() if(NOT TARGET XKB::XKB) qt_find_package(XKB 0.5.0 PROVIDED_TARGETS XKB::XKB MODULE_NAME gui QMAKE_LIB xkbcommon MARK_OPTIONAL) endif() -# special case end +# EGL +if(NOT TARGET EGL::EGL) + qt_find_package(EGL PROVIDED_TARGETS EGL::EGL MODULE_NAME gui QMAKE_LIB egl MARK_OPTIONAL) +endif() # Even if libdrm is already found by qtbase we still need to list it as dependency for some of our # plugins @@ -120,6 +122,8 @@ return 1; # vulkan-server-buffer qt_config_compile_test(vulkan_server_buffer LABEL "Vulkan Buffer Sharing" + LIBRARIES + Wayland::Client CODE "#define VK_USE_PLATFORM_WAYLAND_KHR 1 #include <vulkan/vulkan.h> @@ -142,6 +146,7 @@ qt_config_compile_test(egl_1_5_wayland LABEL "EGL 1.5 with Wayland Platform" LIBRARIES EGL::EGL + Wayland::Client CODE " #include <EGL/egl.h> -- 2.35.1
