[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwayland/, kde-plasma/kwayland/files/

[gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwayland/, kde-plasma/kwayland/files/

[Andreas Sturmlechner]

commit:     e21cd57b09fc545ece10a5ab293f1bfb744d2872
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  1 18:27:26 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Feb  1 21:00:58 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e21cd57b

kde-plasma/kwayland: Disable Server API part w/o any revdeps left

Avoids running into glibc-2.41 related error.

Closes: https://bugs.gentoo.org/949197
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kwayland-5.116.0-no-server.patch         | 36 +++++++++++++++++
 kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild     | 46 ++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/kde-plasma/kwayland/files/kwayland-5.116.0-no-server.patch b/kde-plasma/kwayland/files/kwayland-5.116.0-no-server.patch
new file mode 100644
index 000000000000..4e6ec40c400c
--- /dev/null
+++ b/kde-plasma/kwayland/files/kwayland-5.116.0-no-server.patch
@@ -0,0 +1,36 @@
+From fa0425714656919449a53e41c80ac9ad06d89193 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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
+

diff --git a/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild b/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild
new file mode 100644
index 000000000000..81ca0e246afb
--- /dev/null
+++ b/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_NONGUI="true"
+ECM_QTHELP="true"
+ECM_TEST="true"
+inherit ecm flag-o-matic frameworks.kde.org
+
+DESCRIPTION="Qt-style client and server library wrapper for Wayland libraries"
+HOMEPAGE="https://invent.kde.org/frameworks/kwayland"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE=""
+
+# All failing, I guess we need a virtual wayland server
+RESTRICT="test"
+
+# slot ops: includes qpa/qplatformnativeinterface.h, surface_p.h
+RDEPEND="
+	dev-libs/wayland
+	dev-qt/qtconcurrent:5
+	dev-qt/qtgui:5=[egl]
+	dev-qt/qtwayland:5=
+	media-libs/libglvnd
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/plasma-wayland-protocols-1.9.0
+	dev-libs/wayland-protocols
+	sys-kernel/linux-headers
+"
+BDEPEND="
+	dev-qt/qtwaylandscanner:5
+	dev-util/wayland-scanner
+"
+
+# Pending upstream MR: https://invent.kde.org/plasma/kwayland/-/merge_requests/128
+PATCHES=( "${FILESDIR}/${P}-no-server.patch" ) # bug 949197
+
+src_configure() {
+	filter-lto # bug 866575
+	local mycmakeargs=( -DEXCLUDE_DEPRECATED_BEFORE_AND_AT=5.74.0 )
+	ecm_src_configure
+}