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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49D401581E1 for ; Mon, 18 Nov 2024 20:09:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9866CE099F; Mon, 18 Nov 2024 20:09:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 83679E099F for ; Mon, 18 Nov 2024 20:09:32 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C5AB0341256 for ; Mon, 18 Nov 2024 20:09:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E0491F0B for ; Mon, 18 Nov 2024 20:09:29 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1731960227.737a260e98794e83f02fc02523f835759a6a678f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-plasma/kwin/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-plasma/kwin/Manifest kde-plasma/kwin/kwin-6.2.3-r1.ebuild X-VCS-Directories: kde-plasma/kwin/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 737a260e98794e83f02fc02523f835759a6a678f X-VCS-Branch: master Date: Mon, 18 Nov 2024 20:09:29 +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: da212bed-f13f-4099-a04e-ae4d6b09892d X-Archives-Hash: f12b56c7fbc1e9bb46847e862f0da391 commit: 737a260e98794e83f02fc02523f835759a6a678f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Nov 18 18:14:29 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Nov 18 20:03:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737a260e kde-plasma/kwin: Pick 6.2 branch fixes David Redondo (1): Cancel interactive move resize when outputs change Kai Uwe Broulik (1): tabbox: Do not add windows that have modal children Marco Martin (1): tiling: fix some asserts from scripts Vlad Zahorodnii (5): Close layer shell window if its preferred output has been removed Ensure active window isn't focused when screen is locked utils: Use QList::removeLast() in DamageJournal::add() Revert "scene: Ignore xwayland window shape" core: Set object ownership for Output Xaver Hugl (7): core/colorspace: fix the max luminance of linear activation: don't activate windows that don't accept keyboard input workspace: fix the dpms input event filter sometimes being wrongly deleted effect/offscreenquickview: ensure the view that accepts touch down also gets touch up backends/drm: fix DrmGpu::needsModeset check with leased outputs backends/drm: re-allow HDR on Intel by default backends/drm: re-allow HDR on NVidia with driver version 565.57.01+ KDE-bugs: https://bugs.kde.org/show_bug.cgi?id=494930 https://bugs.kde.org/show_bug.cgi?id=495537 https://bugs.kde.org/show_bug.cgi?id=495400 https://bugs.kde.org/show_bug.cgi?id=495325 https://bugs.kde.org/show_bug.cgi?id=493934 https://bugs.kde.org/show_bug.cgi?id=488941 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-plasma/kwin/Manifest | 1 + kde-plasma/kwin/kwin-6.2.3-r1.ebuild | 156 +++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+) diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 564c9f8ce7eb..59df79412c4e 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,2 +1,3 @@ DIST kwin-6.1.5.tar.xz 8503432 BLAKE2B 8cd8da89f93ac64dbb8a42e90a09a188b86762440964d4e9425a924f0349360bcf31f187fcfb66b61fca42db44f93c97f313703c5b602e873035bec86f36b0b1 SHA512 a71d1f814c948293d5552504115178f20e7450ead86c57b0fda79584f613fbc77851d1735945f7f05bf0b6b8c09cdacf53154820176d133f41ec736ae1492946 +DIST kwin-6.2.3-patchset-1.tar.xz 8668 BLAKE2B b8f9c602f94d883a72f5b688826d74504407fa68801e5b7a1689b576b0040cb6865df2d6e9ec1cd85550618f1bae82ba5ae4f40dc3a56a5301f6aae9fe360159 SHA512 0903dd7bea87e6a6ad76681b5311dd0e414d76aab9bea22eebe7ae04257539a38a4639e6a788eac25e39e0195a1b76df46774db023135e0c4a9d69b2a0effd3b DIST kwin-6.2.3.tar.xz 8557808 BLAKE2B a66c09459b6d41bb7059ae085bc89dc4d8cf08bb61eacb4ab52166863f5c4b971d56e420a295d2f638b30886ad5f2fa1f0f4a725087d0295668158523866648c SHA512 5f54de7536c0bf8c324c8f319614895e279ce888326fdd440b9ac952ea43498c65b532c03920d49605afa31665c7bcd3a66ae637f68eb9d3e1b0ec80ac8c4691 diff --git a/kde-plasma/kwin/kwin-6.2.3-r1.ebuild b/kde-plasma/kwin/kwin-6.2.3-r1.ebuild new file mode 100644 index 000000000000..0d8a755086f9 --- /dev/null +++ b/kde-plasma/kwin/kwin-6.2.3-r1.ebuild @@ -0,0 +1,156 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="true" +PATCHSET="${P}-patchset-1" +KFMIN=6.6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm fcaps plasma.kde.org + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +IUSE="accessibility gles2-only lock screencast +shortcuts systemd" + +RESTRICT="test" + +# qtbase slot op: GuiPrivate use in tabbox +COMMON_DEPEND=" + dev-libs/libei + >=dev-libs/libinput-1.19:= + >=dev-libs/wayland-1.23.0 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsensors-${QTMIN}:6 + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6=[X(+)] + >=kde-frameworks/kguiaddons-${KFMIN}:6[wayland] + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6=[wayland] + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/breeze-${PVCUT}:6 + >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + media-libs/fontconfig + media-libs/freetype + media-libs/lcms:2 + media-libs/libcanberra + media-libs/libdisplay-info:= + media-libs/libepoxy + media-libs/libglvnd + >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] + virtual/libudev:= + x11-libs/libX11 + x11-libs/libXi + >=x11-libs/libdrm-2.4.116 + >=x11-libs/libxcb-1.10:= + >=x11-libs/libxcvt-0.1.1 + >=x11-libs/libxkbcommon-1.5.0 + x11-libs/xcb-util-cursor + x11-libs/xcb-util-keysyms + x11-libs/xcb-util-wm + accessibility? ( media-libs/libqaccessibilityclient:6 ) + gles2-only? ( || ( + >=media-libs/mesa-24.1.0_rc1[opengl] + =kde-plasma/kscreenlocker-${PVCUT}:6 ) + screencast? ( >=media-video/pipewire-0.3.65:= ) + shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/kdeplasma-addons:5 + >=dev-qt/qtmultimedia-${QTMIN}:6[qml] + || ( + dev-qt/qtmultimedia:6[ffmpeg] + ( + dev-qt/qtmultimedia:6[gstreamer] + media-plugins/gst-plugins-soup:1.0 + ) + ) + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6[wayland(+)] + sys-apps/hwdata + x11-base/xwayland[libei] +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.14.0 + >=dev-libs/wayland-protocols-1.36 + >=dev-qt/qttools-${QTMIN}:6[widgets] + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + >=dev-qt/qtwayland-${QTMIN}:6 + x11-base/xorg-proto + x11-libs/xcb-util-image + test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) ) +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + dev-util/wayland-scanner + >=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 ) + +# KDE-bugs #494930, #495537, #495400, #495325, #493934, #488941 +PATCHES=( "${WORKDIR}/${PATCHSET}" ) + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use systemd; then + sed -e "s/^pkg_check_modules.*libsystemd/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + # 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) + -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 +}