mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-04 13:47:35 -08:00
kde-plasma/kwin: backport various fixes from 6.5 branch
Backports from 6.5.0 up to (and including) 4526fe9ee34c4a8a47ebf00046361d4913ad106b, just with the translation sync commits dropped. I had two separate requests to backport different patches from Plasma/6.5 and saw a few other reports of issues that should be fixed by patches on the branch, so pull in the lot. Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
parent
256e4f0be6
commit
7eb4c7a62c
@ -1,3 +1,4 @@
|
||||
DIST kwin-6.4.5-patchset.tar.xz 3740 BLAKE2B b01c0624650d95d5889c7b32b9e93cc17cea86f6f7de3fd9ea79776115f51be07190e18592b8a5216800bb2d0d106ab97a6948b4bcc20f82eef4e50590eb02bf SHA512 1a1ffa55273aa502428b2f7a44c811bd54b0bc7803646dc70109572b26afd2985dd4ce8b324ec15f57f91ed4c2df352e27f8f52ba7a9524b0f07de436eeb1cbb
|
||||
DIST kwin-6.4.5.tar.xz 8792000 BLAKE2B 911a3d62d928b129c1f71fc1641a2c434624eb8ee1ce2ddff19064cfc0267ec611165622c9949071d57a88292b8adfe277c8c78d3c2ce50b3d16f4c2502cb9de SHA512 f753f94edd2c968b713320e40dd01ccd6bdac3d7e7481e0ba56e38b01d00e8ddc8f3c7f21de00ba4849f0c106595a246010dbaa8f67151557bca6475105eddcc
|
||||
DIST kwin-6.5.0-patches.tar.xz 24228 BLAKE2B 87dfff2e5ff80b05d88f00b48b9bb59e0115dbbc3b6842e358d536ebaca2446fb28feea9a2f0e75e04d1a673286f19abf7b6a0bd39332f783ba317f302a1f94c SHA512 9550676716e5d51229e417527ce67415ae59364b1531b7d6a77eb71d5714f10b2b96c12a8b195d9f167f92bef437fb8b8ea08162f5b1c9ff6e1b20df7b9c2555
|
||||
DIST kwin-6.5.0.tar.xz 8787556 BLAKE2B 802340c444f815c3f0fc2cd4505313e38c32b39668e48d30817043df8fdbeea50a970dbd301326897d1efac6b5050b15cc2268693fa4eb82a5262f38a2bcb177 SHA512 ac830192dd7bb397abc2c85d3ff2c21d0f22cb22490386ae1be085bcbca85c25184cb720d6208d54292bf6e92b54e07d6221fbe2e947bdad790b4e692e29d896
|
||||
|
||||
150
kde-plasma/kwin/kwin-6.5.0-r1.ebuild
Normal file
150
kde-plasma/kwin/kwin-6.5.0-r1.ebuild
Normal file
@ -0,0 +1,150 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
ECM_HANDBOOK="optional"
|
||||
# TODO: ECMGenerateQDoc
|
||||
ECM_TEST="true"
|
||||
KFMIN=6.18.0
|
||||
QTMIN=6.9.1
|
||||
inherit ecm fcaps plasma.kde.org xdg
|
||||
|
||||
DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
|
||||
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches.tar.xz"
|
||||
|
||||
LICENSE="GPL-2+"
|
||||
SLOT="6"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="accessibility gles2-only lock screencast +shortcuts systemd X"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# qtbase slot op: GuiPrivate use in tabbox, Qt6WaylandClientPrivate for xx-pip-v1
|
||||
# qtbase[X]: private/qtx11extras_p.h in src/helpers/killer
|
||||
COMMON_DEPEND="
|
||||
dev-libs/libei
|
||||
>=dev-libs/libinput-1.27:=
|
||||
>=dev-libs/wayland-1.24.0
|
||||
>=dev-qt/qt5compat-${QTMIN}:6[qml]
|
||||
>=dev-qt/qtbase-${QTMIN}:6=[accessibility=,gles2-only=,gui,libinput,opengl,wayland,widgets,X]
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:6
|
||||
>=dev-qt/qtsensors-${QTMIN}:6
|
||||
>=dev-qt/qtshadertools-${QTMIN}:6
|
||||
>=dev-qt/qtsvg-${QTMIN}:6
|
||||
>=dev-qt/qttools-${QTMIN}:6[widgets]
|
||||
>=kde-frameworks/kauth-${KFMIN}:6
|
||||
>=kde-frameworks/kcmutils-${KFMIN}:6
|
||||
>=kde-frameworks/kcolorscheme-${KFMIN}:6
|
||||
>=kde-frameworks/kconfig-${KFMIN}:6[qml]
|
||||
>=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
|
||||
>=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]
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:6
|
||||
>=kde-plasma/kdecoration-${KDE_CATV}:6
|
||||
>=kde-plasma/knighttime-${KDE_CATV}:6
|
||||
>=kde-plasma/kwayland-${KDE_CATV}:6
|
||||
>=kde-plasma/plasma-activities-${KDE_CATV}:6=
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
media-libs/lcms:2
|
||||
media-libs/libcanberra
|
||||
>=media-libs/libdisplay-info-0.2.0:=
|
||||
media-libs/libepoxy
|
||||
media-libs/libglvnd
|
||||
>=media-libs/mesa-24.1.0_rc1[opengl,wayland]
|
||||
virtual/libudev:=
|
||||
>=x11-libs/libdrm-2.4.118
|
||||
>=x11-libs/libxcb-1.10:=
|
||||
>=x11-libs/libxcvt-0.1.1
|
||||
>=x11-libs/libxkbcommon-1.5.0
|
||||
x11-libs/xcb-util-wm
|
||||
accessibility? ( media-libs/libqaccessibilityclient:6 )
|
||||
lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
|
||||
screencast? ( >=media-video/pipewire-1.2.0:= )
|
||||
shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 )
|
||||
X? (
|
||||
x11-libs/libX11
|
||||
x11-libs/libXi
|
||||
x11-libs/libXres
|
||||
x11-libs/xcb-util-keysyms
|
||||
)
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!kde-plasma/kdeplasma-addons:5
|
||||
>=kde-frameworks/kirigami-${KFMIN}:6
|
||||
>=kde-frameworks/kitemmodels-${KFMIN}:6
|
||||
>=kde-plasma/aurorae-${KDE_CATV}:6
|
||||
>=kde-plasma/breeze-${KDE_CATV}:6
|
||||
>=kde-plasma/libplasma-${KDE_CATV}:6
|
||||
sys-apps/hwdata
|
||||
X? ( >=x11-base/xwayland-23.1.0[libei] )
|
||||
"
|
||||
RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-libs/plasma-wayland-protocols-1.19.0
|
||||
>=dev-libs/wayland-protocols-1.45
|
||||
>=dev-qt/qtbase-${QTMIN}:6[concurrent]
|
||||
test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) )
|
||||
X? ( x11-base/xorg-proto )
|
||||
"
|
||||
BDEPEND="
|
||||
>=dev-qt/qtbase-${QTMIN}:6[wayland]
|
||||
dev-util/wayland-scanner
|
||||
>=kde-frameworks/kcmutils-${KFMIN}:6
|
||||
"
|
||||
BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10: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 )
|
||||
|
||||
PATCHES=(
|
||||
# Backports from 6.5.0 up to (and including) 4526fe9ee34c4a8a47ebf00046361d4913ad106b,
|
||||
# just with the translation sync commits dropped.
|
||||
"${WORKDIR}"/${P}-patches/
|
||||
)
|
||||
|
||||
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=(
|
||||
# KWIN_BUILD_DECORATIONS exists, drops aurorae, breeze
|
||||
# KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it
|
||||
$(cmake_use_find_package accessibility QAccessibilityClient6)
|
||||
-DKWIN_BUILD_SCREENLOCKER=$(usex lock)
|
||||
-DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts)
|
||||
-DKWIN_BUILD_X11=$(usex X)
|
||||
)
|
||||
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
fcaps_pkg_postinst
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user