summaryrefslogtreecommitdiff
path: root/kde-plasma
diff options
context:
space:
mode:
Diffstat (limited to 'kde-plasma')
-rw-r--r--kde-plasma/Manifest.gzbin11809 -> 11810 bytes
-rw-r--r--kde-plasma/kwayland/Manifest3
-rw-r--r--kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild2
-rw-r--r--kde-plasma/kwayland/kwayland-5.116.0.ebuild44
-rw-r--r--kde-plasma/kwin/Manifest2
-rw-r--r--kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch46
-rw-r--r--kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild152
7 files changed, 202 insertions, 47 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index f7d8ff5aa459..d4e48622c311 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
Binary files differ
diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest
index 948d672746a6..a4efd43ba1e4 100644
--- a/kde-plasma/kwayland/Manifest
+++ b/kde-plasma/kwayland/Manifest
@@ -2,8 +2,7 @@ AUX kwayland-5.116.0-no-server.patch 1103 BLAKE2B 2ee33ae6a353aec07e269168a1fd9c
DIST kwayland-5.116.0.tar.xz 337540 BLAKE2B e238af4a122317fde2b207762858fb913005afde60f1b9cf2dfd90163021d8c3d7d9c3b055a4bb3ae26b5d0560e90c9e0d1e1e51480315bf1a5bc5592a231d11 SHA512 48b24c88872a21d237274868fea601120fb9700f888ab0a7531651dc6501db8559af3a70b6131d89d31010e1f32013222d42e9d1244ae91bf9972588494957a9
DIST kwayland-6.2.5.tar.xz 134116 BLAKE2B 2c3cfff31e795d3f7eda5158ca811ea2a9c989e907c6392bcbb40e17f896311a894549b965a9e552a254fe2380364f5c8d61f380a8f3c2b82896298e47690e18 SHA512 5c21be7b6ad89c99221b8f02e92f54125d39c7e83890398b0509d5b637af077c193b57b05ae7a814f77d39b4ba3692c36698306968072e28aeb3dc5e8bc546e6
DIST kwayland-6.3.2.tar.xz 134084 BLAKE2B 2ab3f233ae1a028d589dfd51963d28fa88f9b32a854a2fe7ef61199896761270c0dde4112e42e4b740c64a6eb0be68ac505a22290ce898fa25bd11e053c7d9ab SHA512 d97e757d1f002c073bbe5dce86983fb3d2e30385c690fc97329a6f4201241ed7dde27cf1bd3243eb1fcf3de26a0cdbfc5c379b62e30d43586ef3b10f95696992
-EBUILD kwayland-5.116.0-r1.ebuild 1136 BLAKE2B a4eda0b7f4dc278d53ac8c15f123da9e66af751fea3385ccbf71bf0cb8ebb156220d1c18e0e1616c36d8a6e8649509034642a9381b463e6d5c620d5d0b0f7391 SHA512 bbc03e7788ecdc3a076918b1abb669e205099dd59101baf34e833e8c7ac33ad803d9be726189a9ef5751e7d246898c5dff40f78e55a3bf234f155a9db4ba1492
-EBUILD kwayland-5.116.0.ebuild 1029 BLAKE2B 2b332c2afa16d2d0ebaf4d2f2ac8aa14a06e27262dd709142d6c4b3a5374ee62581271f07051f21fae1eede4a4f9a8cdd7b6e3d21e8d1314226c39b7d679ff9e SHA512 6ebe0b033864711e02d3e2c119d3718193286cf351b1d6b23f9b767c6863b2bb38bc19f5105b99c31e6d68f27647a41b3bb8e04f488449b97904994b598d4d0a
+EBUILD kwayland-5.116.0-r1.ebuild 1135 BLAKE2B e52d189d4682e2e7bb0da265c1ffce28645f8762dd5293b7d2b4808cfc63118f3f3e046571748e0d57c0cb50d5d9be9bbf355b446c85803216f415a016c7b545 SHA512 aeb81c245868458a200ea60affc775fba92ca530c0630e3a44f65d20bbaf1d359727eaab79fed7fd7f4d37736548f2379de1528d0f520f801c8061529a020d73
EBUILD kwayland-6.2.5.ebuild 952 BLAKE2B 9161f55b9e546936153d9b9dc138019979bec5a81833fadfe126998b75289fbd8f1ec0c918371ece47e6ae5044041ccf6702563bd56b62fdedac1302b9920c91 SHA512 3b3fd36eeadb4f754d5211f58db7c5b8954274ebb494baad331739f370dff1ebb419cb6a350b6b3f69f1ca0aca9e68cee5dfa3ee6c6af7cd2b51bb15deb5369f
EBUILD kwayland-6.3.2.ebuild 956 BLAKE2B 2bb9c82869c163907489ecfe7ebba03e8612594292bcae9c59cf8e338ac405e417e751be3cf2f714e49bdd4e1e70360b63c5aeb414815a8283160d55c9842494 SHA512 6ca8950f5e624dfd14778a382debb14256fdbb2a9fb5dacac01ce7385a84efd013053c54a4f1561eea438195170c6c29ac95085cdab1932a18aea9810abdda57
MISC metadata.xml 515 BLAKE2B f13fada2f68ffdb52894efba4a53cdc940e29dbd2592a09ecd6bc14f184a148b24c39fddd2aa02c59a33c2c6a4952d8173e6f81b6ef794c19503de2ab3c3ca8e SHA512 356522081055cf0b31e042fec323969f9212ff797c5bed21c02da66aaabeb9253d60322532dd098912b1c302ad5368cd90a4e9193f957c644ca633584baf2ff1
diff --git a/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild b/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild
index e8b5e5e810f3..bbebd327fd97 100644
--- a/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild
+++ b/kde-plasma/kwayland/kwayland-5.116.0-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
IUSE=""
# All failing, I guess we need a virtual wayland server
diff --git a/kde-plasma/kwayland/kwayland-5.116.0.ebuild b/kde-plasma/kwayland/kwayland-5.116.0.ebuild
deleted file mode 100644
index f7f3207dc3a3..000000000000
--- a/kde-plasma/kwayland/kwayland-5.116.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_NONGUI="true"
-ECM_QTHELP="true"
-ECM_TEST="true"
-KFMIN=$(ver_cut 1-2)
-QTMIN=5.15.9
-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-1.15.0
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5=[egl]
- >=dev-qt/qtwayland-${QTMIN}:5=
- media-libs/libglvnd
-"
-DEPEND="${RDEPEND}
- >=dev-libs/plasma-wayland-protocols-1.9.0
- >=dev-libs/wayland-protocols-1.15
- sys-kernel/linux-headers
-"
-BDEPEND="
- >=dev-qt/qtwaylandscanner-${QTMIN}:5
- >=dev-util/wayland-scanner-1.19.0
-"
-
-src_configure() {
- filter-lto # bug 866575
- ecm_src_configure
-}
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 70eeb1302702..d989d7fc0e35 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,5 +1,7 @@
+AUX kwin-6.3.2.1-crashfix.patch 1759 BLAKE2B c8965b00b54cb34374811a8c051c9c54da98900662a121916c61873bdf6ced4fc94673401384bf3b5e1dd39bcebf82e603d62b46f3fd0fde5c1977c76389fa07 SHA512 ad6fa8a4968562d9d56a320885ea3efdbaa0544e5d1a975ff1268129c0d64bf4020b7e13e8577085b5f85164c15e5099718567e84eba7c8b8eb69da80bbecf79
DIST kwin-6.2.5.tar.xz 8563352 BLAKE2B 9a1ac80c337722d6a6411c338ac31f14f542f6d84505cc65c66e1ceedea2b88cbc9dabba68c42acf5dbace28b62e04cadc09a010a7972bc5ceb22d79344033fe SHA512 06a78d41003f2fb676f3cadca21a1e26a0006b78dcd9188c09d92fbc45f934aa9e923a69013b1cb496396d924a1848feb136d3016d64e14eca9cc525743b095b
DIST kwin-6.3.2.1.tar.xz 8869196 BLAKE2B 2f1578278c8c977cbd6e1f149e6bd83290779242a1cddad8596e8a7f71f5a439ea65f681772aff0dcd47c6d2283a50c5474f82f0bab606c31bd072b75de8f698 SHA512 551e3860babe05d69f267075fa4cd99b4ce8864717b62f99e09febc63df500c7d355e2f4d59d911e833023e43eb85f9c0fd02190622c26f5361d2b7bdb785894
EBUILD kwin-6.2.5.ebuild 4338 BLAKE2B 7d9ee1ed1aa206230a23efdbb00a9a12b3094ee803bc5dabc74baf5dfdfa325f56a93194e2ecb24863266271973ef3bb011d4fd4acaf595f445f5a4edba5a184 SHA512 044f0f5e4336069826772e335264d5968a620acad76fe73f8d9debe88bf51ac87ed5e980286a3089aaa17c99ef677c88fb7fd6ca7906455470d560eb8a5ea285
+EBUILD kwin-6.3.2.1-r1.ebuild 4515 BLAKE2B b9153bfda63b53099d287e6d426ef57e910f6f478d5a717c8888b24c5fca298ff09fd52f669d8cdb2ba0ae850b831273bc09dcfbcfa9d8b158ee62f0ca735d93 SHA512 c3d9de64dba2e88228488762805b15d1733ca5a546655859850caa971ad7cd748277dcbade559e7edeb7634f12b470da8c5a8b28f2c561b28ae7dc4ce27ad15b
EBUILD kwin-6.3.2.1.ebuild 4468 BLAKE2B 77ee10c8d0900f1dbbd6eccd15f9543a5d2989c35872fc5409df7414b4c0289386d99b1f8f2d50e4e8b28b0fb71efff48fba8243ba40b606a13d830e95a6c261 SHA512 cdb79fe87a8f45d5e790e50670e6f4f9ddc1b697a34aad12da5ca35b1ac82c05c1119d09a910327fa9ef7ee783d876e8ea827c140bb000b82b66562ac8e9f3b4
MISC metadata.xml 677 BLAKE2B 050345f8f8f489b3cb81e112c05fddedc738c8f136d409b8754c54494a02caf5671a66dd1ecd7cfb91f24ab11210c67f78c09c928a4daf16b3512600649551c5 SHA512 5134373a0ce30f351344c07df4a68f97a15bf3bdb061ba8ff3355a42da2281d64bb506cdcb5b1dad698fc2061b4a4a92e054e08c521acb327b84f968a7d936dc
diff --git a/kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch b/kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch
new file mode 100644
index 000000000000..ef481cc513f3
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-6.3.2.1-crashfix.patch
@@ -0,0 +1,46 @@
+commit b97892417ec1649c780e85e403842a77a6ab87b6
+Author: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed Feb 26 12:58:09 2025 +0100
+
+ backends/drm: fix testing for more connectors than CRTCs
+
+ The connectors may not actually be enabled, so the checks could sometimes result in
+ wrongly returning Error::NotEnoughCrtcs.
+
+ BUG: 500819
+ CCBUG: 500797
+
+ (cherry picked from commit aa11d89a90bc4eb77bfe191a2cadede4d957d2a9)
+
+diff --git a/src/backends/drm/drm_gpu.cpp b/src/backends/drm/drm_gpu.cpp
+index 9291b5296d..4599b3dc46 100644
+--- a/src/backends/drm/drm_gpu.cpp
++++ b/src/backends/drm/drm_gpu.cpp
+@@ -345,15 +345,7 @@ void DrmGpu::removeOutputs()
+
+ DrmPipeline::Error DrmGpu::checkCrtcAssignment(QList<DrmConnector *> connectors, const QList<DrmCrtc *> &crtcs)
+ {
+- if (connectors.isEmpty() || crtcs.isEmpty()) {
+- if (m_pipelines.isEmpty()) {
+- // nothing to do
+- return DrmPipeline::Error::None;
+- }
+- if (!connectors.empty()) {
+- // we have no crtcs left to drive the remaining connectors
+- return DrmPipeline::Error::InvalidArguments;
+- }
++ if (connectors.isEmpty()) {
+ return testPipelines();
+ }
+ auto connector = connectors.takeFirst();
+@@ -363,6 +355,10 @@ DrmPipeline::Error DrmGpu::checkCrtcAssignment(QList<DrmConnector *> connectors,
+ pipeline->setCrtc(nullptr);
+ return checkCrtcAssignment(connectors, crtcs);
+ }
++ if (crtcs.isEmpty()) {
++ // we have no crtc left to drive this connector
++ return DrmPipeline::Error::InvalidArguments;
++ }
+ DrmCrtc *currentCrtc = nullptr;
+ if (m_atomicModeSetting) {
+ // try the crtc that this connector is already connected to first
diff --git a/kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild b/kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild
new file mode 100644
index 000000000000..1f63d7f5a050
--- /dev/null
+++ b/kde-plasma/kwin/kwin-6.3.2.1-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=6.10.0
+QTMIN=6.8.1
+inherit ecm fcaps plasma.kde.org xdg
+
+DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux"
+
+LICENSE="GPL-2+"
+SLOT="6"
+KEYWORDS="~amd64 ~arm64 ~loong ~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.27:=
+ >=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-${KDE_CATV}:6
+ >=kde-plasma/kdecoration-${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-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 )
+ lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 )
+ screencast? ( >=media-video/pipewire-1.2.0:= )
+ shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}: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/aurorae-${KDE_CATV}:6
+ >=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)]
+ sys-apps/hwdata
+ >=x11-base/xwayland-23.1.0[libei]
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/plasma-wayland-protocols-1.16.0
+ >=dev-libs/wayland-protocols-1.38
+ >=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-${KDE_CATV}: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 )
+
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
+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
+
+ cmake_run_in src/plugins cmake_comment_add_subdirectory kdecorations
+}
+
+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() {
+ xdg_pkg_postinst
+ fcaps_pkg_postinst
+}