From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id ABB6C158042 for ; Tue, 29 Oct 2024 00:27:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BAA6FE0801; Tue, 29 Oct 2024 00:27:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A0A90E0801 for ; Tue, 29 Oct 2024 00:27:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CBC893430C5 for ; Tue, 29 Oct 2024 00:27:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E0CA61626 for ; Tue, 29 Oct 2024 00:27:10 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1730161548.0d4f045899711d1a2b3dd5f7b236f03f1d3ded51.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwin/kwin-6.2.2-r1.ebuild kde-plasma/kwin/kwin-6.2.2.ebuild X-VCS-Directories: kde-plasma/kwin/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 0d4f045899711d1a2b3dd5f7b236f03f1d3ded51 X-VCS-Branch: master Date: Tue, 29 Oct 2024 00:27:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c6ef19fc-292b-46a1-bb8a-765a0c8d7bb1 X-Archives-Hash: 5aa322dcd3b7ba73655105e2afbef828 commit: 0d4f045899711d1a2b3dd5f7b236f03f1d3ded51 Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 28 21:07:25 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Oct 29 00:25:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d4f0458 kde-plasma/kwin: set cap_sys_nice=ep on kwin_wayland Closes: https://bugs.gentoo.org/941628 Signed-off-by: Mike Gilbert gentoo.org> .../kwin/{kwin-6.2.2.ebuild => kwin-6.2.2-r1.ebuild} | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kde-plasma/kwin/kwin-6.2.2.ebuild b/kde-plasma/kwin/kwin-6.2.2-r1.ebuild similarity index 92% rename from kde-plasma/kwin/kwin-6.2.2.ebuild rename to kde-plasma/kwin/kwin-6.2.2-r1.ebuild index 769ee649f291..60593edc4573 100644 --- a/kde-plasma/kwin/kwin-6.2.2.ebuild +++ b/kde-plasma/kwin/kwin-6.2.2-r1.ebuild @@ -8,14 +8,14 @@ ECM_TEST="true" KFMIN=6.6.0 PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 -inherit ecm plasma.kde.org +inherit ecm fcaps plasma.kde.org DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" LICENSE="GPL-2+" SLOT="6" KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" -IUSE="accessibility +caps gles2-only lock screencast +shortcuts systemd" +IUSE="accessibility gles2-only lock screencast +shortcuts systemd" RESTRICT="test" @@ -106,7 +106,6 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtwayland-${QTMIN}:6 x11-base/xorg-proto x11-libs/xcb-util-image - caps? ( sys-libs/libcap ) test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) ) " BDEPEND=" @@ -115,6 +114,10 @@ BDEPEND=" >=kde-frameworks/kcmutils-${KFMIN}:6 " +# https://bugs.gentoo.org/941628 +# -m 0755 to avoid suid with USE="-filecaps" +FILECAPS=( -m 0755 cap_sys_nice=ep usr/bin/kwin_wayland ) + src_prepare() { ecm_src_prepare @@ -134,10 +137,15 @@ src_configure() { # TODO: KWIN_BUILD_X11=$(usex xwayland) KWIN_BUILD_X11_BACKEND=$(usex X) # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it $(cmake_use_find_package accessibility QAccessibilityClient6) - $(cmake_use_find_package caps Libcap) + -DCMAKE_DISABLE_FIND_PACKAGE_Libcap=ON -DKWIN_BUILD_SCREENLOCKER=$(usex lock) -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts) ) ecm_src_configure } + +pkg_postinst() { + ecm_pkg_postinst + fcaps_pkg_postinst +}