Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwayland for openSUSE:Factory checked in at 2025-02-16 22:37:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland (Old) and /work/SRC/openSUSE:Factory/.kwayland.new.8181 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland" Sun Feb 16 22:37:19 2025 rev:123 rq:1245990 version:5.116.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes 2024-05-20 18:11:36.886315509 +0200 +++ /work/SRC/openSUSE:Factory/.kwayland.new.8181/kwayland.changes 2025-02-16 22:37:57.541631348 +0100 @@ -1,0 +2,6 @@ +Fri Feb 14 15:56:01 UTC 2025 - Christophe Marin <[email protected]> + +- Add patch from Gentoo (fixes build with glibc 2.41) + * kwayland-5.116.0-no-server.patch + +------------------------------------------------------------------- New: ---- kwayland-5.116.0-no-server.patch BETA DEBUG BEGIN: New:- Add patch from Gentoo (fixes build with glibc 2.41) * kwayland-5.116.0-no-server.patch BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.OKK8Bz/_old 2025-02-16 22:37:58.365665608 +0100 +++ /var/tmp/diff_new_pack.OKK8Bz/_new 2025-02-16 22:37:58.365665608 +0100 @@ -33,6 +33,8 @@ Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif +# PATCH-FIX-OPENSUSE +Patch0: kwayland-5.116.0-no-server.patch BuildRequires: extra-cmake-modules >= %{_kf5_version} BuildRequires: fdupes BuildRequires: libQt5Gui-private-headers-devel >= %{qt5_version} @@ -46,7 +48,6 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(wayland-client) >= 1.15.0 BuildRequires: pkgconfig(wayland-protocols) -BuildRequires: pkgconfig(wayland-server) >= 1.15.0 %requires_eq libQt5Gui5 Provides: libKF5WaylandClient5 = %{version} Obsoletes: libKF5WaylandClient5 <= %{version} @@ -68,7 +69,8 @@ %autosetup -p1 %build -%cmake_kf5 -d build +%cmake_kf5 -d build -- -DEXCLUDE_DEPRECATED_BEFORE_AND_AT:STRING=5.74.0 + %cmake_build %install @@ -81,15 +83,11 @@ %{_kf5_debugdir}/*.categories %{_kf5_debugdir}/*.renamecategories %{_kf5_libdir}/libKF5WaylandClient.so.* -%{_kf5_libdir}/libKF5WaylandServer.so.* %files devel %{_kf5_includedir}/ %{_kf5_libdir}/cmake/KF5Wayland/ %{_kf5_libdir}/libKF5WaylandClient.so -%{_kf5_libdir}/libKF5WaylandServer.so %{_kf5_libdir}/pkgconfig/KF5WaylandClient.pc %{_kf5_mkspecsdir}/qt_KWaylandClient.pri -%{_kf5_mkspecsdir}/qt_KWaylandServer.pri -%{_libexecdir}/org-kde-kf5-kwayland-testserver ++++++ kwayland-5.116.0-no-server.patch ++++++ >From fa0425714656919449a53e41c80ac9ad06d89193 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sat, 1 Feb 2025 19:23:24 +0100 Subject: Only require Wayland Server component if needed It is only required if building the server API, meaning EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.74.0 Signed-off-by: Andreas Sturmlechner <[email protected]> --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a177d29..6a71381 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,10 +51,11 @@ if (QT_MAJOR_VERSION STREQUAL "5") pkg_check_modules(XKBCommon REQUIRED IMPORTED_TARGET xkbcommon) endif() -find_package(Wayland 1.15 COMPONENTS Client Server) -set_package_properties(Wayland PROPERTIES - TYPE REQUIRED - ) +find_package(Wayland 1.15 REQUIRED COMPONENTS Client) + +if(EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.74.0) + find_package(Wayland 1.15 REQUIRED COMPONENTS Server) +endif() find_package(WaylandScanner) -- 2.48.1
