diff options
Diffstat (limited to 'kde-plasma')
319 files changed, 4913 insertions, 5458 deletions
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index b1daaa592e3a..dd82ee8c4ec8 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,2 +1,2 @@ -DIST bluedevil-5.24.5.tar.xz 173184 BLAKE2B dfd62b0b9310be5e3389fc0059a1c2c3b5e62fe15f50c4b6bd0515cd36b697e63995f0cdfc0682f785dd42f9a6c23b453cc115a07bd2a96ad56d24d03fabd8ba SHA512 02b24ba96169d733166ac6b906d995414bcf31b4a459d695ec018e7120b6e69ba01ec0f8bfa6e73d1fc8c965fc6fc285bbcefaea86a9dc230cd6a0247e566757 -DIST bluedevil-5.25.2.tar.xz 173204 BLAKE2B 6953a4978b66ae557096980d5b78176bd02bb0135fc44b0f0229597aabac0fde2737c44d48fa5fade5f0f6ab59c5beb5cb5e805ece812e00f6947992e7c26528 SHA512 270ac2f073b1ea223b3500bb99fa5fcacfd738305757b79904f4a82448322ed718210cd36a61900eea69b6ad9f778a56939e7eb27e5b13c9846ca29799f92d84 +DIST bluedevil-5.27.11.tar.xz 366752 BLAKE2B 707c44f6cc918d80b9a93619b4fc47c8d3c7caf6436dfa34a1a336c3c7e4bf8c9b9409a7f07c56c55463301bac62c0c9a9d512ed74e52c0087fc530dbf7206cb SHA512 8eefad775088347456fc3a4ee04e13f83678867cde2076ade6905355a5c2847d7a177d449ba909c627be791584e16e6e0e8c13c2e46b42eb18dd9547a4d0deee +DIST bluedevil-6.0.4.tar.xz 369164 BLAKE2B 5a450a4b221812969b643f34364d6fcc8a618466117b12ea967f62c10a432e61d989c4c6ab66d8556f3de8fa782fc7037e1e671ab61f057ee006ab6dba9d229c SHA512 7f87519d561038d2b6fc06588b25ae3df50f419a0c44bec94525a44a2b9387d12495c88af9c6e780ad607065e927e7cdb1e5d5757a20307ff6e237b87fd82b14 diff --git a/kde-plasma/bluedevil/bluedevil-5.25.2.ebuild b/kde-plasma/bluedevil/bluedevil-5.25.2.ebuild deleted file mode 100644 index bb1f87656ce3..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.25.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Bluetooth stack for KDE Plasma" -HOMEPAGE="https://invent.kde.org/plasma/bluedevil" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/bluez-qt-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.27.11.ebuild index b556abdcbb05..121ed5165402 100644 --- a/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild +++ b/kde-plasma/bluedevil/bluedevil-5.27.11.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Bluetooth stack for KDE Plasma" HOMEPAGE="https://invent.kde.org/plasma/bluedevil" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -23,19 +25,20 @@ DEPEND=" >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/bluez-qt-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=kde-plasma/libplasma-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/bluedevil/bluedevil-6.0.4.ebuild b/kde-plasma/bluedevil/bluedevil-6.0.4.ebuild new file mode 100644 index 000000000000..07560c681986 --- /dev/null +++ b/kde-plasma/bluedevil/bluedevil-6.0.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Bluetooth stack for KDE Plasma" +HOMEPAGE="https://invent.kde.org/plasma/bluedevil" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/bluez-qt-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-plasma/libplasma-${PVCUT}:6 +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/bluedevil/metadata.xml b/kde-plasma/bluedevil/metadata.xml index d925f2439758..d51eb6c02db7 100644 --- a/kde-plasma/bluedevil/metadata.xml +++ b/kde-plasma/bluedevil/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/bluedevil</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest index d43243c4bc8e..4634b4d6e392 100644 --- a/kde-plasma/breeze-grub/Manifest +++ b/kde-plasma/breeze-grub/Manifest @@ -1,2 +1,2 @@ -DIST breeze-grub-5.24.5.tar.xz 3144676 BLAKE2B 078525e002b90569ed8cba208a11ed5392898851f8fade092ababe3ec59ac950751f084dc5f251385d1f5c5f64513343013d63bcd9bd41d32238eb309f74947b SHA512 5ffba2c633f0442c6bb109df6f6ce73d527788c93487818f4c93f6140935eaeae76b7d1efb00d570a766054e2aac5bfea17f6ae7439b04c9dc0f6d8e02d10355 -DIST breeze-grub-5.25.2.tar.xz 3141364 BLAKE2B 5e6f25ab019c52f61748612c8bf906bdeac095ddb34126da2e30c7373fae77e6a83dae0ed4e6c0d35205b23e742c8aaf339e5b5338d083a4673baf735bf3d082 SHA512 b4097285ba92f5756f7a023d585cf2b3b7c7bbe0e5700bc568170dd24adabc2b1989fc532f91bb66b26a9f8a58ba762026f6fdac75ac40894ac7c33af64442bd +DIST breeze-grub-5.27.11.tar.xz 3145680 BLAKE2B 0143cefba69d45aacca005567b9f94b4e4abda728d0c2e8ec35543bd5ca5b007a78b4781a87f19417c7db339e3ecb05be8f80a3815b60c410de4dd27c0bd6ca0 SHA512 36f2c36d7d013ecdbf1ff80d6270e42ac06ab8fbcc12ba27d604657346b92f43661723e1ddfb6a3df7d76b3195f6808b8cce0bb8481783de5a46f6ab84442ff6 +DIST breeze-grub-6.0.4.tar.xz 1446104 BLAKE2B 5e27cce1e493c46d293dd00879df56acb2f4e0852695c65183508b8796f5a408f3412162732962a1c0f2ae881e7396b85fd5a0902d304a40c2d081dffc3f1ab9 SHA512 8030f8312b4d96a220575faa7b88c25b7840652d67fc38e9ea0b4e9e978c0bf66bf8175f8585d700e89897bb5822929016c34049f7f2b59bae9be6e7c12a414e diff --git a/kde-plasma/breeze-grub/breeze-grub-5.25.2.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.27.11.ebuild index af842b702646..7f8634d3db86 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.25.2.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-5.27.11.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit kde.org +inherit plasma.kde.org DESCRIPTION="Breeze theme for GRUB" LICENSE="GPL-3+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" src_prepare() { default; } diff --git a/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.0.4.ebuild index dfc1b0a3ae8b..ca7bec05c14a 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-6.0.4.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit kde.org +inherit plasma.kde.org DESCRIPTION="Breeze theme for GRUB" LICENSE="GPL-3+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" src_prepare() { default; } diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest index a51e809fc387..8b19040d9b43 100644 --- a/kde-plasma/breeze-gtk/Manifest +++ b/kde-plasma/breeze-gtk/Manifest @@ -1,2 +1,2 @@ -DIST breeze-gtk-5.24.5.tar.xz 43816 BLAKE2B ef24e2f3116dc21e8877cbe5d08f727c546c18f94b1b0ab91c789fd421884b2a02c6f2c24b48efee2ba4e8d65458e0e351ce9faa5192aae1af25e7b5a828aad3 SHA512 6bf656a94a1c4f708ad83c9d2c23b15d29387975558494502613df07dbd298580b372a83dd16c1077d8c91057c92d74b47f279e1f92eb53fa9c8783fe98c3c29 -DIST breeze-gtk-5.25.2.tar.xz 45828 BLAKE2B ee1403423efc0bee722bba27a6939d2ce16de629d817393fb32e3cc9e69e8d282794770e15d7e32aa45bd45d676f77d07fde4832f2e2738f1efffd69e95f60cb SHA512 fbae160173b9b51ad7e4ce56850c0fa9734abe294a4a606880e2e7adf83e9053ca90f7848bf61a978df82d6463ed2d9bb8b8b1c47ed5ff9651643a65c9ee3d3a +DIST breeze-gtk-5.27.11.tar.xz 40688 BLAKE2B 0843870e93b21f890ef12c16e1ba25b02ba26774588a22a6fc77d1f6205769992ed30001cd2ffbfa85890581077f009b8bcaa02d00cb0bc5f1d9686a65f7dd89 SHA512 0d9f86142342d124cb31151695038c8cb03b5c7c16f21443e0e1613ec184c37ed7eebc46fadd74f6c553a1081d60846d53072e979e39ba455ca517825eaab846 +DIST breeze-gtk-6.0.4.1.tar.xz 40716 BLAKE2B 455000edc739578a80984687f57fe009f3794237f9065823e55a0e5bcb845201c3e08e7aa3f62a3586db29ef400fe2b94841362474d81eb9f9db4956fa3c91e2 SHA512 3a9fd0b9cded7e32a9acc463f00e5a7827f1754f7da44a525de4bfa6e906e2fe002aa22773dc0c9f4a7740409b3eb2a6773ac540fed152952dbef83e86c337f3 diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.27.11.ebuild index db378cc0e98b..02da519e93f2 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -PYTHON_COMPAT=( python3_{8..10} ) -inherit ecm kde.org python-any-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit ecm plasma.kde.org python-any-r1 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style" HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk" LICENSE="LGPL-2.1+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" BDEPEND="${PYTHON_DEPS} @@ -22,17 +22,10 @@ BDEPEND="${PYTHON_DEPS} " python_check_deps() { - has_version "dev-python/pycairo[${PYTHON_USEDEP}]" + python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]" } pkg_setup() { python-any-r1_pkg_setup ecm_pkg_setup } - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.25.2.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.0.4.1.ebuild index 5e5007caad6c..3864c459aa31 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.25.2.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-6.0.4.1.ebuild @@ -1,38 +1,32 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -PYTHON_COMPAT=( python3_{8..10} ) -inherit ecm kde.org python-any-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit ecm plasma.kde.org python-any-r1 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style" HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk" LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" BDEPEND="${PYTHON_DEPS} dev-lang/sassc $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/breeze-${PVCUT}:6 " python_check_deps() { - has_version "dev-python/pycairo[${PYTHON_USEDEP}]" + python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]" } pkg_setup() { python-any-r1_pkg_setup ecm_pkg_setup } - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze-gtk/metadata.xml b/kde-plasma/breeze-gtk/metadata.xml index d925f2439758..543f816c463e 100644 --- a/kde-plasma/breeze-gtk/metadata.xml +++ b/kde-plasma/breeze-gtk/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/breeze-gtk</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest index 563d54ebc011..3001148933a6 100644 --- a/kde-plasma/breeze-plymouth/Manifest +++ b/kde-plasma/breeze-plymouth/Manifest @@ -1,2 +1,2 @@ -DIST breeze-plymouth-5.24.5.tar.xz 110824 BLAKE2B 76642ca51c025aada9062287a75ca07f5d5a50678cb62ae8188d78d7dbc0654e3d9028b977af4a514702e55546c66f68ed44d5c223154d94ad8f4854ee491d16 SHA512 d34813e6d039228c98bf8c4203ed33c84fac65d4204f08dc04eb93811d2602b2721cb2f60144f9f1aa8e91f4f5d18fa55f6ba8077e124be742cf13e29a54532f -DIST breeze-plymouth-5.25.2.tar.xz 110792 BLAKE2B 18dfb37e87d744e5bc511c8157a0112d44fca06a634483d1e38f474a078327cb626c2f9da30a78952302fd16ccbbb2e590d0461fd59b426437e640400d6eb6ab SHA512 4451c6aaff697b369c4fe6987d9c91b7636f90cf73305e8a9416fc412246f99689fe8a3512b6797464ca364b8216b1fa032a85192233b44d18940367eb21626b +DIST breeze-plymouth-5.27.11.tar.xz 111328 BLAKE2B 19fe9b59d0b5816f2dde0366cc4b1c364892624949eba38ca518a1ad7733ac13cb27af4d816b8a7510f174ac68854a3adb82c406c064c670db18cce2478bb54d SHA512 fcd681089d1f78aa96546d3e9ed0a03ed091646f2874d4b6152bdd4056946a3a566a35c2aa01ec16bb593b87bf3d7677ebd6689bf76c6f0686db2a08bf7fdfef +DIST breeze-plymouth-6.0.4.1.tar.xz 111104 BLAKE2B 4b2750bd4b005271c8c5e10caa739eb55d15dcbf69814691f02c5f5858ed6a325ae506ff993c751ce6cf88f721712989de56bd85ab1c4faf5bc09599e23a6723 SHA512 8adaee96f55544d904f16fb871bd1969e467cd892d2b15c84324a7538fa8064b3594ea858443907f27a75458c6832d48ec7ea059077c44de945f5a337b1ad110 diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.2.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.11.ebuild index cc1ed57083be..9e6449db1996 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.25.2.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +KFMIN=5.102.0 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +inherit cmake plasma.kde.org DESCRIPTION="Breeze theme for Plymouth" LICENSE="GPL-2+ GPL-3+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86" IUSE="" -BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5" +BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0" DEPEND="sys-boot/plymouth" RDEPEND="${DEPEND}" diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.0.4.1.ebuild index 188483457ed0..778c8c15c318 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.0.4.1.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +inherit cmake plasma.kde.org DESCRIPTION="Breeze theme for Plymouth" LICENSE="GPL-2+ GPL-3+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" -BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5" +BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0" DEPEND="sys-boot/plymouth" RDEPEND="${DEPEND}" diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index 3603e29a8220..48118648eab3 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,2 +1,2 @@ -DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0 -DIST breeze-5.25.2.tar.xz 31154056 BLAKE2B b421a24abe50aa7c6ab9fbd0de1f2d7e0278f6548feef5438be8cda61438920cb41697b4f145e021ce4d4182d3ab3d7f034e6acbceda2ba877cd0e4c0c85621d SHA512 78b0fb2c8817010f268f59e35c85b1698eefba154834ae6430564d2ef7ede078e5408ba787b52b40d4f841ec7b5e49114a42314d61f4cc93acb2066ea1bf324a +DIST breeze-5.27.11.tar.xz 87586968 BLAKE2B de90aa5203e6252c2e5400daf46f187d522319888f1c44006eeaaa4f57e87de97911511a9448fb286218b64b0526546ca341868c05f83f135bbe85ca9910ea1c SHA512 71d0b7421c7fa80e67410777fc37aa5ac0f51e74d593baa5ebd38e7f0313986974a1eb606e26c1b335b9ceb4b95717f43d6a45a25dd8de705d49d5a3f74e2bd6 +DIST breeze-6.0.4.tar.xz 58037172 BLAKE2B 1e54faf316cf5820bd5103b82034931c9ad15538d95ac9962cb6a00268ae0363446276e398bd46c471b0b8236bcafe1cb69d316fd6f8a9fce5e31d5cc67cf70f SHA512 47e7d94d4c7acbd350e1698361774534de2f0306716930fe38128fc80231f86614ed153471937eecd6cdab8df2f98f4e27747b2c2ff23d23ccb6b18aa2633b9a diff --git a/kde-plasma/breeze/breeze-5.25.2.ebuild b/kde-plasma/breeze/breeze-5.25.2.ebuild deleted file mode 100644 index af43a2b210bd..000000000000 --- a/kde-plasma/breeze/breeze-5.25.2.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Breeze visual style for the Plasma desktop" -HOMEPAGE="https://invent.kde.org/plasma/breeze" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - X? ( x11-libs/libxcb ) -" -DEPEND="${RDEPEND}" -PDEPEND=" - >=kde-frameworks/breeze-icons-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X XCB) - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze/breeze-5.24.5.ebuild b/kde-plasma/breeze/breeze-5.27.11.ebuild index 3d50e72e704a..3740421bc973 100644 --- a/kde-plasma/breeze/breeze-5.24.5.ebuild +++ b/kde-plasma/breeze/breeze-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Breeze visual style for the Plasma desktop" HOMEPAGE="https://invent.kde.org/plasma/breeze" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -30,20 +30,14 @@ RDEPEND=" >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 - X? ( x11-libs/libxcb ) " DEPEND="${RDEPEND}" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" PDEPEND=" - >=kde-frameworks/breeze-icons-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-plasma/kde-cli-tools-${PVCUT}:* " - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X XCB) - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze/breeze-6.0.4.ebuild b/kde-plasma/breeze/breeze-6.0.4.ebuild new file mode 100644 index 000000000000..7e324701f8a9 --- /dev/null +++ b/kde-plasma/breeze/breeze-6.0.4.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KF5MIN=5.115.0 +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QT5MIN=5.15.12 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Breeze visual style for the Plasma desktop" +HOMEPAGE="https://invent.kde.org/plasma/breeze" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="qt5" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/frameworkintegration-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-plasma/kdecoration-${PVCUT}:6 + qt5? ( + >=dev-qt/qtdbus-${QT5MIN}:5 + >=dev-qt/qtdeclarative-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=dev-qt/qtx11extras-${QT5MIN}:5 + >=kde-frameworks/frameworkintegration-${KF5MIN}:5 + >=kde-frameworks/kcmutils-${KF5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kconfigwidgets-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kguiaddons-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kiconthemes-${KF5MIN}:5 + >=kde-frameworks/kirigami-${KF5MIN}:5 + >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5 + >=kde-frameworks/kwindowsystem-${KF5MIN}:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:6 + qt5? ( >=kde-frameworks/kcmutils-${KF5MIN}:5 ) +" +PDEPEND=" + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=$(usex qt5) + ) + ecm_src_configure +} diff --git a/kde-plasma/breeze/metadata.xml b/kde-plasma/breeze/metadata.xml index d925f2439758..691fe86ecc98 100644 --- a/kde-plasma/breeze/metadata.xml +++ b/kde-plasma/breeze/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/breeze</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index a353280b2339..45496ea47864 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,2 +1,2 @@ -DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518 -DIST discover-5.25.2.tar.xz 8300024 BLAKE2B 87ae77a48ec2327a55341979293f1b9a74287daa1eb588c5718696e6960dda4c3ba91b506d6ca1b6e69449e68931d2ebaab970cf8169b6232e0488d72466b9d3 SHA512 b7d8831037f9c02c1986e51da232f2184caa362f05b3d1c073e07a050f0ff6867173928f4e9c4c7e6befdb02751d7db10fa39e9f033b46444d5a4e9e7be04507 +DIST discover-5.27.11.tar.xz 881132 BLAKE2B 8f60d92745f38aef3a767f41c763d12fe07a915ea7f89ce03a37f1ed4bae1814081d08761be496e1020998a986650269f217eb6820a15b7bbb84aa056034ce60 SHA512 3393b99df506314420c18d2fbf05f7476dd86d4b27c1a153f5da4ebce03add63b0001194d1717b90d0f4bb34f106f34ed4f54f06bcdbf7aa3de492b94a470e37 +DIST discover-6.0.4.tar.xz 999504 BLAKE2B d4d80b8777c84ba51ea3958b986d172aebc01d19e0e9c5f26c12732b2b6223c7eb009df70b61e981c0a9814bca4d320f0b238629379483b2693527ad66f6d976 SHA512 cf63b5c1ce1d0b229765ab62bb728b0ac34dee01600a7352f83058dab5216a97c77f5d31e14ae7ba8f9211319512759d4ff603e86d16d0724db6c2d0cb677a74 diff --git a/kde-plasma/discover/discover-5.25.2.ebuild b/kde-plasma/discover/discover-5.25.2.ebuild deleted file mode 100644 index fe6197a020ff..000000000000 --- a/kde-plasma/discover/discover-5.25.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.94.0 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma resources management GUI" -HOMEPAGE="https://userbase.kde.org/Discover" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+firmware flatpak telemetry" - -# libmarkdown (app-text/discount) only used in PackageKitBackend -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - firmware? ( >=sys-apps/fwupd-1.5.0 ) - flatpak? ( - >=dev-libs/appstream-0.14.4:= - sys-apps/flatpak - ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${PN}-5.25.1-tests-optional.patch" ) - -src_prepare() { - ecm_src_prepare - # we don't need it with PackageKitBackend off - ecm_punt_kf_module Archive - # we don't do anything with this - sed -e "s/^pkg_check_modules.*RpmOstree/#&/" \ - -e "s/^pkg_check_modules.*Ostree/#&/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DWITH_KCM=OFF - -DBUILD_FlatpakBackend=$(usex flatpak) - $(cmake_use_find_package flatpak AppStreamQt) - -DBUILD_FwupdBackend=$(usex firmware) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -src_test() { - # bug 686392: needs network connection - local myctestargs=( - -E "(knsbackendtest)" - ) - - ecm_src_test -} diff --git a/kde-plasma/discover/discover-5.24.5.ebuild b/kde-plasma/discover/discover-5.27.11.ebuild index be46b5a49318..dd1e2d9d8cb8 100644 --- a/kde-plasma/discover/discover-5.24.5.ebuild +++ b/kde-plasma/discover/discover-5.27.11.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma resources management GUI" HOMEPAGE="https://userbase.kde.org/Discover" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="+firmware flatpak telemetry" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" + >=dev-libs/appstream-0.15.3:=[qt5(-)] >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -39,24 +37,24 @@ DEPEND=" >=kde-frameworks/kidletime-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/purpose-${KFMIN}:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) - flatpak? ( - >=dev-libs/appstream-0.14.4:= - sys-apps/flatpak - ) - telemetry? ( dev-libs/kuserfeedback:5 ) + flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt5(-)] ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 + snap? ( app-containers/snapd ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" -PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) src_prepare() { ecm_src_prepare @@ -70,13 +68,19 @@ src_prepare() { src_configure() { local mycmakeargs=( + # TODO: Port PackageKit's portage back-end to python3 -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + # Automated updates will not work for us + # https://invent.kde.org/plasma/discover/-/merge_requests/142 -DWITH_KCM=OFF + -DBUILD_DummyBackend=OFF -DBUILD_FlatpakBackend=$(usex flatpak) - $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) + -DBUILD_RpmOstreeBackend=OFF + -DBUILD_SnapBackend=$(usex snap) + -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package webengine Qt5WebView) ) ecm_src_configure @@ -85,7 +89,7 @@ src_configure() { src_test() { # bug 686392: needs network connection local myctestargs=( - -E "(knsbackendtest)" + -E "(knsbackendtest|flatpaktest)" ) ecm_src_test diff --git a/kde-plasma/discover/discover-6.0.4.ebuild b/kde-plasma/discover/discover-6.0.4.ebuild new file mode 100644 index 000000000000..7a4ff24ff1ed --- /dev/null +++ b/kde-plasma/discover/discover-6.0.4.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma resources management GUI" +HOMEPAGE="https://userbase.kde.org/Discover" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="+firmware flatpak snap telemetry webengine" + +# libmarkdown (app-text/discount) only used in PackageKitBackend +DEPEND=" + >=dev-libs/appstream-1.0.0:=[qt6] + dev-libs/kirigami-addons:6 + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/attica-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + firmware? ( >=sys-apps/fwupd-1.9.4 ) + flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt6(-)] ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) +" +RDEPEND="${DEPEND} + snap? ( app-containers/snapd ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) + +src_prepare() { + ecm_src_prepare + # we don't need it with PackageKitBackend off + ecm_punt_kf_module Archive + # we don't do anything with this + sed -e "s/^pkg_check_modules.*Markdown/#&/" \ + -e "s/^pkg_check_modules.*RpmOstree/#&/" \ + -e "s/^pkg_check_modules.*Ostree/#&/" \ + -i CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + # TODO: Port PackageKit's portage back-end to python3 + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON + # Automated updates will not work for us + # https://invent.kde.org/plasma/discover/-/merge_requests/142 + -DWITH_KCM=OFF + -DBUILD_DummyBackend=OFF + -DBUILD_FlatpakBackend=$(usex flatpak) + -DBUILD_FwupdBackend=$(usex firmware) + -DBUILD_RpmOstreeBackend=OFF + -DBUILD_SnapBackend=$(usex snap) + -DBUILD_SteamOSBackend=OFF + $(cmake_use_find_package telemetry KF6UserFeedback) + $(cmake_use_find_package webengine Qt6WebView) + ) + + ecm_src_configure +} + +src_test() { + # bug 686392: needs network connection + local myctestargs=( + -E "(knsbackendtest|flatpaktest)" + ) + + ecm_src_test +} diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch deleted file mode 100644 index 43976d145baf..000000000000 --- a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 14 May 2021 12:38:57 +0200 -Subject: [PATCH] Use BUILD_TESTING to make tests optional - -Variable is provided by KDECMakeSettings and default enabled. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 6 +++++- - libdiscover/CMakeLists.txt | 4 +++- - libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- - libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- - libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- - 5 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73061dde..7d230317 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) - - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras) - include(KDEInstallDirs) - include(KDECMakeSettings) - include(KDECompilerSettings NO_POLICY_SCOPE) -@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory) - include(KDEClangFormat) - include(KDEGitCommitHooks) - -+if(BUILD_TESTING) -+ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) -+endif() -+ - find_package(PkgConfig REQUIRED) - - find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui ItemModels KIO Declarative KCMUtils IdleTime) -diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt -index 661c371b..56c72008 100644 ---- a/libdiscover/CMakeLists.txt -+++ b/libdiscover/CMakeLists.txt -@@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ - - add_subdirectory(backends) - add_subdirectory(notifiers) --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(discovercommon_SRCS - Category/Category.cpp -diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt -index 5b4aef10..38377d80 100644 ---- a/libdiscover/backends/DummyBackend/CMakeLists.txt -+++ b/libdiscover/backends/DummyBackend/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(dummy-backend_SRCS - DummyResource.cpp -diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt -index 2006a829..810238f0 100644 ---- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt -+++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - set(flatpak-backend_SRCS - FlatpakResource.cpp -diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt -index e2cb4e52..195cb98a 100644 ---- a/libdiscover/backends/KNSBackend/CMakeLists.txt -+++ b/libdiscover/backends/KNSBackend/CMakeLists.txt -@@ -1,4 +1,6 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() - - add_library(kns-backend MODULE - KNSBackend.cpp --- -2.31.1 - diff --git a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch index fc01ca3214bc..50f1175116d3 100644 --- a/kde-plasma/discover/files/discover-5.25.1-tests-optional.patch +++ b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch @@ -1,4 +1,4 @@ -From 608e1dc8232002bc4cff600eae7571a100856334 Mon Sep 17 00:00:00 2001 +From 8706a81bccfbaf9d06a3aedf9f968d760757af07 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> Date: Fri, 14 May 2021 12:38:57 +0200 Subject: [PATCH] Use BUILD_TESTING to make tests optional @@ -7,32 +7,30 @@ Variable is provided by KDECMakeSettings and default enabled. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> --- - CMakeLists.txt | 6 +++++- + CMakeLists.txt | 4 ++++ libdiscover/CMakeLists.txt | 4 +++- libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- - 5 files changed, 17 insertions(+), 5 deletions(-) + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index cd8c61aa..8ce3fa8c 100644 +index 13fe64228..7453c8bfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -22,7 +22,11 @@ - include(ECMQtDeclareLoggingCategory) - include(KDEClangFormat) - include(KDEGitCommitHooks) --find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick) -+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick) -+ +@@ -25,6 +25,10 @@ include(KDEGitCommitHooks) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG OPTIONAL_COMPONENTS WebView) + +if(BUILD_TESTING) + find_package(Qt${QT_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED) +endif() - ++ find_package(PkgConfig REQUIRED) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED CoreAddons Config Crash DBusAddons I18n Archive XmlGui KIO Declarative KCMUtils IdleTime Notifications Purpose) diff --git a/libdiscover/CMakeLists.txt b/libdiscover/CMakeLists.txt -index a26d6934..ca827f3b 100644 +index 023b110fd..7778fab0c 100644 --- a/libdiscover/CMakeLists.txt +++ b/libdiscover/CMakeLists.txt @@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ @@ -47,7 +45,7 @@ index a26d6934..ca827f3b 100644 set(discovercommon_SRCS Category/Category.cpp diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt -index 5b4aef10..38377d80 100644 +index 5b4aef10c..38377d808 100644 --- a/libdiscover/backends/DummyBackend/CMakeLists.txt +++ b/libdiscover/backends/DummyBackend/CMakeLists.txt @@ -1,4 +1,6 @@ @@ -59,7 +57,7 @@ index 5b4aef10..38377d80 100644 set(dummy-backend_SRCS DummyResource.cpp diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt -index 55e6b38e..e2d11b93 100644 +index eac5a3241..e9ee78fd0 100644 --- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt +++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt @@ -1,4 +1,6 @@ @@ -71,7 +69,7 @@ index 55e6b38e..e2d11b93 100644 set(flatpak-backend_SRCS FlatpakResource.cpp diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt -index 54f19e1f..ec3443e9 100644 +index d52bee9d0..7d5ba8dc9 100644 --- a/libdiscover/backends/KNSBackend/CMakeLists.txt +++ b/libdiscover/backends/KNSBackend/CMakeLists.txt @@ -1,4 +1,6 @@ @@ -83,5 +81,5 @@ index 54f19e1f..ec3443e9 100644 add_library(kns-backend MODULE KNSBackend.cpp -- -2.35.1 +2.37.3 diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index 0c430bd5a1dd..13c683e94092 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -7,9 +7,12 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:discover</remote-id> </upstream> <use> <flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag> <flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag> + <flag name="snap">Enable support for snap packages using <pkg>app-containers/snapd</pkg></flag> + <flag name="webengine">Enable webflow support using <pkg>dev-qt/qtwebview</pkg> and <pkg>dev-qt/qtwebengine</pkg> instead of default URL handler</flag> </use> </pkgmetadata> diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest index c23a4e3fcefe..e9adcc8487b8 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,2 +1,3 @@ -DIST drkonqi-5.24.5.tar.xz 795452 BLAKE2B 80a52ca807f2879640ac75581984789e60c8e41af3ed7c697c68fd2c1729248e96fc0c48d31f86fc9f970991cf266a798adc6bb4c1c04f3a06cde76d1be6c6fd SHA512 e1b5986f687da629d5e5f3e9034f551db4fec26870ff6801922da64cb7cff6d3089ae171ede47a6a733bb383cbb6dd54a691db962829027ad1449e71f2c45405 -DIST drkonqi-5.25.2.tar.xz 485904 BLAKE2B 05bc0f6e57a0805eefb8632b73928ec9e47dbf700fd730894d46926cf93c0a6d3b767f39b107aaef54c2e2af62e875411d09fb3543ce72bbfe4554aea3c19dc4 SHA512 428abc2740e714f912fe86e3d6529f7135a672d5434fa312ffaccba04c7d52b6617adc10585704d93bae0a4a355178b161ad04b31b34876fd17f8cf563cddc89 +DIST drkonqi-5.27.11.tar.xz 865308 BLAKE2B 62d395cd6fa18c08037886ad1b9240f080789c651d6b46a4f24eaff67ff1cd36656c1700df33d4ccff21d6cc2abad4e965fa5f678e2739ac745ef8a5490bdbe4 SHA512 c4e4e02f6b039d67e9f82c30f92576127f99e202bef4f0098dd59e7bec6071b587e79c687e5f19571c2be0fc91545258d4059a2f09836c50810021043cd300fd +DIST drkonqi-5.27.8-revert-add-sentry-support.patch.xz 11996 BLAKE2B 17bf8c3e5c9a5bad200d22fa59b84a97caeca2c164d8b92a1dea665df7e73111401e82c1bacf5ab24c40fb21767c6dea38b38afd288d32190e1c72e453a38558 SHA512 50e448f311bde34c7e77a229aa7816899b7eb743b522d41bd31cc2b18741939a028fe42e267ba440560535fcb33890e3360e20d157a2e5959d2943ce8960491d +DIST drkonqi-6.0.4.tar.xz 873360 BLAKE2B 0d9e466e36ad079692c70bd58868cc16bc5e263b981a3bf62f81dd9c7abd612b7d33b930152349499a15c576c0528f99b09b8089e2a952fec6cf12d1ee106f70 SHA512 38d6a41992e508d7779c216eb0a5538a9c860d76cebe189244796e4ab596c6e0fb21025bc5a790cd4eee3601007885abc61c62d26feac79c9b9d5065b20820f2 diff --git a/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild deleted file mode 100644 index 0489a66fa83a..000000000000 --- a/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - || ( - sys-devel/gdb - dev-util/lldb - ) -" - -src_test() { - # needs network access, bug #698510 - local myctestargs=( - -E "(connectiontest)" - ) - ecm_src_test -} diff --git a/kde-plasma/drkonqi/drkonqi-5.25.2.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild index 3f5ee0130ce6..5ae515f4fa32 100644 --- a/kde-plasma/drkonqi/drkonqi-5.25.2.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild @@ -1,54 +1,68 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +ECM_TEST="forceoptional" +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org systemd DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="systemd" COMMON_DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kidletime-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + systemd? ( + >=dev-qt/qtnetwork-${QTMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + sys-apps/systemd:= + ) " DEPEND="${COMMON_DEPEND} >=dev-qt/qtconcurrent-${QTMIN}:5 + test? ( >=dev-qt/qtnetwork-${QTMIN}:5 ) " RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] || ( - sys-devel/gdb - dev-util/lldb + dev-debug/gdb + dev-debug/lldb ) " +PATCHES=( "${WORKDIR}/${PN}-5.27.8-revert-add-sentry-support.patch" ) # bug 871759 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package systemd Systemd) + ) + ecm_src_configure +} + src_test() { # needs network access, bug #698510 local myctestargs=( @@ -56,3 +70,12 @@ src_test() { ) ecm_src_test } + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && systemd_is_booted ; then + elog "For systemd, steps are needed for integration with systemd-coredumpd." + elog "As root, run the following:" + elog "1. systemctl enable drkonqi-coredump-processor@.service" + elog "2. systemctl --user enable --now --global drkonqi-coredump-launcher.socket" + fi +} diff --git a/kde-plasma/drkonqi/drkonqi-6.0.4.ebuild b/kde-plasma/drkonqi/drkonqi-6.0.4.ebuild new file mode 100644 index 000000000000..8aa7561985d8 --- /dev/null +++ b/kde-plasma/drkonqi/drkonqi-6.0.4.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{11..12} ) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org python-single-r1 systemd + +DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="systemd" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/syntax-highlighting-${KFMIN}:6 + systemd? ( + >=dev-qt/qtbase-${QTMIN}:6[network] + >=kde-frameworks/kservice-${KFMIN}:6 + sys-apps/systemd:= + >=sys-auth/polkit-qt-0.175.0[qt6] + ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + test? ( >=dev-qt/qtbase-${QTMIN}:6[network] ) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygdbmi[${PYTHON_USEDEP}] + dev-python/sentry-sdk[${PYTHON_USEDEP}] + ') + || ( + dev-debug/gdb + dev-debug/lldb + ) +" + +pkg_setup() { + ecm_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DWITH_PYTHON_VENDORING=OFF + $(cmake_use_find_package systemd Systemd) + ) + ecm_src_configure +} + +src_test() { + # needs network access, bug #698510 + local myctestargs=( + -E "(connectiontest)" + ) + ecm_src_test +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && systemd_is_booted ; then + elog "For systemd, steps are needed for integration with systemd-coredumpd." + elog "As root, run the following:" + elog "1. systemctl enable drkonqi-coredump-processor@.service" + elog "2. systemctl --user enable --now --global drkonqi-coredump-launcher.socket" + fi +} diff --git a/kde-plasma/drkonqi/metadata.xml b/kde-plasma/drkonqi/metadata.xml index d925f2439758..be35b35a0d33 100644 --- a/kde-plasma/drkonqi/metadata.xml +++ b/kde-plasma/drkonqi/metadata.xml @@ -5,6 +5,9 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <use> + <flag name="systemd">Enable Coredumpd integration</flag> + </use> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> diff --git a/kde-plasma/flatpak-kcm/Manifest b/kde-plasma/flatpak-kcm/Manifest new file mode 100644 index 000000000000..50ba780822f4 --- /dev/null +++ b/kde-plasma/flatpak-kcm/Manifest @@ -0,0 +1,2 @@ +DIST flatpak-kcm-5.27.11.tar.xz 234316 BLAKE2B 7d68b8e199573f2c7dc5169f4cb9aaf4a267a97558cadbbbaa9ab023a73553d18be65f63fbfb302c951272b06b5ab46aaf8c4d8915e250efed33fa3a005305a4 SHA512 78cfde4e7d9177ff2eea8be56d18b81797c97fedd09736387ddcd39d6aff508cee1dc10d187faed43706412613b692a7d9d852a0e21716c63597f19fc959c87a +DIST flatpak-kcm-6.0.4.tar.xz 239216 BLAKE2B 70f0215f3f12034fba57dec8dc45c928a23508fef930d7a9147ea1022f77f419cc301899816fce8108c43d9cb32f2530121f7681f1129313353c613c77acd6e9 SHA512 d07e9bf459d455079f1fd6aa71f095e5f153a828133fd09e2903b050382501f1a2df71501c0b2639e2182649e2fe552b9aadd240cceddd27f6a4d840cf1b1472 diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-5.27.11.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-5.27.11.ebuild new file mode 100644 index 000000000000..178bcfb16d66 --- /dev/null +++ b/kde-plasma/flatpak-kcm/flatpak-kcm-5.27.11.ebuild @@ -0,0 +1,34 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org + +DESCRIPTION="Flatpak Permissions Management KCM" +HOMEPAGE="https://invent.kde.org/plasma/flatpak-kcm" + +LICENSE="GPL-2 LGPL-2.1+" +SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" + +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=sys-apps/flatpak-0.11.8 +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 +" diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-6.0.4.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.0.4.ebuild new file mode 100644 index 000000000000..44f463616b06 --- /dev/null +++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.0.4.ebuild @@ -0,0 +1,35 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Flatpak Permissions Management KCM" +HOMEPAGE="https://invent.kde.org/plasma/flatpak-kcm" + +LICENSE="GPL-2 LGPL-2.1+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtbase-${QTMIN}:6 + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=sys-apps/flatpak-0.11.8 +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/flatpak-kcm/metadata.xml b/kde-plasma/flatpak-kcm/metadata.xml new file mode 100644 index 000000000000..31f896cd3c17 --- /dev/null +++ b/kde-plasma/flatpak-kcm/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/flatpak-kcm</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest index 3121e556b806..ee0bd9f90f46 100644 --- a/kde-plasma/kactivitymanagerd/Manifest +++ b/kde-plasma/kactivitymanagerd/Manifest @@ -1,2 +1,2 @@ -DIST kactivitymanagerd-5.24.5.tar.xz 105216 BLAKE2B be8c117f6b4030a38d10d5abb6c5c090b70aa2368dc821d87168e2e3e9990f08d557e277bb488c94c74245153b4e3c733d7e93afb27903ba233c41236536cf95 SHA512 971105d22e7058b4c62ae00bef160b629cdef59e84cfc1d5fe6f7d9e43d12e71f8c93a56ef933f58729f71ead1d6b5c2247828a5a99bbe8300e0312888421b9c -DIST kactivitymanagerd-5.25.2.tar.xz 106364 BLAKE2B db5c0195934c851ac41aeda13523b6588b4476a5235eaa7f37fb485edf53be261d058e1786c7661865d1ce69c6d75062015774f480147878dc806477e3e2f4f3 SHA512 3d64e242c9151f4c5775e11226b9cc2d7f35151b0942eed6aa7cabe2345313cc4c4cdad4c54f63e9a5fa33ede84ab5b3bee714a230c1b0f11bc65abd48d94c29 +DIST kactivitymanagerd-5.27.11.tar.xz 126972 BLAKE2B 8e293e6ef19de7ce2048aceaa5152d10d4488e082f032ec805a0df6932fd74d29a3f8879cf109f0554881ece2b1e45ec695e12fbc80c9e7469b343b9ae4230a2 SHA512 0174babd75a7c13d2014d9bc3bf65b20a6851d19eeed2d2421524ca31db0ffab3dc973f7da753e4805096e9411632df082ba289ce9870898b58522fc7410ce17 +DIST kactivitymanagerd-6.0.4.tar.xz 110068 BLAKE2B 6d5bf7875a7cdb9bebcb49172283320fd716e6f8e7dc8717d7883692f8329d0bf2d52ba7a9511c6b0663fab3974004e29e6c06dd07bdee0521a629d243d19523 SHA512 10a945a70f4c4ab2b28a9731771c0a79aef9ce99b6c179544c85e1c7935554893284d3718c9653eff3a2c2534149a8f337b92dbc9c43c9336988961b8201a295 diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.2.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.2.ebuild deleted file mode 100644 index c221d6fad657..000000000000 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.25.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="System service to manage user's activities, track the usage patterns etc." - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -DEPEND="${RDEPEND} - dev-libs/boost -" diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.11.ebuild index a2e2bf34c5d2..66d57dc27b5b 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.11.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="System service to manage user's activities, track the usage patterns etc." LICENSE="|| ( GPL-2 GPL-3 )" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -28,7 +29,7 @@ RDEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 " DEPEND="${RDEPEND} diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.0.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.0.4.ebuild new file mode 100644 index 000000000000..fc206357fa3f --- /dev/null +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.0.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="System service to manage user's activities, track the usage patterns etc." + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +DEPEND="${RDEPEND} + dev-libs/boost +" diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest index 6e24e6159c00..255f442b723e 100644 --- a/kde-plasma/kde-cli-tools/Manifest +++ b/kde-plasma/kde-cli-tools/Manifest @@ -1,2 +1,2 @@ -DIST kde-cli-tools-5.24.5.tar.xz 632976 BLAKE2B b5fb19eb0ed76f0217a066357744cfb1aa341a6220e79d32db96147c152b8d73e7b1807d8fb6a94d76b9d97b88f0988dbe0b1639321f88bbce07e8bf7140afcd SHA512 db89474ea3c88978123012430249677405b245628b0b12fda917b70fca9ea36e060f351420d0dd94f64e3a479a04a768064df27830884e2a8883db9104b90844 -DIST kde-cli-tools-5.25.2.tar.xz 631428 BLAKE2B ffe9f725f860e3ca4578a44b01a0d59ce99db70e2a8e34a3b17191427f3fb5813326a19dc3f8dc9303563b23bd38d0e8ccfa48e934b8500288434622a9d05b4b SHA512 bbc2b7d5358a4c6a1a4687509d38df8335c786eb238780b0c1ab730acb1130a984bc1954dc43c41ed430ce9be7b5c9b67b9d42bd4daca62fae750c2263a79921 +DIST kde-cli-tools-5.27.11.tar.xz 670892 BLAKE2B 56463030f1935dd722212282000f9fd5e337de7171cc2f9ec08fdae66ed681463680af33fa5ac6b21c93e9eebbb4b415a211f0e72f075521960084afa69bfdb0 SHA512 8f6bbe39df4e491a28d3c6576c58bcbf74971f54157a8cdbc3bb7d4719a31d83f38bae45402cb8f48f11bd37d907bb625f89b929b83a2bb459d7c9c836d78006 +DIST kde-cli-tools-6.0.4.tar.xz 627724 BLAKE2B a2315befa9a490606848b5acddd2bc40f3aabbb6547d0557bee9df49552346297942c1054e5576a65d3754952a90a0ec681d589c81904692df57499e3878a6b5 SHA512 ad2fc4440eddf9f4fbc732e43373838aa2f137a891acaf9cb49b2383ea27855f7bab667c53d9071111fcf11e6f149c926ebebaa6ddf29c74f2bedecebb42e1c5 diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild deleted file mode 100644 index a004399d626b..000000000000 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="optional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system" -HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="kdesu X" - -REQUIRED_USE="kdesu? ( X )" -# requires running kde environment -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -RDEPEND="${DEPEND} - kdesu? ( sys-apps/dbus[X] ) -" - -PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kdesu KF5Su) - $(cmake_use_find_package X Qt5X11Extras) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu -} diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.2.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.11.ebuild index 154028ff6c24..5994b8dc1e81 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.25.2.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.11.ebuild @@ -1,22 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system" HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="kdesu X" REQUIRED_USE="kdesu? ( X )" @@ -28,7 +27,6 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -42,6 +40,7 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 ) X? ( >=dev-qt/qtx11extras-${QTMIN}:5 @@ -51,6 +50,7 @@ DEPEND=" RDEPEND="${DEPEND} kdesu? ( sys-apps/dbus[X] ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" ) diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.0.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.0.4.ebuild new file mode 100644 index 000000000000..57a1fca30b26 --- /dev/null +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.0.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="optional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Tools based on KDE Frameworks 6 to better interact with the system" +HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="kdesu X" + +REQUIRED_USE="kdesu? ( X )" +# requires running kde environment +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?] + kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:6 ) + X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) +" +RDEPEND="${DEPEND} + kdesu? ( sys-apps/dbus[X] ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package kdesu KF6Su) + -DWITH_X11=$(usex X) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + use kdesu && dosym ../$(get_libdir)/libexec/kf6/kdesu /usr/bin/kdesu +} diff --git a/kde-plasma/kde-cli-tools/metadata.xml b/kde-plasma/kde-cli-tools/metadata.xml index c20b86d4f7a1..90af160c0c88 100644 --- a/kde-plasma/kde-cli-tools/metadata.xml +++ b/kde-plasma/kde-cli-tools/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kde-cli-tools</remote-id> </upstream> <use> <flag name="kdesu">Build graphical frontend for <pkg>kde-frameworks/kdesu</pkg></flag> diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest index dec366872c15..0b309af0c3c6 100644 --- a/kde-plasma/kde-gtk-config/Manifest +++ b/kde-plasma/kde-gtk-config/Manifest @@ -1,2 +1,2 @@ -DIST kde-gtk-config-5.24.5.tar.xz 71564 BLAKE2B fbfdaac7a4ff1cd18e39b7b0602c0b1c643a96c4658bbd96af210f7da1c3de764b9ad43e23f1e632fee268dfe38469fbf4c37b6a88feb9ca189baf769cab9c42 SHA512 0cc7a76aca458ec093b55ea148637a82fa53467f3944d4192f4138f7eb93c88a2a65cd64e7438814f11182a390d39629982850b6939902738fd1d2a2af65319d -DIST kde-gtk-config-5.25.2.tar.xz 72052 BLAKE2B 84fd12ab954ecd39b5722da8e7f515e9d0b9a8ac193e78599229da876a7137daf0481c6714ad3542a32057134a93d558a273008c0aa84ef19c84861ce3c09482 SHA512 6eb050bca9dea54b98a643de89c0f024314b45899fe07ca0645f7e48a0c1991c18438563d5a41ebbe9cf360af4a42d5a51d62393561ce01916118d6e79e846e0 +DIST kde-gtk-config-5.27.11.tar.xz 77516 BLAKE2B db2d4a03aa563cfd4df9c227400ccab51acbbace4b403dac30d9ef05ecca76186256435fdd62e46995fc7594d20a95109d1ecc6c941735bb22cca34e35a3b9a2 SHA512 5887631ba33ce1c121843412a713bc6fc3099a16a8961c9651919e66d9cce83f8391c47d7f6a5f4ad32ec5a497095755b315dfbbeb47ab5b3fa71b9166bf0ba0 +DIST kde-gtk-config-6.0.4.tar.xz 78252 BLAKE2B a94223ef9fb1197c167cf5a6e99d2fbcb868447dccd1daf7de7bc43666e1db1a69677adcef45a89f7672777224890d943479e3492dfaecdc583bc3395f334fd8 SHA512 a6d1bc7b75e0b0d6659be91b22b779af3d50b6ca6590523ea169f92e7d373cdc6940a4a9f49136f3aab009b7da6a2a5d9130798d44bc5a8f045da12be31018b8 diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.27.11-revert-6b3865a7.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.27.11-revert-6b3865a7.patch new file mode 100644 index 000000000000..18373f7e5051 --- /dev/null +++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.27.11-revert-6b3865a7.patch @@ -0,0 +1,42 @@ +From 6f324aabdd4f118a81bb5c898689a0151e09d2e0 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Wed, 6 Mar 2024 15:31:41 +0000 +Subject: [PATCH] Revert "Round x11GlobalScaleFactor instead of flooring it" + +This reverts commit 6b3865a72baff3932fbe89ef0c44ff1b9bb4cd10 +--- + kded/gtkconfig.cpp | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp +index 8e825fd..85272ce 100644 +--- a/kded/gtkconfig.cpp ++++ b/kded/gtkconfig.cpp +@@ -197,14 +197,9 @@ void GtkConfig::setEnableAnimations() const + } + } + +-static double roundPreferFloor(double d) +-{ +- return (d - floor(d)) > 0.5 ? ceil(d) : floor(d); +-} +- + void GtkConfig::setGlobalScale() const + { +- const unsigned scaleFactor = roundPreferFloor(configValueProvider->x11GlobalScaleFactor()); ++ const unsigned scaleFactor = configValueProvider->x11GlobalScaleFactor(); + XSettingsEditor::setValue(QStringLiteral("Gdk/WindowScalingFactor"), scaleFactor); + GSettingsEditor::setValue("scaling-factor", scaleFactor); // For IntelliJ IDEA + } +@@ -212,7 +207,7 @@ void GtkConfig::setGlobalScale() const + void GtkConfig::setTextScale() const + { + const double x11Scale = configValueProvider->x11GlobalScaleFactor(); +- const int x11ScaleIntegerPart = int(roundPreferFloor(x11Scale)); ++ const int x11ScaleIntegerPart = int(x11Scale); + + const int forceFontDpi = configValueProvider->fontDpi(); + +-- +GitLab + diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.11.ebuild index 8bbe52c868c7..ade4b6476ba5 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.11.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications" HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config" LICENSE="GPL-3" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" - dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -29,16 +27,17 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 - x11-libs/gtk+:3 + x11-libs/gtk+:3[X] " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* x11-misc/xsettingsd " -BDEPEND=" - dev-lang/sassc -" +BDEPEND="dev-lang/sassc" + +PATCHES=( "${FILESDIR}/${P}-revert-6b3865a7.patch" ) src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.2.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.0.4.ebuild index d385b61ce943..ebbb0c9ae074 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.25.2.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.0.4.ebuild @@ -1,44 +1,40 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=6.6.2 +inherit ecm plasma.kde.org DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications" HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config" LICENSE="GPL-3" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-cpp/glibmm:2 dev-libs/glib:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtsvg-${QTMIN}:6 gnome-base/gsettings-desktop-schemas - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - x11-libs/gtk+:3 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/kdecoration-${PVCUT}:6 + x11-libs/gtk+:3[X] " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* x11-misc/xsettingsd " -BDEPEND=" - dev-lang/sassc -" +BDEPEND="dev-lang/sassc" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml index d925f2439758..e3b2387f985f 100644 --- a/kde-plasma/kde-gtk-config/metadata.xml +++ b/kde-plasma/kde-gtk-config/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kde-gtk-config</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest index 0b52d311a29d..8fa878a6acdc 100644 --- a/kde-plasma/kdecoration/Manifest +++ b/kde-plasma/kdecoration/Manifest @@ -1,2 +1,2 @@ -DIST kdecoration-5.24.5.tar.xz 48772 BLAKE2B 79ae2d1001e771388161917882206971fdae13461278ddc2ff1094b3a1f6e5666fa1fb18c18d51f1a97166b4d7cd0553b2c19983a6cd6c365586394e4aab0b69 SHA512 d523e8515868685a15c20deead4ece798369736b117b1c29b14fa4849d6fc0a409a5b2a3eaa2756694e12ae0e22440a670ed6b79aecef7197b67d591b384d11a -DIST kdecoration-5.25.2.tar.xz 49208 BLAKE2B 32cee60f39f13b3b6a78fe7653bd197756f433228ef76b8dc1be139243bea2c83f1f9dc7070874ae032e19009a3d40b228aa2fe27591382b3a68287046f6efd7 SHA512 2be02149d6da7690aa0802510107291c481106368df3da68b12c5428193cf01fb4769f853526dfd0eb9a3a3641e057c66f34ff703cd11e843271f7f4a4c09c37 +DIST kdecoration-5.27.11.tar.xz 52748 BLAKE2B 8d3e7bd7e27dddd3b1f6ceb728291235fe1ae58c39d5eb242643aa27553c942062cf85d5f638c6a47fc45ad93f7a9ec8609dd1815c1b70ca7ebd246d32270966 SHA512 dd687d9925a56630df9b9e7b1ac58c1536efea97307a75b3f0fc43357d2f118c8727ed425cf4267ffee13fc9ec96c0f592d94b77835ce819b576dba00bb25037 +DIST kdecoration-6.0.4.tar.xz 54564 BLAKE2B 353aaca4a7eb11ef76a67a82c506bf09c0b1aa0a36c01eee3f811960ff7b56763b50955c0f62bf94df25de4d60ed79cb1031264ed121a1c9f0b8ad7f4e6b1f35 SHA512 a27f97b5bdec32702e9aee66b81d11da340dcd12048a1a193f35419e45032bffbffc5e49bd65648314db6b0513e041b29c18941bf117474c72698fd45a60fbfc diff --git a/kde-plasma/kdecoration/kdecoration-5.25.2.ebuild b/kde-plasma/kdecoration/kdecoration-5.25.2.ebuild deleted file mode 100644 index 98592d149e0f..000000000000 --- a/kde-plasma/kdecoration/kdecoration-5.25.2.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plugin based library to create window decorations" - -LICENSE="|| ( LGPL-2.1 LGPL-3 )" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.27.11.ebuild index dd18504d63bf..c0324dc1039d 100644 --- a/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild +++ b/kde-plasma/kdecoration/kdecoration-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plugin based library to create window decorations" LICENSE="|| ( LGPL-2.1 LGPL-3 )" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kdecoration/kdecoration-6.0.4.ebuild b/kde-plasma/kdecoration/kdecoration-6.0.4.ebuild new file mode 100644 index 000000000000..67c2a06f36d6 --- /dev/null +++ b/kde-plasma/kdecoration/kdecoration-6.0.4.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plugin based library to create window decorations" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/ki18n-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest index ca78f6b8cd3a..6cb381e47fe0 100644 --- a/kde-plasma/kdeplasma-addons/Manifest +++ b/kde-plasma/kdeplasma-addons/Manifest @@ -1,2 +1,2 @@ -DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669 -DIST kdeplasma-addons-5.25.2.tar.xz 657952 BLAKE2B bf81211228869d615ca0ec755d61d03947e81e175e252d3b3b35dfb19d1524ee13346b16b2094d91b73312ba756f62086460ab1399939ef190877406ddc64d3b SHA512 9a4707c567b339a2b8916252318a567997abd54864f13187d0ed3e71178f0dafb82631a2dbc6fbdc0d4547378589a7be0984f19be1c5b745d9ea06216c0b1bc9 +DIST kdeplasma-addons-5.27.11.tar.xz 828464 BLAKE2B e1510944a45d20c0fbb46204e5ecd029a6de92396c40eadfe6fd932e8319c101befdb6862b385e0c8f02a5d91890927a576e1557563dab591d4dca745087318f SHA512 fdb9fdecba5e3b389ebc1ef165de3a988b52989bf4d38e38e46629355c937967b82f7cda8843641c16cd4927eddf6c35038168ffb739106eb33b356c9d939c86 +DIST kdeplasma-addons-6.0.4.tar.xz 862240 BLAKE2B b4a285f477a27f43f4b911d3d7ab5e2b828f9424b7cc3692df6e9f111f446d9e990b1c4ba7bf5aeea533cd9e7d5181d1e713994398abf9903649e5f749134fbc SHA512 f3f9ac1ab0d95ad09e7f79fda0b2eae781750670d26dd552b23984fd9449f8d269df85d437054b41f39651add9515cd685b2bfe1720235cc22b6bc8f4cbdbdcf diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch deleted file mode 100644 index 5e692fa1fedb..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d3bb3dc1d96ef7d734503e6d78dc3ce35106a628 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Thu, 5 May 2022 10:16:45 +0800 -Subject: [PATCH] wallpapers/potd: Give random chooser a seed in - simonstalenhagprovider - -Make the seed depend on the current date. - -CCBUG: 453391 ---- - dataengines/potd/simonstalenhagprovider.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/dataengines/potd/simonstalenhagprovider.cpp b/dataengines/potd/simonstalenhagprovider.cpp -index ebcb3423f..fe273ec79 100644 ---- a/dataengines/potd/simonstalenhagprovider.cpp -+++ b/dataengines/potd/simonstalenhagprovider.cpp -@@ -6,10 +6,11 @@ - - #include "simonstalenhagprovider.h" - -+#include <random> -+ - #include <QDebug> - #include <QJsonArray> - #include <QJsonDocument> --#include <QRandomGenerator> - - #include <KIO/Job> - #include <KPluginFactory> -@@ -28,8 +29,11 @@ static QJsonValue randomArrayValueByKey(const QJsonObject &object, QLatin1String - return result; - } - -- auto arraySize = array.size(); -- return array.at(QRandomGenerator::global()->bounded(arraySize)); -+ // Plasma 5.24.0 release date -+ std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate())); -+ std::uniform_int_distribution<int> distrib(0, array.size() - 1); -+ -+ return array.at(distrib(randomEngine)); - } - - SimonStalenhagProvider::SimonStalenhagProvider(QObject *parent, const QVariantList &args) --- -GitLab - diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch deleted file mode 100644 index af9ef33516e9..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 326ae3a24ccb1f1b526f4742a84e4ce24046effd Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Thu, 5 May 2022 10:19:22 +0800 -Subject: [PATCH] wallpapers/potd: Give random chooser a seed in flickrprovider - -Make the seed depend on the current date. - -BUG: 453391 -FIXED-IN: 5.24.6 ---- - dataengines/potd/flickrprovider.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp -index fe542f2b5..3861bd700 100644 ---- a/dataengines/potd/flickrprovider.cpp -+++ b/dataengines/potd/flickrprovider.cpp -@@ -7,8 +7,9 @@ - - #include "flickrprovider.h" - -+#include <random> -+ - #include <QDebug> --#include <QRandomGenerator> - #include <QRegularExpression> - #include <QUrlQuery> - -@@ -127,7 +128,11 @@ void FlickrProvider::xmlRequestFinished(KJob *_job) - } - - if (m_photoList.begin() != m_photoList.end()) { -- QUrl url(m_photoList.at(QRandomGenerator::global()->bounded(m_photoList.size()))); -+ // Plasma 5.24.0 release date -+ std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate())); -+ std::uniform_int_distribution<int> distrib(0, m_photoList.size() - 1); -+ -+ QUrl url(m_photoList.at(distrib(randomEngine))); - KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); - connect(imageJob, &KIO::StoredTransferJob::finished, this, &FlickrProvider::imageRequestFinished); - } else { --- -GitLab - diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild deleted file mode 100644 index a3695f4c18c8..000000000000 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.25.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Extra Plasma applets and engines" - -LICENSE="GPL-2 LGPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="share webengine" - -RESTRICT="test" # bug 727846 - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kholidays-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kunitconversion-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package webengine Qt5WebEngine) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Disk quota applet" sys-fs/quota - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.11.ebuild index a5195e5682e3..eeba0ce7ff99 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.11.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature DESCRIPTION="Extra Plasma applets and engines" LICENSE="GPL-2 LGPL-2" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="share webengine" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+alternate-calendar networkmanager share webengine" RESTRICT="test" # bug 727846 DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -41,25 +39,23 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kunitconversion-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + alternate-calendar? ( dev-libs/icu:= ) + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 " -PATCHES=( - "${FILESDIR}"/${P}-fix-potd-wallpapers-change-freq-{1,2}.patch # KDE-bug 453391 -) - src_configure() { local mycmakeargs=( + $(cmake_use_find_package alternate-calendar ICU) + $(cmake_use_find_package networkmanager KF5NetworkManagerQt) $(cmake_use_find_package share KF5Purpose) $(cmake_use_find_package webengine Qt5WebEngine) ) diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.0.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.0.4.ebuild new file mode 100644 index 000000000000..7db0147028d1 --- /dev/null +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.0.4.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="Extra Plasma applets and engines" + +LICENSE="GPL-2 LGPL-2" +SLOT="6" +KEYWORDS="~amd64" +IUSE="+alternate-calendar share webengine" + +RESTRICT="test" # bug 727846, +missing selenium-webdriver-at-spi + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kholidays-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kunitconversion-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + alternate-calendar? ( dev-libs/icu:= ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) +" +RDEPEND="${DEPEND} + dev-libs/kirigami-addons:6 + >=dev-qt/qtquick3d-${QTMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package alternate-calendar ICU) + $(cmake_use_find_package share KF6Purpose) + $(cmake_use_find_package webengine Qt6WebEngine) + ) + + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Disk quota applet" "sys-fs/quota" + fi + ecm_pkg_postinst +} diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml index 8aace809aa2b..ca846463acd9 100644 --- a/kde-plasma/kdeplasma-addons/metadata.xml +++ b/kde-plasma/kdeplasma-addons/metadata.xml @@ -9,6 +9,8 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> + <flag name="alternate-calendar">Support alternate calendar systems (currently Chinese or Indian) via <pkg>dev-libs/icu</pkg></flag> + <flag name="networkmanager">Disable wallpaper update when using metered connections</flag> <flag name="share">Enable applet for quickly sharing data to a variety of sources</flag> <flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag> </use> diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest index 6db83600ba03..d8267cdb2c3c 100644 --- a/kde-plasma/kgamma/Manifest +++ b/kde-plasma/kgamma/Manifest @@ -1,2 +1,2 @@ -DIST kgamma5-5.24.5.tar.xz 83552 BLAKE2B ea89b6eb7ac288a75ab417716541e8997bc3927abf6312b944949e2ae03b3fca7ea88fd121ecd3681da57b794e8706b00fe55e432c9bdc9ac886f7347b49180f SHA512 a7f4c9fbc370c69ba9df2aa0ae2c75b896cc90adafd97c5ae214a05e8ae0261e94050e0acd1924c16f94b632209fe4803ed475555d882ee6e57d5271691ddc2f -DIST kgamma5-5.25.2.tar.xz 84240 BLAKE2B d8d4713fbe011070ae5735004f0b84b83ddbacce51c3a609b1bb56dc8a89dff3b85adb600354337961845437ab83922265eca151c1f8835a1bb93e44a10da95f SHA512 c57647bd0cc57057feddef920d1438b38124ab5e26805e7020315a847fe39c1031963318ca8848b10cf243da8415f0b542218d9d496bd78a9b914e8c4a6bdab1 +DIST kgamma-5.27.11.tar.xz 88576 BLAKE2B 67cd1a9b0f2f080f66871c889825826d16e7b32477928555abdcf0e7de5d8dfeadfb4ea66b792568a136c88889d76d6d3ec9d6c34f5ab7decf9abe04542a6da0 SHA512 853f09c6bdefb8ed3474131785475f9fccbe17edb949308049eda3060609a57ba53d9eae2074e399eedc8a731581063888b2205f59fec396e7296cc062caa309 +DIST kgamma-6.0.4.tar.xz 86336 BLAKE2B 07f621cac3d55cd242a2a080c624e121727236cee48b4f79288822ce005acf60f9aba70c81dc90ae56e627a9896ae0f1c469ae7e6c1d4b5e558469f61e810ff9 SHA512 824c603948729a103a5d45422913c05d1227cc8e84f4ffaa9b23c4a7e16a9a11e85b45b63fe1a3f4e532138a74cfbaba239a0664388dcb7eae077c410f619b88 diff --git a/kde-plasma/kgamma/kgamma-5.25.2.ebuild b/kde-plasma/kgamma/kgamma-5.25.2.ebuild deleted file mode 100644 index 747adda8e22e..000000000000 --- a/kde-plasma/kgamma/kgamma-5.25.2.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KDE_ORG_NAME="${PN}5" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Screen gamma values kcontrol module" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - x11-libs/libX11 - x11-libs/libXxf86vm -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" diff --git a/kde-plasma/kgamma/kgamma-5.24.5.ebuild b/kde-plasma/kgamma/kgamma-5.27.11.ebuild index 30f59eedc23c..746800890d94 100644 --- a/kde-plasma/kgamma/kgamma-5.24.5.ebuild +++ b/kde-plasma/kgamma/kgamma-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KDE_ORG_NAME="${PN}5" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Screen gamma values kcontrol module" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" diff --git a/kde-plasma/kgamma/kgamma-6.0.4.ebuild b/kde-plasma/kgamma/kgamma-6.0.4.ebuild new file mode 100644 index 000000000000..a4ee42b7876e --- /dev/null +++ b/kde-plasma/kgamma/kgamma-6.0.4.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Screen gamma values kcontrol module" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + x11-libs/libX11 + x11-libs/libXxf86vm +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" diff --git a/kde-plasma/kgamma/metadata.xml b/kde-plasma/kgamma/metadata.xml index d925f2439758..a9d8cabf439a 100644 --- a/kde-plasma/kgamma/metadata.xml +++ b/kde-plasma/kgamma/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kgamma</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kglobalacceld/Manifest b/kde-plasma/kglobalacceld/Manifest new file mode 100644 index 000000000000..1bcbe19c4dab --- /dev/null +++ b/kde-plasma/kglobalacceld/Manifest @@ -0,0 +1 @@ +DIST kglobalacceld-6.0.4.tar.xz 53212 BLAKE2B 9f9543ab0e9aa32bbb58083cebc27d4b92ca2e7f02117b13069df1e9b55bdc84fe0d167afa43d958a8a485c344ab5db9fd98a3910d287d766a2a1b7334cf7a7c SHA512 54c281bb284d32b2785766c1e0c779b3f354e7534505f73dd3e477463b40ad86f8561546f3c2fa4bcb95bfd3c274e0d52e683ebd1b20fc535d5c06b10da9a963 diff --git a/kde-plasma/kglobalacceld/kglobalacceld-6.0.4.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-6.0.4.ebuild new file mode 100644 index 000000000000..9f882bf4630d --- /dev/null +++ b/kde-plasma/kglobalacceld/kglobalacceld-6.0.4.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Daemon providing Global Keyboard Shortcut (Accelerator) functionality" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="X" + +REQUIRED_USE="test? ( X )" +RESTRICT="test" # requires installed instance + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X?] + X? ( + >=dev-qt/qtbase-${QTMIN}:6=[gui] + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) +" +RDEPEND="${DEPEND} + !kde-frameworks/kglobalaccel:5[-kf6compat(-)] +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +src_configure() { + local mycmakeargs=( + -DWITH_X11=$(usex X) + ) + ecm_src_configure +} + +# src_test() { +# XDG_CURRENT_DESKTOP="KDE" ecm_src_test # bug 789342 +# } diff --git a/kde-plasma/kglobalacceld/metadata.xml b/kde-plasma/kglobalacceld/metadata.xml new file mode 100644 index 000000000000..4681e2b666ad --- /dev/null +++ b/kde-plasma/kglobalacceld/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kglobalacceld</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/khotkeys/Manifest b/kde-plasma/khotkeys/Manifest index 2e6c1e2e61e1..65f3b89eccd3 100644 --- a/kde-plasma/khotkeys/Manifest +++ b/kde-plasma/khotkeys/Manifest @@ -1,2 +1 @@ -DIST khotkeys-5.24.5.tar.xz 1853496 BLAKE2B f06865ced3dd0e97b6dae96cc96aed105192cb6055aedebd991955bd4a473ff085acac0f35fd509fc7465cb100bb43860f2bb23f618d7fc994eb115c2b0ce38d SHA512 b12373b8295cf8e7909a72a07fab8847d8cf26053814b02acf215e912156b797c3a7c3cd459f04e9b6b47cd09d5941d1f3433ee4e8b128e49d3dc9832fbb3876 -DIST khotkeys-5.25.2.tar.xz 1831608 BLAKE2B 8fcadc953fd09166f54ac167e7022039a031eecc3f64774975cd198aec4dfb6e46cfc6609c489e631516b0e6aa759624445fa5fa5a0017b8809a78ea3a40ca52 SHA512 021e548b590a9c1cc9ba65719fb118cc6c5e6902c428333d58ab79d62535d7317ebcc05760c45a95a9e1e064395802c8e225724e7e4601d3af9e4913e1c5694c +DIST khotkeys-5.27.11.tar.xz 1895584 BLAKE2B 3f718709f945b956e468fabb82e5921a7175dd756327e3b01170a4a68c2899912d45ed32242ee436fa578819e9835d1993c84986a91d09a27e7730f28b86025b SHA512 9c39c989bce1ef80ad3334d65ddeb2d4a2da039e54b8863fa29538c25d532562e74791a97957fad1c66b6642c02b51818b24ad4dea7059185d1f7564cf0cdd7f diff --git a/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild deleted file mode 100644 index 09d090616a7d..000000000000 --- a/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace hotkey module" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5[X] - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - x11-libs/libX11 - x11-libs/libXtst -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libxcb - x11-libs/libXtst -" -RDEPEND="${COMMON_DEPEND} - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/khotkeys/khotkeys-5.25.2.ebuild b/kde-plasma/khotkeys/khotkeys-5.27.11.ebuild index 7dadedfd8bd1..7df40ad86cfe 100644 --- a/kde-plasma/khotkeys/khotkeys-5.25.2.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma workspace hotkey module" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" COMMON_DEPEND=" @@ -46,5 +46,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kded-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest index df1b5b6ee78e..817b5779be08 100644 --- a/kde-plasma/kinfocenter/Manifest +++ b/kde-plasma/kinfocenter/Manifest @@ -1,3 +1,3 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 -DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883 -DIST kinfocenter-5.25.2.tar.xz 730812 BLAKE2B b006cf585f8dfec29cf5cf37f64f23d14e5bffeaca0a8e9a32ef12fe42a8786c5859070ec07cbbd13e8f7f0bc664ae3de05007893bf5dd5b78d8bcba281bdb63 SHA512 163cc8f501f6c91109bbd5f3b324a5224b47fa81c0b4664da671849799b76ad0dced78d9f9a18d1248bad381f95b8095a90eeafc6ca487d46905621ef5c363f2 +DIST kinfocenter-5.27.11.tar.xz 1018276 BLAKE2B 921832d3c52abfe35d3b77f34161c630d54c6fe8675eac6b2dcc343ab21b7c30b501216c9762aa90a8f5bfc036d2d8859a7419478ec38a85afcbf90315788cc1 SHA512 24a9df9fb28637e39293669569e4be896956ecfc3a27719821a1498f541aed220e7ebcd0e1a0b63051562690a9400b7fefc9c1217763c87009745e886573205e +DIST kinfocenter-6.0.4.tar.xz 830724 BLAKE2B a6a9ac461d30f3231d989acb282ddfdabeffa3a2b90793c6f4048634615c6b4affe2494f9c465f6786999a154adac8fd18b76a996b85104d1a9606234c1ab336 SHA512 1c3214d844576a4bcfff49e05d316031688fb76355e302097e68140ffbf20feb33d47b0c3a1db067dc63bf0944e5d49b8f3cafd9cbf6e43aaf8fc9ace81b38a4 diff --git a/kde-plasma/kinfocenter/kinfocenter-5.25.2.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.27.11.ebuild index 33ceeed36b27..35e67be31cff 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.25.2.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.27.11.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature DESCRIPTION="Utility providing information about the computer hardware" HOMEPAGE="https://userbase.kde.org/KInfoCenter" @@ -15,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="gles2-only usb" DEPEND=" @@ -23,6 +23,7 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5[gles2-only=] >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -38,11 +39,13 @@ DEPEND=" usb? ( virtual/libusb:1 ) " RDEPEND="${DEPEND} + dev-qt/qdbus:* >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* >=kde-plasma/systemsettings-${PVCUT}:5 " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_configure() { local mycmakeargs=( @@ -71,6 +74,7 @@ pkg_postinst() { optfeature "advanced CPU information module" sys-apps/util-linux fi optfeature "Wayland information module" app-misc/wayland-utils + optfeature "Firmware security module" "app-text/aha sys-apps/fwupd" optfeature "OpenGL information module" x11-apps/mesa-progs optfeature "PCI devices information module" sys-apps/pciutils optfeature "X Server information module" x11-apps/xdpyinfo diff --git a/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.0.4.ebuild index b08d48776b71..6514f41e79f6 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-6.0.4.ebuild @@ -1,52 +1,53 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org optfeature +QTMIN=6.6.2 +inherit ecm plasma.kde.org optfeature DESCRIPTION="Utility providing information about the computer hardware" HOMEPAGE="https://userbase.kde.org/KInfoCenter" SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png" LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="gles2-only usb" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gles2-only=,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 gles2-only? ( media-libs/mesa[gles2] ) usb? ( virtual/libusb:1 ) " RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/systemsettings-${PVCUT}:5 + || ( + >=dev-qt/qttools-${QTMIN}:6[qdbus] + dev-qt/qdbus:* + ) + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + >=kde-plasma/systemsettings-${PVCUT}:6 " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" src_configure() { local mycmakeargs=( $(cmake_use_find_package usb USB1) + -DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # missing ) ecm_src_configure @@ -71,6 +72,7 @@ pkg_postinst() { optfeature "advanced CPU information module" sys-apps/util-linux fi optfeature "Wayland information module" app-misc/wayland-utils + optfeature "Firmware security module" "app-text/aha sys-apps/fwupd" optfeature "OpenGL information module" x11-apps/mesa-progs optfeature "PCI devices information module" sys-apps/pciutils optfeature "X Server information module" x11-apps/xdpyinfo diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml index d925f2439758..a7a67f3066f4 100644 --- a/kde-plasma/kinfocenter/metadata.xml +++ b/kde-plasma/kinfocenter/metadata.xml @@ -8,4 +8,7 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> + <use> + <flag name="usb">Show USB device information</flag> + </use> </pkgmetadata> diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest index 4f831686e7a5..80e1fe367960 100644 --- a/kde-plasma/kmenuedit/Manifest +++ b/kde-plasma/kmenuedit/Manifest @@ -1,2 +1,2 @@ -DIST kmenuedit-5.24.5.tar.xz 901504 BLAKE2B da12126c44a5094433ac14665ca35fed6ff9e9f11daa6d9ad399b07e3c2e08df64bed95b92df42aa621a3513a8bb63df0f29ab0fab53afe2b6840856c540e6c6 SHA512 c637b662b366691a179d8ea67a91062a10a6d40467a72b3858f6f43f20ea6e03bfa65e1861e4cafd329098a8fd1b7976c565c355496df7f5199d8316e930b759 -DIST kmenuedit-5.25.2.tar.xz 904148 BLAKE2B 24eb956bc39f996db241902ff3cdc59648a2553e44345aaee84e18d24900693c008f0ed337afa8d78a00fa138de86cb996b2b7daf450f1b06e00d20370edb061 SHA512 cdee11da03f1b4ddc30e105cca24c0268e041c01796db454740b21fc9567c4670b4399d39c6f23abf441ff09f6abf3c658e01de44bbf07ec052ec962657db798 +DIST kmenuedit-5.27.11.tar.xz 932088 BLAKE2B b9e85a079b9a2059ed64a31e61bad93ffc9862efed1106e8ef5adaa2637ff10a355b5b48e1a91761fbd6e8444917cb7e3278a36603e708ca286313dd96614cc2 SHA512 5dcfcd5be25a109fc3b42c42bf4476a7738b312aefb78e71c8191901758afd7be77481b0beabadc42955afd6852977b556d597e8ac8437598788e62302e66863 +DIST kmenuedit-6.0.4.tar.xz 930292 BLAKE2B d5c0bb5bc4b54dc465953a104328e1a189f57c06435bfcbb2d81ff7d9ade277cc51db508442f3c1621c5af2dc21861a5d3eb47deed043233f71de560f05640c7 SHA512 2b3bf5ce0eaa9cfd43dd79732bb24cb59f1ecf2efec81f4d53c189daebdde6796ea35ea237da83d85c03b91312c3a00053b1fbe3cc7b8b396ff3b5924f247c21 diff --git a/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild deleted file mode 100644 index ec4bfa6adfbb..000000000000 --- a/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma menu editor" -HOMEPAGE="https://invent.kde.org/plasma/kmenuedit" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 -" -DEPEND="${RDEPEND}" diff --git a/kde-plasma/kmenuedit/kmenuedit-5.25.2.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.27.11.ebuild index 9b9df22b874e..2460039ddcb9 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.25.2.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma menu editor" HOMEPAGE="https://invent.kde.org/plasma/kmenuedit" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" diff --git a/kde-plasma/kmenuedit/kmenuedit-6.0.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-6.0.4.ebuild new file mode 100644 index 000000000000..2d894dc5152f --- /dev/null +++ b/kde-plasma/kmenuedit/kmenuedit-6.0.4.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma menu editor" +HOMEPAGE="https://invent.kde.org/plasma/kmenuedit" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml] + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 +" +DEPEND="${RDEPEND}" diff --git a/kde-plasma/kmenuedit/metadata.xml b/kde-plasma/kmenuedit/metadata.xml index d925f2439758..7fe5ace1f983 100644 --- a/kde-plasma/kmenuedit/metadata.xml +++ b/kde-plasma/kmenuedit/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kmenuedit</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kpipewire/Manifest b/kde-plasma/kpipewire/Manifest new file mode 100644 index 000000000000..b08fb58a044e --- /dev/null +++ b/kde-plasma/kpipewire/Manifest @@ -0,0 +1,2 @@ +DIST kpipewire-5.27.11.tar.xz 60076 BLAKE2B a0f9513babcf7d68252296ad258b2875e0e16a131302af8305f78a7d1fff87844c57cd88103aa95bdc8e584eab1e2142cd9edd9278c4afecf7b61769290f5910 SHA512 0350946c2e64f8b1224e31d49154f47b652bba55b3c3fbe39fa8b9da0e959a3c65b38d6f99cd3003a8ff409b29bdbbcc1b3f99deeb4052d1538776a2465c3641 +DIST kpipewire-6.0.4.tar.xz 144888 BLAKE2B 6f846797441e5560df7ca95c34bfb3f92fb996a541388cd6568fff4ade607a5513a58023db4625a249203fbaa183bc6d857eb58ac0e9e58e79a62c280619e808 SHA512 c4c3accfb99e5bb588cb31ea6163de8f8c75bfd920e8309683b25ad1a92a9eed6bd8dd0ae229e11057eb0c368dd7a3374197a97ed1b5a1620ec6b6e5b7555f33 diff --git a/kde-plasma/kpipewire/kpipewire-5.27.11.ebuild b/kde-plasma/kpipewire/kpipewire-5.27.11.ebuild new file mode 100644 index 000000000000..07bf4e12e3cc --- /dev/null +++ b/kde-plasma/kpipewire/kpipewire-5.27.11.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org + +DESCRIPTION="Components relating to Flatpak pipewire use in Plasma" + +LICENSE="LGPL-2.1+" +SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" + +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + media-libs/libepoxy + media-libs/libglvnd + media-video/ffmpeg:= + >=media-video/pipewire-0.3:= + x11-libs/libdrm +" +DEPEND="${COMMON_DEPEND} + dev-libs/plasma-wayland-protocols +" +RDEPEND="${COMMON_DEPEND} + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + x11-themes/sound-theme-freedesktop +" +BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" diff --git a/kde-plasma/kpipewire/kpipewire-6.0.4.ebuild b/kde-plasma/kpipewire/kpipewire-6.0.4.ebuild new file mode 100644 index 000000000000..3f81e119669c --- /dev/null +++ b/kde-plasma/kpipewire/kpipewire-6.0.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Components relating to Flatpak pipewire use in Plasma" + +LICENSE="LGPL-2.1+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + media-libs/libepoxy + media-libs/libglvnd + media-libs/libva:= + media-video/ffmpeg:= + >=media-video/pipewire-0.3:= + x11-libs/libdrm +" +DEPEND="${COMMON_DEPEND} + test? ( + dev-libs/plasma-wayland-protocols + dev-libs/wayland + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + ) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + x11-themes/sound-theme-freedesktop + test? ( >=dev-qt/qtwayland-${QTMIN}:6 ) +" diff --git a/kde-plasma/kwayland-server/metadata.xml b/kde-plasma/kpipewire/metadata.xml index d925f2439758..d925f2439758 100644 --- a/kde-plasma/kwayland-server/metadata.xml +++ b/kde-plasma/kpipewire/metadata.xml diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index b5e348ecd4dd..e7109704fb92 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,2 +1,2 @@ -DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97 -DIST kscreen-5.25.2.tar.xz 142956 BLAKE2B b1c14a95eb8780549baa3134c34e3519a482ec1c83fee265bf3847a5eda681c20ea6c6dc38da0af0a7bae499c4013903b8d0cee3e75621d8c117de6316d06561 SHA512 377580c04a1f6765c921dfc421b569434c976daf043bfcbaafad6006336e8de45d6340872f1bf8de9f55e40077f6eda50cd913b37f470d2568a278766086891f +DIST kscreen-5.27.11.tar.xz 186972 BLAKE2B 8c0ac5a2b4f80c7c65234755f858d816fe2d5b8d5288c86675f11d7af86fd5060eb97822b906d25e659ccc644f0439ddbc0db2bf594f8b1bbff787377280a313 SHA512 7f84eeb95972014878afea09568f7c1a465b2a6c519492f67964fd35fe8ec50fb8d815e0e935ada426ff9ee437fb8cc456b11b10d7cedf6b3bb3f6294312b633 +DIST kscreen-6.0.4.tar.xz 202552 BLAKE2B ebb617a6d12ea2de35e62609151026d6a78a6e5b172455b6059d7dbdac94d9758594f80298639a156dfc40752997426b62de142d39fed2efab8fb70ad49ce42e SHA512 541b3bda55590cc599c36f9c37cbd4439bb93e3156c57d66aa5350d0b7f35dcc52ae40e9dd93e0b07baf01bb223b2332346bae9a615d81be3668583f783e6343 diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch deleted file mode 100644 index d2efce69b9e5..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ff8dc215e8d2691fcf41d0bb305f820531d95150 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Sat, 14 May 2022 01:29:01 +0200 -Subject: [PATCH] Fix connecting external monitors when a monitor is rotated - -It would be placed right by the unrotated geometry and after rotating it -the new output would end up floating in the logical space. -This happened because the explicitLogicalSize is cached and needs -updating after changing its settings. - - -(cherry picked from commit cc832fd4296440fcd9298cb03b0cc736a99ed8bb) ---- - kded/generator.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kded/generator.cpp b/kded/generator.cpp -index e5117a9..e311b04 100644 ---- a/kded/generator.cpp -+++ b/kded/generator.cpp -@@ -85,6 +85,7 @@ KScreen::ConfigPtr Generator::idealConfig(const KScreen::ConfigPtr ¤tConfi - - for (const auto &output : connectedOutputs) { - initializeOutput(output, config->supportedFeatures()); -+ output->setExplicitLogicalSize(config->logicalSizeForOutput(*output)); - } - - if (connectedOutputs.count() == 1) { --- -GitLab - diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch deleted file mode 100644 index ecba1664c51c..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-kded-xcb-resources-leak.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 93cfd297506e4106a7b6e7bcc649442c5bf0f7d1 Mon Sep 17 00:00:00 2001 -From: Stefan Becker <chemobejk@gmail.com> -Date: Sun, 29 May 2022 23:33:55 +0300 -Subject: [PATCH] X11: fix kded xcb resource leak - -This fixes commit 579358f501ae978aa527a25eb3ef9dd42557db46 - -XOpenDisplay() internally calls xcb_connect(), creating a new XCB client -connection. This means that on every KScreen configuration change event -the kded5 process creates a new connection until XCB runs into the hard -limit of 256 of clients, leading to the dreaded "Maximum number of -clients reached" error. - -Re-use the display from QX11Info instead of calling XOpenDisplay(). - -BUG: 453280 - - -(cherry picked from commit 0270a49328aa70b14dd08e2ed5a425ca3f8e4fd5) ---- - kded/daemon.cpp | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -diff --git a/kded/daemon.cpp b/kded/daemon.cpp -index e8ed4ac..443d98d 100644 ---- a/kded/daemon.cpp -+++ b/kded/daemon.cpp -@@ -361,6 +361,14 @@ void KScreenDaemon::alignX11TouchScreen() - if (qGuiApp->platformName() != QStringLiteral("xcb")) { - return; - } -+ auto *display = QX11Info::display(); -+ if (!display) { -+ return; -+ } -+ auto *connection = QX11Info::connection(); -+ if (!connection) { -+ return; -+ } - - const QRect totalRect(QPoint(0, 0), m_monitoredConfig->data()->screen()->currentSize()); - QRect internalOutputRect; -@@ -411,15 +419,6 @@ void KScreenDaemon::alignX11TouchScreen() - break; - } - -- auto *display = XOpenDisplay(nullptr); -- if (!display) { -- return; -- } -- auto *connection = QX11Info::connection(); -- if (!connection) { -- return; -- } -- - auto getAtom = [](xcb_connection_t *connection, const char *name) { - auto cookie = xcb_intern_atom(connection, true, strlen(name), name); - auto reply = xcb_intern_atom_reply(connection, cookie, nullptr); --- -GitLab - diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch deleted file mode 100644 index 2d0d3ba1e851..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6ecb832923612820c721f58d1d12dd176e10528a Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Thu, 5 May 2022 18:27:38 +0200 -Subject: [PATCH] kcm: fix choosing the refresh rate - -It always chose the last one, and not the highest one - - -(cherry picked from commit 5e1be88dbe6e5160dcc232631df81d9bdc9d179e) ---- - kcm/output_model.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp -index 92e4ea3..3672b49 100644 ---- a/kcm/output_model.cpp -+++ b/kcm/output_model.cpp -@@ -394,6 +394,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex) - auto it = modes.begin(); - while (it != modes.end()) { - if ((*it)->size() == size && (*it)->refreshRate() > bestRefreshRate) { -+ bestRefreshRate = (*it)->refreshRate(); - modeIt = it; - } - it++; --- -GitLab - diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch deleted file mode 100644 index e7d85fd87013..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 584ed8a067a7c0329e1572dd9970b6e3dae6a56f Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Thu, 5 May 2022 18:22:46 +0200 -Subject: [PATCH] kcm: fix refresh rate list not being updated - -BUG: 453392 - - -(cherry picked from commit 8c1e2cffda762fef83ea48658a08847382c71486) ---- - kcm/output_model.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp -index fcdb738..92e4ea3 100644 ---- a/kcm/output_model.cpp -+++ b/kcm/output_model.cpp -@@ -417,7 +417,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex) - QModelIndex index = createIndex(outputIndex, 0); - // Calling this directly ignores possible optimization when the - // refresh rate hasn't changed in fact. But that's ok. -- Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRateIndexRole}); -+ Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRatesRole, RefreshRateIndexRole}); - Q_EMIT sizeChanged(); - return true; - } --- -GitLab - diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild deleted file mode 100644 index f4e86614ad8d..000000000000 --- a/kde-plasma/kscreen/kscreen-5.24.5-r2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma screen management" -HOMEPAGE="https://invent.kde.org/plasma/kscreen" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -# bug #580440, last checked 5.6.3 -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsensors-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392 - "${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch" - "${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch" - "${FILESDIR}/${P}-fix-kded-xcb-resources-leak.patch" # KDE-bug 453280 -) diff --git a/kde-plasma/kscreen/kscreen-5.25.2.ebuild b/kde-plasma/kscreen/kscreen-5.27.11.ebuild index 4bfa5020633f..6b7c8112c10b 100644 --- a/kde-plasma/kscreen/kscreen-5.25.2.ebuild +++ b/kde-plasma/kscreen/kscreen-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma screen management" HOMEPAGE="https://invent.kde.org/plasma/kscreen" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # bug #580440, last checked 5.6.3 @@ -26,22 +26,25 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtsensors-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/kglobalaccel-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5= + >=kde-plasma/libplasma-${KFMIN}:5 x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXi " RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/kscreen/kscreen-6.0.4.ebuild b/kde-plasma/kscreen/kscreen-6.0.4.ebuild new file mode 100644 index 000000000000..35c334bcfcb4 --- /dev/null +++ b/kde-plasma/kscreen/kscreen-6.0.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma screen management" +HOMEPAGE="https://invent.kde.org/plasma/kscreen" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# bug #580440, last checked 5.6.3 +RESTRICT="test" + +# qtbase slot up: GuiPrivate use in kded daemon +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtsensors-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6= + >=kde-plasma/libplasma-${PVCUT}:6 + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXi +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/kscreen/metadata.xml b/kde-plasma/kscreen/metadata.xml index d925f2439758..307cc9b59524 100644 --- a/kde-plasma/kscreen/metadata.xml +++ b/kde-plasma/kscreen/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kscreen</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest index 82a735d015b6..3fed1804c982 100644 --- a/kde-plasma/kscreenlocker/Manifest +++ b/kde-plasma/kscreenlocker/Manifest @@ -1,2 +1,2 @@ -DIST kscreenlocker-5.24.5.tar.xz 119436 BLAKE2B 9a9885e683d474308feb82be9e33047f37ba1e9d127ce435e205d44311c5edc9ca1fae391858409058226a80e80a783852ca53e03800c0ddd74867681182a072 SHA512 c3252ead5f6cedece82ea94d88324b968938d0218ec05182f07fea85ead5ec451bc04bf417fc4f7a0f37aa56358caeb893175eae8cbb74ea748f843de9aaab83 -DIST kscreenlocker-5.25.2.tar.xz 112824 BLAKE2B c500de1ac83f26f4e282965df68fb7a78679ac3500abd01559c899c759d061db165dbc63ff9f8e0e3c9220aa46b61bb41ff736b4a401092bbaf6e2f5e37a3c07 SHA512 0a56ca34e62bcc42cbc889d329bdfcff2b4197cf39645da877d63dc5e6a3dd598799604c9e1e2b54cf840c84ada4ad61b533ca725e75a0b7493008235036fb7f +DIST kscreenlocker-5.27.11.tar.xz 160796 BLAKE2B 6ab6060ee7ce2b01a0a29f6d0aebbaba052fabaa6c229e92603b52d32ea473c438b8647cc2f2bdbf48edfa98c05aa7e22ce0b75964d9a8ab6d914c32254fdfcb SHA512 cfaaa6242253f6c511f645bb7f9023328a5d5bb58616284f85db949da969e04303f4e0e28283a08ed0fb02845840be67a76785d4b4596ef057ec7069cda92a3a +DIST kscreenlocker-6.0.4.tar.xz 164520 BLAKE2B 4c31ff447374c1506e578c6524825da98c98a2cb0dd7ab5ba8edd39d1688d94de5385bd5bf39db292bea8a8bc76f56ae95c86bfeacc4d1a222eb4dbf993c1ba5 SHA512 a5f01c8d1c976584546dacdb9d0f18ee8b59bf3e00caf01a6de294d1998eaf0806e551650d0528a3b3d4f65954fc7edadd808ba75b5b7d7060646058ab8d34cf diff --git a/kde-plasma/kscreenlocker/files/kde-fingerprint.pam b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam new file mode 100644 index 000000000000..6ca0ba1f09e6 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 + +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_faillock.so preauth +-auth required pam_fprintd.so +auth required pam_env.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde-r1.pam b/kde-plasma/kscreenlocker/files/kde-r1.pam new file mode 100644 index 000000000000..ce9e84d58840 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-r1.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 + +auth include system-local-login + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde-smartcard.pam b/kde-plasma/kscreenlocker/files/kde-smartcard.pam new file mode 100644 index 000000000000..694fc1e905b0 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-smartcard.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 + +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_faillock.so preauth +-auth required pam_pkcs11.so wait_for_card card_only +auth required pam_env.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild deleted file mode 100644 index 5ebb504f19e5..000000000000 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org pam - -DESCRIPTION="Library and components for secure lock screen architecture" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="+pam" - -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/wayland - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/layer-shell-qt-${PVCUT}:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxcb - x11-libs/xcb-util-keysyms - pam? ( sys-libs/pam ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" -BDEPEND="dev-util/wayland-scanner" - -src_prepare() { - ecm_src_prepare - use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests -} - -src_configure() { - local mycmakeargs=( - -DPAM_REQUIRED=$(usex pam) - $(cmake_use_find_package pam PAM) - ) - ecm_src_configure -} - -src_test() { - # requires running environment - local myctestargs=( - -E x11LockerTest - ) - ecm_src_test -} - -src_install() { - ecm_src_install - - if use pam; then - newpamd "${FILESDIR}/kde.pam" kde - newpamd "${FILESDIR}/kde-np.pam" kde-np - else - chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die - chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die - fi -} diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.25.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.27.11.ebuild index c7bd795fab4d..4d0b30ed4b30 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.25.2.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org pam +QTMIN=5.15.9 +inherit ecm plasma.kde.org pam DESCRIPTION="Library and components for secure lock screen architecture" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RESTRICT="test" @@ -36,13 +35,15 @@ COMMON_DEPEND=" >=kde-frameworks/kglobalaccel-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5 sys-libs/pam x11-libs/libX11 x11-libs/libXi @@ -55,10 +56,13 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 " -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" -BDEPEND="dev-util/wayland-scanner" +BDEPEND=" + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" src_prepare() { ecm_src_prepare diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.0.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.0.4.ebuild new file mode 100644 index 000000000000..671e7ee625cc --- /dev/null +++ b/kde-plasma/kscreenlocker/kscreenlocker-6.0.4.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org pam + +DESCRIPTION="Library and components for secure lock screen architecture" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" + +# qtbase slot up: GuiPrivate use in greeter +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${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/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + sys-libs/pam + x11-libs/libX11 + x11-libs/libXi + x11-libs/libxcb + x11-libs/xcb-util-keysyms +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 +" +BDEPEND=" + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:6 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +src_prepare() { + ecm_src_prepare + use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests +} + +src_test() { + # requires running environment + local myctestargs=( + -E x11LockerTest + ) + ecm_src_test +} + +src_install() { + ecm_src_install + + newpamd "${FILESDIR}/kde-r1.pam" kde + newpamd "${FILESDIR}/kde-fingerprint.pam" kde-fingerprint + newpamd "${FILESDIR}/kde-smartcard.pam" kde-smartcard +} diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest index 74102c584bd3..d8f4c6c5599e 100644 --- a/kde-plasma/ksshaskpass/Manifest +++ b/kde-plasma/ksshaskpass/Manifest @@ -1,2 +1,2 @@ -DIST ksshaskpass-5.24.5.tar.xz 24708 BLAKE2B e6937ec76b6cadff437c77eaceb075d7050e6d3581e64b66c1a07491352e335e63dc58b6655da6f5532919295bfad0e13da6855370b4c0a3c1eacb9698dc1759 SHA512 e4d7358eb213105a4e479eb3c9d229a87d86c4ebda199f486f9952f81dc1e91b43ba30d834907586f9badbb7e2933e44af5713119caa2e3bc060f16936e9a457 -DIST ksshaskpass-5.25.2.tar.xz 24908 BLAKE2B 3103df99571277a9b2dbff8426e2d62a48f6fdc281bc22041edac173c3dc75cab28cb9ef67a6a46de7a3e27031c48a530ade23da278021a90f7c1e3b4bdc69d5 SHA512 1ac15dba4a6263a45d9a5468029b57405764702fa4facc8f3eebf9c09f051e60cfa9cbe6236f10d0890a0e331e14d901a0ed78f09fe69f53718aec94f9be5afa +DIST ksshaskpass-5.27.11.tar.xz 27980 BLAKE2B 4fa35480f0ed7389bf41f56fc8266fccb8a33060c37f6df2c1edc44f49466267dbd45584e0afff6aaa79a3b5ffc1aca916c36a7ad768e36a457c081bfa53f217 SHA512 85c4091faa4ec4a6d068d4a0d464601054b88187ccfa05f4156b146dd3b3900dc15bcb3f9f9b0b057fb9b5687eabf55bb34d06d98a9e26ddb6a0afba1684feee +DIST ksshaskpass-6.0.4.tar.xz 28864 BLAKE2B a43470fb0f90887075bae2ad22c7bded179e225e3b0613dd2dc8717b997781f5253fed4daa7cb44cc8c351e34001b96913b52c6aab6fb6df9603b73da5c2bb05 SHA512 a0dc562f0fa7cb8cc17e84745b29f82e96828e8a093e5b2a89a13924685649ecd62b41d937a3a39c9a9309db90ee427c5b4bea94a2b79e564d065d13e4ebe6b4 diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.25.2.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.27.11.ebuild index 99b8cf6579dd..ebf18544fa10 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.25.2.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration" HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.0.4.ebuild index e198cd959e39..8bd4b1f19279 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-6.0.4.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration" HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass" LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" DEPEND=" - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[widgets] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 " RDEPEND="${DEPEND}" @@ -34,7 +34,7 @@ src_install() { pkg_postinst() { ecm_pkg_postinst - elog "In order to have ssh-agent start with Plasma 5," + elog "In order to have ssh-agent start with Plasma 6," elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh" elog "and uncomment the lines enabling ssh-agent." elog @@ -43,10 +43,7 @@ pkg_postinst() { elog "to properly kill the agent when the session ends." elog elog "${PN} has been installed as your default askpass application" - elog "for Plasma 5 sessions." + elog "for Plasma 6 sessions." elog "If that's not desired, select the one you want to use in" elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh" - - # Clean up pre-5.17.4 dirs - rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null } diff --git a/kde-plasma/ksshaskpass/metadata.xml b/kde-plasma/ksshaskpass/metadata.xml index d925f2439758..8a7cc7ffebd5 100644 --- a/kde-plasma/ksshaskpass/metadata.xml +++ b/kde-plasma/ksshaskpass/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/ksshaskpass</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest index 1e5886215314..5a266c12ddb9 100644 --- a/kde-plasma/ksystemstats/Manifest +++ b/kde-plasma/ksystemstats/Manifest @@ -1,2 +1,2 @@ -DIST ksystemstats-5.24.5.tar.xz 94604 BLAKE2B e0cbdf1b51a34ae8471c6ea795535930a6a6dc53b2e47a730c4a846d4113611d9866ca24bfb7be3c95ac730df397fb0fecb6ad347bb9b919c9172a3128e7a7a1 SHA512 6bbcf6512c223fc97203c02baca5bb230ef86c8012318307e32bc030160f31fc2797a28d95af442826b5f48656673213f6cdde487e1782a50300a9bc96e22969 -DIST ksystemstats-5.25.2.tar.xz 98556 BLAKE2B 78a377e8e697250b7c4bfb0d1931e7c49751b467d5d524ba3a96c44ff719768adfbf8c6c6db4b6babdb81914bcf77d1bd3905338a08e1778d00e303795a50320 SHA512 893e2c9d1c9b46e054e10e974c82522bcfa9b978724447940606964aa4e90d97245327c8157383f4731cc439b616899c2d49f25ad2f96420e23f8d760810e9e5 +DIST ksystemstats-5.27.11.tar.xz 115812 BLAKE2B e2bd3cff153a4e48e119f4086d41f6b0ddef68ac3b6ef7613a4bec1358d8a9d2443bd92886e5ff746e7e51d46e23bf1c70e8c8d494b52f1db3aada2714da2422 SHA512 3fe1687bbe8b3aa6e7852e613f2938f0e2264bd98d3f743a0091b22132e60e710c946b7754b1d1b8085165506d89acd4f29db08d92d50822820287ed5d957621 +DIST ksystemstats-6.0.4.tar.xz 124668 BLAKE2B c5c6b430c8f0a630d4ac5ff9fddaaa1c5e559468ecd7fa32a2bdaf2440b8ec8b1d90d012a9c79a4463338974f5db747de78ce903a06851dd63becd9d38d85d36 SHA512 b8487f6e7dc989b5c7546d36734b6fbf1dd9a8aa8949ad0f8261eabcb78349cdb1372f6aa284a9dfd0aeaba4c183146fd3caca15e72dae32a143f417bf6ff470 diff --git a/kde-plasma/ksystemstats/ksystemstats-5.25.2.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.25.2.ebuild deleted file mode 100644 index 02e68e7de73e..000000000000 --- a/kde-plasma/ksystemstats/ksystemstats-5.25.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plugin-based system monitoring daemon" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="networkmanager" - -DEPEND=" - dev-libs/libnl:3 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - net-libs/libpcap - sys-apps/lm-sensors:= - sys-libs/libcap - virtual/libudev:= - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) - ) - ecm_src_configure -} diff --git a/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.27.11.ebuild index 84530f541465..986e2f6c561d 100644 --- a/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild +++ b/kde-plasma/ksystemstats/ksystemstats-5.27.11.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +VIRTUALX_REQUIRED="test" # bug 909312 (test fails) +inherit ecm plasma.kde.org virtualx DESCRIPTION="Plugin-based system monitoring daemon" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="networkmanager" DEPEND=" @@ -34,9 +34,7 @@ DEPEND=" virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) " -RDEPEND="${DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 -" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/ksystemstats/ksystemstats-6.0.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.0.4.ebuild new file mode 100644 index 000000000000..0ef2de0a4f4c --- /dev/null +++ b/kde-plasma/ksystemstats/ksystemstats-6.0.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +VIRTUALX_REQUIRED="test" # bug 909312 (test fails) +inherit ecm plasma.kde.org virtualx + +DESCRIPTION="Plugin-based system monitoring daemon" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="networkmanager" + +DEPEND=" + dev-libs/libnl:3 + >=dev-qt/qtbase-${QTMIN}:6[dbus,network] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + net-libs/libpcap + sys-apps/lm-sensors:= + sys-libs/libcap + virtual/libudev:= + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package networkmanager KF6NetworkManagerQt) + ) + ecm_src_configure +} diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest index 962833f39e8a..7f1063986c78 100644 --- a/kde-plasma/kwallet-pam/Manifest +++ b/kde-plasma/kwallet-pam/Manifest @@ -1,2 +1,2 @@ -DIST kwallet-pam-5.24.5.tar.xz 20480 BLAKE2B 10597c6fd3905ace5a64a28585b051cee0325a63b184b171a3b8a066bc3cd8891be7fbcfccd054acc6627bbee282c1ae5553f65d902e754a9cd51bd2d38fa1c2 SHA512 9ce9862b5cc6525b183911cd9d96edeae585cd0d54055fc38a7f2f41febfeb388d31b4aa18f1c36a7068898457af53f560e22a2f5a8a4a015910d56fa70aa740 -DIST kwallet-pam-5.25.2.tar.xz 20524 BLAKE2B 0b2fce85cd54ff7f6583c2d21bfdde8aece8fcd26b47405e524501e06375742ba0db107f03161d6b498090e270c5e9b7813b2336edb947f5f93dd796f97c6b24 SHA512 58c145850a0adabe69875a62f2354d7dc4744d2ef30b05e011e168b75e260333cd4e3d8fa1ae48a1a541c121add22a34d87d6bb74780b6105c7bfa042e841a4b +DIST kwallet-pam-5.27.11.tar.xz 22948 BLAKE2B 1c0cf86bb7e57696e44ac34a4392d1f81a6ade8fbaef6c61eefc79df39890aa1799ddbb39ec59fbde3ea4536c1113c1147b28bcdfc898049e847af99b107267b SHA512 b52177df434bf71214874a2410637240bb5a23f0fd06d41f3b62630d90e5262a231012c4f11119f96c151bb222e73652e5e8506ccc26c7cc451090f3bd156b6a +DIST kwallet-pam-6.0.4.tar.xz 23016 BLAKE2B cd1abeb02c7d734db35848318613cfff54b98c7e06c8ec3ced237bcdf154d4808c5e5e7c04d70a7469f479566e9cc12626e038b40735b7d8004cd03797c4a406 SHA512 af186165fe2e2ada5e1dd8359b41980af36e18b5266048fd3dbeeb4e2815ec158a1d1079d0c25ea427dc4c43414bf985c8eea828eafe54d9c58bc4b3c59255c6 diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.27.11.ebuild index 8ddb3f24688e..44a9bab4e37f 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-5.27.11.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.102.0 PVCUT=$(ver_cut 1-3) -inherit ecm kde.org +inherit ecm plasma.kde.org DESCRIPTION="PAM module to not enter KWallet password again after login" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.25.2.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.0.4.ebuild index 510f5681057b..cb964d02d812 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.25.2.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-6.0.4.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -inherit ecm kde.org +inherit ecm plasma.kde.org DESCRIPTION="PAM module to not enter KWallet password again after login" LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" DEPEND=" dev-libs/libgcrypt:0= - >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:6 sys-libs/pam " RDEPEND="${DEPEND} @@ -32,6 +32,6 @@ src_configure() { pkg_postinst() { ecm_pkg_postinst - elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." + elog "This package enables auto-unlocking of kde-frameworks/kwallet:6." elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" } diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest index f0e68c6cd76f..441d6c2f0473 100644 --- a/kde-plasma/kwayland-integration/Manifest +++ b/kde-plasma/kwayland-integration/Manifest @@ -1,2 +1,2 @@ -DIST kwayland-integration-5.24.5.tar.xz 24844 BLAKE2B 99fedecea63c3b3792b6c275143b7e32283f32c38d098f039ec09a2b98facbd79c89753bf32fdd82c39115d2fd603626f67328a0c2a0dcac7cb3cec5f914c580 SHA512 ebdfb1cef57e82081c22394b6d4309e5662a91aaf925df1186a17765bf49a2d07a810be7767f5d9de18cae942584fbbdef42dc6bb59dc0c4896e7ff8abf117ac -DIST kwayland-integration-5.25.2.tar.xz 24292 BLAKE2B d8546b2188db05deea3e12263a920916a36806bd244bceed95946f465d27340a62791b1ba3e1daba1a86ed5486b3c5b9fcde0574510231ae4cbe73030fbeb5c3 SHA512 0c7ce622c27f7a51da607442a7f05cef180197a153bf5a4fa16d95bf63665321511a973b93eb68788b0a9a481027de5383a1658539b1af25fef5443053d2b4ce +DIST kwayland-integration-5.27.11.tar.xz 25708 BLAKE2B 67fe2d113955b2cdec1c3d621efbe84b2565aa3f22e0d15eb95f1a2bce1a6c7fe87da9c2974d93fb2f1939d92d64d2ab2a2a1db609df5973ded5ac4a02f214cf SHA512 c5f19a03e8161b346dbd89fb0d1b72d7906c19a7d55535878d9d75b7d96025d61808161f6b0ccaf9b5fef1d112f8e0ba1033ce149e42aec2cd261351d5ffb1c9 +DIST kwayland-integration-6.0.4.tar.xz 26392 BLAKE2B 774a60343555fc480b98700886abc0769bcd25f996070603cdfd2735ff0dabb1e913e2901ee93eaad0dd4de31b48d871b2da59d15805bce920eec9af79f63179 SHA512 2fac1bf44212a0c70f89625bdf7169551e26d252299e740a3c0ee4c87a3172ed69549856c7cc0f2cb27b09c5b72fe4de14a186e2d513436708d839e95503157a diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild index 7ea29d557359..430cc1e0db8f 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild @@ -1,45 +1,49 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm flag-o-matic plasma.kde.org -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" +DESCRIPTION="Provides KWindowSystem integration plugin for Wayland" HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" -RESTRICT="test" # bug 668872 - # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X # slot ops: +# dev-qt/qtgui: QtXkbCommonSupportPrivate # dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff -# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h # kde-frameworks/kwindowsystem: Various private headers DEPEND=" >=dev-libs/wayland-1.15 + >=dev-qt/qtgui-${QTMIN}:5= || ( >=dev-qt/qtgui-${QTMIN}:5[libinput] >=dev-qt/qtgui-${QTMIN}:5[X] ) >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtwayland-${QTMIN}:5= - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxkbcommon " RDEPEND="${DEPEND}" BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner virtual/pkgconfig " + +src_prepare() { + ecm_src_prepare + ecm_punt_kf_module IdleTime + cmake_comment_add_subdirectory autotests # only contains idletime test + cmake_run_in src cmake_comment_add_subdirectory idletime + filter-lto # bug 921430 +} diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.25.2.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-6.0.4.ebuild index 8602ac348b3b..2ce54ec08c7a 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.25.2.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-6.0.4.ebuild @@ -1,44 +1,48 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_TEST="true" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm flag-o-matic plasma.kde.org -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" +DESCRIPTION="Provides KWindowSystem integration plugin for Wayland" HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="~amd64" IUSE="" -RESTRICT="test" # bug 668872 - # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X # slot ops: +# dev-qt/qtgui: QtXkbCommonSupportPrivate # dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff -# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h # kde-frameworks/kwindowsystem: Various private headers -DEPEND=" +RDEPEND=" >=dev-libs/wayland-1.15 + >=dev-qt/qtgui-${QTMIN}:5= || ( >=dev-qt/qtgui-${QTMIN}:5[libinput] >=dev-qt/qtgui-${QTMIN}:5[X] ) >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtwayland-${QTMIN}:5= - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxkbcommon " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-libs/plasma-wayland-protocols +" BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner virtual/pkgconfig " + +src_configure() { + filter-lto # bug 921430 + ecm_src_configure +} diff --git a/kde-plasma/kwayland-integration/metadata.xml b/kde-plasma/kwayland-integration/metadata.xml index d925f2439758..7715b5766454 100644 --- a/kde-plasma/kwayland-integration/metadata.xml +++ b/kde-plasma/kwayland-integration/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kwayland-integration</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest deleted file mode 100644 index 6ba5254c5e4a..000000000000 --- a/kde-plasma/kwayland-server/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST kwayland-server-5.24.5.tar.xz 221388 BLAKE2B 38a1e66c1290c32db10a6818b10e57097fef70ac376797e272c329e9a49556bf423da4a731e46718bf39a30131def4adf90f1742589425ad040bc125c84fcffa SHA512 72159618a22233b9b49cab8ee1a804f629763e903a2e711c8c23f990544d79b5d27e768c33f8d844c916e41a6d3a2af5ddcab69d0448569adc247e0f737975f5 diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch deleted file mode 100644 index 6e03d215ed43..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f669d7002b3966f53f8e17275123b24ec41e8e21 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Mon, 16 May 2022 16:28:53 +0300 -Subject: [PATCH] wayland: Fix supported action initialization in data offer - interface - -Currently we guess the supported and preferred dnd actions in data offer -for version >= 3. This can create problems because kwin may not send the -right action events when the supported dnd actions actually change. ---- - src/server/dataoffer_interface.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/server/dataoffer_interface.cpp b/src/server/dataoffer_interface.cpp -index ed682172..d78abeca 100644 ---- a/src/server/dataoffer_interface.cpp -+++ b/src/server/dataoffer_interface.cpp -@@ -25,9 +25,8 @@ public: - DataOfferInterface *q; - QPointer<AbstractDataSource> source; - -- // defaults are set to sensible values for < version 3 interfaces -- DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move; -- DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy; -+ DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::None; -+ DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::None; - - protected: - void data_offer_destroy_resource(Resource *resource) override; -@@ -43,6 +42,11 @@ DataOfferInterfacePrivate::DataOfferInterfacePrivate(AbstractDataSource *_source - , q(_q) - , source(_source) - { -+ // defaults are set to sensible values for < version 3 interfaces -+ if (wl_resource_get_version(resource) < WL_DATA_OFFER_ACTION_SINCE_VERSION) { -+ supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move; -+ preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy; -+ } - } - - void DataOfferInterfacePrivate::data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) --- -GitLab - diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild deleted file mode 100644 index 8950843499dd..000000000000 --- a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Wayland Server Components built on KDE Frameworks" -HOMEPAGE="https://invent.kde.org/plasma/kwayland-server" - -LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -# All failing, I guess we need a virtual wayland server -RESTRICT="test" - -RDEPEND=" - >=dev-libs/wayland-1.19.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[egl] - >=dev-qt/qtwayland-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - media-libs/libglvnd -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 - >=dev-libs/wayland-protocols-1.24 -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-supported-action-init.patch -) diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest new file mode 100644 index 000000000000..fc0af13cac3d --- /dev/null +++ b/kde-plasma/kwayland/Manifest @@ -0,0 +1,2 @@ +DIST kwayland-5.115.0.tar.xz 337404 BLAKE2B f03eb7d0b4ad86733dae5f7488f6f902c4ce0c17ef90a8fcf9df4ca1d5b184bf8b2ad402580c407a2076be4409f81155eff565e2134221ae4ea277d593f1745a SHA512 d4279353a7179001f19bd6962595c321161ec5f5fa24518af4326b21dab56caeed5a86cc82c5335cd8288c0b348feccfb59ec8e3ee0ec0f418972c29d48832ec +DIST kwayland-6.0.4.tar.xz 133764 BLAKE2B 118672442b101b6044f2acef55b2f14235abfac37e8098f0d461260eb167b7a3d374ac726ea030ad6e2e844a3950be83535073d232e60a6787bacd3389991848 SHA512 12db8acbd24716ee3321d2e8b47315dfa645dc447224eba7db80095d9f5eb41d61f7d3d8422f38a6d066313d0cc6994085b4bc9bb974e427b574a1aafd20a653 diff --git a/kde-plasma/kwayland/kwayland-5.115.0.ebuild b/kde-plasma/kwayland/kwayland-5.115.0.ebuild new file mode 100644 index 000000000000..f7f3207dc3a3 --- /dev/null +++ b/kde-plasma/kwayland/kwayland-5.115.0.ebuild @@ -0,0 +1,44 @@ +# 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/kwayland/kwayland-6.0.4.ebuild b/kde-plasma/kwayland/kwayland-6.0.4.ebuild new file mode 100644 index 000000000000..20d88c070389 --- /dev/null +++ b/kde-plasma/kwayland/kwayland-6.0.4.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm flag-o-matic plasma.kde.org + +DESCRIPTION="Qt-style API to interact with the wayland-client API" +HOMEPAGE="https://invent.kde.org/frameworks/kwayland" + +LICENSE="LGPL-2.1" +SLOT="6" +KEYWORDS="~amd64" +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/qtbase-${QTMIN}:6=[concurrent,gui,opengl] + >=dev-qt/qtwayland-${QTMIN}:6= + media-libs/libglvnd +" +DEPEND="${RDEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 + >=dev-libs/wayland-protocols-1.15 + sys-kernel/linux-headers +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 +" + +src_configure() { + filter-lto # bug 866575 + ecm_src_configure +} diff --git a/kde-plasma/kwayland/metadata.xml b/kde-plasma/kwayland/metadata.xml new file mode 100644 index 000000000000..f337bba66b29 --- /dev/null +++ b/kde-plasma/kwayland/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kwayland</remote-id> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Frameworks API. + </subslots> + </slots> +</pkgmetadata> diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest index 5c7c720078cd..d53f970c9b2b 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,2 +1,2 @@ -DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089 -DIST kwin-5.25.2.tar.xz 6622476 BLAKE2B ee659cce95cc2fea3d9b0a2ce8669c107cac60c1844f3c569e002782ea19bd980a999076ad84231215712a8e25a6fa91cf4b979c88b30d09e9c5437a67c39430 SHA512 1a93bcd5d0a6f70aa67e1bb940fa505ffa2c946280e772a1fd061dd3acfaa84a851302cd6c96d30abd10d01dbdc731d884f3a79e590b0c7ff26a44b019cc7ec9 +DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b +DIST kwin-6.0.4.tar.xz 8831164 BLAKE2B 091566504516522c549e7d44003dafd7fc373a051e331ea90625a495e34023b3f35daacab9651884b8275c673e633a9afea7e55380c8c8d0d85c02f41b868474 SHA512 5c8d038b598f72f30540ca350b70dc4c54fb8e4f94636c93c65f7293be531a5f4d5faa843c9614f770b82f0f4409e80c1da73180a6844918ed6d45d2bb479a59 diff --git a/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch b/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch deleted file mode 100644 index d5b1f8c3864e..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7fcf36d636f62f101397d88ad6c448f54da79e46 Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Fri, 13 May 2022 15:37:13 +0000 -Subject: [PATCH] effects/overview: hide panels - -This makes it consistent with WindowView (and the panel window doesn't respond -to input anyways even if shown, which is misleading). - -BUG: 444274 -FIXED-IN: 5.24.6 - - -(cherry picked from commit db2af5500f964f3eefde60183b69f21125aeb194) ---- - src/effects/overview/qml/ScreenView.qml | 20 ++++++++------------ - 1 file changed, 8 insertions(+), 12 deletions(-) - -diff --git a/src/effects/overview/qml/ScreenView.qml b/src/effects/overview/qml/ScreenView.qml -index 40cc29f4c7..39119e40b9 100644 ---- a/src/effects/overview/qml/ScreenView.qml -+++ b/src/effects/overview/qml/ScreenView.qml -@@ -70,16 +70,8 @@ FocusScope { - } - } - -- ExpoArea { -- id: heapArea -- screen: targetScreen -- } -- - Column { -- x: heapArea.x -- y: heapArea.y -- width: heapArea.width -- height: heapArea.height -+ anchors.fill: parent - - Item { - id: topBar -@@ -176,15 +168,19 @@ FocusScope { - - KWinComponents.WindowThumbnailItem { - id: windowThumbnail -- visible: !model.client.hidden -+ visible: !model.client.hidden && opacity > 0 - wId: model.client.internalId - x: model.client.x - targetScreen.geometry.x - y: model.client.y - targetScreen.geometry.y - width: model.client.width - height: model.client.height -+ opacity: container.effect.gestureInProgress -+ ? 1 - container.effect.partialActivationFactor -+ : (model.client.hidden || container.organized) ? 0 : 1 - -- TapHandler { -- onTapped: effect.deactivate(); -+ Behavior on opacity { -+ enabled: !container.effect.gestureInProgress -+ NumberAnimation { duration: animationDuration; easing.type: Easing.OutCubic } - } - } - } --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch deleted file mode 100644 index 53c05da522ec..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3b58fe4bde0722b352e4114adb992a2ed2c96423 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Sat, 7 May 2022 21:23:17 +0200 -Subject: [PATCH] backends/drm: consider escaped separators KWIN_DRM_DEVICES - -':' conflicts with the file names in /dev/dri/by-path, so allow it to be -escaped with '\' - -CCBUG: 453386 - - -(cherry picked from commit a110aabbccf56019bdc324b3c751112f35ec3f6c) ---- - src/backends/drm/drm_backend.cpp | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp -index 272dba702c..567ea3f696 100644 ---- a/src/backends/drm/drm_backend.cpp -+++ b/src/backends/drm/drm_backend.cpp -@@ -57,12 +57,34 @@ - namespace KWin - { - -+static QStringList splitPathList(const QString &input, const QChar delimiter) -+{ -+ QStringList ret; -+ QString tmp; -+ for (int i = 0; i < input.size(); i++) { -+ if (input[i] == delimiter) { -+ if (i > 0 && input[i - 1] == '\\') { -+ tmp[tmp.size() - 1] = delimiter; -+ } else if (!tmp.isEmpty()) { -+ ret.append(tmp); -+ tmp = QString(); -+ } -+ } else { -+ tmp.append(input[i]); -+ } -+ } -+ if (!tmp.isEmpty()) { -+ ret.append(tmp); -+ } -+ return ret; -+} -+ - DrmBackend::DrmBackend(QObject *parent) - : Platform(parent) - , m_udev(new Udev) - , m_udevMonitor(m_udev->monitor()) - , m_session(Session::create(this)) -- , m_explicitGpus(qEnvironmentVariable("KWIN_DRM_DEVICES").split(':', Qt::SkipEmptyParts)) -+ , m_explicitGpus(splitPathList(qEnvironmentVariable("KWIN_DRM_DEVICES"), ':')) - , m_dpmsFilter() - { - setSupportsPointerWarping(true); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch deleted file mode 100644 index d38e11375bbe..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e2d271b6365188a86755af82745ad37535ceb4d7 Mon Sep 17 00:00:00 2001 -From: Erik Kurzinger <ekurzinger@nvidia.com> -Date: Sun, 8 May 2022 12:16:20 -0700 -Subject: [PATCH] platforms/drm: set read buffer in - GbmSurface::makeContextCurrent - -The first time the GBM backend's EGL context is made current after -creation, both the read and draw surfaces are set to EGL_NO_SURFACE. -This will set the GL read and draw buffers to GL_NONE in accordance with -the EGL spec. - -When a real surface is later made current, however, the spec is arguably -unclear on whether the read and draw buffers should remain set to -GL_NONE or whether they should be restored to the default GL_BACK. The -Mesa driver does the latter, the NVIDIA driver does the former. - -To work around this difference, Kwin has an explicit call to -glDrawBuffer in GbmSurface::makeContextCurrent. It does not have a -corresponding call to glReadBuffer, though, which can cause some desktop -effects such as background contrast to render incorrectly with the -NVIDIA driver. This change adds that missing call. - -(cherry picked from commit e6d2bc153f499d1ec3510c02badca38d4c42c340) ---- - src/backends/drm/egl_gbm_backend.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/backends/drm/egl_gbm_backend.cpp b/src/backends/drm/egl_gbm_backend.cpp -index 5a0be7ccaf..b34fa1320b 100644 ---- a/src/backends/drm/egl_gbm_backend.cpp -+++ b/src/backends/drm/egl_gbm_backend.cpp -@@ -377,6 +377,7 @@ bool EglGbmBackend::makeContextCurrent(const Output::RenderData &render) const - } - if (!GLPlatform::instance()->isGLES()) { - glDrawBuffer(GL_BACK); -+ glReadBuffer(GL_BACK); - } - return true; - } --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-1.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-1.patch deleted file mode 100644 index 46b6f0ad9c71..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-1.patch +++ /dev/null @@ -1,307 +0,0 @@ -From 4c3195270d6c8e1da8c3e2e3abe5aae75d5bf3c2 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Fri, 26 Nov 2021 12:03:14 +0200 -Subject: [PATCH] Ensure that Toplevel::output() stays always in sync with - geometry - -Currently, if geometry updates are blocked, the Toplevel.output property -won't be updated. On the other hand, it's reasonable to use the output -property instead of manually looking up the output in window management -code, e.g. Workspace::clientArea(). - -In other words, using the Toplevel.output property is like walking on a -mine field, things can blow up. You can't use Toplevel.output even if it -makes perfect sense. - -This change ensures that Toplevel.output property is always kept in sync -with the frame geometry. Unfortunately, this means that the output -property no longer can be updated when the frameGeometryChanged() signal -is emitted. It has to be done in moveResizeInternal() method. - -BUG: 448064 - -(cherry picked from 510a41eeb89f51843405fa0258c852ab06d05bb8) - -Part-of: <https://invent.kde.org/plasma/kwin/-/merge_requests/2448> ---- - src/abstract_client.cpp | 3 --- - src/events.cpp | 1 + - src/internal_client.cpp | 6 ++++++ - src/toplevel.cpp | 17 ----------------- - src/toplevel.h | 10 ++-------- - src/unmanaged.cpp | 6 ++++++ - src/unmanaged.h | 1 + - src/waylandclient.cpp | 6 ++++++ - src/x11client.cpp | 7 +++++++ - src/x11client.h | 1 + - 10 files changed, 30 insertions(+), 28 deletions(-) - -diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp -index 0714b9ac3f..ddff11e53c 100644 ---- a/src/abstract_client.cpp -+++ b/src/abstract_client.cpp -@@ -63,8 +63,6 @@ AbstractClient::AbstractClient() - { - connect(this, &AbstractClient::clientStartUserMovedResized, this, &AbstractClient::moveResizedChanged); - connect(this, &AbstractClient::clientFinishUserMovedResized, this, &AbstractClient::moveResizedChanged); -- connect(this, &AbstractClient::clientStartUserMovedResized, this, &AbstractClient::removeCheckOutputConnection); -- connect(this, &AbstractClient::clientFinishUserMovedResized, this, &AbstractClient::setupCheckOutputConnection); - - connect(this, &AbstractClient::windowShown, this, &AbstractClient::hiddenChanged); - connect(this, &AbstractClient::windowHidden, this, &AbstractClient::hiddenChanged); -@@ -1011,7 +1009,6 @@ void AbstractClient::finishInteractiveMoveResize(bool cancel) - if (cancel) { - moveResize(initialInteractiveMoveResizeGeometry()); - } -- checkOutput(); // needs to be done because clientFinishUserMovedResized has not yet re-activated online alignment - if (output() != interactiveMoveResizeStartOutput()) { - workspace()->sendClientToOutput(this, output()); // checks rule validity - if (isFullScreen() || maximizeMode() != MaximizeRestore) { -diff --git a/src/events.cpp b/src/events.cpp -index b9bb9bbd36..a22960f0d0 100644 ---- a/src/events.cpp -+++ b/src/events.cpp -@@ -1261,6 +1261,7 @@ void Unmanaged::configureNotifyEvent(xcb_configure_notify_event_t *e) - m_clientGeometry = newgeom; - m_frameGeometry = newgeom; - m_bufferGeometry = newgeom; -+ checkOutput(); - Q_EMIT bufferGeometryChanged(this, old); - Q_EMIT clientGeometryChanged(this, old); - Q_EMIT frameGeometryChanged(this, old); -diff --git a/src/internal_client.cpp b/src/internal_client.cpp -index 3be51ff27b..b4c9250fd3 100644 ---- a/src/internal_client.cpp -+++ b/src/internal_client.cpp -@@ -10,6 +10,7 @@ - #include "internal_client.h" - #include "decorations/decorationbridge.h" - #include "deleted.h" -+#include "platform.h" - #include "surfaceitem.h" - #include "workspace.h" - -@@ -477,6 +478,7 @@ void InternalClient::commitGeometry(const QRect &rect) - // The client geometry and the buffer geometry are the same. - const QRect oldClientGeometry = m_clientGeometry; - const QRect oldFrameGeometry = m_frameGeometry; -+ const AbstractOutput *oldOutput = m_output; - - m_clientGeometry = frameRectToClientRect(rect); - m_frameGeometry = rect; -@@ -486,6 +488,7 @@ void InternalClient::commitGeometry(const QRect &rect) - return; - } - -+ m_output = kwinApp()->platform()->outputAt(rect.center()); - syncGeometryToInternalWindow(); - - if (oldClientGeometry != m_clientGeometry) { -@@ -495,6 +498,9 @@ void InternalClient::commitGeometry(const QRect &rect) - if (oldFrameGeometry != m_frameGeometry) { - Q_EMIT frameGeometryChanged(this, oldFrameGeometry); - } -+ if (oldOutput != m_output) { -+ Q_EMIT screenChanged(); -+ } - Q_EMIT geometryShapeChanged(this, oldFrameGeometry); - } - -diff --git a/src/toplevel.cpp b/src/toplevel.cpp -index 698f6998e5..ff216835c4 100644 ---- a/src/toplevel.cpp -+++ b/src/toplevel.cpp -@@ -47,7 +47,6 @@ Toplevel::Toplevel() - , m_skipCloseAnimation(false) - { - connect(screens(), &Screens::changed, this, &Toplevel::screenChanged); -- setupCheckOutputConnection(); - connect(this, &Toplevel::bufferGeometryChanged, this, &Toplevel::inputTransformationChanged); - - // Only for compatibility reasons, drop in the next major release. -@@ -379,22 +378,6 @@ void Toplevel::deleteEffectWindow() - effect_window = nullptr; - } - --void Toplevel::checkOutput() --{ -- setOutput(kwinApp()->platform()->outputAt(frameGeometry().center())); --} -- --void Toplevel::setupCheckOutputConnection() --{ -- connect(this, &Toplevel::frameGeometryChanged, this, &Toplevel::checkOutput); -- checkOutput(); --} -- --void Toplevel::removeCheckOutputConnection() --{ -- disconnect(this, &Toplevel::frameGeometryChanged, this, &Toplevel::checkOutput); --} -- - int Toplevel::screen() const - { - return kwinApp()->platform()->enabledOutputs().indexOf(m_output); -diff --git a/src/toplevel.h b/src/toplevel.h -index f6b5dd4e61..3309647eb4 100644 ---- a/src/toplevel.h -+++ b/src/toplevel.h -@@ -636,13 +636,6 @@ Q_SIGNALS: - void visibleGeometryChanged(); - - protected Q_SLOTS: -- /** -- * Checks whether the screen number for this Toplevel changed and updates if needed. -- * Any method changing the geometry of the Toplevel should call this method. -- */ -- void checkOutput(); -- void setupCheckOutputConnection(); -- void removeCheckOutputConnection(); - void setReadyForPainting(); - - protected: -@@ -673,6 +666,8 @@ protected: - void deleteShadow(); - void deleteEffectWindow(); - void setDepth(int depth); -+ -+ AbstractOutput *m_output = nullptr; - QRect m_frameGeometry; - QRect m_clientGeometry; - QRect m_bufferGeometry; -@@ -700,7 +695,6 @@ private: - QRegion opaque_region; - mutable QRegion m_shapeRegion; - mutable bool m_shapeRegionIsValid = false; -- AbstractOutput *m_output = nullptr; - bool m_skipCloseAnimation; - quint32 m_pendingSurfaceId = 0; - QPointer<KWaylandServer::SurfaceInterface> m_surface; -diff --git a/src/unmanaged.cpp b/src/unmanaged.cpp -index de3caa303d..3164813a75 100644 ---- a/src/unmanaged.cpp -+++ b/src/unmanaged.cpp -@@ -12,6 +12,7 @@ - #include "workspace.h" - #include "effects.h" - #include "deleted.h" -+#include "platform.h" - #include "surfaceitem_x11.h" - #include "utils/common.h" - -@@ -206,6 +207,11 @@ QWindow *Unmanaged::findInternalWindow() const - return nullptr; - } - -+void Unmanaged::checkOutput() -+{ -+ setOutput(kwinApp()->platform()->outputAt(frameGeometry().center())); -+} -+ - void Unmanaged::damageNotifyEvent() - { - Q_ASSERT(kwinApp()->operationMode() == Application::OperationModeX11); -diff --git a/src/unmanaged.h b/src/unmanaged.h -index e874fc1724..fa543eb0b8 100644 ---- a/src/unmanaged.h -+++ b/src/unmanaged.h -@@ -45,6 +45,7 @@ private: - void configureNotifyEvent(xcb_configure_notify_event_t *e); - void damageNotifyEvent(); - QWindow *findInternalWindow() const; -+ void checkOutput(); - void associate(); - void initialize(); - bool m_outline = false; -diff --git a/src/waylandclient.cpp b/src/waylandclient.cpp -index 39d6ea22bc..9d8070c7f8 100644 ---- a/src/waylandclient.cpp -+++ b/src/waylandclient.cpp -@@ -7,6 +7,7 @@ - */ - - #include "waylandclient.h" -+#include "platform.h" - #include "screens.h" - #include "wayland_server.h" - #include "workspace.h" -@@ -289,6 +290,7 @@ void WaylandClient::updateGeometry(const QRect &rect) - const QRect oldClientGeometry = m_clientGeometry; - const QRect oldFrameGeometry = m_frameGeometry; - const QRect oldBufferGeometry = m_bufferGeometry; -+ const AbstractOutput *oldOutput = m_output; - - m_clientGeometry = frameRectToClientRect(rect); - m_frameGeometry = rect; -@@ -310,6 +312,7 @@ void WaylandClient::updateGeometry(const QRect &rect) - return; - } - -+ m_output = kwinApp()->platform()->outputAt(rect.center()); - updateWindowRules(Rules::Position | Rules::Size); - - if (changedGeometries & WaylandGeometryBuffer) { -@@ -321,6 +324,9 @@ void WaylandClient::updateGeometry(const QRect &rect) - if (changedGeometries & WaylandGeometryFrame) { - Q_EMIT frameGeometryChanged(this, oldFrameGeometry); - } -+ if (oldOutput != m_output) { -+ Q_EMIT screenChanged(); -+ } - Q_EMIT geometryShapeChanged(this, oldFrameGeometry); - } - -diff --git a/src/x11client.cpp b/src/x11client.cpp -index ce275fff1b..d7ed823128 100644 ---- a/src/x11client.cpp -+++ b/src/x11client.cpp -@@ -4062,6 +4062,8 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode) - m_lastClientGeometry == m_clientGeometry) { - return; - } -+ -+ m_output = kwinApp()->platform()->outputAt(frameGeometry.center()); - if (areGeometryUpdatesBlocked()) { - setPendingMoveResizeMode(mode); - return; -@@ -4070,6 +4072,7 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode) - const QRect oldBufferGeometry = m_lastBufferGeometry; - const QRect oldFrameGeometry = m_lastFrameGeometry; - const QRect oldClientGeometry = m_lastClientGeometry; -+ const AbstractOutput *oldOutput = m_lastOutput; - - updateServerGeometry(); - updateWindowRules(Rules::Position|Rules::Size); -@@ -4077,6 +4080,7 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode) - m_lastBufferGeometry = m_bufferGeometry; - m_lastFrameGeometry = m_frameGeometry; - m_lastClientGeometry = m_clientGeometry; -+ m_lastOutput = m_output; - - if (isActive()) { - workspace()->setActiveOutput(output()); -@@ -4092,6 +4096,9 @@ void X11Client::moveResizeInternal(const QRect &rect, MoveResizeMode mode) - if (oldFrameGeometry != m_frameGeometry) { - Q_EMIT frameGeometryChanged(this, oldFrameGeometry); - } -+ if (oldOutput != m_output) { -+ Q_EMIT screenChanged(); -+ } - Q_EMIT geometryShapeChanged(this, oldFrameGeometry); - } - -diff --git a/src/x11client.h b/src/x11client.h -index b523044d3d..adb8b0e8df 100644 ---- a/src/x11client.h -+++ b/src/x11client.h -@@ -524,6 +524,7 @@ private: - QMetaObject::Connection m_edgeGeometryTrackingConnection; - - QMargins m_clientFrameExtents; -+ AbstractOutput *m_lastOutput = nullptr; - QRect m_lastBufferGeometry; - QRect m_lastFrameGeometry; - QRect m_lastClientGeometry; --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch deleted file mode 100644 index 026efdf9465b..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-fix-plasmashell-crash-2.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a8477c1cf7acbf3358c85e53b236150dd43b4640 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Thu, 14 Apr 2022 18:48:56 +0200 -Subject: [PATCH] toplevel: set valid output in the constructor - -This makes it less easy to cause crashes and fixes some segfaults. - -BUG: 452433 -BUG: 448064 - -(cherry picked from commit e48a5c0535f01dc380449ba8481c869ff23e5558) - -Tested-by: Merge Service <https://invent.kde.org/plasma/kwin/-/merge_requests/2448> -Part-of: <https://invent.kde.org/plasma/kwin/-/merge_requests/2448> ---- - src/toplevel.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/toplevel.cpp b/src/toplevel.cpp -index ff216835c4..5d3d7a5dde 100644 ---- a/src/toplevel.cpp -+++ b/src/toplevel.cpp -@@ -34,7 +34,8 @@ namespace KWin - { - - Toplevel::Toplevel() -- : m_visual(XCB_NONE) -+ : m_output(workspace()->activeOutput()) -+ , m_visual(XCB_NONE) - , bit_depth(24) - , info(nullptr) - , ready_for_painting(false) --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch b/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch deleted file mode 100644 index f79d4bba71ce..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f7b1edc79e9526fe6bad69a8ad475a5d77e5aead Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Tue, 10 May 2022 13:07:03 +0200 -Subject: [PATCH] tabbox: don't dismiss popups - -The glitches that dismissing popups was supposed to prevent are apparently -no longer present. - -BUG: 446318 -(cherry picked from commit 94b0ca814688bf3622aa53f4d4d26f97d8de7306) ---- - src/tabbox/tabbox.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp -index a1c50b27fc..76a50795ad 100644 ---- a/src/tabbox/tabbox.cpp -+++ b/src/tabbox/tabbox.cpp -@@ -1020,10 +1020,6 @@ void TabBox::navigatingThroughWindows(bool forward, const QKeySequence &shortcut - // CDE style raise / lower - CDEWalkThroughWindows(forward); - } else { -- workspace()->forEachAbstractClient([](Toplevel *toplevel) { -- if (toplevel->isPopupWindow()) -- toplevel->popupDone(); -- }); - if (areModKeysDepressed(shortcut)) { - if (startKDEWalkThroughWindows(mode)) - KDEWalkThroughWindows(forward); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-update-device-outputName.patch b/kde-plasma/kwin/files/kwin-5.24.5-update-device-outputName.patch deleted file mode 100644 index d1dbb3fb9bb8..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-update-device-outputName.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1b96d21507a3b6b0a9ac6eac424d4e4db5602839 Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Wed, 18 May 2022 13:34:45 +0200 -Subject: [PATCH] Update device outputName when setting output - -BUG:451279 -FIXED-IN:5.25.0 - - -(cherry picked from commit d3a37aa9aef58fbaedcef77d2797c22a015dc9c0) ---- - src/backends/libinput/device.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/backends/libinput/device.cpp b/src/backends/libinput/device.cpp -index f247b66d74..30f51aca3c 100644 ---- a/src/backends/libinput/device.cpp -+++ b/src/backends/libinput/device.cpp -@@ -668,8 +668,10 @@ void Device::setOutput(AbstractOutput *output) - { - m_output = output; - if (m_output) { -+ m_outputName = output->name(); - writeEntry(ConfigKey::OutputName, output->name()); - } else { -+ m_outputName = QString(); - writeEntry(ConfigKey::OutputName, QString()); - } - Q_EMIT outputNameChanged(); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch index 15936e6dd311..268d88a09cdb 100644 --- a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch +++ b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch @@ -1,17 +1,17 @@ -From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001 +From e15641e466b4802f73b34ea2e510df7f78c50afd Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> Date: Tue, 6 Aug 2019 22:36:44 +0200 Subject: [PATCH] Disable the effect video button if gstreamer is missing --- - kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +- + src/kcms/effects/package/contents/ui/Effect.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml -index 71dbc5935..86ddf40b3 100644 ---- a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml -+++ b/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml -@@ -112,7 +112,7 @@ Kirigami.SwipeListItem { +diff --git a/src/kcms/effects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml +index f8a36c03e..ce673728e 100644 +--- a/src/kcms/effects/package/contents/ui/Effect.qml ++++ b/src/kcms/effects/package/contents/ui/Effect.qml +@@ -116,7 +116,7 @@ Kirigami.SwipeListItem { } actions: [ Kirigami.Action { @@ -21,5 +21,5 @@ index 71dbc5935..86ddf40b3 100644 tooltip: i18nc("@info:tooltip", "Show/Hide Video") onTriggered: videoItem.showHide() -- -2.22.0 +2.39.0 diff --git a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch new file mode 100644 index 000000000000..3bf872a6e30f --- /dev/null +++ b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch @@ -0,0 +1,41 @@ +From ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90 Mon Sep 17 00:00:00 2001 +From: Aleix Pol Gonzalez <aleixpol@kde.org> +Date: Wed, 21 Feb 2024 12:25:09 +0000 +Subject: [PATCH] qpa: Don't build SPI support if Qt wasn't build with it + +Signed-off-by: Falko Becker <falko.becker@mbition.io> +--- + src/plugins/qpa/integration.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp +index 9a9195d8173..238a2e60628 100644 +--- a/src/plugins/qpa/integration.cpp ++++ b/src/plugins/qpa/integration.cpp +@@ -33,9 +33,12 @@ + #include <QtGui/private/qgenericunixeventdispatcher_p.h> + #include <QtGui/private/qgenericunixfontdatabase_p.h> + #include <QtGui/private/qgenericunixthemes_p.h> +-#include <QtGui/private/qspiaccessiblebridge_p.h> + #include <QtGui/private/qunixeventdispatcher_qpa_p.h> + ++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) ++#include <QtGui/private/qspiaccessiblebridge_p.h> ++#endif ++ + namespace KWin + { + +@@ -160,7 +163,9 @@ QPlatformOpenGLContext *Integration::createPlatformOpenGLContext(QOpenGLContext + QPlatformAccessibility *Integration::accessibility() const + { + if (!m_accessibility) { ++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) + m_accessibility.reset(new QSpiAccessibleBridge()); ++#endif + } + return m_accessibility.get(); + } +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.24.5-r2.ebuild b/kde-plasma/kwin/kwin-5.24.5-r2.ebuild deleted file mode 100644 index 8e56a5025394..000000000000 --- a/kde-plasma/kwin/kwin-5.24.5-r2.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="optional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="accessibility caps gles2-only multimedia plasma screencast" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/libinput-1.19 - >=dev-libs/wayland-1.2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5= - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwayland-server-${PVCUT}:5 - media-libs/fontconfig - media-libs/freetype - media-libs/lcms:2 - media-libs/libepoxy - >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] - virtual/libudev:= - x11-libs/libX11 - x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 - >=x11-libs/libxkbcommon-0.7.0 - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - accessibility? ( media-libs/libqaccessibilityclient:5 ) - caps? ( sys-libs/libcap ) - gles2-only? ( media-libs/mesa[gles2] ) - plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) - screencast? ( >=media-video/pipewire-0.3:= ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - sys-apps/hwdata - x11-base/xwayland - multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - x11-base/xorg-proto - test? ( - dev-libs/plasma-wayland-protocols - >=dev-libs/wayland-protocols-1.19 - ) -" -BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}"/${P}-fix-multi-gpu-double-copy.patch # KDE-bug 453386 - "${FILESDIR}"/${P}-tabbox-dont-dismiss-popups.patch # KDE-bug 446318 - "${FILESDIR}"/${P}-effects-overview-hide-panels.patch # KDE-bug 444274 - "${FILESDIR}"/${P}-fix-nvidia-render-glitches.patch - "${FILESDIR}"/${P}-update-device-outputName.patch # KDE-bug 451279 - "${FILESDIR}"/${P}-fix-plasmashell-crash-{1,2}.patch # KDE-bugs 448064, 452433 -) - -src_prepare() { - ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch" - - # TODO: try to get a build switch upstreamed - if ! use screencast; then - sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package accessibility QAccessibilityClient) - $(cmake_use_find_package caps Libcap) - $(cmake_use_find_package plasma KF5Runner) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - optfeature "color management support" x11-misc/colord - elog - elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised" - elog "windows to the end of the list was changed so that it remains in the" - elog "original order. To revert to the well established behavior:" - elog - elog " - Edit ~/.config/kwinrc" - elog " - Find [TabBox] section" - elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\"" -} diff --git a/kde-plasma/kwin/kwin-5.25.2.ebuild b/kde-plasma/kwin/kwin-5.27.11.ebuild index 4b4bb9fd0c9a..b0e84b231dc1 100644 --- a/kde-plasma/kwin/kwin-5.25.2.ebuild +++ b/kde-plasma/kwin/kwin-5.27.11.ebuild @@ -1,36 +1,33 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="optional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm flag-o-matic plasma.kde.org optfeature DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="accessibility caps gles2-only lock multimedia plasma screencast" RESTRICT="test" COMMON_DEPEND=" - >=dev-libs/libinput-1.19 - >=dev-libs/wayland-1.20.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-libs/libinput-1.19:= + >=dev-libs/wayland-1.21.0 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[egl,gles2-only=,libinput] - >=dev-qt/qtwayland-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5=[accessibility,egl,gles2-only=,libinput] + >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5[qml] @@ -39,40 +36,38 @@ COMMON_DEPEND=" >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5= + >=kde-frameworks/kglobalaccel-${KFMIN}:5=[X(+)] >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kitemviews-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kdecoration-${PVCUT}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 media-libs/libepoxy media-libs/libglvnd - >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] + >=media-libs/mesa-21.3[egl(+),gbm(+),wayland,X] virtual/libudev:= x11-libs/libX11 x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 + >=x11-libs/libdrm-2.4.112 + >=x11-libs/libxcb-1.10:= >=x11-libs/libxcvt-0.1.1 - >=x11-libs/libxkbcommon-0.7.0 + >=x11-libs/libxkbcommon-1.5.0 x11-libs/xcb-util-cursor - x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:5 ) - caps? ( sys-libs/libcap ) gles2-only? ( media-libs/mesa[gles2] ) lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:5 ) plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) @@ -82,29 +77,35 @@ RDEPEND="${COMMON_DEPEND} !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] sys-apps/hwdata x11-base/xwayland - multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) + multimedia? ( + >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] + media-plugins/gst-plugins-soup:1.0 + ) " DEPEND="${COMMON_DEPEND} - dev-libs/plasma-wayland-protocols - >=dev-libs/wayland-protocols-1.25 + >=dev-libs/plasma-wayland-protocols-1.9 + >=dev-libs/wayland-protocols-1.31 >=dev-qt/designer-${QTMIN}:5 >=dev-qt/qtconcurrent-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 x11-base/xorg-proto + x11-libs/xcb-util-image + caps? ( sys-libs/libcap ) " BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 " -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" src_prepare() { ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch" + use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch" # TODO: try to get a build switch upstreamed if ! use screencast; then @@ -113,6 +114,9 @@ src_prepare() { } src_configure() { + # ODR violation (bug #921558) + filter-lto + local mycmakeargs=( # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it $(cmake_use_find_package accessibility QAccessibilityClient) diff --git a/kde-plasma/kwin/kwin-6.0.4.ebuild b/kde-plasma/kwin/kwin-6.0.4.ebuild new file mode 100644 index 000000000000..e3510abd0ff4 --- /dev/null +++ b/kde-plasma/kwin/kwin-6.0.4.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="optional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="accessibility caps gles2-only lock screencast +shortcuts" + +RESTRICT="test" + +# qtbase slot up: GuiPrivate use in tabbox +COMMON_DEPEND=" + >=dev-libs/libinput-1.19:= + >=dev-libs/wayland-1.22.0 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[accessibility=,dbus,gles2-only=,gui,libinput,opengl,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsensors-${QTMIN}:6 + >=dev-qt/qtshadertools-${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/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.112 + >=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[gles2] ) + lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 ) + screencast? ( >=media-video/pipewire-0.3:= ) + shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/kdeplasma-addons:5 + !kde-plasma/kwayland-server + >=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 +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 + >=dev-libs/wayland-protocols-1.32 + >=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 + caps? ( sys-libs/libcap ) + test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) ) +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:6 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +PATCHES=( + "${FILESDIR}/${PN}-6.0.2-qtgui-accessibility-optional.patch" # bug 926935, 6.1 +) + +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 +} + +src_configure() { + local mycmakeargs=( + # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it + $(cmake_use_find_package accessibility QAccessibilityClient6) + $(cmake_use_find_package caps Libcap) + -DKWIN_BUILD_SCREENLOCKER=$(usex lock) + -DKWIN_BUILD_GLOBALSHORTCUTS=$(usex shortcuts) + ) + + ecm_src_configure +} diff --git a/kde-plasma/kwin/metadata.xml b/kde-plasma/kwin/metadata.xml index d71da9e2cb08..4903bdce5a1e 100644 --- a/kde-plasma/kwin/metadata.xml +++ b/kde-plasma/kwin/metadata.xml @@ -12,5 +12,6 @@ <flag name="lock">Enable screen locking via <pkg>kde-plasma/kscreenlocker</pkg></flag> <flag name="multimedia">Enable effect video button in desktop effects KCM</flag> <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag> + <flag name="shortcuts">Enable global shortcuts support via <pkg>kde-plasma/kglobalacceld</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/kwrited/Manifest b/kde-plasma/kwrited/Manifest index e59fe40ad01f..f8a96f628901 100644 --- a/kde-plasma/kwrited/Manifest +++ b/kde-plasma/kwrited/Manifest @@ -1,2 +1,2 @@ -DIST kwrited-5.24.5.tar.xz 20904 BLAKE2B 84068117f8c2c890df1f3ebc4d305a7e417eddc6670340f653b9378118d07c666a16c96376868d6f6f6765e5c42a842161343856563e553b3146c0a140839323 SHA512 3fd38606fd81017f54df910e47f62bdc82758205fdeacae80a5bca6c5fe7ce9413a4f3f7c3ce2735107c6cd6ebecbc5a929b809eef52a593cc69c358c7c38af4 -DIST kwrited-5.25.2.tar.xz 21040 BLAKE2B c87c8907e57bf714bb74112c9b047703b3ab1a41476c03c6062411d2695cc3b0b7a78b795870e00d3ebd3d99b6d524b47a0a18779deb26cead729e69aa084051 SHA512 82c7a4997a8e037c6ab4c51cfbbcca7c4a45fd0a2152e00ee0fc6b3424e54ff955dc52ea4adee373fce7c328ceaddf5b12d172cec5fd4979700c1c670f36f614 +DIST kwrited-5.27.11.tar.xz 23492 BLAKE2B c37d142111e4bf2892b7795fc689452ab210a8cfc099aa89d75c0766975d62670f5a04039f1e10154d1a0b1d0025a7b8cc12fc68bc6042fcf1640c0c1154d6fe SHA512 b4a541832d567dbc2b0d391f7aa1463f17b89e62b3bb28447f728f7d32f640c2b5bd1011ef2224c37cbaa517f90e7bb17d0eadd9209af2af22db1986d6ab401a +DIST kwrited-6.0.4.tar.xz 23704 BLAKE2B a05c9cd5eb0063eef462aaaf309f8aedc754404242ecca8836bd4464c470197e29dcd032096dc625358da8c4501a04b11e748c26b03e4cd43055a2303fa1a5b6 SHA512 6a6b178b3bfa9c3bcbb59caac35e78119d78d522494eb3f4af20d1a50288797b292689c7de7ece1c895f526b800e989b54d9a7ea815aa77d22a642f82419a633 diff --git a/kde-plasma/kwrited/kwrited-5.25.2.ebuild b/kde-plasma/kwrited/kwrited-5.25.2.ebuild deleted file mode 100644 index eb0242800003..000000000000 --- a/kde-plasma/kwrited/kwrited-5.25.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma daemon listening for wall and write messages" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kwrited/kwrited-5.24.5.ebuild b/kde-plasma/kwrited/kwrited-5.27.11.ebuild index 7292d7ecfbba..2e1967fda504 100644 --- a/kde-plasma/kwrited/kwrited-5.24.5.ebuild +++ b/kde-plasma/kwrited/kwrited-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma daemon listening for wall and write messages" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kwrited/kwrited-6.0.4.ebuild b/kde-plasma/kwrited/kwrited-6.0.4.ebuild new file mode 100644 index 000000000000..2c44074a0ede --- /dev/null +++ b/kde-plasma/kwrited/kwrited-6.0.4.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma daemon listening for wall and write messages" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpty-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest index 0b05eee488f2..f6ece9fd52f0 100644 --- a/kde-plasma/layer-shell-qt/Manifest +++ b/kde-plasma/layer-shell-qt/Manifest @@ -1,2 +1,2 @@ -DIST layer-shell-qt-5.24.5.tar.xz 17892 BLAKE2B c6874b199bb72fad4923cd7a36f5605483f19e12c71d65bd67a074c23ccee9de398fdf4c314b2eb69a0dc758122489dac759d1d0fbf22203a80f982c1dea9cfd SHA512 e9aeb94d7200543eef03950f6e3ccf3a60faf66bcf048760ea35d27c621bbced712411501f9d48fdaf98a36708a1a202c0531bbc94df0ccf99278ffd106b7abc -DIST layer-shell-qt-5.25.2.tar.xz 18336 BLAKE2B 1749a79e1fcca978a0f7d90e6e1f19bbcdebcbeb9d1be8b84efcc12bdbaac1d958d4d0451ca3e9b34d084507ffccd94ff6935a2f6f374131b409f4e3a82aeec5 SHA512 ec0d5aa2382e8da923204f9e53994b4c1db33dfbede481883bb6e249ad89c4a69d293683f943e47dd51b76026242fe736c817fddb0b80df9ea3c2b83a56959be +DIST layer-shell-qt-5.27.11.tar.xz 18488 BLAKE2B 3c56db129c4d525ee1968e3016f77f5adcf9ed121f6a7b28a6331ca06a1e1ad0df091c4d8afeb64e12176094332da5de33e91e219551c17ce22adc463dbe6b92 SHA512 9a7439a5653fe684967445109624989fbb11f8bc46815afd3eadf44f5753f4442d1d9d59c0721f1f383715f16aae845e3edc8c62409ccabee324dca219fb3429 +DIST layer-shell-qt-6.0.4.tar.xz 20936 BLAKE2B b031a437de17c5926cef7081ddb0071c83e5ce682a9a7cbbd66a1f4e9b7a9d1207e0d44c375dee3f76b2952adedfbddf705d50b80b01083ccaf4a85323027c59 SHA512 0eaa28103023c63d9df2c1d9ebd221c2ac1a0198f45923cfd521a3107eaf9498b9d6c0b3a98e15fa2aec229de92b1aa2760c6a35a813511d2b7befe22a73f51f diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.2.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.11.ebuild index 935db61a1c7f..574e0d00c5b0 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.25.2.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.11.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol" LICENSE="LGPL-3+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.0.4.ebuild index 3b6ca14f2ea1..9a1226aaba93 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.0.4.ebuild @@ -1,36 +1,31 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol" LICENSE="LGPL-3+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" -# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X # slot op: various private QtWaylandClient headers RDEPEND=" >=dev-libs/wayland-1.15 - >=dev-qt/qtdeclarative-${QTMIN}:5 - || ( - >=dev-qt/qtgui-${QTMIN}:5[libinput] - >=dev-qt/qtgui-${QTMIN}:5[X] - ) - >=dev-qt/qtwayland-${QTMIN}:5= + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6= x11-libs/libxkbcommon " DEPEND="${RDEPEND} dev-libs/wayland-protocols " BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 dev-util/wayland-scanner virtual/pkgconfig " diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest index 75105fdb74ff..23db07dfb826 100644 --- a/kde-plasma/libkscreen/Manifest +++ b/kde-plasma/libkscreen/Manifest @@ -1,2 +1,2 @@ -DIST libkscreen-5.24.5.tar.xz 99464 BLAKE2B 544a2a6def8fc58c839247bb080c2650bae73dc6850a5436b5d9ed1666d8d8744af75f213f32008e3c331db90d151f5dd567f6fcc919b61dbe1d3c8d14d2fff5 SHA512 780abc702ee6bd53703dc5671e56dc59e10e62ce33c3714454c3c8b5a7a5cf43d4402906f9b1c7c1c19e9dc36cb323c07eb20603a0fb44c73281844c879c8370 -DIST libkscreen-5.25.2.tar.xz 99968 BLAKE2B ecbd2344c7ac47fc7fbdd82921afa674b4f49c45aa0e3bc71520fb9ccefe8a07318f4a24ab90cdefbd59e7de7afb040d3bf5ca572a42819c61bdffcaa717cdf3 SHA512 ce83139d401cdaecb23f83053e665bc9ab39c661b1849663c6a95de30a463571db45cc3c1ce8fba316c25ed8df22c13ef83d38e6bf92bc2e872aaac161da9988 +DIST libkscreen-5.27.11.tar.xz 116052 BLAKE2B a727284888faa02f86c12ed332daa7fd5bf3fa2611664a5cd37608d61821a59023fb11b19afe26210735d5ffe5ee2e56a3a3b737b66d99aae8177061bb5cba5b SHA512 46cca0d7f91be8a284cbee951183d5559a1f298b987e5f76d5bf4b9a3d292d8ccf363f409582080d04aee692083f3e0a073bae15444f53e0f77565bb7c2255ba +DIST libkscreen-6.0.4.tar.xz 118048 BLAKE2B 13919a7bea9c129dfa1eec49e286fe1beb7c2b01902345c1803415ac410c0bdd37f46f3de1d0eb2967931754d6e1a1023905c8dea43655af4e2351f7596b1aa1 SHA512 c448307cd2fdf01b594232675e45feb3bd8722e3c17fca012af0152a82f0fe6a5a5a30c1b4b5cf94aa821a029d5e6f88c76d9606418306a30b3d2660e494e584 diff --git a/kde-plasma/libkscreen/libkscreen-5.25.2.ebuild b/kde-plasma/libkscreen/libkscreen-5.25.2.ebuild deleted file mode 100644 index 99ab6d1853a3..000000000000 --- a/kde-plasma/libkscreen/libkscreen-5.25.2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="true" -ECM_TEST="forceoptional" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plasma screen management library" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/7" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -# requires running session -RESTRICT="test" - -RDEPEND=" - dev-libs/wayland - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - x11-libs/libxcb -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner -" diff --git a/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild index 102411807edf..03720e8c6c61 100644 --- a/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild +++ b/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="true" ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plasma screen management library" LICENSE="GPL-2" # TODO: CHECK -SLOT="5/7" +SLOT="5/8" KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" @@ -25,15 +24,17 @@ RDEPEND=" dev-libs/wayland >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - x11-libs/libxcb + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + x11-libs/libxcb:= " DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/plasma-wayland-protocols-1.10.0 " BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 >=dev-qt/qtwaylandscanner-${QTMIN}:5 dev-util/wayland-scanner " diff --git a/kde-plasma/libkscreen/libkscreen-6.0.4.ebuild b/kde-plasma/libkscreen/libkscreen-6.0.4.ebuild new file mode 100644 index 000000000000..77117e7ed6eb --- /dev/null +++ b/kde-plasma/libkscreen/libkscreen-6.0.4.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="true" +ECM_TEST="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma screen management library" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6/8" +KEYWORDS="~amd64" +IUSE="" + +# requires running session +RESTRICT="test" + +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +RDEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui] + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + x11-libs/libxcb:= +" +DEPEND="${RDEPEND} + >=dev-libs/plasma-wayland-protocols-1.12.0 +" +BDEPEND=" + >=dev-qt/qttools-${QTMIN}:6[linguist] + >=dev-qt/qtwayland-${QTMIN}:6 + dev-util/wayland-scanner +" diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 83b041697c07..25705b395f05 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,2 +1,2 @@ -DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5 -DIST libksysguard-5.25.2.tar.xz 771300 BLAKE2B a57d186ee436e00b8941ff776c990d9f40012561b001331095e0355a3543efd25f4ae31c5b2d2d2eb268c9507825eddc8c7c4d03dc5c06c91b448ed90ae2d9bd SHA512 2bce6c82393c7d934323bed650a5d95ce00add6509577c404faaa1742ca7ab21d0bfad85c6a035aaf95ba34a21c96372ebac34c9643cce0660032b37fc1b3f4e +DIST libksysguard-5.27.11.tar.xz 890640 BLAKE2B 61a657f8fbc1042e57ec6e4ba85a6900db680547c61a611200dddc15b94af76f5183db6dc2c867138ccfc2af67f185d16eaff130999c525b3c8b7c23e38adc42 SHA512 21ac0f398c969146a9901cb184508cfab8f1d6e75e364ca638f85e87b0a25f9c901f81696c0bd6ee060f35c54204718f891510e7816858c190d78c2b25004544 +DIST libksysguard-6.0.4.tar.xz 293532 BLAKE2B 2a70aa94b283fc8402f2551895cae041bef268a095011d90cec42e6ff733b7ace3473f21e6496a4a0f5d4f7595649e6907e8df04dabff83dc1cf127df6e97142 SHA512 eda6a98679fe607c0593c6cf19da451e3f051f82a18982fe5f70ff79aa25c0c47f1af661fe385b71730d8f46fa4ae91f717865f3123cd8e4ba4efa6c664e2b7c diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch deleted file mode 100644 index bf81b8bf68eb..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-gpu-sensors.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 88722b18c92f3a688a69abef9022cbcdcb5163bb Mon Sep 17 00:00:00 2001 -From: David Redondo <kde@david-redondo.de> -Date: Fri, 29 Apr 2022 13:59:38 +0200 -Subject: [PATCH] Fall back to power average if input is not available - -Some power sensors don't expose a current value most notably amdgpu. -For those fall back to the average reading if available. -BUG:445920 - - -(cherry picked from commit 7758d202eed28169c031e099e408ea258469e408) ---- - systemstats/SensorsFeatureSensor.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/systemstats/SensorsFeatureSensor.cpp b/systemstats/SensorsFeatureSensor.cpp -index 6c8bdb34..3555115f 100644 ---- a/systemstats/SensorsFeatureSensor.cpp -+++ b/systemstats/SensorsFeatureSensor.cpp -@@ -95,6 +95,9 @@ makeSensorsFeatureSensor(const QString &id, const sensors_chip_name *const chipN - break; - case SENSORS_FEATURE_POWER: - valueFeature = sensors_get_subfeature(chipName, feature, SENSORS_SUBFEATURE_POWER_INPUT); -+ if (!valueFeature) { -+ valueFeature = sensors_get_subfeature(chipName, feature, SENSORS_SUBFEATURE_POWER_AVERAGE); -+ } - unit = UnitWatt; - maximum = getValueOfFirstExisting({SENSORS_SUBFEATURE_POWER_CRIT, SENSORS_SUBFEATURE_POWER_MAX}); - break; --- -GitLab - diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch deleted file mode 100644 index 61b981734fa7..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-1.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b94b0e11f9c0f718f109f37dad8a889301f3a59a Mon Sep 17 00:00:00 2001 -From: Arjen Hiemstra <ahiemstra@heimr.nl> -Date: Mon, 9 May 2022 19:05:06 +0200 -Subject: [PATCH] Faces: Write preset faceproperties to the right location - -When loading presets we expect the faceproperties file to be located in -"contents/config/" but when writing we are placing it in "contents/" -which means that custom presets are not loaded properly. - -BUG: 450745 - - -(cherry picked from commit 05866a594198d8c76814d8cd4eb3e83cc9123c8d) ---- - faces/SensorFaceController.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp -index d3daa87d..21fb2954 100644 ---- a/faces/SensorFaceController.cpp -+++ b/faces/SensorFaceController.cpp -@@ -938,8 +938,8 @@ void SensorFaceController::savePreset() - cg.sync(); - - QDir subDir(dir.path()); -- subDir.mkdir(QStringLiteral("contents")); -- KConfig faceConfig(subDir.path() % QStringLiteral("/contents/faceproperties")); -+ subDir.mkpath(QStringLiteral("contents/config")); -+ KConfig faceConfig(subDir.path() % QStringLiteral("/contents/config/faceproperties")); - - KConfigGroup configGroup(&faceConfig, "Config"); - configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(totalSensors()).toJson(QJsonDocument::Compact)); --- -GitLab - diff --git a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch b/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch deleted file mode 100644 index 35bf11ee6431..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.24.5-fix-missing-selfmade-presets-2.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0d06f3fdda71e87d70a4ca8d45af6badb3ab4ee1 Mon Sep 17 00:00:00 2001 -From: Arjen Hiemstra <ahiemstra@heimr.nl> -Date: Mon, 9 May 2022 19:08:10 +0200 -Subject: [PATCH] Faces: Do not write resolved sensors to preset file - -The three sensor properties of FaceController contain the resolved -sensors. This means we are not writing group regular expressions to face -presets but are wiriting only the local sensors that were found for that -group, pretty much bypassing why we have the groups in the first place. -The unresolved sensors are only contained in the sensor configuration, -so read them from there and write that to the preset faceproperties. - - -(cherry picked from commit 1ea0671de11ea51aa2e181deafb70d8da588a2af) ---- - faces/SensorFaceController.cpp | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/faces/SensorFaceController.cpp b/faces/SensorFaceController.cpp -index 21fb2954..632b7dd4 100644 ---- a/faces/SensorFaceController.cpp -+++ b/faces/SensorFaceController.cpp -@@ -942,9 +942,14 @@ void SensorFaceController::savePreset() - KConfig faceConfig(subDir.path() % QStringLiteral("/contents/config/faceproperties")); - - KConfigGroup configGroup(&faceConfig, "Config"); -- configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(totalSensors()).toJson(QJsonDocument::Compact)); -- configGroup.writeEntry(QStringLiteral("highPrioritySensorIds"), QJsonDocument(highPrioritySensorIds()).toJson(QJsonDocument::Compact)); -- configGroup.writeEntry(QStringLiteral("lowPrioritySensorIds"), QJsonDocument(lowPrioritySensorIds()).toJson(QJsonDocument::Compact)); -+ -+ auto sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("totalSensors")); -+ configGroup.writeEntry(QStringLiteral("totalSensors"), QJsonDocument(sensors).toJson(QJsonDocument::Compact)); -+ sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("highPrioritySensorIds")); -+ configGroup.writeEntry(QStringLiteral("highPrioritySensorIds"), QJsonDocument(sensors).toJson(QJsonDocument::Compact)); -+ sensors = d->readAndUpdateSensors(d->sensorsGroup, QStringLiteral("lowPrioritySensorIds")); -+ configGroup.writeEntry(QStringLiteral("lowPrioritySensorIds"), QJsonDocument(sensors).toJson(QJsonDocument::Compact)); -+ configGroup.writeEntry(QStringLiteral("chartFace"), faceId()); - - KConfigGroup colorsGroup(&faceConfig, "SensorColors"); - d->colorsGroup.copyTo(&colorsGroup); --- -GitLab - diff --git a/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild deleted file mode 100644 index 664a0d856123..000000000000 --- a/kde-plasma/libksysguard/libksysguard-5.24.5-r1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Task management and system monitoring library" - -LICENSE="LGPL-2+" -SLOT="5/9" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="webengine X" - -COMMON_DEPEND=" - dev-libs/libnl:3 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - net-libs/libpcap - sys-apps/lm-sensors:= - sys-libs/libcap - sys-libs/zlib - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5 - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXres - ) -" -DEPEND="${COMMON_DEPEND} - >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 - !<kde-plasma/plasma-workspace-5.18.80:5 -" - -PATCHES=( - "${FILESDIR}"/${PN}-5.22.80-no-detailed-mem-message.patch - "${FILESDIR}"/${P}-fix-missing-gpu-sensors.patch # KDE-bug 445920 - "${FILESDIR}"/${P}-fix-missing-selfmade-presets-{1,2}.patch # KDE-bug 450745 -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package webengine Qt5WebChannel) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) - $(cmake_use_find_package X X11) - ) - - ecm_src_configure -} - -src_test() { - LC_NUMERIC="C" ecm_src_test # bug 695514 -} diff --git a/kde-plasma/libksysguard/libksysguard-5.25.2.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild index 86a4ce117496..af3dbfb6339b 100644 --- a/kde-plasma/libksysguard/libksysguard-5.25.2.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild @@ -1,75 +1,76 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="true" -KFMIN=5.94.0 -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Task management and system monitoring library" LICENSE="LGPL-2+" SLOT="5/9" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="webengine X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="webengine" -COMMON_DEPEND=" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" dev-libs/libnl:3 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5[qml] >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=kde-frameworks/solid-${KFMIN}:5 net-libs/libpcap sys-apps/lm-sensors:= - sys-libs/libcap sys-libs/zlib + x11-libs/libX11 + x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-${QTMIN}:5 >=dev-qt/qtwebengine-${QTMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXres - ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 - !<kde-plasma/plasma-workspace-5.18.80:5 + x11-base/xorg-proto " +BDEPEND="sys-libs/libcap" +# downstream patch PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" ) src_configure() { local mycmakeargs=( $(cmake_use_find_package webengine Qt5WebChannel) $(cmake_use_find_package webengine Qt5WebEngineWidgets) - $(cmake_use_find_package X X11) ) ecm_src_configure } src_test() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) LC_NUMERIC="C" ecm_src_test # bug 695514 } diff --git a/kde-plasma/libksysguard/libksysguard-6.0.4.ebuild b/kde-plasma/libksysguard/libksysguard-6.0.4.ebuild new file mode 100644 index 000000000000..360b1e840f19 --- /dev/null +++ b/kde-plasma/libksysguard/libksysguard-6.0.4.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Task management and system monitoring library" + +LICENSE="LGPL-2+" +SLOT="6/9" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + dev-libs/libnl:3 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + net-libs/libpcap + sys-apps/lm-sensors:= + sys-libs/zlib +" +DEPEND="${RDEPEND}" +BDEPEND="sys-libs/libcap" + +src_test() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) + LC_NUMERIC="C" ecm_src_test # bug 695514 +} diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index 667c2569dcaf..156526552da7 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 -DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch index 971dc941d0fc..85eddb74b513 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch @@ -39,7 +39,7 @@ index 015c5181f..0aa635e11 100644 + include(ECMMarkAsTest) + include(GenerateExportHeader) + -+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n WindowSystem) + + find_package(KWinDBusInterface CONFIG REQUIRED) + find_package(KScreenLocker 5.13.80 REQUIRED) @@ -69,7 +69,7 @@ index 015c5181f..0aa635e11 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp @@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") - qt_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS kf5_org.kde.KLauncher.xml klauncher_interface) qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.25.2.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.25.2.ebuild deleted file mode 100644 index 1d79b179c681..000000000000 --- a/kde-plasma/libkworkspace/libkworkspace-5.25.2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Workspace library to interact with the Plasma session manager" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -} diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.11.ebuild index 14acef8df3b4..f22da375b176 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.27.11.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Workspace library to interact with the Plasma session manager" +S="${S}/${PN}" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" @@ -31,21 +32,16 @@ RDEPEND=" x11-libs/libXau " DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 " -S="${S}/${PN}" - src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + eapply "${FILESDIR}/${PN}-5.27.9-standalone.patch" sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die cat >> CMakeLists.txt <<- _EOF_ || die ki18n_install(po) diff --git a/kde-plasma/libplasma/Manifest b/kde-plasma/libplasma/Manifest new file mode 100644 index 000000000000..08a9cd61e4b8 --- /dev/null +++ b/kde-plasma/libplasma/Manifest @@ -0,0 +1,2 @@ +DIST libplasma-6.0.4.tar.xz 2115088 BLAKE2B fa285976d9b814b92f68d1a98ba7d67f0511fdc21484562901691de6062e45998b474d628733a877a0249d8fcff88bfd8c40e77ab215f7f8f6eb3064aea249a0 SHA512 afc4555b57fda20299a3a46560271590af69370eb11831d1246196c0f115215664181694efdf80cb5c0496385a9354bb3d6c4a68814d0235dee4afaaa468bd31 +DIST plasma-framework-5.115.0.tar.xz 3310792 BLAKE2B 495d1a5de3839a50a0511099f5c839ecfb498ec3e71181e11a07f339bd4ae057f8ac51f5d8b28b7c96e81f89218b90b259bb31a45ebf202af033599db957ef32 SHA512 46ff7c6e93c7be3bb6998010b8b613f7c90cb9b3313290d6ebf0b94ed896e676c245aa090f0beb74c4c68576909f7dc7b6f580e386c18a923be90f74bdc1fbb6 diff --git a/kde-plasma/libplasma/libplasma-5.115.0.ebuild b/kde-plasma/libplasma/libplasma-5.115.0.ebuild new file mode 100644 index 000000000000..210454d2de75 --- /dev/null +++ b/kde-plasma/libplasma/libplasma-5.115.0.ebuild @@ -0,0 +1,76 @@ +# 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" +KDE_ORG_TAR_PN="plasma-framework" +KFMIN=$(ver_cut 1-2) +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="Plasma library and runtime components based upon KF5 and Qt5" + +LICENSE="LGPL-2+" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="gles2-only kf6compat man wayland" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5[gles2-only=,X] + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + =kde-frameworks/karchive-${KFMIN}*:5 + =kde-frameworks/kconfig-${KFMIN}*:5[qml] + =kde-frameworks/kconfigwidgets-${KFMIN}*:5 + =kde-frameworks/kcoreaddons-${KFMIN}*:5 + =kde-frameworks/kdeclarative-${KFMIN}*:5 + =kde-frameworks/kglobalaccel-${KFMIN}*:5 + =kde-frameworks/kguiaddons-${KFMIN}*:5 + =kde-frameworks/ki18n-${KFMIN}*:5 + =kde-frameworks/kiconthemes-${KFMIN}*:5 + =kde-frameworks/kio-${KFMIN}*:5 + =kde-frameworks/kirigami-${KFMIN}*:5 + =kde-frameworks/knotifications-${KFMIN}*:5 + =kde-frameworks/kpackage-${KFMIN}*:5 + =kde-frameworks/kservice-${KFMIN}*:5 + =kde-frameworks/kwidgetsaddons-${KFMIN}*:5 + =kde-frameworks/kwindowsystem-${KFMIN}*:5[X] + =kde-frameworks/kxmlgui-${KFMIN}*:5 + =kde-plasma/plasma-activities-${KFMIN}*:5 + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) + wayland? ( + =kde-plasma/kwayland-${KFMIN}*:5 + media-libs/libglvnd + ) +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + kf6compat? ( kde-plasma/libplasma:6 ) +" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KFMIN}:5 )" + +src_configure() { + local mycmakeargs=( + -DBUILD_DESKTOPTHEMES=$(usex !kf6compat) + $(cmake_use_find_package !gles2-only OpenGL) + $(cmake_use_find_package man KF5DocTools) + $(cmake_use_find_package wayland EGL) + $(cmake_use_find_package wayland KF5Wayland) + ) + + ecm_src_configure +} diff --git a/kde-plasma/libplasma/libplasma-6.0.4.ebuild b/kde-plasma/libplasma/libplasma-6.0.4.ebuild new file mode 100644 index 000000000000..1e916937ef5b --- /dev/null +++ b/kde-plasma/libplasma/libplasma-6.0.4.ebuild @@ -0,0 +1,69 @@ +# 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=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma library and runtime components based upon KF6 and Qt6" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="gles2-only wayland" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gles2-only=,gui,widgets,X] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-libs/wayland-1.15.0 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + =kde-plasma/plasma-activities-${PVCUT}*:6 + media-libs/libglvnd + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package !gles2-only OpenGL) + ) + + ecm_src_configure +} diff --git a/kde-plasma/libplasma/metadata.xml b/kde-plasma/libplasma/metadata.xml new file mode 100644 index 000000000000..ab1489f0a20c --- /dev/null +++ b/kde-plasma/libplasma/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/libplasma</remote-id> + </upstream> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Frameworks API. + </subslots> + </slots> +</pkgmetadata> diff --git a/kde-plasma/metadata.xml b/kde-plasma/metadata.xml index 73b0ca8d1a31..2af1b4beacc8 100644 --- a/kde-plasma/metadata.xml +++ b/kde-plasma/metadata.xml @@ -4,4 +4,8 @@ <longdescription lang="en"> The kde-plasma category contains KDE Plasma </longdescription> + <longdescription lang="de"> + Die Kategorie kde-plasma enthält Pakete für die Desktop-Umgebung + KDE Plasma. + </longdescription> </catmetadata> diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest index 21e6c0f24970..bb00b7b31983 100644 --- a/kde-plasma/milou/Manifest +++ b/kde-plasma/milou/Manifest @@ -1,2 +1,2 @@ -DIST milou-5.24.5.tar.xz 48264 BLAKE2B 00ee42f530a73038198f0abbd04e54c54bb60fc449129a634dfdaefc56331ad0a55cfa7ccd4ae0fc60643b4ec5f8d89bc27382b27a23f36172fcc1956376b026 SHA512 b6a2979b6ab4717d53e0f58605ba43a08f78836a287c0988aeb9461f6d4cb42f71d1081ec1261dcb957ee97b67f8eba42f3c6861e96d6a2e796142edac74ea7c -DIST milou-5.25.2.tar.xz 48572 BLAKE2B 55d31e4197b9826ff5d1ac670292b72d519c6564510ddca8bb225d6389fff230deed813e8a9acf2befcab132e2237ecd50da954a6ce76e0b749e76bf3a4fe207 SHA512 a9f3a20d6dae3f81f31bc00ad0ae86cf94e8ce28bfcab63ecc50c3bede4b91544d0120c6c83bbd91ddc38770ffc1748b3be73973146e53b6d99c45f04161f14b +DIST milou-5.27.11.tar.xz 58672 BLAKE2B 8b9cee6958c1437a239fc737d67a4677aab1c9a7d0d00873824512191a5be0d13550eae7db0c02d784328c22d7709c11b8beaecfe73649c51fc59b51fe49b91f SHA512 62fb06f50130a5836d50824ac1d9828463eb525787baa94489726e1fbfec270e1cf8b7f18a45430bdcbf3629eed0560a5d890cacd8d1d824dcc1362d53e50d9f +DIST milou-6.0.4.tar.xz 49872 BLAKE2B 02125d12f483f7db3ee368f75f96c5dc16847d382134b574e49a8d5f41828ada1b985552cef9e8230c6eae916a169fa30ca7052ffacbc59220900173d7567903 SHA512 8a95186eb0933236f03e846d8cc2ab886882e44a13de98de4aefdd915955f5f3f7d4fb0c358449869324dd7deca772c78172c90a2203828e30e9c39fb70d8c71 diff --git a/kde-plasma/milou/metadata.xml b/kde-plasma/milou/metadata.xml index d925f2439758..bd104055766b 100644 --- a/kde-plasma/milou/metadata.xml +++ b/kde-plasma/milou/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/milou</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/milou/milou-5.25.2.ebuild b/kde-plasma/milou/milou-5.25.2.ebuild deleted file mode 100644 index 92c9742fe8ae..000000000000 --- a/kde-plasma/milou/milou-5.25.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Dedicated search application built on top of Baloo" -HOMEPAGE="https://invent.kde.org/plasma/milou" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/milou/milou-5.24.5.ebuild b/kde-plasma/milou/milou-5.27.11.ebuild index f74c41e92e5c..a598d1429da6 100644 --- a/kde-plasma/milou/milou-5.24.5.ebuild +++ b/kde-plasma/milou/milou-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Dedicated search application built on top of Baloo" HOMEPAGE="https://invent.kde.org/plasma/milou" LICENSE="GPL-2 LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -28,6 +28,6 @@ DEPEND=" >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/milou/milou-6.0.4.ebuild b/kde-plasma/milou/milou-6.0.4.ebuild new file mode 100644 index 000000000000..dfeb9a2fb38e --- /dev/null +++ b/kde-plasma/milou/milou-6.0.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Dedicated search application built on top of Baloo" +HOMEPAGE="https://invent.kde.org/plasma/milou" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/ocean-sound-theme/Manifest b/kde-plasma/ocean-sound-theme/Manifest new file mode 100644 index 000000000000..18fe5f4e34de --- /dev/null +++ b/kde-plasma/ocean-sound-theme/Manifest @@ -0,0 +1 @@ +DIST ocean-sound-theme-6.0.4.tar.xz 1209596 BLAKE2B 41273904165ba1a3410b44801ff41349e8eef1851c952a1200d3d929a5d9ffdb7c260cf55c2deb07de76c649c4c63a500468deb7dde9f5f0a262ca61114ead33 SHA512 c3683b71ca672aa20c4a20b23689ef2f868fae15758fac9116cb6ae40afa56cd5db540c8a1e5b7745446ae6d8c76a45e522e21882d0a5bcfd6aaa9804a1814f3 diff --git a/kde-plasma/ocean-sound-theme/metadata.xml b/kde-plasma/ocean-sound-theme/metadata.xml new file mode 100644 index 000000000000..e9eabb047204 --- /dev/null +++ b/kde-plasma/ocean-sound-theme/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/ocean-sound-theme</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.0.4.ebuild b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.0.4.ebuild new file mode 100644 index 000000000000..a2a91e818a06 --- /dev/null +++ b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.0.4.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Ocean Sound Theme for Plasma" +HOMEPAGE="https://invent.kde.org/plasma/ocean-sound-theme" + +LICENSE="CC-BY-SA-4.0" +SLOT="6" +KEYWORDS="~amd64" diff --git a/kde-plasma/oxygen-sounds/Manifest b/kde-plasma/oxygen-sounds/Manifest index cba8db0f45d1..eca0f1b67a9d 100644 --- a/kde-plasma/oxygen-sounds/Manifest +++ b/kde-plasma/oxygen-sounds/Manifest @@ -1 +1,2 @@ -DIST oxygen-sounds-5.25.2.tar.xz 1896484 BLAKE2B 5a15aef31f3c6474ed119b8c1835a52bb1b410bf08b97fb039ec8df3ef07cc561286b53e172e923fea1340458c84997a3864d810d2245bfcbe0e5f33d1626ef5 SHA512 77df558ce50865ae8da824f1a9b43de1addfc0b9e62756cfb2324930c13bdc5cc3b97df1ee03671310259ca7e77126bf48cbae46876c068a7bd72abf85d78f68 +DIST oxygen-sounds-5.27.11.tar.xz 1896616 BLAKE2B 2ffa50064fd35338c9bb36f1aa9395f3aff54f2b39307a80991c153544c60f15c1c4c56b64510efd4c442d26e40b84ead3a2fc9b873f6fbc2b01f8f22115fdc7 SHA512 e3287ee9ce4ae5b5fbfaa4debb563db11c395e14e3a037d65b22e136a4b188eda274e21c3e1349a3b921ea701581993bd9c11012befdc3fdd8094b4ed18a6ea3 +DIST oxygen-sounds-6.0.4.tar.xz 1936200 BLAKE2B b3265993f9327f880e5e451b06e50bb43bb60a6c840ac3ec85b8a0a1f0f8c65d7042d1146e2b6a98e63049a7c29f6e566431a8fe2029ea0fa82e762654046f23 SHA512 3181e648f062e166b40e85a6611336eccc7a83c2b81ead0eb7010285c3b5219d9066267035d605cc39e89e0641f91e100dd2cd304e835a23a98c94b19fe06b9c diff --git a/kde-plasma/oxygen-sounds/metadata.xml b/kde-plasma/oxygen-sounds/metadata.xml index d925f2439758..0a584161d508 100644 --- a/kde-plasma/oxygen-sounds/metadata.xml +++ b/kde-plasma/oxygen-sounds/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/oxygen-sounds</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.2.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.11.ebuild index 82e1ed8f26aa..9d1a3e5e2f37 100644 --- a/kde-plasma/oxygen-sounds/oxygen-sounds-5.25.2.ebuild +++ b/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.11.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Oxygen sound theme for the Plasma desktop" HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" RDEPEND="!<kde-plasma/oxygen-5.24.80" diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-6.0.4.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-6.0.4.ebuild new file mode 100644 index 000000000000..09a626bef723 --- /dev/null +++ b/kde-plasma/oxygen-sounds/oxygen-sounds-6.0.4.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Oxygen sound theme for the Plasma desktop" +HOMEPAGE="https://invent.kde.org/plasma/oxygen-sounds" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" + +RDEPEND="!<kde-plasma/oxygen-5.24.80" diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest index d36d90d5a058..d9584dd70d57 100644 --- a/kde-plasma/oxygen/Manifest +++ b/kde-plasma/oxygen/Manifest @@ -1,2 +1,2 @@ -DIST oxygen-5.24.5.tar.xz 4615504 BLAKE2B d937770d2919f2318cfce3fc0b90f9c8009aa1c80ce9f491d3c9863c383fd3d8b0ff61582a454d7bb7cc066183ac514c4058d48b523aec68b635ffd1b3e93606 SHA512 90df776e36014b07849c9454632bb73a3b75d5d146eeec8d9de88b63d0bdbd68fabd9f1eaac0166f47057a61c48f7b531630f48d6b037d1a266e18e36febbaa2 -DIST oxygen-5.25.2.tar.xz 2723684 BLAKE2B 20a3de08356565dd57f567cc04f4678833bc8910a8a1d7dcc69336727c748e82d541b88d722e2dd02fa817e103bb56c6d3343014e0b48e3cd77a093a7e822a32 SHA512 a7dbd73034fe39260315debddfdbbc3e99a4519907372945f129604d4e8ae9d6643f10e53b1cd4af635609dfe774fdf809be492742b57864d636a6a08ea315db +DIST oxygen-5.27.11.tar.xz 2783000 BLAKE2B 06bbf12c5e45f4fee4e5b7f572b7f6b57debc084bbd533afd7f839e1bd9bba119cf040b1a028a743d88fa7f50d9ea44f84e6eaca731c4d1d7c419d39210260c5 SHA512 8448d3f3d885175f0967bf8a3e1c2924846484c7e3794073f2b82ce9288468a2767f7361d1520a9c24a2a457f9f96deb752b73fc773d87c86609b4e148465c5e +DIST oxygen-6.0.4.tar.xz 2794488 BLAKE2B c34f344ce1b113e6e2b12ed7c57ff6128657947ae0c400d80ba1b04743e25065c7ee94d35bd8a212130a680df2f739fe64655f3cb7fb786e661f241a2799ca76 SHA512 9cfc66e10c155aac24afaa02633768a5ed9b61aae79bcb40010d138e19b83b15d56fd330e21c7ff424da526ee7f5a5f0d2671491205da5de4f9c562fe33d06f9 diff --git a/kde-plasma/oxygen/metadata.xml b/kde-plasma/oxygen/metadata.xml index d925f2439758..d6ee381fc974 100644 --- a/kde-plasma/oxygen/metadata.xml +++ b/kde-plasma/oxygen/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/oxygen</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/oxygen/oxygen-5.25.2.ebuild b/kde-plasma/oxygen/oxygen-5.25.2.ebuild deleted file mode 100644 index ae186f8c427a..000000000000 --- a/kde-plasma/oxygen/oxygen-5.25.2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Oxygen visual style for the Plasma desktop" -HOMEPAGE="https://invent.kde.org/plasma/oxygen" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="wayland" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - x11-libs/libxcb - wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/kservice-${KFMIN}:5 -" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package wayland KF5Wayland) - ) - ecm_src_configure -} diff --git a/kde-plasma/oxygen/oxygen-5.24.5.ebuild b/kde-plasma/oxygen/oxygen-5.27.11.ebuild index 1f0f9efb675b..bea400c0bd6e 100644 --- a/kde-plasma/oxygen/oxygen-5.24.5.ebuild +++ b/kde-plasma/oxygen/oxygen-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Oxygen visual style for the Plasma desktop" HOMEPAGE="https://invent.kde.org/plasma/oxygen" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="wayland" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -34,18 +34,8 @@ RDEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 x11-libs/libxcb - wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) " DEPEND="${RDEPEND} >=kde-frameworks/kservice-${KFMIN}:5 " -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package wayland KF5Wayland) - ) - ecm_src_configure -} +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" diff --git a/kde-plasma/oxygen/oxygen-6.0.4.ebuild b/kde-plasma/oxygen/oxygen-6.0.4.ebuild new file mode 100644 index 000000000000..0b7dc7063608 --- /dev/null +++ b/kde-plasma/oxygen/oxygen-6.0.4.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KF5MIN=5.115.0 +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QT5MIN=5.15.12 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Oxygen visual style for the Plasma desktop" +HOMEPAGE="https://invent.kde.org/plasma/oxygen" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="qt5 X" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/frameworkintegration-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + qt5? ( + >=dev-qt/qtdbus-${QT5MIN}:5 + >=dev-qt/qtdeclarative-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=kde-frameworks/frameworkintegration-${KF5MIN}:5 + >=kde-frameworks/kcompletion-${KF5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kconfigwidgets-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kguiaddons-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5 + >=kde-frameworks/kwindowsystem-${KF5MIN}:5 + X? ( >=dev-qt/qtx11extras-${QT5MIN}:5 ) + ) + X? ( + >=dev-qt/qtbase-${QTMIN}:6=[gui] + x11-libs/libxcb + ) +" +DEPEND="${RDEPEND} + >=kde-frameworks/kservice-${KFMIN}:6 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=$(usex qt5) + $(cmake_use_find_package X XCB) + ) + ecm_src_configure +} diff --git a/kde-plasma/plasma-activities-stats/Manifest b/kde-plasma/plasma-activities-stats/Manifest new file mode 100644 index 000000000000..ca6e8bb11bab --- /dev/null +++ b/kde-plasma/plasma-activities-stats/Manifest @@ -0,0 +1,2 @@ +DIST kactivities-stats-5.115.0.tar.xz 84596 BLAKE2B 3be9008bde4bd020cb02ce12e659adab977be31af0a83000086a938fb91a9736dc414ec051b7bfd62e6feb381a2e3d64c679e97cf2acc6c39924f73b23533f51 SHA512 873d9497cb55583659cbf7dfd108991acc473e71803f06128ce33f396b64d86ec60b8e71613da6d7b40d13e4597582370e8ea1e626b33e7d251d982c92825520 +DIST plasma-activities-stats-6.0.4.tar.xz 83192 BLAKE2B ee6f19b7d8e69e769cfa1799b0f40429afefef2c58c9ddab81038c0885f706b69e330c807b0f294f6ee05c7614e2fd8feae325e6b050678f13538e342caa7b1a SHA512 676deda84eab9cde73b4498694913deafb60be041106e945c61431552e3e61e9b71e3dd07fc40282e67d2a2cbfa4318704fbc702f7bc123ea24137bcbf351a0c diff --git a/kde-plasma/plasma-activities-stats/metadata.xml b/kde-plasma/plasma-activities-stats/metadata.xml new file mode 100644 index 000000000000..3351d37e0915 --- /dev/null +++ b/kde-plasma/plasma-activities-stats/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-activities-stats</remote-id> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Frameworks API. + </subslots> + </slots> +</pkgmetadata> diff --git a/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.115.0.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.115.0.ebuild new file mode 100644 index 000000000000..5b91aa1d0901 --- /dev/null +++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.115.0.ebuild @@ -0,0 +1,28 @@ +# 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" +KDE_ORG_TAR_PN="kactivities-stats" +KFMIN=$(ver_cut 1-2) +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="Library for accessing usage data collected by the activities system" + +LICENSE="LGPL-2+" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + =kde-frameworks/kconfig-${KFMIN}*:5 + =kde-plasma/plasma-activities-${KFMIN}*:5 +" +DEPEND="${RDEPEND} + test? ( dev-libs/boost ) +" diff --git a/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.0.4.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.0.4.ebuild new file mode 100644 index 000000000000..72c0dacced5a --- /dev/null +++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.0.4.ebuild @@ -0,0 +1,27 @@ +# 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=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Library for accessing usage data collected by the activities system" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,sql] + >=kde-frameworks/kconfig-${KFMIN}:6 + kde-plasma/plasma-activities:6 +" +DEPEND="${RDEPEND} + test? ( dev-libs/boost ) +" diff --git a/kde-plasma/plasma-activities/Manifest b/kde-plasma/plasma-activities/Manifest new file mode 100644 index 000000000000..e799e155b353 --- /dev/null +++ b/kde-plasma/plasma-activities/Manifest @@ -0,0 +1,2 @@ +DIST kactivities-5.115.0.tar.xz 73552 BLAKE2B b3d50bbef065937345e550367235073800ea0ef7d6dd46452d93574b83ce8d783d5e35550425c372972950243ab57e0f041dfa876ad953eaae7a50de60d8cbf6 SHA512 8addffc50b40a4b8a13f26d625b6cf76cfa1758c2aa78b9eb1578f4b9447044e21b643f4140f0dcda0bab7f4b0598a1cce6246c0c0c31ae9a49d33cb31382a3b +DIST plasma-activities-6.0.4.tar.xz 71016 BLAKE2B 666361458ac2bc7eb127f97cc05f19407a0e7ecfed8874bf0b9ba1128354755916b5b16228d351f8c317326ad2b055f9ca025dc8ff69b9a94013c9eb1d8f48bc SHA512 e9f6cc4fdd0b64860218091a8112cedd8d0c22e767bcb4939100ea2f64e5aefc05150e822204090be333d2d9bba70b7bcc56d217b00fde000647f7ffb53078ad diff --git a/kde-plasma/plasma-activities/metadata.xml b/kde-plasma/plasma-activities/metadata.xml new file mode 100644 index 000000000000..bb67a13ea2fd --- /dev/null +++ b/kde-plasma/plasma-activities/metadata.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-activities</remote-id> + </upstream> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Frameworks API. + </subslots> + </slots> +</pkgmetadata> diff --git a/kde-plasma/plasma-activities/plasma-activities-5.115.0.ebuild b/kde-plasma/plasma-activities/plasma-activities-5.115.0.ebuild new file mode 100644 index 000000000000..1c26fb347d4b --- /dev/null +++ b/kde-plasma/plasma-activities/plasma-activities-5.115.0.ebuild @@ -0,0 +1,31 @@ +# 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" +KDE_ORG_TAR_PN="kactivities" +KFMIN=$(ver_cut 1-2) +QTMIN=5.15.9 +inherit ecm frameworks.kde.org + +DESCRIPTION="Core components for KDE's Activities System" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtsql-${QTMIN}:5 + =kde-frameworks/kconfig-${KFMIN}*:5 + =kde-frameworks/kcoreaddons-${KFMIN}*:5 +" +DEPEND="${RDEPEND} + dev-libs/boost + test? ( =kde-frameworks/kwindowsystem-${KFMIN}*:5[X] ) +" diff --git a/kde-plasma/plasma-activities/plasma-activities-6.0.4.ebuild b/kde-plasma/plasma-activities/plasma-activities-6.0.4.ebuild new file mode 100644 index 000000000000..b4f0416592b6 --- /dev/null +++ b/kde-plasma/plasma-activities/plasma-activities-6.0.4.ebuild @@ -0,0 +1,29 @@ +# 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=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Core components for KDE's Activities System" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 +" +DEPEND="${RDEPEND} + dev-libs/boost + test? ( >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] ) +" diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest index dff7642e695d..830a75e55022 100644 --- a/kde-plasma/plasma-browser-integration/Manifest +++ b/kde-plasma/plasma-browser-integration/Manifest @@ -1,2 +1,2 @@ -DIST plasma-browser-integration-5.24.5.tar.xz 222452 BLAKE2B 6caca77f50f401a230e5936b36b7babdf6186d6a11a7fb1bda2a0423a7bea5b3f7a66d12e7d569b406e93636b980bb9308c20452a8a9b62197b4170988361aab SHA512 f34885920f1d4859d57ce3c96523c46d392f5835bce6b7d73afb30ea60827e5d520c168ccf45d2d46cec8027b0d9abe2bfc0c5b4ecfbf3b4433bb3ed0b405497 -DIST plasma-browser-integration-5.25.2.tar.xz 223220 BLAKE2B 190e34896cc726e613b768652a291626d27d24421b084b8f20706edd28a759fcb2f84f22ba97d153452902a2c544bd5fae1abaf94453e6741a7b81c32edc8b5f SHA512 06804d4c5e4cc1266c2318767c185c6fb014e8942938b7191f65e7f8d36415ffaabe08616435ff0a6496ccc28c7250438941a21ed8655741f1548ce1765f8ff0 +DIST plasma-browser-integration-5.27.11.tar.xz 212584 BLAKE2B 0ee27e9da1efa965b9babd18731e3a31d6fe30a23f786154f6a0de773f31c9e85b9d7ba7cda72ba53e031f3a626be79a1a579ab19e5fb3cd3479158abe575ea0 SHA512 5d887ab92221a9ae83ac1a927195e659b6508155c7e2062884f1b8ae8dddbdceea4a4a66ce1704179343ceef493240dd7ad68c461b3aa5f257c43f6062c0e7b0 +DIST plasma-browser-integration-6.0.4.tar.xz 219432 BLAKE2B 13eaf071b133796900c276f01231e014456b282842d12b14ac829e85afa79be2724d6ffd6b1caae379d70ff6f6df96aa37b483e61d55ed53a1234abf5c41f992 SHA512 2df6308b73f7195ce948c57cc86651d2e3fae6d8b414d1afd75feba04a117a7c3887a958bd019eb819a417811ed4f1f73cc62f12010c19db5c87c1b6f4f104b6 diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.2.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.2.ebuild deleted file mode 100644 index 0262f123a5d7..000000000000 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.25.2.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" -HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration" - -LICENSE="GPL-3+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" - ) - - ecm_src_configure -} diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.11.ebuild index 15e44d6aa3de..2a7c4161f1e7 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.11.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration" LICENSE="GPL-3+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -DEPEND=" +RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 @@ -30,11 +29,14 @@ DEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/purpose-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 >=kde-plasma/plasma-workspace-${PVCUT}:5 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + >=kde-frameworks/krunner-${KFMIN}:5 +" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.0.4.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.0.4.ebuild new file mode 100644 index 000000000000..4ba4cb854551 --- /dev/null +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.0.4.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" +HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration" + +LICENSE="GPL-3+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kfilemetadata-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-workspace-${PVCUT}:6 +" +DEPEND="${RDEPEND} + >=kde-frameworks/krunner-${KFMIN}:6 +" + +src_configure() { + local mycmakeargs=( + -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" + ) + + ecm_src_configure +} diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 223066121296..49ad27a8bdad 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,3 +1,3 @@ -DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270 -DIST plasma-desktop-5.25.2.tar.xz 6279760 BLAKE2B bc17e6dd7f472b1d07802015e20c4a727042179f45be29b2eff9da22e9b81a821d12a3398ef3f5b1dc9228f767112501911b72e6ef65d3a3d4d750949ce44172 SHA512 3459dec46338453f4fc4271753c44a91cf1924eb0eab26d64ebab5bd3070ed1ce5c18154dfae4b20f496ffa492cb3e329958c1f628f1871bac89cc30d049fde4 -DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20 +DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9 +DIST plasma-desktop-6.0.4.tar.xz 15635644 BLAKE2B e3f468a603290c5ceb8cd530b66b32438b8625a65d933e333ede107da69dc1f8d2bd117905a839f6abc7098a6fb19eb1d0cbf8439a375cee43b9f23675a1b253 SHA512 6e682e2ff91bda05331f581a36afbf1ea571c8855a27280d871e0ae1cd570373f5bb781d078c010d8cf74da0f062deabd9186b161a08a3178304ea6c50816860 +DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch new file mode 100644 index 000000000000..de53c25d0114 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-5.90.0-override-include-dirs.patch @@ -0,0 +1,117 @@ +From 45f2c2ce1fc9d4b2f0d6418a95f04a71337239d4 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 6 Apr 2020 00:41:07 +0200 +Subject: [PATCH] Replace input drivers pkg_check_modules calls with manual + targets + +All they need is one header each, allow include dir overrides. + +Evdev - evdev-properties.h +XorgLibinput - libinput-properties.h +XorgServer - xserver-properties.h +--- + CMakeLists.txt | 8 +------- + config-gentoo.cmake | 22 ++++++++++++++++++++++ + kcms/mouse/CMakeLists.txt | 6 ------ + kcms/touchpad/CMakeLists.txt | 3 --- + kcms/touchpad/backends/x11.cmake | 2 +- + 5 files changed, 24 insertions(+), 17 deletions(-) + create mode 100644 config-gentoo.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b8868a130..ea950b050 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -224,16 +224,10 @@ set_package_properties(XCB PROPERTIES TYPE REQUIRED) + add_feature_info("XCB-XKB" XCB_XKB_FOUND "Required for building kcm/keyboard") + add_feature_info("libxft" X11_Xft_FOUND "X FreeType interface library required for font installation") + +-pkg_check_modules(XORGLIBINPUT xorg-libinput IMPORTED_TARGET) +-pkg_check_modules(EVDEV xorg-evdev>=2.8.99.1 IMPORTED_TARGET) +-pkg_check_modules(XORGSERVER xorg-server IMPORTED_TARGET) ++include(config-gentoo.cmake) + + ecm_find_qmlmodule(org.kde.pipewire 0.1) + +-if(XORGLIBINPUT_FOUND) +- set(HAVE_XORGLIBINPUT 1) +-endif() +- + include(ConfigureChecks.cmake) + + find_package(PackageKitQt6) +diff --git a/config-gentoo.cmake b/config-gentoo.cmake +new file mode 100644 +index 000000000..0d7353c27 +--- /dev/null ++++ b/config-gentoo.cmake +@@ -0,0 +1,22 @@ ++if(BUILD_KCM_MOUSE_X11) ++ add_library(PkgConfig::XORGLIBINPUT INTERFACE IMPORTED) ++ set_property(TARGET PkgConfig::XORGLIBINPUT PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES "${XORGLIBINPUT_INCLUDE_DIRS}" ++ ) ++ ++ add_library(PkgConfig::EVDEV INTERFACE IMPORTED) ++ set_property(TARGET PkgConfig::EVDEV PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES "${EVDEV_INCLUDE_DIRS}" ++ ) ++endif() ++ ++if(BUILD_KCM_TOUCHPAD_X11) ++ add_library(PkgConfig::XORGSERVER INTERFACE IMPORTED) ++ set_property(TARGET PkgConfig::XORGSERVER PROPERTY ++ INTERFACE_INCLUDE_DIRECTORIES "${XORGSERVER_INCLUDE_DIRS}" ++ ) ++endif() ++ ++if(BUILD_KCM_MOUSE_X11 OR BUILD_KCM_TOUCHPAD_X11) ++ set(HAVE_XORGLIBINPUT 1) ++endif() +diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt +index 639981380..2c9009061 100644 +--- a/kcms/mouse/CMakeLists.txt ++++ b/kcms/mouse/CMakeLists.txt +@@ -32,12 +32,6 @@ if (BUILD_KCM_MOUSE_KWIN_WAYLAND) + endif() + + if (BUILD_KCM_MOUSE_X11) +- if (NOT EVDEV_FOUND) +- list(APPEND MISSING_DEPS "xorg-evdev") +- endif() +- if (NOT XORGLIBINPUT_FOUND) +- list(APPEND MISSING_DEPS "xorg-libinput") +- endif() + if (NOT X11_Xi_FOUND) + list(APPEND MISSING_DEPS "X11_Xi") + endif() +diff --git a/kcms/touchpad/CMakeLists.txt b/kcms/touchpad/CMakeLists.txt +index 309cb247d..33b4f8428 100644 +--- a/kcms/touchpad/CMakeLists.txt ++++ b/kcms/touchpad/CMakeLists.txt +@@ -17,9 +17,6 @@ if (BUILD_KCM_TOUCHPAD_X11) + if (NOT X11_Xi_FOUND) + list(APPEND MISSING_DEPS "X11_Xi") + endif() +- if (NOT XORGSERVER_FOUND) +- list(APPEND MISSING_DEPS "xorg-server") +- endif() + if (MISSING_DEPS) + message(FATAL_ERROR "Missing X11 dependencies for kcm_touchpad: ${MISSING_DEPS}. Install dependencies or set CMake option -DBUILD_KCM_TOUCHPAD_X11=OFF.") + endif() +diff --git a/kcms/touchpad/backends/x11.cmake b/kcms/touchpad/backends/x11.cmake +index 88bf0c676..33be94c49 100644 +--- a/kcms/touchpad/backends/x11.cmake ++++ b/kcms/touchpad/backends/x11.cmake +@@ -10,7 +10,7 @@ SET(backend_SRCS + backends/x11/xrecordkeyboardmonitor.cpp + ) + +-if (XORGLIBINPUT_FOUND) ++if (HAVE_XORGLIBINPUT) + + SET(backend_SRCS + ${backend_SRCS} +-- +2.43.0 + diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index 3ea9270f30ec..3e49f87352a5 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -9,7 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag> <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> <flag name="kaccounts">Build the OpenDesktop integration plugin</flag> <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild deleted file mode 100644 index ae1f627cb572..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-1" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry" - -COMMON_DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb[xkb] - x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - kaccounts? ( - kde-apps/kaccounts-integration:5 - net-libs/accounts-qt - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/user-manager - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/oxygen-${PVCUT}:5 - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch -) - -src_prepare() { - ecm_src_prepare - - if ! use ibus; then - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die - fi - - use emoji || cmake_run_in applets/kimpanel/backend/ibus \ - cmake_comment_add_subdirectory emojier - - # TODO: try to get a build switch upstreamed - if ! use scim; then - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - $(cmake_use_find_package kaccounts AccountsQt5) - $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) - fi - - ecm_src_configure -} - -src_test() { - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 - # test_kio_fonts needs D-Bus, bug #634166 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918 - local myctestargs=( - -j1 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" - ) - - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "screen reader support" app-accessibility/orca - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild index 1dffe8ec99b9..f64ee0ee6e80 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.25.2.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-1" +XORGHDRS="${PN}-override-include-dirs-3" SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="ibus kaccounts scim screencast +semantic-desktop" +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras COMMON_DEPEND=" + dev-libs/wayland >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -29,12 +30,11 @@ COMMON_DEPEND=" >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 @@ -60,30 +60,30 @@ COMMON_DEPEND=" >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 + >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?] + >=media-libs/phonon-4.11.0[qt5(+)] x11-libs/libX11 + x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi - x11-libs/libxcb[xkb] + x11-libs/libxcb + x11-libs/libxkbcommon x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) ibus? ( app-i18n/ibus dev-libs/glib:2 @@ -93,33 +93,41 @@ COMMON_DEPEND=" ) kaccounts? ( kde-apps/kaccounts-integration:5 - net-libs/accounts-qt + net-libs/accounts-qt[qt5(+)] ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) " DEPEND="${COMMON_DEPEND} + >=dev-libs/wayland-protocols-1.25 dev-libs/boost x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} - !kde-plasma/user-manager + !<kde-plasma/kdeplasma-addons-5.25.50 >=dev-qt/qtgraphicaleffects-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwaylandscanner-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* >=kde-plasma/oxygen-${PVCUT}:5 + media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) + kaccounts? ( net-libs/signon-oauth2[qt5(+)] ) + screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 ) +" +BDEPEND=" + dev-util/intltool + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" PATCHES=( - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch + "${WORKDIR}/${XORGHDRS}/${PN}-5.27.9-override-include-dirs.patch" # downstream patch ) src_prepare() { @@ -130,9 +138,6 @@ src_prepare() { -i applets/kimpanel/backend/ibus/CMakeLists.txt || die fi - use emoji || cmake_run_in applets/kimpanel/backend/ibus \ - cmake_comment_add_subdirectory emojier - # TODO: try to get a build switch upstreamed if ! use scim; then sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die @@ -146,14 +151,11 @@ src_configure() { -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + $(cmake_use_find_package ibus GLIB2) $(cmake_use_find_package kaccounts AccountsQt5) $(cmake_use_find_package kaccounts KAccounts) $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) - fi ecm_src_configure } diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild new file mode 100644 index 000000000000..c1de5247a60d --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.4.ebuild @@ -0,0 +1,186 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="true" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="KDE Plasma desktop" +XORGHDRS="${PN}-override-include-dirs-3" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="ibus kaccounts scim screencast sdl +semantic-desktop X" + +RESTRICT="test" # missing selenium-webdriver-at-spi + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +COMMON_DEPEND=" + dev-libs/icu:= + dev-libs/wayland + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/attica-${KFMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kded-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-plasma/kwin-${PVCUT}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-stats-${PVCUT}:6 + >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?] + >=kde-plasma/plasma5support-${PVCUT}:6 + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libXi + X? ( + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libxkbcommon + x11-libs/libxkbfile + ) + ibus? ( + app-i18n/ibus + dev-libs/glib:2 + x11-libs/xcb-util-keysyms + ) + kaccounts? ( + kde-apps/kaccounts-integration:6 + >=net-libs/accounts-qt-1.16_p20220803[qt6] + ) + scim? ( app-i18n/scim ) + sdl? ( media-libs/libsdl2[joystick] ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/wayland-protocols-1.25 + dev-libs/boost + x11-base/xorg-proto + test? ( + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + ) +" +RDEPEND="${COMMON_DEPEND} + !<kde-plasma/kdeplasma-addons-5.25.50 + dev-libs/kirigami-addons:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + >=kde-plasma/oxygen-${PVCUT}:6 + media-fonts/noto-emoji + sys-apps/util-linux + x11-apps/setxkbmap + x11-misc/xdg-user-dirs + kaccounts? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6] ) + screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) +" +BDEPEND=" + dev-util/intltool + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}/${PN}-5.90.0-override-include-dirs.patch" # downstream patch +) + +src_prepare() { + ecm_src_prepare + + if ! use ibus; then + sed -e "s/XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ + -i applets/kimpanel/backend/ibus/CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use scim; then + sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt6=ON # not packaged + $(cmake_use_find_package ibus GLIB2) + $(cmake_use_find_package kaccounts AccountsQt6) + $(cmake_use_find_package kaccounts KAccounts6) + $(cmake_use_find_package sdl SDL2) + $(cmake_use_find_package semantic-desktop KF6Baloo) + -DBUILD_KCM_MOUSE_X11=$(usex X) + -DBUILD_KCM_TOUCHPAD_X11=$(usex X) + ) + + if use X; then + mycmakeargs+=( + -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + ) + fi + + ecm_src_configure +} + +src_test() { + # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 + # test_kio_fonts needs D-Bus, bug #634166 + # lookandfeel-kcmTest is unreliable for a long time, bug #607918 + local myctestargs=( + -j1 + -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" + ) + + ecm_src_test +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "screen reader support" "app-accessibility/orca" + fi + ecm_pkg_postinst +} diff --git a/kde-plasma/plasma-disks/Manifest b/kde-plasma/plasma-disks/Manifest index fd4985e7cc0f..22a8f5cdefce 100644 --- a/kde-plasma/plasma-disks/Manifest +++ b/kde-plasma/plasma-disks/Manifest @@ -1,2 +1,2 @@ -DIST plasma-disks-5.24.5.tar.xz 88304 BLAKE2B 649bb10a09333cc49f34731188a66cea6017702e5d5d5f7dc1aa100c6cf7b274153a5570ce20aa3c05737a9f5c8041dd73e0707b91b1198ff3d4e456081497b9 SHA512 fc13922a8961a0581eb5c67f23a00c7898e0700604785573c677ceae3391d784fd44944acbfae501a620ce9e86c21694a03b4613a60284488c1cf5450c5de6fe -DIST plasma-disks-5.25.2.tar.xz 90728 BLAKE2B 14118f0025b8891a2125224743f0312f6a906aecec2e2f85113f59096f498af1b85c62f98e4150f43eb2d6705c6b9324ffa9221e77f2e18d3f2397e7e99ba729 SHA512 6ef14ba066b35cf600aa4aaf4519af5309ffb9402f497a73333c953e17d3ad3e32fb9858a60a18bd955305208e0fd3d03bd66e6ac619789dc42edb3ff10ab09d +DIST plasma-disks-5.27.11.tar.xz 93892 BLAKE2B 7da072a23214297ceabaf256cf30ab2d0ed304f76351953ffae973a54ed0ad25a839549bb0c61b2793546b38c7857ec927d0ebb03885d3a43b2580aa9a60fd13 SHA512 102323ee220e0c2e823fe0a20f96a47646d5000555baa3f81e89168f62093690ed347f776cd78e290c7972114f9a76ba7e62f47c17db56312d5b58774f68100f +DIST plasma-disks-6.0.4.tar.xz 99832 BLAKE2B 8b7d6195c72ec1a5e86925b1d30639c120e6904f0767ba59455044e9faeee4a242a4224caea216bcf9c507562dc651e14f568635a2ee67680ad8c2bca127ac9b SHA512 50205d7f14ce7dc2cb05755205087efc25b356946b68526807c884b8f599501fb2fb0c312782bfaa0b936d93fe77d77b78a5d802547d39096ea93ebf4d9e57df diff --git a/kde-plasma/plasma-disks/metadata.xml b/kde-plasma/plasma-disks/metadata.xml index d925f2439758..9ac314a3e317 100644 --- a/kde-plasma/plasma-disks/metadata.xml +++ b/kde-plasma/plasma-disks/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-disks</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild deleted file mode 100644 index 857b4e21996c..000000000000 --- a/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure" -HOMEPAGE="https://invent.kde.org/plasma/plasma-disks" - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - sys-apps/smartmontools -" -RDEPEND="${DEPEND} - kde-plasma/kinfocenter:5 -" diff --git a/kde-plasma/plasma-disks/plasma-disks-5.25.2.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.27.11.ebuild index e96d87018b12..669889c70f68 100644 --- a/kde-plasma/plasma-disks/plasma-disks-5.25.2.ebuild +++ b/kde-plasma/plasma-disks/plasma-disks-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="true" -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure" HOMEPAGE="https://invent.kde.org/plasma/plasma-disks" LICENSE="|| ( GPL-3 GPL-2 )" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/plasma-disks/plasma-disks-6.0.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-6.0.4.ebuild new file mode 100644 index 000000000000..e73bdf433e50 --- /dev/null +++ b/kde-plasma/plasma-disks/plasma-disks-6.0.4.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure" +HOMEPAGE="https://invent.kde.org/plasma/plasma-disks" + +LICENSE="|| ( GPL-3 GPL-2 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + sys-apps/smartmontools +" +RDEPEND="${DEPEND} + kde-plasma/kinfocenter:6 +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/plasma-firewall/Manifest b/kde-plasma/plasma-firewall/Manifest index bf8f8421582c..7da05ebf8672 100644 --- a/kde-plasma/plasma-firewall/Manifest +++ b/kde-plasma/plasma-firewall/Manifest @@ -1,2 +1,2 @@ -DIST plasma-firewall-5.24.5.tar.xz 346660 BLAKE2B 767cd4722325e8035735b744afdccfe4114e68756919f3904fcbd2aa25879b09b7bb4fcaffcaf0a2687f5744e1177fb177658b6af0ed3fef7838498c99f583a3 SHA512 4c774b10c32929399a8b01007e3c34ab702803a0aa80ea812bbcc4d4ead02d0e64136f575454fdc2f0e938740afbf6d48025c654831aa5485b86253418bf13d1 -DIST plasma-firewall-5.25.2.tar.xz 355264 BLAKE2B c574fe5e528146758dd26e029852cd6ea0230e93e997f5eae7555d56997b02aae7bb3c540059d9631f65066921d4357baf8d5c07e3055aeaeed70a4ea5e4cacd SHA512 d462cc1aceed6b6c2aa2d88e7a213fec120e7dad6ea37b61031e38300600a688a1bd4ff0b0a979fe270b69723c891576ce490012975e5fffb55d65a0ca519750 +DIST plasma-firewall-5.27.11.tar.xz 362988 BLAKE2B 484e853f4a8c61823e2a235fe5d5e40b6861c04044ca5058b8e866d9a9d9cb072b8a64c2c1b8a950f1604acc85dd27c38314735db2b6e4f59e8fb9085eda0ea8 SHA512 9c6a41448ef83a1c464e1e10441ae811bc898afc451b821fbd46141df4ffe1ad395692c420ce02dd5618197a307fa2729dbe8f0f703c1a64b14068f6c018ba7b +DIST plasma-firewall-6.0.4.tar.xz 367948 BLAKE2B ce35e958a969b63902ed53fe8bde171d5b7bf7678cb344c57fd3a0e991bb929b05fc32c0ac3fc5dbad4e30592b5fdda829611b553b9fce6921e755beb0685515 SHA512 70b914f1dbe011e10a250f4a3ca84a0e324798ba5d74cd3f89adddb61e92a53b7fca95cee63f6065c84dc36a81f45cb091ed51156b23564f62fba89625340a7c diff --git a/kde-plasma/plasma-firewall/metadata.xml b/kde-plasma/plasma-firewall/metadata.xml index 173d8fdb463d..b4a87d9ec623 100644 --- a/kde-plasma/plasma-firewall/metadata.xml +++ b/kde-plasma/plasma-firewall/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">network/plasma-firewall</remote-id> </upstream> <use> <flag name="firewalld">Build <pkg>net-firewall/firewalld</pkg> backend</flag> diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.27.11.ebuild index 5093bf4f5120..c93d394f02d8 100644 --- a/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild +++ b/kde-plasma/plasma-firewall/plasma-firewall-5.27.11.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org python-single-r1 +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{10..12} ) +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org python-single-r1 DESCRIPTION="Plasma frontend for Firewalld or UFW" HOMEPAGE="https://invent.kde.org/network/plasma-firewall" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="firewalld +ufw" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )" @@ -31,13 +32,13 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 " RDEPEND="${DEPEND} ${PYTHON_DEPS} firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_prepare() { ecm_src_prepare diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.25.2.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.0.4.ebuild index 64ef809a6ecf..b32a35aa7769 100644 --- a/kde-plasma/plasma-firewall/plasma-firewall-5.25.2.ebuild +++ b/kde-plasma/plasma-firewall/plasma-firewall-6.0.4.ebuild @@ -1,42 +1,39 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org python-single-r1 +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{10..12} ) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org python-single-r1 DESCRIPTION="Plasma frontend for Firewalld or UFW" HOMEPAGE="https://invent.kde.org/network/plasma-firewall" LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="firewalld +ufw" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 " RDEPEND="${DEPEND} ${PYTHON_DEPS} firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" src_prepare() { ecm_src_prepare diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest index 44409ea17cea..0efd849ea295 100644 --- a/kde-plasma/plasma-integration/Manifest +++ b/kde-plasma/plasma-integration/Manifest @@ -1,2 +1,2 @@ -DIST plasma-integration-5.24.5.tar.xz 83772 BLAKE2B a399ee55271799855195ad77ec96f25f37d9b2d49f88f0e54d536067a8aef728be3de35ca4d9da105f51382a57ff30733dea79fe2b4d91174d90989e9b9b4cc1 SHA512 6c60eff349d6b60fd8f781e162768d7cfb45d042687c1206f3f2c9e7af0c5719ff70555eff181782607ac53755844b0968ee7b9a75c87d6bd65b489a3a9dc348 -DIST plasma-integration-5.25.2.tar.xz 86096 BLAKE2B 0e24d17a4adccb80df9deb2fc7567a4bfea35feb6ee71e57fc65860b1a0b04b4b7bc3fac0bbef8ee4e2e591992879c56b676b943e415b3db32511bcb34118d63 SHA512 2f51a0cc2e64475eb0e506c05af89e5299f5fa5ecb63d825f79a445db0d0ca7101c5aac0c1fb3737045fc60d3599bb8600002ca06963d79ad30a113679dd5f01 +DIST plasma-integration-5.27.11.tar.xz 89460 BLAKE2B b6e0f487332c7280d394c9e84c44f18cd0694812307fdb1109a27d7f04ac5e0b2c6934adfed10fcbb65b5ec358e4ece728c8761edbc2872f33b40d3cff54495f SHA512 34e040425a11089bdda444132c224af8b4fca5d3fd30e875d4a385ad26bb215409c076c19ee3a2bbe3736121a7988bbc6ca564814f4e28b8e20acb5ebc194347 +DIST plasma-integration-6.0.4.tar.xz 92584 BLAKE2B 61545df5f849812e745be6098842e1a7847e231077b316df03d0d4f5dcec7de32d7bc0ab5e8d000145f089137a19d54df5a593cd3b4eeab8d802a452c83cc142 SHA512 80bd8d44ceb920109d971027f71eafbdc682972d7b0eb737504c840befd47ccd6dc1536e67e173d1df11b38bb91bd493351159de853fdd2b5035800846004833 diff --git a/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild deleted file mode 100644 index d598ad5a2941..000000000000 --- a/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -# requires running kde environment -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[dbus] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - x11-libs/libXcursor - x11-libs/libxcb -" -RDEPEND="${DEPEND} - media-fonts/hack - media-fonts/noto -" diff --git a/kde-plasma/plasma-integration/plasma-integration-5.25.2.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.27.11.ebuild index b4abee4133b4..056b3049e30b 100644 --- a/kde-plasma/plasma-integration/plasma-integration-5.25.2.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-5.27.11.ebuild @@ -1,19 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" LICENSE="LGPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # requires running kde environment @@ -50,6 +49,4 @@ RDEPEND="${COMMON_DEPEND} media-fonts/hack media-fonts/noto " -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 -" +BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" diff --git a/kde-plasma/plasma-integration/plasma-integration-6.0.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.0.4.ebuild new file mode 100644 index 000000000000..1f740140256d --- /dev/null +++ b/kde-plasma/plasma-integration/plasma-integration-6.0.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KF5MIN=5.115.0 +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QT5MIN=5.15.12 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="qt5" + +# requires running kde environment +RESTRICT="test" + +# slot ops: qdbus*_p.h and Qt6::GuiPrivate for qtx11extras_p.h +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + x11-libs/libXcursor + x11-libs/libxcb + qt5? ( + >=dev-qt/qtdbus-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5=[dbus] + >=dev-qt/qtquickcontrols2-${QT5MIN}:5 + >=dev-qt/qtwayland-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=dev-qt/qtx11extras-${QT5MIN}:5 + >=kde-frameworks/kcompletion-${KF5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kconfigwidgets-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kguiaddons-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kiconthemes-${KF5MIN}:5 + >=kde-frameworks/kio-${KF5MIN}:5 + >=kde-frameworks/kjobwidgets-${KF5MIN}:5 + >=kde-frameworks/knotifications-${KF5MIN}:5 + >=kde-frameworks/kwindowsystem-${KF5MIN}:5 + >=kde-frameworks/kxmlgui-${KF5MIN}:5 + ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 +" +RDEPEND="${COMMON_DEPEND} + media-fonts/hack + media-fonts/noto + media-fonts/noto-emoji +" +PDEPEND=" + >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6 +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=$(usex qt5) + ) + ecm_src_configure +} diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index 929b376cb8ad..d99c868979a6 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -17,16 +17,23 @@ <flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag> <flag name="display-manager">Pull in a graphical display manager</flag> <flag name="firewall">Pull in <pkg>kde-plasma/plasma-firewall</pkg> for system firewall administration</flag> + <flag name="flatpak">Pull in <pkg>kde-plasma/flatpak-kcm</pkg> for flatpak permissions administration</flag> <flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag> <flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag> <flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag> <flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag> + <flag name="oxygen-theme">Pull in Oxygen icons, sound theme and visual style for KDE Plasma</flag> <flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag> <flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag> + <flag name="qt5">Pull in required packages for seamless integration of KF5/Qt5-based applications</flag> <flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag> <flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag> <flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag> <flag name="thunderbolt">Pull in <pkg>kde-plasma/plasma-thunderbolt</pkg> control center module</flag> + <flag name="unsupported">Allow packages that are known to ruin runtime experience ** DO NOT FILE BUGS WITH THIS ENABLED **</flag> + <flag name="wacom">Pull in <pkg>kde-plasma/wacomtablet</pkg> control center module</flag> <flag name="wallpapers">Install wallpapers for the Plasma Workspace</flag> + <flag name="webengine">Use <pkg>kde-apps/khelpcenter</pkg> to access the locally installed KDE Help System Handbook</flag> + <flag name="xwayland">Enable Wayland windows screensharing to XWayland applications via <pkg>gui-apps/xwaylandvideobridge</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/plasma-meta/plasma-meta-5.25.2.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.27.11.ebuild index 76be986707c7..12b463bf6356 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.25.2.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.27.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,11 +8,11 @@ HOMEPAGE="https://kde.org/plasma-desktop/" LICENSE="metapackage" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt -+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook -+kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart -systemd thunderbolt +wallpapers" +cups +desktop-portal discover +display-manager +elogind +firewall flatpak grub +gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm +sdk +smart systemd thunderbolt +wallpapers" REQUIRED_USE="^^ ( elogind systemd )" @@ -42,8 +42,9 @@ RDEPEND=" >=kde-plasma/plasma-desktop-${PV}:${SLOT} >=kde-plasma/plasma-integration-${PV}:${SLOT} >=kde-plasma/plasma-systemmonitor-${PV}:${SLOT} + >=kde-plasma/plasma-welcome-${PV}:${SLOT} >=kde-plasma/plasma-workspace-${PV}:${SLOT} - >=kde-plasma/polkit-kde-agent-${PV}:${SLOT} + >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] @@ -54,6 +55,7 @@ RDEPEND=" colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) + cups? ( kde-plasma/print-manager:${SLOT} ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) display-manager? ( @@ -64,6 +66,7 @@ RDEPEND=" !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) + flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} ) grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} ) gtk? ( >=kde-plasma/breeze-gtk-${PV}:${SLOT} diff --git a/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.0.4.ebuild index 28ee1d06a038..e38e671c9a36 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-6.0.4.ebuild @@ -1,51 +1,59 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DESCRIPTION="Merge this to pull in all Plasma 5 packages" +DESCRIPTION="Merge this to pull in all Plasma 6 packages" HOMEPAGE="https://kde.org/plasma-desktop/" LICENSE="metapackage" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt -+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook -+kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart -systemd thunderbolt +wallpapers" +cups discover +display-manager +elogind +firewall flatpak grub gtk +kwallet ++networkmanager oxygen-theme plymouth pulseaudio qt5 +sddm sdk +smart systemd +thunderbolt unsupported wacom +wallpapers webengine +xwayland" REQUIRED_USE="^^ ( elogind systemd )" RDEPEND=" - >=kde-plasma/breeze-${PV}:${SLOT} + !${CATEGORY}/${PN}:5 + >=kde-plasma/breeze-${PV}:${SLOT}[qt5?] >=kde-plasma/kactivitymanagerd-${PV}:${SLOT} >=kde-plasma/kde-cli-tools-${PV}:${SLOT} >=kde-plasma/kdecoration-${PV}:${SLOT} >=kde-plasma/kdeplasma-addons-${PV}:${SLOT} >=kde-plasma/kgamma-${PV}:${SLOT} - >=kde-plasma/khotkeys-${PV}:${SLOT} + >=kde-plasma/kglobalacceld-${PV}:${SLOT} >=kde-plasma/kinfocenter-${PV}:${SLOT} >=kde-plasma/kmenuedit-${PV}:${SLOT} + >=kde-plasma/kpipewire-${PV}:${SLOT} >=kde-plasma/kscreen-${PV}:${SLOT} >=kde-plasma/kscreenlocker-${PV}:${SLOT} >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksystemstats-${PV}:${SLOT} - >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwayland-server-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} + >=kde-plasma/kwayland-${PV}:${SLOT} + >=kde-plasma/kwin-${PV}:${SLOT}[lock] >=kde-plasma/kwrited-${PV}:${SLOT} >=kde-plasma/layer-shell-qt-${PV}:${SLOT} >=kde-plasma/libkscreen-${PV}:${SLOT} >=kde-plasma/libksysguard-${PV}:${SLOT} + >=kde-plasma/libplasma-${PV}:${SLOT} >=kde-plasma/milou-${PV}:${SLOT} - >=kde-plasma/oxygen-${PV}:${SLOT} + >=kde-plasma/ocean-sound-theme-${PV}:${SLOT} + >=kde-plasma/plasma-activities-${PV}:${SLOT} + >=kde-plasma/plasma-activities-stats-${PV}:${SLOT} >=kde-plasma/plasma-desktop-${PV}:${SLOT} - >=kde-plasma/plasma-integration-${PV}:${SLOT} + >=kde-plasma/plasma-integration-${PV}:${SLOT}[qt5?] >=kde-plasma/plasma-systemmonitor-${PV}:${SLOT} + >=kde-plasma/plasma-welcome-${PV}:${SLOT} >=kde-plasma/plasma-workspace-${PV}:${SLOT} - >=kde-plasma/polkit-kde-agent-${PV}:${SLOT} + >=kde-plasma/plasma5support-${PV}:${SLOT} + >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} + >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} + >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] @@ -54,7 +62,7 @@ RDEPEND=" colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) - desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) + cups? ( >=kde-plasma/print-manager-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) display-manager? ( sddm? ( @@ -64,24 +72,29 @@ RDEPEND=" !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) + flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} ) grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} ) gtk? ( >=kde-plasma/breeze-gtk-${PV}:${SLOT} >=kde-plasma/kde-gtk-config-${PV}:${SLOT} x11-misc/appmenu-gtk-module ) - handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} ) - legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} ) networkmanager? ( >=kde-plasma/plasma-nm-${PV}:${SLOT} net-misc/networkmanager[elogind?,systemd?] ) + oxygen-theme? ( + >=kde-frameworks/oxygen-icons-6.0.0:* + >=kde-plasma/oxygen-${PV}:${SLOT}[qt5?] + >=kde-plasma/oxygen-sounds-${PV}:${SLOT} + ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} >=kde-plasma/plymouth-kcm-${PV}:${SLOT} ) pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} ) + qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 ) sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} ) smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} ) systemd? ( @@ -89,7 +102,14 @@ RDEPEND=" firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} ) + !unsupported? ( + !gui-apps/qt6ct + !sys-apps/xdg-desktop-portal-gnome + ) + wacom? ( >=kde-plasma/wacomtablet-${PV}:${SLOT} ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} ) + webengine? ( kde-apps/khelpcenter:6 ) + xwayland? ( >=gui-apps/xwaylandvideobridge-0.4.0 ) " # Optional runtime deps: kde-plasma/plasma-desktop RDEPEND="${RDEPEND} @@ -97,11 +117,12 @@ RDEPEND="${RDEPEND} " pkg_postinst() { - has_version sys-auth/consolekit || return - ewarn "An existing installation of sys-auth/consolekit was detected even though" - ewarn "${PN} was configured with USE $(usex elogind elogind systemd)." - ewarn "There can only be one session manager at runtime, otherwise random issues" - ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf" - ewarn "or package.use and remove sys-auth/consolekit before raising bugs." - ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE" + if ! use qt5 && has_version dev-qt/qtgui; then + ewarn "KF5- and Qt5-based applications will exhibit various integration bugs" + ewarn "and generally look out of place in Plasma 6 without the dependencies" + ewarn "enforced by kde-plasma/plasma-meta[qt5]." + ewarn + ewarn "This warning message is being displayed because dev-qt/qtgui:5 is" + ewarn "currently installed which indicates the use of such applications." + fi } diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 84ab2d899b7a..376530f6f73d 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1,2 @@ -DIST plasma-nm-5.24.5.tar.xz 926128 BLAKE2B 43abf81b433291432cc8d5a576ac7579c7a68f196afab106b832a8851846eebdf1562654f7186efae65f3e0942b88aa12f778eb9e5a3972cbafc62f165d07b02 SHA512 0b64b2f231d7e97f901251e274bebd53b22c19ddcfa67cc66947f48adebe61c6bde21f339896f267af22f4112b9a392d331345999000c43cb5b1e51680668ec8 -DIST plasma-nm-5.25.2.tar.xz 935968 BLAKE2B ce344195a01c43e07dbcc3fa8c7ab0455737e51087bce2af8e60b53e883c3b2dca0878229889bb19a08c435732e79ac49e428d8b201011cbf978388f4dca799d SHA512 5025ac852b890f67f6c8c0da5e2c21a1fc20e25c21c22f9f1dedec09fa31cf7094d1048bf4c0a969d1208e977d48292786b8c04e65076bb03a62481c0a6f66e8 +DIST plasma-nm-5.27.11.tar.xz 1150816 BLAKE2B 9c48416a45caf9ac4836f793bd082906b2f3548dc1000c013c9403d609e3d0eee6036da4c6bb9b24be31a278487f777bd6fc3b258ce75adec35759c94ee35994 SHA512 79148728ab0e365c686ad4f24e8304f4be37112794c6356495b6108629ba68348588cf56f2fee60d2392ebaa5f4ab33cc43c30bdbae053ead5c5783cc1ced8ad +DIST plasma-nm-6.0.4.tar.xz 1170808 BLAKE2B 77fac645493cb462fdd5742d513e544d1ee41c4895fbee49dfefe57a2c980bb68ea864fb2ec67863c22f3805f718effc43ed00364c98a06f671be7b88a1de485 SHA512 df2fdb51f3e78ca123ac9c206c2a99ef3e52e7b05a8d8b2d638da675dacefcfb6b13b71ca9f951ab9e4dabea301eb1a1ab7019dbedd1dde4fec0f64bc6558c35 diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml index 4cc596c40725..357da291c490 100644 --- a/kde-plasma/plasma-nm/metadata.xml +++ b/kde-plasma/plasma-nm/metadata.xml @@ -9,7 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="modemmanager">Enable support for mobile broadband devices</flag> <flag name="openconnect">Build support for the OpenConnect VPN client</flag> <flag name="teamd">Enable Teamd control support</flag> </use> diff --git a/kde-plasma/plasma-nm/plasma-nm-5.25.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.25.2.ebuild deleted file mode 100644 index 2e82872e6502..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.25.2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma applet for NetworkManager" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="modemmanager openconnect teamd" - -DEPEND=" - >=app-crypt/qca-2.3.0:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - net-misc/networkmanager[teamd=] - modemmanager? ( - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 - net-misc/mobile-broadband-provider-info - ) - openconnect? ( - >=dev-qt/qtxml-${QTMIN}:5 - net-vpn/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - ecm_src_prepare - - # TODO: try to get a build switch upstreamed - if ! use openconnect; then - sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - if ! has_version "kde-plasma/plasma-workspace:5"; then - elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5." - elog "However, the networkmanagement KCM can be called from either systemsettings" - elog "or manually: $ kcmshell5 kcm_networkmanagement" - fi -} diff --git a/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild index 65f17f90aad8..1c2ec2adf0cb 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild @@ -1,34 +1,34 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="modemmanager openconnect teamd" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="openconnect teamd" DEPEND=" - >=app-crypt/qca-2.3.0:2 + >=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 @@ -38,17 +38,13 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/modemmanager-qt-${KFMIN}:5 >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + net-misc/mobile-broadband-provider-info net-misc/networkmanager[teamd=] - modemmanager? ( - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 - net-misc/mobile-broadband-provider-info - ) openconnect? ( - >=dev-qt/qtxml-${QTMIN}:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) @@ -56,10 +52,15 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" src_prepare() { ecm_src_prepare @@ -70,15 +71,6 @@ src_prepare() { fi } -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - ) - - ecm_src_configure -} - pkg_postinst() { ecm_pkg_postinst diff --git a/kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild new file mode 100644 index 000000000000..ebef5ede78f0 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-6.0.4.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma applet for NetworkManager" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="6" +KEYWORDS="~amd64" +IUSE="openconnect teamd" + +DEPEND=" + >=app-crypt/qca-2.3.7:2[qt6] + dev-libs/qcoro[dbus] + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/modemmanager-qt-${KFMIN}:6 + >=kde-frameworks/networkmanager-qt-${KFMIN}:6[teamd=] + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + net-misc/mobile-broadband-provider-info + net-misc/networkmanager[teamd=] + openconnect? ( + >=dev-qt/qtwebengine-${QTMIN}:6 + net-vpn/networkmanager-openconnect + net-vpn/openconnect:= + ) +" +RDEPEND="${DEPEND} + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DBUILD_OPENCONNECT=$(usex openconnect) + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + + if ! has_version "kde-frameworks/kcmutils:6"; then + elog "${PN} is not terribly useful without kde-frameworks/kcmutils:6." + elog "However, the networkmanagement KCM can be called from either systemsettings" + elog "or manually: $ kcmshell6 kcm_networkmanagement" + fi +} diff --git a/kde-plasma/plasma-pa/Manifest b/kde-plasma/plasma-pa/Manifest index 3585f534cbe4..78ac451412e3 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,2 +1,2 @@ -DIST plasma-pa-5.24.5.tar.xz 132952 BLAKE2B f877a23a07420c27cc55760a870bf45d887b0787c0e25dea2e37b79d04b56db8d4ebace9505934fb370cda4adf0d992033b3ed72fda4b73497acdbacb551fc10 SHA512 fdf18b0baa1fb43a8d576d454ba6625bf7d376eb30fcbe8e09df388441a04d1b373b6d53a56b4f14552fc06cbdddea193248044d0cc5e3b71fb90651708afaa1 -DIST plasma-pa-5.25.2.tar.xz 135356 BLAKE2B c1d451cbf3b35110ce424fb6fbc271f27351a7130e93c0502ce26fba2daf5082a812fde44d3bab8a7f01267b62c9b5dfbdd389b0620fffdd9598b8a26fa6d389 SHA512 f7f0dfc99def0221bac2cf74d62ee93ebded3c22f34896a4e074404efca4c559a141865f56ebf2164ee0a7e8862978084640ae520a3f90e438d0481103086586 +DIST plasma-pa-5.27.11.tar.xz 164028 BLAKE2B b657d0d82f4c0faa2e08d054c3f9e4f7fc439dbf5a2c3d6671b06b91d21f22da44ad3b0b6c848f6be63709cd6b7666bcef4f1992228c24574ade99c79824d6de SHA512 660e5e32476e8426dced4cf2fc1b198145f1e25237a1da392bbe9c889ffad92bc2a94dbf0daf13e03737f0fa5913e50bff264637178105815b4f32336b611857 +DIST plasma-pa-6.0.4.tar.xz 170392 BLAKE2B 09c7c29afe0619e509b88996d2978c77d157b8de86745b7b67073745af1a68917e9f3eda45762a28d15f571592905eefcbf1065552303605496a362fea317b59 SHA512 a911574ad84ca67caa32b0f038abe687ad1073bbda691ecf5f4b79274ca9f7914284ca96f4ebf4088ed2d69c6eb5190cea0fe7bcbdf2406ce97ea09e7b845300 diff --git a/kde-plasma/plasma-pa/plasma-pa-5.25.2.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.25.2.ebuild deleted file mode 100644 index 136949386869..000000000000 --- a/kde-plasma/plasma-pa/plasma-pa-5.25.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Plasma applet for audio volume management using PulseAudio" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - media-libs/libcanberra - media-sound/pulseaudio -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - || ( - media-video/pipewire - media-sound/pulseaudio-daemon - media-sound/pulseaudio[daemon(+)] - ) - x11-themes/sound-theme-freedesktop -" diff --git a/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.27.11.ebuild index f61ca444d701..2939a17453ca 100644 --- a/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild +++ b/kde-plasma/plasma-pa/plasma-pa-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plasma applet for audio volume management using PulseAudio" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -20,21 +20,20 @@ DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 media-libs/libcanberra - media-sound/pulseaudio + media-libs/libpulse " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - || ( - media-video/pipewire - media-sound/pulseaudio-daemon - media-sound/pulseaudio[daemon(+)] - ) x11-themes/sound-theme-freedesktop " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/plasma-pa/plasma-pa-6.0.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.0.4.ebuild new file mode 100644 index 000000000000..63fc040f502b --- /dev/null +++ b/kde-plasma/plasma-pa/plasma-pa-6.0.4.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma applet for audio volume management using PulseAudio" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" # missing selenium-webdriver-at-spi + +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + media-libs/libcanberra + media-libs/libpulse +" +RDEPEND="${DEPEND} + dev-libs/kirigami-addons:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + x11-themes/sound-theme-freedesktop +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest index 0c5e2f93c050..eec68e4a7a10 100644 --- a/kde-plasma/plasma-sdk/Manifest +++ b/kde-plasma/plasma-sdk/Manifest @@ -1,2 +1,2 @@ -DIST plasma-sdk-5.24.5.tar.xz 261552 BLAKE2B 6a52464135d73119b53b3a5ce73e5a58f8797e6e8357010809e623bca5797199fb76aac5c3c0f18269d5584303b207e9ac21b03415e80d041f73154aa8b31aaa SHA512 9dff5a3088fb92296e4bb53d8839dade53dc71595c62e85bf5431ce85b686fec9197adf09177f1aa6ab488d0ededc063121f074f1c77b8b281950eb5cea0caf8 -DIST plasma-sdk-5.25.2.tar.xz 263684 BLAKE2B 7ce338380c22a547137d8e614a51d748bf6b5dd87cddfebf2e559252763236cca567683f9147bd52cb67ed434487416196be2f0b5789d3ff242a3ac8b4dc94cd SHA512 a3c8fd3616e59242c04e8d02de900455914b51407eb47de40e0ddd9802c6993bffb44fae4944746ecdaf6de47432902184253f2ccc976a78f30b97d48d60631c +DIST plasma-sdk-5.27.11.1.tar.xz 322312 BLAKE2B 36f63e5dd301b93a6c36e87d8fc8b48f9c1819d7d74ce5da1b69ea7f450af0fbb36c7f4155b3c6c6b8e4b0ac9484fda5288feb1a4d643ae0753d4f4a4a957c48 SHA512 000f69a9197c978bc105a11d1b9f127c3e8f788686ad9654fdb595ed4a4e6cd156cc01654b804d5e2d719e386939a1ed27ae96c35e1612f0ac0db72fdd267d97 +DIST plasma-sdk-6.0.4.tar.xz 326412 BLAKE2B 8be1288c3953fd6b77c0f4b3e5ee1ff5eb4c969e56f6cdaf570ee7e8810a4f2abf185786aeed3eeb6e0e84b6c54de27e5241a5a71ca953dee6659bafbca25d33 SHA512 ca150c1985950831fff091306281cf2aa7a6a60b75329af3187955532452a42bcb8baef3c2f7f736c32ef2a83e9a12fb49173571f3395154a4a34e7ed8b64442 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.25.2.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.25.2.ebuild deleted file mode 100644 index 49e17c91c35e..000000000000 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.25.2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="optional" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Useful applications for Plasma development" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.27.11.1.ebuild index 305df908068b..8bd539f2e20e 100644 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild +++ b/kde-plasma/plasma-sdk/plasma-sdk-5.27.11.1.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="optional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Useful applications for Plasma development" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -37,7 +36,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/ktexteditor-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.0.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.0.4.ebuild new file mode 100644 index 000000000000..6ca142b6e5f5 --- /dev/null +++ b/kde-plasma/plasma-sdk/plasma-sdk-6.0.4.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="optional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Useful applications for Plasma development" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=kde-frameworks/kirigami-${KFMIN}:6 +" diff --git a/kde-plasma/plasma-systemmonitor/Manifest b/kde-plasma/plasma-systemmonitor/Manifest index 85ecb0a1b0e5..f453b551cf9f 100644 --- a/kde-plasma/plasma-systemmonitor/Manifest +++ b/kde-plasma/plasma-systemmonitor/Manifest @@ -1,2 +1,2 @@ -DIST plasma-systemmonitor-5.24.5.tar.xz 151824 BLAKE2B dfc6bc0dfe6815879eaed6686f52f108ce3e9a84f76899afffac255c97e36dd8afb4521d2dd8abad157306b1e0e02c874935e40e88aa2c187ce22f668c05b760 SHA512 b8c4a959eb587b25d8d503b3b2d05e6c8ced3b0cb146e08f0351f424962d059b70c8dd323d55b31ef903157b71bad6f20f969840a860ed25ebdafeb3db18489d -DIST plasma-systemmonitor-5.25.2.tar.xz 156188 BLAKE2B be381e649431bead26e9d6337493b73ab5a337eead53759e06d070c9883b7b582b3c7f38d18563b37847a518411ce8fdbaea5d1ad116b22355185f519b302c3a SHA512 7aaa5af6b389aba6caa584d86435a2635d4c4439825a0d820b25e69607fa8d1a5141176d25dc2d980572e8544976fb73ca5f2c6e0ad7aa08429bad5f8473360d +DIST plasma-systemmonitor-5.27.11.tar.xz 173356 BLAKE2B 358a4f021813564c608d12c9483c076c746a201b2072bab3cb48625bc62a9666b4afd10267839a9836b4544b2cc0a2f88f53052a615606fe89db08f4f5100f2b SHA512 bbd7036d2666b39910f5e1d87e336f3531c55bbc35b29510be33619aa1afdfca26f4c437cdc68758c28ef3afe35ec0e618135c6cba68d967abcb0c03e045d06c +DIST plasma-systemmonitor-6.0.4.tar.xz 181332 BLAKE2B befde4c6db0b9d0413752588f9f55f489292d4c0ee9b530ec6f806993abf1488d81e82659d032e997d2df0106be566e1ad63cc2b2aefa5ddd21b622ce2242361 SHA512 1e8269412c6bc8ce32f48fbc9bb7a847884926fcdd8231ab468b1bdc1824733d05d48b69f7fcce1fea92694d4b0bb0caf1f6819eb287dc2b2c0f6fc0bbadc004 diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild deleted file mode 100644 index ed93a083cd93..000000000000 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-3) -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Monitor system sensors, process information and other system resources" -HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/" - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/ksystemstats-${PVCUT}:5 -" diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.2.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.11.ebuild index f5a5a018f691..a661ce1a6006 100644 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.25.2.ebuild +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -KFMIN=5.94.0 -QTMIN=5.15.4 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Monitor system sensors, process information and other system resources" HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/" LICENSE="|| ( GPL-3 GPL-2 )" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -31,6 +31,7 @@ DEPEND=" >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/libksysguard-${PVCUT}:5 " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.0.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.0.4.ebuild new file mode 100644 index 000000000000..6b88e5f0912d --- /dev/null +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.0.4.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PVCUT=$(ver_cut 1-3) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Monitor system sensors, process information and other system resources" +HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/" + +LICENSE="|| ( GPL-3 GPL-2 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/kirigami-addons:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/ksystemstats-${PVCUT}:6 +" diff --git a/kde-plasma/plasma-thunderbolt/Manifest b/kde-plasma/plasma-thunderbolt/Manifest index cfb8a2c682e0..bfe3b9cced60 100644 --- a/kde-plasma/plasma-thunderbolt/Manifest +++ b/kde-plasma/plasma-thunderbolt/Manifest @@ -1,2 +1,2 @@ -DIST plasma-thunderbolt-5.24.5.tar.xz 66752 BLAKE2B 38fe4132da08afe71a26751307d9ecd77cf0462323b4dc452ae2355cedf25f41c1de4e6f6dfe50b24fd2f1650383434aea4ec775e194b219d27a09387a8453e4 SHA512 b1096fac09800e33b87e79a2e774eaf19afa063263e71f772ec0081fda714c63dd07a0000489c36c3f7deead3ee563880bc12f336b8ea599b396613d28cc08f5 -DIST plasma-thunderbolt-5.25.2.tar.xz 67800 BLAKE2B 34ee0aa5338cf6259a3c20c45a6fc98910b481f3b4045b5577bdcbc740e3d5f0f9bf40944347dcceb71dd6fb4c0a061caef75a586d062231cfd8dab718d91daa SHA512 ef8ba3bf89f2e899c7cc0aeaa126e8e218024ed842e35e8893d7d8189738782618ba73d50e08b030d1392c8b2ec9640b27a7e4462670c92b3bcd8b37b59ba9ab +DIST plasma-thunderbolt-5.27.11.tar.xz 72824 BLAKE2B c6c7fb62b255388672116a0e0cd9d36637a8ace2e2b559e39ebb5a64867c1c3057f832875885990fec3cd0a478bb177f8e10f5cb05c486e33b097836f7f3dd4a SHA512 8ba96ca33d32b3185e7026c75f8b6158df4cee88e4f2a5e42a1a86faf22391fe62112e441cc1d41a36e7a7b74cef3d61ac2426399e0e71a862d88807c404c6f8 +DIST plasma-thunderbolt-6.0.4.tar.xz 75068 BLAKE2B de3c31dbe5a366140f82cef9e607834719060e9f80ed619022c2870711e387d5c9080373dd8291ca92191ef3693371e59723d0cdaa99d03438505ae060c1052c SHA512 119f6af9088dc108ccee9e0ba83d2a357f25a561f774f7ac88282fc8716594fa38d7d2b125cb19fbff9055498b4187f7c7ea7dcf146e8d2103109652df63a936 diff --git a/kde-plasma/plasma-thunderbolt/metadata.xml b/kde-plasma/plasma-thunderbolt/metadata.xml index d925f2439758..507f645eef1a 100644 --- a/kde-plasma/plasma-thunderbolt/metadata.xml +++ b/kde-plasma/plasma-thunderbolt/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-thunderbolt</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.2.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.2.ebuild deleted file mode 100644 index 48406635f8c6..000000000000 --- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.25.2.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Plasma integration for controlling Thunderbolt devices" -HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt" - -LICENSE="|| ( GPL-2 GPL-3+ )" -SLOT="5" -KEYWORDS="~amd64 ~riscv ~x86" -IUSE="" - -# tests require DBus -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - sys-apps/bolt -" diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.11.ebuild index 346585e6911a..98e1bee10aa6 100644 --- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild +++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plasma integration for controlling Thunderbolt devices" HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt" LICENSE="|| ( GPL-2 GPL-3+ )" SLOT="5" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 ~loong ~riscv x86" IUSE="" # tests require DBus @@ -36,3 +36,4 @@ RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 sys-apps/bolt " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.0.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.0.4.ebuild new file mode 100644 index 000000000000..88642424e300 --- /dev/null +++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.0.4.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma integration for controlling Thunderbolt devices" +HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt" + +LICENSE="|| ( GPL-2 GPL-3+ )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# tests require DBus +RESTRICT="test" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + sys-apps/bolt +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest index 6a0ed5ab0b93..70912fa89bd0 100644 --- a/kde-plasma/plasma-vault/Manifest +++ b/kde-plasma/plasma-vault/Manifest @@ -1,2 +1,2 @@ -DIST plasma-vault-5.24.5.tar.xz 178032 BLAKE2B a9e93f71a627c0426e881b1e48e3a6cb32c3744db7986a09c33c36cf04be275dffd22c45369bfdcf1ca0f05b31d0d30129e7af54f6d425bb28e96f586a5453c3 SHA512 6495f94f060f139e91a25cbecf432d5bf9ee5ae949438278966c11cd7e725feb63aee6955dce5b46b816b0c57f5253b2cf215ad70efd592bf6e579ad6acb4cd2 -DIST plasma-vault-5.25.2.tar.xz 178364 BLAKE2B 8cb9a996284e1ea9fe3e1a70db7bfd842b132d41e2cbeb67175ddaf25ace6735c72ed7aa3a5f5cd4afddb0633b2e59c7a929e1cfe43a91e27aadebc91cdb32dd SHA512 d101719042a4adf6e0b96ab182635e83bf9a36e011196b825dce674a80aabe04c39ea9d9f7b177ed6e4ba36f79eff67104c1f1e055bc62579ce0104f5c0caf1d +DIST plasma-vault-5.27.11.tar.xz 187204 BLAKE2B 7dcfdf2f2407a1138c80e8a28513643f3a4803643062c3bf1407fdd1066688b336b1287f3c4b4890dc7ce25069badaec78a9f1f7822cd28d928b7224f8847c4c SHA512 8e7a6a2acf28810ab8c12cf3d38583a563fb7f741c509395bf1b21a37070390eef2e2b6e0f7aa8dfaf8de8e12679be84aa25fb73790c5a431922eb531e944305 +DIST plasma-vault-6.0.4.tar.xz 192772 BLAKE2B 3b4faf50e0cce330500295cd3e976fe128bb1abfdc5489594eb571da300d30dd604dc8b071cd0b5292381e4aa52190d46560e1cfb07698ded886ed74d9be4f33 SHA512 1f3dadf69a4f1803eb8bc3e6f5b3c147c38761df67d3d121e1226191d8e0ea7b1ccc0a736b5276648d3c98d5a456e59c2df3ac9a80470e8c43e8e659a543c42b diff --git a/kde-plasma/plasma-vault/plasma-vault-5.25.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.25.2.ebuild deleted file mode 100644 index 2b6339bbf300..000000000000 --- a/kde-plasma/plasma-vault/plasma-vault-5.25.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Plasma applet and services for creating encrypted vaults" -HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/" - -LICENSE="LGPL-3" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="networkmanager" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) - ) - - ecm_src_configure -} diff --git a/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.27.11.ebuild index 9cce0daf50a1..018fbaf45b59 100644 --- a/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm flag-o-matic plasma.kde.org DESCRIPTION="Plasma applet and services for creating encrypted vaults" HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/" LICENSE="LGPL-3" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="networkmanager" DEPEND=" @@ -21,7 +21,6 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kcodecs-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -29,9 +28,11 @@ DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) " RDEPEND="${DEPEND} @@ -40,6 +41,9 @@ RDEPEND="${DEPEND} " src_configure() { + # ODR violations (bug #909446, kde#471836) + filter-lto + local mycmakeargs=( $(cmake_use_find_package networkmanager KF5NetworkManagerQt) ) diff --git a/kde-plasma/plasma-vault/plasma-vault-6.0.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.0.4.ebuild new file mode 100644 index 000000000000..a5e5dd80e4e4 --- /dev/null +++ b/kde-plasma/plasma-vault/plasma-vault-6.0.4.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm flag-o-matic plasma.kde.org + +DESCRIPTION="Plasma applet and services for creating encrypted vaults" +HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/" + +LICENSE="LGPL-3" +SLOT="6" +KEYWORDS="~amd64" +IUSE="networkmanager" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) +" +RDEPEND="${DEPEND} + || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) +" + +src_configure() { + # ODR violations (bug #909446, kde#471836) + filter-lto + + local mycmakeargs=( + $(cmake_use_find_package networkmanager KF6NetworkManagerQt) + ) + + ecm_src_configure +} diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest new file mode 100644 index 000000000000..6eea706d16de --- /dev/null +++ b/kde-plasma/plasma-welcome/Manifest @@ -0,0 +1,2 @@ +DIST plasma-welcome-5.27.11.tar.xz 839880 BLAKE2B 68d9192fa244c51aa50ca9746221444d879e0e031ca0fdbafdd641786ae3528fd7bde0ea2c76fabc7aed617248184a88e5c6658e85654fe162cf34bb47bd4a84 SHA512 b6e263d6fae310500743bb2ab6407ad5162b36aa91be9c932cd45ed56a2087ce47bde0be1a15be05397ccda9399f7b168266b6b10550ab3f337330af5b246aeb +DIST plasma-welcome-6.0.4.tar.xz 907892 BLAKE2B 687fde60dffa88ec96400dbe43ef8dbefa16f206494efb02b8bc40b9a74c55b5eda60b91149fffc9782120e4b20fdeb7f367be896c1811045a63b14ea82b7bf9 SHA512 865c4c84dfeede20f6e1d740833bda009af3be5202321e14a74c3dda9a5086e685361a4d75bb5a3ded85e827d0bd0fae59ec4f5d11799fce34c1061aeec90651 diff --git a/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch new file mode 100644 index 000000000000..fc4eaa684a63 --- /dev/null +++ b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch @@ -0,0 +1,99 @@ +From 24092946ed95b4ddf7e7f4c0f5bd9000e45fecad Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Wed, 19 Apr 2023 21:16:59 +0200 +Subject: [PATCH] Make KAccounts optional + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 2 +- + src/CMakeLists.txt | 1 + + src/contents/ui/main.qml | 4 +++- + src/controller.cpp | 9 +++++++++ + src/controller.h | 1 + + src/kuserfeedbacksettings.h.cmake | 1 + + 6 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 772d79e..86db439 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ ecm_setup_version(${PROJECT_VERSION} + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Network Qml QuickControls2 Svg) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons ConfigWidgets DBusAddons Declarative I18n KIO NewStuff Notifications Plasma Service WindowSystem) + find_package(KUserFeedback) +-find_package(KAccounts REQUIRED) ++find_package(KAccounts) + + ecm_set_disabled_deprecation_versions(QT 5.15.2 + KF 5.101 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 4eab33d..e0cc179 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,6 +3,7 @@ + # SPDX-FileCopyrightText: 2022 Nate Graham <nate@kde.org> + + set(HAVE_KUSERFEEDBACK ${KUserFeedback_FOUND}) ++set(HAVE_KACCOUNTS ${KAccounts_FOUND}) + configure_file(kuserfeedbacksettings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedbacksettings.h) + + add_executable(plasma-welcome main.cpp controller.cpp resources.qrc module.cpp) +diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml +index 380c074..86da39b 100644 +--- a/src/contents/ui/main.qml ++++ b/src/contents/ui/main.qml +@@ -124,7 +124,9 @@ Kirigami.ApplicationWindow { + pageStack.push(kcm_feedback); + } + +- pageStack.push(kcm_kaccounts); ++ if (Controller.kAccountsAvailable()) { ++ pageStack.push(kcm_kaccounts); ++ } + + // Append any distro-specific pages that were found + let distroPages = Controller.distroPages() +diff --git a/src/controller.cpp b/src/controller.cpp +index 7586c23..de8fa85 100644 +--- a/src/controller.cpp ++++ b/src/controller.cpp +@@ -50,6 +50,15 @@ bool Controller::networkAlreadyConnected() + return false; + } + ++bool Controller::kAccountsAvailable() ++{ ++#if HAVE_KACCOUNTS ++ return true; ++#else ++ return false; ++#endif ++} ++ + bool Controller::userFeedbackAvailable() + { + #if HAVE_KUSERFEEDBACK +diff --git a/src/controller.h b/src/controller.h +index 20ba44c..97a9d1c 100644 +--- a/src/controller.h ++++ b/src/controller.h +@@ -15,6 +15,7 @@ public: + Q_INVOKABLE static void runCommand(const QString &command, const QString &desktopFilename); + Q_INVOKABLE bool networkAlreadyConnected(); + Q_INVOKABLE bool userFeedbackAvailable(); ++ Q_INVOKABLE bool kAccountsAvailable(); + Q_INVOKABLE QStringList distroPages(); + + Q_PROPERTY(QString newPlasmaVersion MEMBER m_newPlasmaVersion NOTIFY newPlasmaVersionChanged) +diff --git a/src/kuserfeedbacksettings.h.cmake b/src/kuserfeedbacksettings.h.cmake +index f30924f..a76aedf 100644 +--- a/src/kuserfeedbacksettings.h.cmake ++++ b/src/kuserfeedbacksettings.h.cmake +@@ -5,3 +5,4 @@ + */ + + #cmakedefine01 HAVE_KUSERFEEDBACK ++#cmakedefine01 HAVE_KACCOUNTS +-- +2.40.0 + diff --git a/kde-plasma/plasma-welcome/metadata.xml b/kde-plasma/plasma-welcome/metadata.xml new file mode 100644 index 000000000000..7499be9e7e7d --- /dev/null +++ b/kde-plasma/plasma-welcome/metadata.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> + <use> + <flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag> + <flag name="kaccounts">Build the OpenDesktop integration plugin</flag> + </use> +</pkgmetadata> diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild new file mode 100644 index 000000000000..e9f2c0fdc96a --- /dev/null +++ b/kde-plasma/plasma-welcome/plasma-welcome-5.27.11.ebuild @@ -0,0 +1,60 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org + +DESCRIPTION="A friendly onboarding wizard for Plasma" + +LICENSE="GPL-2+" +SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="discover kaccounts telemetry" + +DEPEND=" + >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + kaccounts? ( kde-apps/kaccounts-integration:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) +" +RDEPEND="${DEPEND} + discover? ( kde-plasma/discover:5 ) +" + +PATCHES=( "${FILESDIR}/${PN}-5.27.4.1-kaccounts-optional.patch" ) + +src_prepare() { + ecm_src_prepare + + if ! use discover; then + sed -e "s:pageStack.push(discover);:// & disabled by IUSE=discover:" \ + -i src/contents/ui/main.qml || die + fi +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package kaccounts KAccounts) + $(cmake_use_find_package telemetry KUserFeedback) + ) + ecm_src_configure +} diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.0.4.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.0.4.ebuild new file mode 100644 index 000000000000..04c90c6f1796 --- /dev/null +++ b/kde-plasma/plasma-welcome/plasma-welcome-6.0.4.ebuild @@ -0,0 +1,48 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Friendly onboarding wizard for Plasma" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="discover telemetry" + +DEPEND=" + dev-libs/kirigami-addons:6 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + discover? ( kde-plasma/discover:6 ) +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package telemetry KF6UserFeedback) + ) + ecm_src_configure +} diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest index f3f1dc3cb73a..2e3321faf9f5 100644 --- a/kde-plasma/plasma-workspace-wallpapers/Manifest +++ b/kde-plasma/plasma-workspace-wallpapers/Manifest @@ -1,2 +1,2 @@ -DIST plasma-workspace-wallpapers-5.24.5.tar.xz 72711796 BLAKE2B 0740e3ac16db5274505358a096997e36f72bd2e58fe60cc7fec914a7a9cfe8a5480fc3e5317cef9a6e4a75d05b58ecb9918b433a61e522a5c605b503cdf785d1 SHA512 8b22bb8a2c093f3f7b7da8b0db55c688fa6d602326429db3e32960d7596c0f79e79d1a724bdb914d55caeffa36f422eea6678afdd62e2bb89f3afa479d056873 -DIST plasma-workspace-wallpapers-5.25.2.tar.xz 70524788 BLAKE2B da26e4653cd7df05cbf2788a1af9dc7e8955e2445796402b362a9a7fe651488766535e2b51fdbe99c38ef82e0891fb2070665945e478a76518361288c2ec4870 SHA512 bcecdaeead5a6b0a31f5c31776932e5015b4ada0bf4930952593a553db5842063ce42be1d1553fc0e5f26def5442c85199651374839e9dc76104a599aa7ef236 +DIST plasma-workspace-wallpapers-5.27.11.tar.xz 94029756 BLAKE2B 570645ce99c8f9992a328d8e61a25f36aa43f8fc7c4742b31869b2df6b234f39e991755867b873158db7ba74accaef5bd627a355cf0cb5b183ce4f5236d0b074 SHA512 796f5c652d449fc5d02a3702cf3037126d26cb1d46f5d698e154a80585931c0a4f6a658ad58ebb611be29bbff8a27a71091fd988a9533e0bcf86d4d597658b2c +DIST plasma-workspace-wallpapers-6.0.4.tar.xz 110081284 BLAKE2B dcb90668978bd6be7ad43dd4bfdf6f242198d529a01906bcd5f9135486e5e7205de62d88fbdabb2433fb312c3c9fc690e465253fa9ed1ef44f3e587f93db6de9 SHA512 8a6233319e9a6d480f025a4d92b2289820e62417df69b22ccaa911790eefbf14e98de844d27aa498d3a099f309fc1d70e9fb3bd11721d781f58cefc82238bfab diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.2.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.11.ebuild index 3a5f3e5403a9..36c00c8005b0 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.25.2.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +inherit cmake plasma.kde.org DESCRIPTION="Wallpapers for the Plasma workspace" LICENSE="GPL-2" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" BDEPEND=" dev-qt/qtcore:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 " diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.0.4.ebuild index 862f306fb000..a4488992a794 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.0.4.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +QTMIN=6.6.2 +inherit cmake plasma.kde.org DESCRIPTION="Wallpapers for the Plasma workspace" LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" BDEPEND=" - dev-qt/qtcore:5 - kde-frameworks/extra-cmake-modules:5 + >=dev-qt/qtbase-${QTMIN}:6 + kde-frameworks/extra-cmake-modules:0 " diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 667c2569dcaf..36fb5b6ad962 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1,2 @@ -DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 -DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 +DIST plasma-workspace-6.0.4.tar.xz 19946316 BLAKE2B f687b07b748fe026605d7cf7b1fe45dc43bfb080736b663499bab1da15f2cd6308c680e6ba2ed5752b1bb1c33d5705fdbf5f3fbb0dfd0dbe0abff091f32803c0 SHA512 d55cd7232b2d4da4172e813cdaa432e9582f3d16a7f38055303617a0c66f67511c6e20cc19bfb8bff68e06515c445783040dd212fbb686b2993f469ec6757466 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch deleted file mode 100644 index c96c0ba623d6..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Mon, 22 Oct 2018 10:35:10 +0200 -Subject: [PATCH] libkworkspace: Allow standalone build - ---- - CMakeLists.txt | 6 +++- - 1 file changed, 5 insertions(+), 1 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67f82cfb7..88a8c09b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" - - find_package(KF5TextEditor) - find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(LibKWorkspace 5.21.5) - - find_package(KF5Screen CONFIG REQUIRED) - find_package(KScreenLocker 5.13.80 REQUIRED) -@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS) - option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE) - - add_subdirectory(doc) --add_subdirectory(libkworkspace) -+if(NOT LibKWorkspace_FOUND) -+ message(STATUS "System LibKWorkspace not found, using bundled.") -+ add_subdirectory(libkworkspace) -+endif() - add_subdirectory(libdbusmenuqt) - add_subdirectory(appmenu) - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch deleted file mode 100644 index d61877300d27..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Wed, 4 May 2022 10:45:52 -0600 -Subject: [PATCH 2/8] applets/appmenu: fix top-level menu text coloration - -28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but -neglected to respect the Plasma color scheme, if any. This causes -problems with Plasma themes that have their own colors and don't -respect the systemwide color scheme, such as Breeze Twilight. - -Fix it by using the appropriate colors from the PlasmaCore color scheme -object, not the systemwide object provided by Qt. - -BUG: 453348 -FIXED-IN: 5.24.6 - - -(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e) ---- - applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml -index 441e99016..afb37589a 100644 ---- a/applets/appmenu/package/contents/ui/MenuDelegate.qml -+++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml -@@ -66,9 +66,6 @@ AbstractButton { - - contentItem: PC3.Label { - text: controlRoot.Kirigami.MnemonicData.richTextLabel -- // Kirigami.Theme.highlightedTextColor returns different colors -- // depending on window focus, which does not apply to this applet -- // instead, we use palette.highlightedText here, which returns consistent result -- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText -+ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor - } - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch deleted file mode 100644 index 8cffd8d372ed..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d0340868619c26de5892f8bd095456dc5a32d0ce Mon Sep 17 00:00:00 2001 -From: Amy Rose <amy@fluff.tech> -Date: Tue, 17 May 2022 07:38:03 +0000 -Subject: [PATCH 8/8] applets/kicker: refresh RootModel on session backend - state change - -BUG: 427530 - -Hunting this one down since mid-March... - -In "native" Plasma containments like the panel, desktop, and plasmawindowed, the `LogindSessionBackend` in `libkworkspace` enters the "Ready" state nearly instantly, before any signals can even be attached. In other containments like Latte Dock and plasmoidviewer, however, the initialization takes some time to complete (unsure why). RootModel was not watching or waiting to check what the session backend's state was, resulting in validity checks being done too soon and never checked again. - - -(cherry picked from commit 2cc819f39bcce9ca83ab3767c42beb1e500e55b1) ---- - applets/kicker/plugin/rootmodel.cpp | 1 + - applets/kicker/plugin/systementry.cpp | 1 + - applets/kicker/plugin/systementry.h | 1 + - applets/kicker/plugin/systemmodel.cpp | 2 ++ - applets/kicker/plugin/systemmodel.h | 3 +++ - 5 files changed, 8 insertions(+) - -diff --git a/applets/kicker/plugin/rootmodel.cpp b/applets/kicker/plugin/rootmodel.cpp -index 4ec323683..837108744 100644 ---- a/applets/kicker/plugin/rootmodel.cpp -+++ b/applets/kicker/plugin/rootmodel.cpp -@@ -449,6 +449,7 @@ void RootModel::refresh() - } - - m_systemModel = new SystemModel(this); -+ QObject::connect(m_systemModel, &SystemModel::sessionManagementStateChanged, this, &RootModel::refresh); - - if (m_showPowerSession) { - m_entryList << new GroupEntry(this, i18n("Power / Session"), QStringLiteral("system-log-out"), m_systemModel); -diff --git a/applets/kicker/plugin/systementry.cpp b/applets/kicker/plugin/systementry.cpp -index fdd86ece3..939e2119e 100644 ---- a/applets/kicker/plugin/systementry.cpp -+++ b/applets/kicker/plugin/systementry.cpp -@@ -79,6 +79,7 @@ void SystemEntry::refresh() - { - if (!s_sessionManagement) { - s_sessionManagement = new SessionManagement(); -+ QObject::connect(s_sessionManagement, &SessionManagement::stateChanged, this, &SystemEntry::sessionManagementStateChanged); - } - - bool valid = false; -diff --git a/applets/kicker/plugin/systementry.h b/applets/kicker/plugin/systementry.h -index a0a258024..981a3a5f5 100644 ---- a/applets/kicker/plugin/systementry.h -+++ b/applets/kicker/plugin/systementry.h -@@ -54,6 +54,7 @@ public: - - Q_SIGNALS: - void isValidChanged() const; -+ void sessionManagementStateChanged(); - - private Q_SLOTS: - void refresh(); -diff --git a/applets/kicker/plugin/systemmodel.cpp b/applets/kicker/plugin/systemmodel.cpp -index 656bbdc4e..844f80d09 100644 ---- a/applets/kicker/plugin/systemmodel.cpp -+++ b/applets/kicker/plugin/systemmodel.cpp -@@ -92,10 +92,12 @@ void SystemModel::populate() - - auto addIfValid = [=](const SystemEntry::Action action) { - SystemEntry *entry = new SystemEntry(this, action); -+ QObject::connect(entry, &SystemEntry::sessionManagementStateChanged, this, &SystemModel::sessionManagementStateChanged); - - if (entry->isValid()) { - m_entries << entry; - } -+ - QObject::connect(entry, &SystemEntry::isValidChanged, this, &AbstractModel::refresh, Qt::UniqueConnection); - }; - -diff --git a/applets/kicker/plugin/systemmodel.h b/applets/kicker/plugin/systemmodel.h -index cd9048de1..29ae9e428 100644 ---- a/applets/kicker/plugin/systemmodel.h -+++ b/applets/kicker/plugin/systemmodel.h -@@ -25,6 +25,9 @@ public: - - Q_INVOKABLE bool trigger(int row, const QString &actionId, const QVariant &argument) override; - -+Q_SIGNALS: -+ void sessionManagementStateChanged(); -+ - protected Q_SLOTS: - void refresh() override; - --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch deleted file mode 100644 index 0ac8ed788ade..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch +++ /dev/null @@ -1,137 +0,0 @@ -From ea2833e4dd7114f8bf22a322a26c6c05ebf767f2 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Mon, 25 Apr 2022 21:58:58 +0300 -Subject: [PATCH 3/8] applets/systemtray: Prefer IconName over IconPixmap - -In case both IconName and IconPixmap are provided, the system tray -applet is going to prefer the pixmap. - -That can create a dark icon on dark background bug because plasma can't -recolor pixmaps. - -The SNI spec recommends visualizations to prefer icons over pixmaps: - -> An icon can either be identified by its Freedesktop-compliant icon -> name, carried by this property of by the icon data itself, carried by -> the property IconPixmap. Visualizations are encouraged to prefer icon -> names over icon pixmaps if both are available (FIXME: still not very -> defined: could e the pixmap used as fallback if an icon name is not found?) - -BUG: 418996 - -- Unset iconName when icon can't be loaded -- no code duplication -(cherry picked from commit 7363d0e0f3c1a447e6264e92762735bd33da2682) ---- - .../systemtray/statusnotifieritemsource.cpp | 82 ++++++++----------- - 1 file changed, 33 insertions(+), 49 deletions(-) - -diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp -index f67845e42..731aecadc 100644 ---- a/applets/systemtray/statusnotifieritemsource.cpp -+++ b/applets/systemtray/statusnotifieritemsource.cpp -@@ -286,68 +286,52 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call) - QIcon overlay; - QStringList overlayNames; - -- // Icon -+ // Overlay icon - { -- KDbusImageVector image; -- QIcon icon; -- QString iconName; -- -- properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image; -- if (image.isEmpty()) { -- QString iconName = properties[QStringLiteral("OverlayIconName")].toString(); -- m_overlayIconName = iconName; -- if (!iconName.isEmpty()) { -+ m_overlayIconName = QString(); -+ -+ const QString iconName = properties[QStringLiteral("OverlayIconName")].toString(); -+ if (!iconName.isEmpty()) { -+ overlay = QIcon(new KIconEngine(iconName, iconLoader())); -+ if (!overlay.isNull()) { -+ m_overlayIconName = iconName; - overlayNames << iconName; -- overlay = QIcon(new KIconEngine(iconName, iconLoader())); - } -- } else { -- overlay = imageVectorToPixmap(image); - } -+ if (overlay.isNull()) { -+ KDbusImageVector image; -+ properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image; -+ if (!image.isEmpty()) { -+ overlay = imageVectorToPixmap(image); -+ } -+ } -+ } - -- properties[QStringLiteral("IconPixmap")].value<QDBusArgument>() >> image; -- if (image.isEmpty()) { -- iconName = properties[QStringLiteral("IconName")].toString(); -- if (!iconName.isEmpty()) { -- icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames)); -- -- if (overlayNames.isEmpty() && !overlay.isNull()) { -+ auto loadIcon = [this, &properties, &overlay, &overlayNames](const QString &iconKey, const QString &pixmapKey) -> std::tuple<QIcon, QString> { -+ const QString iconName = properties[iconKey].toString(); -+ if (!iconName.isEmpty()) { -+ QIcon icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames)); -+ if (!icon.isNull()) { -+ if (!overlay.isNull() && overlayNames.isEmpty()) { - overlayIcon(&icon, &overlay); - } -+ return {icon, iconName}; - } -- } else { -- icon = imageVectorToPixmap(image); -+ } -+ KDbusImageVector image; -+ properties[pixmapKey].value<QDBusArgument>() >> image; -+ if (!image.isEmpty()) { -+ QIcon icon = imageVectorToPixmap(image); - if (!icon.isNull() && !overlay.isNull()) { - overlayIcon(&icon, &overlay); - } -+ return {icon, QString()}; - } -- m_icon = icon; -- m_iconName = iconName; -- } -+ return {}; -+ }; - -- // Attention icon -- { -- KDbusImageVector image; -- QIcon attentionIcon; -- -- properties[QStringLiteral("AttentionIconPixmap")].value<QDBusArgument>() >> image; -- if (image.isEmpty()) { -- QString iconName = properties[QStringLiteral("AttentionIconName")].toString(); -- m_attentionIconName = iconName; -- if (!iconName.isEmpty()) { -- attentionIcon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames)); -- -- if (overlayNames.isEmpty() && !overlay.isNull()) { -- overlayIcon(&attentionIcon, &overlay); -- } -- } -- } else { -- attentionIcon = imageVectorToPixmap(image); -- if (!attentionIcon.isNull() && !overlay.isNull()) { -- overlayIcon(&attentionIcon, &overlay); -- } -- } -- m_attentionIcon = attentionIcon; -- } -+ std::tie(m_icon, m_iconName) = loadIcon(QStringLiteral("IconName"), QStringLiteral("IconPixmap")); -+ std::tie(m_attentionIcon, m_attentionIconName) = loadIcon(QStringLiteral("AttentionIconName"), QStringLiteral("AttentionIconPixmap")); - - // ToolTip - { --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch deleted file mode 100644 index 609ab0f011cd..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7795e5fb4f7e2a79e15a9e5711149f71144e73c9 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Fri, 13 May 2022 14:43:44 +0800 -Subject: [PATCH 5/8] applets/systemtray: disconnect KConfigLoader signal when - instance is about to be deleted - -When an applet is about to be deleted, it will save its config -automatically, but in this case the system tray doesn't need to load the -config again. - -BUG: 453726 - - -(cherry picked from commit 6da91d053b4f142277d60db4a1a17eded9249d11) ---- - applets/systemtray/systemtray.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp -index 3b7f688a6..0d889b3f0 100644 ---- a/applets/systemtray/systemtray.cpp -+++ b/applets/systemtray/systemtray.cpp -@@ -40,6 +40,8 @@ SystemTray::SystemTray(QObject *parent, const KPluginMetaData &data, const QVari - - SystemTray::~SystemTray() - { -+ // When the applet is about to be deleted, delete now to avoid calling loadConfig() -+ delete m_settings; - } - - void SystemTray::init() --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch deleted file mode 100644 index 57477173acbb..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1a966d3fb979cf0f0080c805aed248ee77978800 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Mon, 16 May 2022 16:18:00 +0800 -Subject: [PATCH 6/8] kcms/desktoptheme: find metadata.json when loading - ThemesModel - -Before this commit ThemesModel only finds metadata.desktop, but after -KF5.94, the default theme metadata files have been ported to json format. - -BUG: 453830 - - -(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e) ---- - kcms/desktoptheme/themesmodel.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp -index 6f0ecf4e3..296951742 100644 ---- a/kcms/desktoptheme/themesmodel.cpp -+++ b/kcms/desktoptheme/themesmodel.cpp -@@ -155,7 +155,15 @@ void ThemesModel::load() - const QDir cd(ppath); - const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot); - for (const QString &pack : entries) { -- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop"); -+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator()); -+ -+ QString _metadata = QStringLiteral("%1json").arg(prefix); -+ if (QFile::exists(_metadata)) { -+ themes << _metadata; -+ continue; -+ } -+ -+ _metadata = QStringLiteral("%1desktop").arg(prefix); - if (QFile::exists(_metadata)) { - themes << _metadata; - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch deleted file mode 100644 index 2a379c707efe..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c602c52578da1331d2466ff9803c7e0b9287c24c Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Mon, 16 May 2022 14:49:46 +0200 -Subject: [PATCH 7/8] kcms/desktoptheme: Fix reading of metadata in ThemesModel - -We can not use KConfig to read the desktop file. - -CCBUG: 453830 - - -(cherry picked from commit 43ae993da35bb408b4fabb5c4514feff97628e0d) ---- - kcms/desktoptheme/themesmodel.cpp | 27 +++++++++++++++++++-------- - 1 file changed, 19 insertions(+), 8 deletions(-) - -diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp -index 296951742..ce3cac14b 100644 ---- a/kcms/desktoptheme/themesmodel.cpp -+++ b/kcms/desktoptheme/themesmodel.cpp -@@ -16,6 +16,7 @@ - - #include <KColorScheme> - #include <KDesktopFile> -+#include <KPluginMetaData> - - #include <KConfigGroup> - #include <KSharedConfig> -@@ -176,15 +177,25 @@ void ThemesModel::load() - int themeNameSepIndex = themeRoot.lastIndexOf(QLatin1Char('/'), -1); - const QString packageName = themeRoot.right(themeRoot.length() - themeNameSepIndex - 1); - -- KDesktopFile df(theme); -+ QString name; -+ QString comment; - -- if (df.noDisplay()) { -- continue; -- } -+ if (theme.endsWith(QLatin1String(".json"))) { -+ KPluginMetaData data = KPluginMetaData::fromJsonFile(theme); -+ name = data.name(); -+ comment = data.description(); -+ } else { -+ KDesktopFile df(theme); - -- QString name = df.readName(); -- if (name.isEmpty()) { -- name = packageName; -+ if (df.noDisplay()) { -+ continue; -+ } -+ -+ name = df.readName(); -+ if (name.isEmpty()) { -+ name = packageName; -+ } -+ comment = df.readComment(); - } - const bool isLocal = QFileInfo(theme).isWritable(); - bool hasPluginName = std::any_of(m_data.begin(), m_data.end(), [&](const ThemesModelData &item) { -@@ -205,7 +216,7 @@ void ThemesModel::load() - type = LightTheme; - } - } -- ThemesModelData item{name, packageName, df.readComment(), type, isLocal, false}; -+ ThemesModelData item{name, packageName, comment, type, isLocal, false}; - m_data.append(item); - } - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch deleted file mode 100644 index 594efe7df172..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e2b631d43528c3e41d53c8a359b6129c616bc271 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko <me@ratijas.tk> -Date: Sat, 30 Apr 2022 03:20:11 +0300 -Subject: [PATCH 1/8] [sddm-theme] KeyboardButton: Fix layout name not being - shown - -It used to cause an error like this: - - [03:21:31.246] (WW) GREETER: file:///usr/share/sddm/themes/breeze/KeyboardButton.qml:19: TypeError: Cannot read property 'shortName' of null - -(cherry picked from commit 2e9020ca6c1d55842a4b014623f0d88697972000) ---- - sddm-theme/KeyboardButton.qml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml -index d5d5a446c..712096d87 100644 ---- a/sddm-theme/KeyboardButton.qml -+++ b/sddm-theme/KeyboardButton.qml -@@ -10,7 +10,7 @@ PlasmaComponents.ToolButton { - - property int currentIndex: -1 - -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) -+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].shortName) - implicitWidth: minimumWidth - - visible: menu.items.length > 1 -@@ -27,7 +27,6 @@ PlasmaComponents.ToolButton { - onObjectRemoved: keyboardMenu.removeItem( object ) - delegate: QQC.MenuItem { - text: modelData.longName -- property string shortName: modelData.shortName - onTriggered: { - keyboard.currentLayout = model.index - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch deleted file mode 100644 index d09b60ce6ce4..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd8f1b5e302717c84f6a05af36c621122ead6d99 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Fri, 6 May 2022 21:36:09 +0800 -Subject: [PATCH 4/8] wallpapers/image: Fix missing folder action buttons - -The width of the action area needs to be substracted in contentItem's -width. - -Also use `Kirigami.Units.gridUnit * 4` because `overlayWidth` was -introduced in Frameworks 5.94, and people using Plasma 5.24 may have an -older Frameworks version. ---- - wallpapers/image/imagepackage/contents/ui/config.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/wallpapers/image/imagepackage/contents/ui/config.qml b/wallpapers/image/imagepackage/contents/ui/config.qml -index 97f9f81a5..7bb675f23 100644 ---- a/wallpapers/image/imagepackage/contents/ui/config.qml -+++ b/wallpapers/image/imagepackage/contents/ui/config.qml -@@ -331,6 +331,7 @@ ColumnLayout { - // Don't need a highlight or hover effects - hoverEnabled: false - contentItem: Kirigami.BasicListItem { -+ width: slidePathsView.width - (parent.hasOwnProperty("overlayWidth") ? overlayWidth : Kirigami.Units.gridUnit * 4) - // Don't need a highlight or hover effects - hoverEnabled: false - separatorVisible: false --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index 79fb12a10ab1..427c617b6684 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -11,8 +11,9 @@ <use> <flag name="appstream">Enable AppStream software metadata support</flag> <flag name="geolocation">Enables dataengine providing location information</flag> - <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag> - <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag> + <flag name="policykit">Enable locale generation and Users KCM using <pkg>sys-auth/polkit</pkg> and <pkg>sys-apps/accountsservice</pkg></flag> + <flag name="screencast">Enable screencast portal using <pkg>kde-plasma/kpipewire</pkg></flag> <flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag> + <flag name="wallpaper-metadata">Show metadata for image wallpaper plugin using <pkg>kde-apps/libkexiv2</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild deleted file mode 100644 index ff25b6a845ef..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop telemetry" - -REQUIRED_USE="gps? ( geolocation )" -RESTRICT="test" - -# slot op: various private QtWaylandClient headers -COMMON_DEPEND=" - >=dev-libs/wayland-1.15 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5= - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kpeople-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kunitconversion-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/prison-${KFMIN}:5[qml] - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/layer-shell-qt-${PVCUT}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - sci-libs/libqalculate:= - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) - fontconfig? ( - >=dev-qt/qtprintsupport-${QTMIN}:5 - media-libs/fontconfig - x11-libs/libXft - x11-libs/xcb-util-image - ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - policykit? ( virtual/libcrypt:= ) - screencast? ( - >=dev-qt/qtgui-${QTMIN}:5=[egl] - media-libs/libglvnd - >=media-video/pipewire-0.3:= - x11-libs/libdrm - ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-util/wayland-scanner-1.19.0 - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) -" -RDEPEND="${COMMON_DEPEND} - app-text/iso-codes - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpaths-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - kde-apps/kio-extras:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 - sys-apps/dbus - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - !<kde-plasma/breeze-5.22.90:5 - !<kde-plasma/plasma-desktop-5.23.90:5 - policykit? ( sys-apps/accountsservice ) -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - virtual/pkgconfig -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}"/${PN}-5.21.5-split-libkworkspace.patch # downstream - "${FILESDIR}"/${PN}-5.22.5-krunner-cwd-at-home.patch # TODO upstream: KDE-bug 432975, bug 767478 - "${FILESDIR}"/${P}-sddm-theme-KeyboardButton-fix-layout-name.patch - "${FILESDIR}"/${P}-applets-appmenu-fix-top-level-menu-text-coloration.patch # KDE-bug 453348 - "${FILESDIR}"/${P}-applets-systemtray-prefer-IconName-over-IconPixmap.patch # KDE-bug 418996 - "${FILESDIR}"/${P}-wallpapers-image-fix-missing-folder-action-buttons.patch - "${FILESDIR}"/${P}-fix-plasmashell-crash-on-panel-w-systray-remove.patch # KDE-bug 453726 - "${FILESDIR}"/${P}-kcms-desktoptheme-detect-installed-styles-{1,2}.patch # KDE-bug 453830 - "${FILESDIR}"/${P}-applets-kicker-refresh-RootModel-on-session-backend.patch # KDE-bug 427530 -) - -src_prepare() { - ecm_src_prepare - - cmake_comment_add_subdirectory libkworkspace - # delete colliding libkworkspace translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -name "libkworkspace*" -delete || die - fi - - # 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 geolocation; then - use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ - -i dataengines/geolocation/CMakeLists.txt || die - fi - - if ! use policykit; then - cmake_run_in kcms cmake_comment_add_subdirectory users - fi - - ecm_punt_kf_module Su -} - -src_configure() { - local mycmakeargs=( - -DBUILD_xembed-sni-proxy=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF5Holidays) - $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package geolocation KF5NetworkManagerQt) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - - # default startup and shutdown scripts - insinto /etc/xdg/plasma-workspace/env - doins "${FILESDIR}"/10-agent-startup.sh - - insinto /etc/xdg/plasma-workspace/shutdown - doins "${FILESDIR}"/10-agent-shutdown.sh - fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh -} - -pkg_postinst () { - ecm_pkg_postinst - - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" - elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.25.2.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.ebuild index fda548de9024..19bf008b5923 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.25.2.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="forceoptional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma workspace" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop telemetry" +screencast +semantic-desktop telemetry +wallpaper-metadata" REQUIRED_USE="gps? ( geolocation )" RESTRICT="test" +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras # slot op: various private QtWaylandClient headers COMMON_DEPEND=" + dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] @@ -35,11 +36,10 @@ COMMON_DEPEND=" >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -53,7 +53,6 @@ COMMON_DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 @@ -62,6 +61,7 @@ COMMON_DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kpeople-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 @@ -69,21 +69,23 @@ COMMON_DEPEND=" >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kunitconversion-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/prison-${KFMIN}:5[qml] >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 + >=media-libs/phonon-4.11.0[qt5(+)] sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE @@ -96,8 +98,7 @@ COMMON_DEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) + appstream? ( <dev-libs/appstream-1[qt5] ) calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) fontconfig? ( >=dev-qt/qtprintsupport-${QTMIN}:5 @@ -107,34 +108,43 @@ COMMON_DEPEND=" ) geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) gps? ( sci-geosciences/gpsd ) - policykit? ( virtual/libcrypt:= ) + policykit? ( + sys-auth/polkit-qt[qt5(+)] + virtual/libcrypt:= + ) screencast? ( >=dev-qt/qtgui-${QTMIN}:5=[egl] + >=kde-plasma/kpipewire-${PVCUT}:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) + wallpaper-metadata? ( kde-apps/libkexiv2:5 ) " DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/wayland-protocols-1.31 >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) - test? ( >=dev-libs/wayland-protocols-1.24 ) " RDEPEND="${COMMON_DEPEND} + !<kde-plasma/breeze-5.22.90:5 + !<kde-plasma/plasma-desktop-5.27.0:5 app-text/iso-codes >=dev-qt/qdbus-${QTMIN}:* >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpaths-${QTMIN}:5 >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] >=dev-qt/qtquickcontrols2-${QTMIN}:5 - kde-apps/kio-extras:5 + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kactivitymanagerd-${PVCUT}:5 >=kde-plasma/milou-${PVCUT}:5 >=kde-plasma/plasma-integration-${PVCUT}:5 sys-apps/dbus @@ -142,15 +152,15 @@ RDEPEND="${COMMON_DEPEND} x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot - !<kde-plasma/breeze-5.22.90:5 - !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) " BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:5 virtual/pkgconfig " -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" PATCHES=( "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream @@ -162,12 +172,11 @@ src_prepare() { cmake_comment_add_subdirectory libkworkspace # delete colliding libkworkspace translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -name "libkworkspace*" -delete || die - fi + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die # TODO: try to get a build switch upstreamed if ! use screencast; then + ecm_punt_bogus_dep KPipeWire sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die fi @@ -180,18 +189,24 @@ src_prepare() { if ! use policykit; then cmake_run_in kcms cmake_comment_add_subdirectory users fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi } src_configure() { local mycmakeargs=( -DBUILD_xembed-sni-proxy=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON + -DGLIBC_LOCALE_GEN=$(usex policykit) $(cmake_use_find_package appstream AppStreamQt) $(cmake_use_find_package calendar KF5Holidays) $(cmake_use_find_package fontconfig Fontconfig) $(cmake_use_find_package geolocation KF5NetworkManagerQt) $(cmake_use_find_package semantic-desktop KF5Baloo) $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package wallpaper-metadata KF5KExiv2) ) ecm_src_configure diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.0.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.0.4.ebuild new file mode 100644 index 000000000000..c34a58c45cb2 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.0.4.ebuild @@ -0,0 +1,229 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma workspace" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop systemd telemetry +wallpaper-metadata" + +REQUIRED_USE="gps? ( geolocation )" +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +# slot op: various private QtWaylandClient headers +COMMON_DEPEND=" + dev-libs/icu:= + >=dev-libs/wayland-1.15 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,libinput,network,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtshadertools-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6= + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=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/kded-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/ktexteditor-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kunitconversion-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/prison-${KFMIN}:6[qml] + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/breeze-${PVCUT}:6 + >=kde-plasma/kscreenlocker-${PVCUT}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/kwin-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-stats-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + media-libs/libcanberra + >=media-libs/phonon-4.12.0[qt6] + sci-libs/libqalculate:= + sys-libs/zlib + virtual/libudev:= + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXau + x11-libs/libxcb + x11-libs/libXcursor + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXtst + x11-libs/xcb-util + appstream? ( >=dev-libs/appstream-1[qt6] ) + calendar? ( >=kde-frameworks/kholidays-${KFMIN}:6 ) + fontconfig? ( + media-libs/fontconfig + x11-libs/libXft + x11-libs/xcb-util-image + ) + geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) + gps? ( sci-geosciences/gpsd ) + policykit? ( + >=sys-auth/polkit-qt-0.175[qt6] + virtual/libcrypt:= + ) + screencast? ( + >=dev-qt/qtbase-${QTMIN}:6=[opengl] + >=kde-plasma/kpipewire-${PVCUT}:6 + media-libs/libglvnd + >=media-video/pipewire-0.3:= + x11-libs/libdrm + ) + semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) + systemd? ( sys-apps/systemd:= ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + wallpaper-metadata? ( kde-apps/libkexiv2:6 ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + x11-base/xorg-proto + fontconfig? ( x11-libs/libXrender ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/libkworkspace:5 + !<kde-plasma/plasma-desktop-5.27.0:5 + !kde-plasma/xembed-sni-proxy:* + app-text/iso-codes + dev-libs/kirigami-addons:6 + >=dev-qt/qttools-${QTMIN}:*[qdbus] + kde-apps/kio-extras:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 + >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + >=kde-plasma/milou-${PVCUT}:6 + >=kde-plasma/plasma-integration-${PVCUT}:6 + sys-apps/dbus + x11-apps/xmessage + x11-apps/xprop + x11-apps/xrdb + x11-apps/xsetroot + policykit? ( sys-apps/accountsservice ) +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:6 + virtual/pkgconfig + test? ( >=dev-qt/qtwayland-${QTMIN}:6[compositor] ) +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +PATCHES=( + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 +) + +src_prepare() { + ecm_src_prepare + + # TODO: try to get a build switch upstreamed + if ! use screencast; then + ecm_punt_bogus_dep KPipeWire + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if use geolocation; then + use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ + -i dataengines/geolocation/CMakeLists.txt || die + fi + + if ! use policykit; then + cmake_run_in kcms cmake_comment_add_subdirectory users + fi + + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi + + # TODO: try to get a build switch upstreamed + if ! use systemd; then + sed -e "s/^pkg_check_modules.*SYSTEMD/#&/" -i CMakeLists.txt || die + fi +} + +src_configure() { + local mycmakeargs=( + -DWITH_X11=ON # TODO: broken upstream, fix it if you can + -DGLIBC_LOCALE_GEN=$(usex policykit) + $(cmake_use_find_package appstream AppStreamQt) + $(cmake_use_find_package calendar KF6Holidays) + $(cmake_use_find_package fontconfig Fontconfig) + $(cmake_use_find_package geolocation KF6NetworkManagerQt) + $(cmake_use_find_package semantic-desktop KF6Baloo) + $(cmake_use_find_package telemetry KF6UserFeedback) + $(cmake_use_find_package wallpaper-metadata KExiv2Qt6) + ) + + ecm_src_configure +} + +src_install() { + ecm_src_install + + # default startup and shutdown scripts + insinto /etc/xdg/plasma-workspace/env + doins "${FILESDIR}"/10-agent-startup.sh + + insinto /etc/xdg/plasma-workspace/shutdown + doins "${FILESDIR}"/10-agent-shutdown.sh + fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh +} + +pkg_postinst () { + ecm_pkg_postinst + + elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," + elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" + elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" +} diff --git a/kde-plasma/plasma5support/Manifest b/kde-plasma/plasma5support/Manifest new file mode 100644 index 000000000000..3059c03ac0bf --- /dev/null +++ b/kde-plasma/plasma5support/Manifest @@ -0,0 +1 @@ +DIST plasma5support-6.0.4.tar.xz 55712 BLAKE2B 3a5f4b143a1824e474accb3929926b0c366dd9b8d15bfbafed88f598b7e066bf4cf11c3875b989c3fd6869c937382f5979cabdf7b1ce1952b087716557370e1d SHA512 db501ad90331871a46450a3e051830970d4da2e0a90f7ee4b8d97efca7f1b2e9995418bc124b1378fa3af94dcfcdb9c46f376eb44d27c54036b2e22469867763 diff --git a/kde-plasma/plasma5support/metadata.xml b/kde-plasma/plasma5support/metadata.xml new file mode 100644 index 000000000000..7c7e791bbadc --- /dev/null +++ b/kde-plasma/plasma5support/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma5support</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/plasma5support/plasma5support-6.0.4.ebuild b/kde-plasma/plasma5support/plasma5support-6.0.4.ebuild new file mode 100644 index 000000000000..c32801cdf76c --- /dev/null +++ b/kde-plasma/plasma5support/plasma5support-6.0.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="true" +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Support components for porting from KF5/Qt5 to KF6/Qt6" + +LICENSE="GPL-2+ LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/plymouth-kcm/Manifest b/kde-plasma/plymouth-kcm/Manifest index ad3684f3a302..d65a5f5dc9c9 100644 --- a/kde-plasma/plymouth-kcm/Manifest +++ b/kde-plasma/plymouth-kcm/Manifest @@ -1,2 +1,2 @@ -DIST plymouth-kcm-5.24.5.tar.xz 39964 BLAKE2B ba1e54afb9a19b4e3858caa31c8c729feb338412368c8b91a197ee87351397f6c54f62753862982f6f2a3bbcbb74c39946bfcc9e90085ec22179676672ebb229 SHA512 7bc78c3b3d2639de00f428bda606b4f822c99f4c3dc0c2f1fe3f422208e05273701a1871fc573c36b8e14cc1a8bc02e07e4389a40b3fee3a6b79c44a561c2cf8 -DIST plymouth-kcm-5.25.2.tar.xz 40012 BLAKE2B c1d8af32289dfa8ef50f74396f23d206dc05500c7b6cecc8af4e9933b7f5d5aacfdc30c91d0b625db24b44380e4b7fa05f76b583d64063e911df6efa6ded7ef6 SHA512 1c4a9a5c2f46744e9fee2e6ca0bd684640dd049b324a3f4bbe93b4c5eb3fe52a590c150e306f392ec4ef24f7f194456d2a91b7710ee1a6da6096b779a7105dd9 +DIST plymouth-kcm-5.27.11.tar.xz 45828 BLAKE2B 28c06e6f1cd8cbd1d82786b00c28f652dc7ac123677ba0e00d2df494fa4ddd57883842051e984b144d6b6a8f87ba3d05d3a07fb9e8eb250013ca7044c232f0e7 SHA512 3b7174d52141db79330cb56ee3426dfc44f5d5edb5ebce5354fca098dd741c2414a0faaf5bc8a10a4c1ca21a72141a0c5f36558ede681400537d0686f4a2b0b5 +DIST plymouth-kcm-6.0.4.tar.xz 46428 BLAKE2B fa7454bf346fa07d157c5a0dfc0abef603943c4297d126dff4c7438e1f380f50f4a18a9e5654ef639ca11b09b97cd849d8784254f92d992ba9c355665bf32d2b SHA512 b9e4865a79d99b72203a3e6088eb65ac6eb4291de771746439c5984c7b13aa9cdb7b3a858867e122f35151e9cb18358de100fbde8590262f4e2966c06098ae48 diff --git a/kde-plasma/plymouth-kcm/metadata.xml b/kde-plasma/plymouth-kcm/metadata.xml index d925f2439758..485b99be0e32 100644 --- a/kde-plasma/plymouth-kcm/metadata.xml +++ b/kde-plasma/plymouth-kcm/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_plymouth</bugs-to> + <remote-id type="kde-invent">plasma/plymouth-kcm</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild deleted file mode 100644 index d6268b4f5766..000000000000 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma control module for Plymouth" -HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - sys-boot/plymouth -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.2.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.11.ebuild index c01658895a2c..7c9c3c65222a 100644 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.25.2.ebuild +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma control module for Plymouth" HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86" IUSE="" DEPEND=" @@ -33,5 +33,8 @@ DEPEND=" sys-boot/plymouth " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.0.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.0.4.ebuild new file mode 100644 index 000000000000..3a1ab63851de --- /dev/null +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.0.4.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma control module for Plymouth" +HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + sys-boot/plymouth +" +RDEPEND="${DEPEND} + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/polkit-kde-agent/Manifest b/kde-plasma/polkit-kde-agent/Manifest index d904bfd0e949..f8288e9bd347 100644 --- a/kde-plasma/polkit-kde-agent/Manifest +++ b/kde-plasma/polkit-kde-agent/Manifest @@ -1,2 +1,2 @@ -DIST polkit-kde-agent-1-5.24.5.tar.xz 48444 BLAKE2B 4e39fe9e23d474e79a0e2611669065e05180f9e2e514cd0aba23b950c19357ac8d56d1a3fbaa85516b3eff86ebe2fbfb8e96d1dcda2cca9333ce0d9b7e7f7f8e SHA512 8182271a4463e28001c5806156afffa8436c9fce0ead257c60b413bf54565d8271e8356f5670e8eb2aea5c3d2a308e31f14f6eff4c6903e1936e6395d8502a93 -DIST polkit-kde-agent-1-5.25.2.tar.xz 48584 BLAKE2B 9f157ec0b0da1b265d7e933fdc083da8aca4c0b166ca6d72c626b2f20efdd0671be338b8e8d24b96a8a6097dd709feb9536b3984f5d3d570cf119266abb476ef SHA512 b55b845e01041e49892bc36ca76b50342a5c4210e6768c95e5af12bfea819ade774999ec54c7330679599b2e9335eb94be699f50d68b510327dcdc78e1e8c844 +DIST polkit-kde-agent-1-5.27.11.tar.xz 53144 BLAKE2B bfffb3ed163b0d1581a23f663120c367d32afaefe843f19b5e5b0b099fd3f7f6b0f396a8543797e6dc9771acb137125f0a7a2ebd2520edc15acec560ef532987 SHA512 c5687704986bca51fde5d0b8d054ee6bdd957d0742c0e6a6f33100c77874ea75b7cb973393d4c7711964e390aa31fe30128d157a757ae13fc0c4d2eae1fc7bed +DIST polkit-kde-agent-1-6.0.4.tar.xz 56348 BLAKE2B 7a46c65c5f7ddaf8285de50d5a8e2c7c97b9cb5c680f5002c14123f4e1404b7b3c18af4f8cc6f77a000b54d18d4921721476274c6e005a1461d949487f917a38 SHA512 7f5a3c0f3283caf6b669a237980d5cec8774d0fcbc5512b37981c146b5da19aec97374e6288ceffe5f257021bc0765562f84c57bf2de9c0940413a3b06182c91 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.2.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.2.ebuild deleted file mode 100644 index c09922bf9069..000000000000 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.25.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="${PN}-1" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="PolKit agent module for KDE Plasma" -HOMEPAGE="https://kde.org/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=sys-auth/polkit-qt-0.113.0 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.11.ebuild index 6d8dd7374950..9a3e74aae971 100644 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="${PN}-1" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="PolKit agent module for KDE Plasma" HOMEPAGE="https://kde.org/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -27,7 +27,7 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=sys-auth/polkit-qt-0.113.0 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=sys-auth/polkit-qt-0.113.0[qt5(+)] " RDEPEND="${DEPEND}" diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.0.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.0.4.ebuild new file mode 100644 index 000000000000..a303cb987fa3 --- /dev/null +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.0.4.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KDE_ORG_NAME="${PN}-1" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="PolKit agent module for KDE Plasma" +HOMEPAGE="https://kde.org/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=sys-auth/polkit-qt-0.175[qt6] +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 +" diff --git a/kde-plasma/powerdevil/Manifest b/kde-plasma/powerdevil/Manifest index 8b3d67a29f15..ba7e41b69f4b 100644 --- a/kde-plasma/powerdevil/Manifest +++ b/kde-plasma/powerdevil/Manifest @@ -1,2 +1,2 @@ -DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15 -DIST powerdevil-5.25.2.tar.xz 636376 BLAKE2B 0d700e6172b3c91eb9e603acc3a7c0b107ed15e9221445c7aaf4106416619b505f7b11e0ea7c2c5c3a0a2df4716c35626b330572b5d5fd00aa6e77822ef7856b SHA512 6b6a49aaa702a5c482df708eaf8b07b3a7bf787503ab0c40a3d9f60f7a5bc57efb551b7606863804db9fb8791d1d56754fe37f367e48ae8e01ff879defa59edb +DIST powerdevil-5.27.11.tar.xz 791244 BLAKE2B 423bca5c6c1731f241e1db5aba3a75c7f5801fb99957fb6de6df682053ee5810aeec412a599b83862f4b27c7392cd8781f5b5e952a11bcdb2910a406bf9990c6 SHA512 7ea5640d42c3aa4bc21091a56452202f798ed3df3cfab6b0f38895cdd558fe877e463bf2c801914ded2511777b353d6e252f9dcee2856b1995b6f08c84cc3b84 +DIST powerdevil-6.0.4.tar.xz 795852 BLAKE2B ce23fbb018b9d447028d5c89a96086f4251007bdda70d7ac704fb9e3e64b1e2e82cc15e8b3b244e851342914ed885b31f8e0c28cc6cd9b07fa5647f5e11bea0e SHA512 9290ea667b254f4a9c7ce7322a1f34eed755d15067caa1dd29573bfd9b4cff1d47589f585176e63e9f8e0435129287581ca52e5548c4083c5c2f6e508c0f7a49 diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml index 4b6478b5df5d..a24d6661f302 100644 --- a/kde-plasma/powerdevil/metadata.xml +++ b/kde-plasma/powerdevil/metadata.xml @@ -7,9 +7,11 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/powerdevil</remote-id> </upstream> <use> <flag name="brightness-control">Enable screen brightness control using <pkg>app-misc/ddcutil</pkg></flag> + <flag name="caps">Capabilities support for scheduled wakeup which can wake from suspend (CAP_WAKE_ALARM)</flag> <flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/powerdevil/powerdevil-5.25.2.ebuild b/kde-plasma/powerdevil/powerdevil-5.25.2.ebuild deleted file mode 100644 index f85798251353..000000000000 --- a/kde-plasma/powerdevil/powerdevil-5.25.2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="Power management for KDE Plasma Shell" -HOMEPAGE="https://invent.kde.org/plasma/powerdevil" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="brightness-control caps +wireless" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5[policykit] - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - virtual/libudev:= - x11-libs/libxcb - brightness-control? ( app-misc/ddcutil:= ) - caps? ( sys-libs/libcap ) - wireless? ( - >=kde-frameworks/bluez-qt-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5 - ) -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=sys-power/upower-0.9.23 -" - -src_configure() { - local mycmakeargs=( - -DHAVE_DDCUTIL=$(usex brightness-control) - $(cmake_use_find_package caps Libcap) - $(cmake_use_find_package wireless KF5BluezQt) - $(cmake_use_find_package wireless KF5NetworkManagerQt) - ) - - ecm_src_configure -} diff --git a/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.27.11.ebuild index f06590672c3f..3adfa345818f 100644 --- a/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Power management for KDE Plasma Shell" HOMEPAGE="https://invent.kde.org/plasma/powerdevil" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="brightness-control caps +wireless" DEPEND=" @@ -22,7 +22,6 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5[policykit] >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -38,12 +37,12 @@ DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) @@ -54,9 +53,11 @@ DEPEND=" ) " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + sys-power/power-profiles-daemon >=sys-power/upower-0.9.23 " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/powerdevil/powerdevil-6.0.4.ebuild b/kde-plasma/powerdevil/powerdevil-6.0.4.ebuild new file mode 100644 index 000000000000..587311940d33 --- /dev/null +++ b/kde-plasma/powerdevil/powerdevil-6.0.4.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Power management for KDE Plasma Shell" +HOMEPAGE="https://invent.kde.org/plasma/powerdevil" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="brightness-control caps" + +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=kde-frameworks/kauth-${KFMIN}:6[policykit] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-workspace-${PVCUT}:6 + virtual/libudev:= + x11-libs/libxcb + brightness-control? ( app-misc/ddcutil:= ) + caps? ( sys-libs/libcap ) +" +RDEPEND="${DEPEND} + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + sys-power/power-profiles-daemon + >=sys-power/upower-0.9.23 +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +src_configure() { + local mycmakeargs=( + -DHAVE_DDCUTIL=$(usex brightness-control) + $(cmake_use_find_package caps Libcap) + ) + + ecm_src_configure +} diff --git a/kde-plasma/print-manager/Manifest b/kde-plasma/print-manager/Manifest new file mode 100644 index 000000000000..85a7f0a77d44 --- /dev/null +++ b/kde-plasma/print-manager/Manifest @@ -0,0 +1,2 @@ +DIST print-manager-23.08.5.tar.xz 290620 BLAKE2B 3a29dd5e4684e966d95cd9db424a4b3c82889cf8c2d1fe99a4c9d27e6593979cdbd26c11c8bd1af8df98ca9c86d2557da96a31f914e4deac10e86c2a188f0a9d SHA512 28af8ea76d08e83a5cdf1ea5c2e6ff6314bb89b835ed6af2648219075a75ed3606eb7472a2ebeea2aceb67fc562838a3c554b8515f168f36510a4e07077974f3 +DIST print-manager-6.0.4.tar.xz 340020 BLAKE2B 56da7b890033255f4ac5bf3943c2bce844355fd422e39fd7adfb8d115bb3b0ca99bb8edb1facbe3b76d953a6d35405037e00e2fd667cac7f1a16d82fef7f5577 SHA512 fd1d5e1c1cb26838e0b5b98ade3f703425caa6a86b6184af508df4adeaa2521980546a20362e0f2f55d6e968b1f7c24c663a3e0754403977d457860f86885855 diff --git a/kde-plasma/print-manager/metadata.xml b/kde-plasma/print-manager/metadata.xml new file mode 100644 index 000000000000..1039dab47de3 --- /dev/null +++ b/kde-plasma/print-manager/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_printer_manager</bugs-to> + <remote-id type="kde-invent">plasma/print-manager</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild b/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild new file mode 100644 index 000000000000..4c791d5b867e --- /dev/null +++ b/kde-plasma/print-manager/print-manager-23.08.5-r100.ebuild @@ -0,0 +1,13 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Shim print-manager to ease slot 5 users into slot 6" +HOMEPAGE="https://kde.org/plasma-desktop" + +LICENSE="metapackage" +SLOT="5" +KEYWORDS="~amd64" + +RDEPEND="kde-plasma/print-manager:6" diff --git a/kde-plasma/print-manager/print-manager-23.08.5.ebuild b/kde-plasma/print-manager/print-manager-23.08.5.ebuild new file mode 100644 index 000000000000..7dce0e85c4e5 --- /dev/null +++ b/kde-plasma/print-manager/print-manager-23.08.5.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm gear.kde.org + +DESCRIPTION="Manage CUPS print jobs and printers in Plasma" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+gtk" + +DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + net-print/cups +" +RDEPEND="${DEPEND} + >=dev-qt/qtquickcontrols-${QTMIN}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 + kde-plasma/kde-cli-tools:* + gtk? ( app-admin/system-config-printer ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" + +pkg_postinst() { + ecm_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then + ewarn "By switching off \"gtk\" USE flag, you have chosen to do without" + ewarn "an important, though optional, runtime dependency:" + ewarn + ewarn "app-admin/system-config-printer" + ewarn + ewarn "${PN} will work nevertheless, but is going to be less comfortable" + ewarn "and will show the following error status during runtime:" + ewarn + ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing" + ewarn "was not provided by any .service files'\"" + fi +} diff --git a/kde-plasma/print-manager/print-manager-6.0.4.ebuild b/kde-plasma/print-manager/print-manager-6.0.4.ebuild new file mode 100644 index 000000000000..aa99a2858e98 --- /dev/null +++ b/kde-plasma/print-manager/print-manager-6.0.4.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Manage CUPS print jobs and printers in Plasma" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="+gtk" + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + net-print/cups +" +RDEPEND="${DEPEND} + !<kde-plasma/print-manager-23.08.5-r100:5 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + kde-plasma/kde-cli-tools:* + gtk? ( app-admin/system-config-printer ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +pkg_postinst() { + ecm_pkg_postinst + + if [[ -z "${REPLACING_VERSIONS}" ]] && ! use gtk ; then + ewarn "By switching off \"gtk\" USE flag, you have chosen to do without" + ewarn "an important, though optional, runtime dependency:" + ewarn + ewarn "app-admin/system-config-printer" + ewarn + ewarn "${PN} will work nevertheless, but is going to be less comfortable" + ewarn "and will show the following error status during runtime:" + ewarn + ewarn "\"Failed to group devices: 'The name org.fedoraproject.Config.Printing" + ewarn "was not provided by any .service files'\"" + fi +} diff --git a/kde-plasma/qqc2-breeze-style/Manifest b/kde-plasma/qqc2-breeze-style/Manifest new file mode 100644 index 000000000000..d699b6669da7 --- /dev/null +++ b/kde-plasma/qqc2-breeze-style/Manifest @@ -0,0 +1 @@ +DIST qqc2-breeze-style-6.0.4.tar.xz 65864 BLAKE2B 55d0fc5dce90eb180e4f5ec259f5d93400cad0ee3076bbc00e3f8356ababb26d5c77a1eb024a49fadda953a7489f44d1c235647bf678d21f0af658719e11912c SHA512 51f9a855ab574115e2f6121a25a5271236743c52cf504a17a83e394f923352d24e12ab1713689edede3e128014e4061db04e3e3d4b1c76906490362391d275ab diff --git a/kde-plasma/qqc2-breeze-style/metadata.xml b/kde-plasma/qqc2-breeze-style/metadata.xml new file mode 100644 index 000000000000..93ee04d43b6f --- /dev/null +++ b/kde-plasma/qqc2-breeze-style/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/qqc2-breeze-style</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.0.4.ebuild b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.0.4.ebuild new file mode 100644 index 000000000000..b672cf26596d --- /dev/null +++ b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.0.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 2023-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="false" +KFMIN=6.0.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Breeze inspired QQC2 Style" + +LICENSE="|| ( GPL-2+ LGPL-3+ ) CC0-1.0" +SLOT="6" +KEYWORDS="~amd64" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kquickcharts-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/sddm-kcm/Manifest b/kde-plasma/sddm-kcm/Manifest index af8ca26e950d..6c82e19f0d47 100644 --- a/kde-plasma/sddm-kcm/Manifest +++ b/kde-plasma/sddm-kcm/Manifest @@ -1,2 +1,2 @@ -DIST sddm-kcm-5.24.5.tar.xz 81280 BLAKE2B d944d898b84dd9da0849c5a81586365d0cae06a1c116587807329e8b029cf26f3faa31e0dcce5382d42d7416b601f10e4110850d643f5f7b0a83a5f4d7f906b3 SHA512 1fbc050e70dde74bcaa0a97ac982f017146ca65f180ea07e57190bd13ea653789fb369b83bc0b2583b73d37e4cd3db087eebe2cdaa3346b81c1d7d11730fad15 -DIST sddm-kcm-5.25.2.tar.xz 81928 BLAKE2B c5e100eac9c6fa779141e00f7609fa33192c425e69cd9bf59d12400bb6ef350890af76c0c364005a44cc6ab5dc93b0860f54d4b047dad335dfda712c99cdab52 SHA512 189cd6c451b4c82792c298c4626db956d6a4c1b5b4653901de9bae8c2344ffbc9093ac399b36102536048f861c80aee01365a291ffcfe3cc5eca3f94ddf9512a +DIST sddm-kcm-5.27.11.tar.xz 94340 BLAKE2B 10592e30e288f85f565d1070542b19a2a03d58a7d0befc69807049ad4ccb8a1491b93e94bd50fcc0f59e0b483d41a7758ead475def217e57c3600298340b049e SHA512 512eb0acfc0e3925d2c020103b94dc4ae7df4e82a4492e686f38e9ff6554e0f1ace42fa63bae3c4b8d8956a6413fc78cf65779ce3024213cfaaf5aa3fb2a74ff +DIST sddm-kcm-6.0.4.tar.xz 97476 BLAKE2B f2852354d9b4d8fd2ab04c080bb4a07dcc0b49483b8d7289db68a7bc4dab834a1dce607187f27a58c8a114af9a07bc21de7b0769e729b6fe459e3f8141ea7269 SHA512 41f4d76f214be149d570ec152f0d155566d96831807d498012b2672c203d998bcaa5e2b74e2d45e8bf41d0451fa01fcc6854e8b8717af7b700ae9fc2222c111b diff --git a/kde-plasma/sddm-kcm/metadata.xml b/kde-plasma/sddm-kcm/metadata.xml index d925f2439758..ef73ee478dde 100644 --- a/kde-plasma/sddm-kcm/metadata.xml +++ b/kde-plasma/sddm-kcm/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/sddm-kcm</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.25.2.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.25.2.ebuild deleted file mode 100644 index 327a31ba6ed0..000000000000 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.25.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma control module for SDDM" -HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - x11-misc/sddm -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.27.11.ebuild index 362db6a8c3c2..d430bade52bb 100644 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild +++ b/kde-plasma/sddm-kcm/sddm-kcm-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma control module for SDDM" HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -30,14 +30,16 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* x11-misc/sddm " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.0.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.0.4.ebuild new file mode 100644 index 000000000000..9601866d0043 --- /dev/null +++ b/kde-plasma/sddm-kcm/sddm-kcm-6.0.4.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma control module for SDDM" +HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + x11-misc/sddm +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/systemsettings/Manifest b/kde-plasma/systemsettings/Manifest index 2a59a8b9f491..0081caf51e75 100644 --- a/kde-plasma/systemsettings/Manifest +++ b/kde-plasma/systemsettings/Manifest @@ -1,2 +1,2 @@ -DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1 -DIST systemsettings-5.25.2.tar.xz 207588 BLAKE2B 29c41074458ee5f809448bbe6e49a5623672c92a08ddf57448ae44dcaf199ad4a7797171450b48172b3536cf4f1ed95469d5ee355a619fab39e069678281b1d0 SHA512 16f1e7771ca3025193743126492bcebda5b61373f3ad434efa506ba540d1dd6d5681fc72c89c1a1829f5661831617ed6c9cdf2847dcc34df8d32d218ed99d36e +DIST systemsettings-5.27.11.tar.xz 230736 BLAKE2B 0645be30d2f673683b020d62ce2a8168d4c656fcc23a863a6ca15bacc57be85cc13ef11ff5006ae377526ec55251120ed110afcc502d737d372255f5555ac824 SHA512 5e48b9f7099d2e6efb681094e24da50727bf8819e90bfbd55dbddb546449c1976f2e6763c13e00270f5bd845b3342764a745de40cf0d0278c7285bc1e6943991 +DIST systemsettings-6.0.4.tar.xz 218800 BLAKE2B a2c9e06d0a8f12533cd29dd0f1c4b66f06b86e4519fb24e4c90cbbbc32002b9f3201233776223524a37f07c9c9d8b66aff9a610b447d824c18b409f04281b62a SHA512 8c631bab21d70baec86352cb8238883fc8df2b3c6a0955f76d392f50d81166b9d25085771da7d8dd929d88cf86f68ef62b5b1cb285df29f8e7c8e177d9aba7c8 diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch deleted file mode 100644 index c52f043133b7..000000000000 --- a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 12 May 2022 16:49:55 +0200 -Subject: [PATCH] Fix activating running instance on Wayland - -(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3) ---- - app/main.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/app/main.cpp b/app/main.cpp -index 13a803cd..e3f7b004 100644 ---- a/app/main.cpp -+++ b/app/main.cpp -@@ -172,7 +172,8 @@ int main(int argc, char *argv[]) - mainWindow->reloadStartupModule(); - } - -- KWindowSystem::forceActiveWindow(mainWindow->winId()); -+ KWindowSystem::updateStartupId(mainWindow->windowHandle()); -+ KWindowSystem::activateWindow(mainWindow->windowHandle()); - }); - - if (!startupModule.isEmpty()) { --- -GitLab - diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch deleted file mode 100644 index 9f8d494ded69..000000000000 --- a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 12 May 2022 01:22:14 +0200 -Subject: [PATCH] Fix current index in subcategory list - -We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken - -Manually set the current index when the backend index changes - -BUG: 453543 - -Fixed-In: 5.24.6 -(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a) ---- - sidebar/package/contents/ui/SubCategoryPage.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml -index 756b2763..19b33142 100644 ---- a/sidebar/package/contents/ui/SubCategoryPage.qml -+++ b/sidebar/package/contents/ui/SubCategoryPage.qml -@@ -140,6 +140,7 @@ Kirigami.ScrollablePage { - Connections { - target: systemsettings - function onActiveSubCategoryRowChanged() { -+ subCategoryView.currentIndex = systemsettings.activeSubCategoryRow - if (systemsettings.activeSubCategoryRow >= 0) { - if (subCategoryView.count > 1) { - root.pageStack.push(subCategoryColumn); --- -GitLab - diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild deleted file mode 100644 index 3fd54a2ee7bc..000000000000 --- a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org optfeature - -DESCRIPTION="Control Center to configure KDE Plasma desktop" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543 - "${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch" -) - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/systemsettings/systemsettings-5.25.2.ebuild b/kde-plasma/systemsettings/systemsettings-5.27.11.ebuild index 9c2c438cbbef..4dd8d8440f8c 100644 --- a/kde-plasma/systemsettings/systemsettings-5.25.2.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" -KFMIN=5.94.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature DESCRIPTION="Control Center to configure KDE Plasma desktop" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -21,8 +21,6 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -46,6 +44,7 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 diff --git a/kde-plasma/systemsettings/systemsettings-6.0.4.ebuild b/kde-plasma/systemsettings/systemsettings-6.0.4.ebuild new file mode 100644 index 000000000000..fc4732969291 --- /dev/null +++ b/kde-plasma/systemsettings/systemsettings-6.0.4.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="Control Center to configure KDE Plasma desktop" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/plasma-activities-${PVCUT}:6 +" +RDEPEND="${DEPEND}" + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config + fi + ecm_pkg_postinst +} diff --git a/kde-plasma/wacomtablet/Manifest b/kde-plasma/wacomtablet/Manifest new file mode 100644 index 000000000000..630dc7efd03e --- /dev/null +++ b/kde-plasma/wacomtablet/Manifest @@ -0,0 +1,3 @@ +DIST wacomtablet-3.2.0-patchset-1.tar.xz 7796 BLAKE2B 4fa998a0f4376579d1e0d06a8aa9edababedca22d579dbdae651eee3699decc880a7a1d277f04c2bc24adba87908c07ab711989a5985b68af5b295d3b3260d33 SHA512 ff96f05831e4760ce99920061f0dc927aa6a2d5ef4b7443c3129bb1431262cb4bc1434097595976672393e3b611438014ccb528fc948e7c0407fc9a2d52ade8d +DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6 +DIST wacomtablet-6.0.4.tar.xz 824848 BLAKE2B f39de4084f9411acace921f25610c29ac0bfe4950ec8cab675ce360b79788155b010226785e2e3978a10867b8f5856b90e92aa76325996025e2f9791a6c23008 SHA512 7e12a8b27b1c52f19b4847558ccdce86709eca06982798d9ada7a27cf954fa4f9c5b2c3e2f6d8593045c218a5256c3a87078823fd8d0901e2382172de21a4095 diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch new file mode 100644 index 000000000000..9434b0082569 --- /dev/null +++ b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch @@ -0,0 +1,41 @@ +From 32c78782b3061bab2a3b1457133faf77b6d9ed2a Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Mon, 14 Nov 2022 02:57:07 +0100 +Subject: [PATCH] Fix incorrect xsetwacom call + +When param is e.g. 'Button 1' the 'Button' and '1' need to be passed as separate arguments + +BUG: 454947 +--- + src/kded/xsetwacomadaptor.cpp | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp +index 934fa8b..fc1bcac 100644 +--- a/src/kded/xsetwacomadaptor.cpp ++++ b/src/kded/xsetwacomadaptor.cpp +@@ -245,10 +245,18 @@ bool XsetwacomAdaptor::setRotation(const QString& value) + bool XsetwacomAdaptor::setParameter(const QString &device, const QString ¶m, const QString &value) const + { + QProcess setConf; +- if (!value.isEmpty()) { +- setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value); ++ ++ // https://bugs.kde.org/show_bug.cgi?id=454947 ++ static const QRegularExpression buttonWithNumber(QStringLiteral("^Button \\d+$")); ++ if (param.contains(buttonWithNumber)) { ++ const QStringList splitted = param.split(QLatin1Char(' ')); ++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << splitted[0] << splitted[1] << value); + } else { +- setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param); ++ if (!value.isEmpty()) { ++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value); ++ } else { ++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param); ++ } + } + + if (!setConf.waitForStarted() || !setConf.waitForFinished()) { +-- +GitLab + diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch new file mode 100644 index 000000000000..4ab144beabd4 --- /dev/null +++ b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch @@ -0,0 +1,24 @@ +From c6bdd5a15c2e200aae6a7fe3597bbf11691e7e5f Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Tue, 6 Jun 2023 23:24:07 +0200 +Subject: [PATCH] Add missing include + +--- + autotests/faketablet/faketablet.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/autotests/faketablet/faketablet.cpp b/autotests/faketablet/faketablet.cpp +index 076a8d18..bf9e4904 100644 +--- a/autotests/faketablet/faketablet.cpp ++++ b/autotests/faketablet/faketablet.cpp +@@ -20,6 +20,7 @@ + #include <iostream> + #include <cstring> + #include <cstdio> ++#include <cstdint> + #include <cstdlib> + #include <csignal> + #include <unistd.h> +-- +GitLab + diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch new file mode 100644 index 000000000000..e86f97cfaef4 --- /dev/null +++ b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch @@ -0,0 +1,143 @@ +From 9c2f133ee400562ca9813e329f6e2bdae24a5ac5 Mon Sep 17 00:00:00 2001 +From: Nicolas Fella <nicolas.fella@gmx.de> +Date: Thu, 4 Aug 2022 22:43:07 +0200 +Subject: [PATCH] Port from QRegExp to QRegularExpression + +--- + src/common/buttonshortcut.cpp | 33 ++++++++++++++++++++------------- + src/kded/xsetwacomadaptor.cpp | 17 +++++++++++------ + 2 files changed, 31 insertions(+), 19 deletions(-) + +diff --git a/src/common/buttonshortcut.cpp b/src/common/buttonshortcut.cpp +index e11784f..32bf842 100644 +--- a/src/common/buttonshortcut.cpp ++++ b/src/common/buttonshortcut.cpp +@@ -19,7 +19,7 @@ + + #include "buttonshortcut.h" + +-#include <QRegExp> ++#include <QRegularExpression> + #include <QKeySequence> + + #include <KLocalizedString> +@@ -266,8 +266,8 @@ bool ButtonShortcut::set(const QString& sequence) + return true; + } + +- QRegExp modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), Qt::CaseInsensitive); +- QRegExp buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), Qt::CaseInsensitive); ++ static const QRegularExpression modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), QRegularExpression::CaseInsensitiveOption); ++ static const QRegularExpression buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), QRegularExpression::CaseInsensitiveOption); + + if (seq.contains(buttonRx)) { + // this is a button +@@ -388,7 +388,8 @@ void ButtonShortcut::convertToNormalizedKeySequence(QString& sequence, bool from + { + normalizeKeySequence(sequence); + +- QStringList keyList = sequence.split (QRegExp (QLatin1String ("\\s+")), Qt::SkipEmptyParts); ++ static const QRegularExpression rx(QStringLiteral("\\s+")); ++ QStringList keyList = sequence.split (rx, Qt::SkipEmptyParts); + bool isFirstKey = true; + + sequence.clear(); +@@ -460,28 +461,33 @@ void ButtonShortcut::normalizeKeySequence(QString& sequence) const + { + // When setting a shortcut like "ctrl+x", xsetwacom will convert it to "key +ctrl +x -x" + // therefore we just truncate the string on the first "-key" we find. +- QRegExp minusKeyRx (QLatin1String ("(^|\\s)-\\S")); +- int pos = 0; ++ static const QRegularExpression minusKeyRx (QLatin1String ("(^|\\s)-\\S")); + +- if ((pos = minusKeyRx.indexIn(sequence, 0)) != -1) { +- sequence = sequence.left(pos); ++ const QRegularExpressionMatch minusKeyRxMatch = minusKeyRx.match(sequence); ++ ++ if (minusKeyRxMatch.hasMatch()) { ++ sequence = sequence.left(minusKeyRxMatch.capturedStart()); + } + + // cleanup leading "key " identifier from xsetwacom sequences +- sequence.remove(QRegExp (QLatin1String ("^\\s*key\\s+"), Qt::CaseInsensitive)); ++ static const QRegularExpression leadingKey(QStringLiteral("^\\s*key\\s+"), QRegularExpression::CaseInsensitiveOption); ++ sequence.remove(leadingKey); + + // Remove all '+' prefixes from keys. + // This will convert shortcuts like "+ctrl +alt" to "ctrl alt", but not + // shortcuts like "ctrl +" which is required to keep compatibility to older + // (buggy) configuration files. +- sequence.replace(QRegExp (QLatin1String ("(^|\\s)\\+(\\S)")), QLatin1String ("\\1\\2")); ++ static const QRegularExpression plusPrefixes(QStringLiteral("(^|\\s)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption); ++ sequence.replace(plusPrefixes, QLatin1String ("\\1\\2")); + + // Cleanup plus signs between keys. + // This will convert shortcuts like "ctrl+alt+shift" or "Ctrl++" to "ctrl alt shift" or "Ctrl +". +- sequence.replace (QRegExp (QLatin1String ("(\\S)\\+(\\S)")), QLatin1String ("\\1 \\2")); ++ static const QRegularExpression cleanupPlus(QStringLiteral("(\\S)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption); ++ sequence.replace (cleanupPlus, QLatin1String ("\\1 \\2")); + + // replace multiple whitespaces with one +- sequence.replace (QRegExp (QLatin1String ("\\s{2,}")), QLatin1String (" ")); ++ static const QRegularExpression whitespaces(QStringLiteral("\\s{2,}"), QRegularExpression::CaseInsensitiveOption); ++ sequence.replace (whitespaces, QLatin1String (" ")); + + // trim the string + sequence = sequence.trimmed(); +@@ -500,7 +506,8 @@ void ButtonShortcut::prettifyKey(QString& key) const + bool ButtonShortcut::setButtonSequence(const QString& buttonSequence) + { + QString buttonNumber = buttonSequence; +- buttonNumber.remove(QRegExp (QLatin1String ("^\\s*button\\s+"), Qt::CaseInsensitive)); ++ static const QRegularExpression rx(QStringLiteral("^\\s*button\\s+"), QRegularExpression::CaseInsensitiveOption); ++ buttonNumber.remove(rx); + + bool ok = false; + int button = buttonNumber.toInt(&ok); +diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp +index a39f307..934fa8b 100644 +--- a/src/kded/xsetwacomadaptor.cpp ++++ b/src/kded/xsetwacomadaptor.cpp +@@ -27,7 +27,7 @@ + #include "tabletarea.h" + + #include <QProcess> +-#include <QRegExp> ++#include <QRegularExpression> + + using namespace Wacom; + +@@ -142,10 +142,13 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param) + QString modifiedParam = param.key(); + + // convert tablet button number to hardware button number +- QRegExp rx(QLatin1String("^Button\\s*([0-9]+)$"), Qt::CaseInsensitive); ++ static const QRegularExpression rx(QLatin1String("^Button\\s*([0-9]+)$"), QRegularExpression::CaseInsensitiveOption); ++ ++ const QRegularExpressionMatch match = rx.match(modifiedParam); ++ ++ if (match.hasMatch()) { ++ QString hwButtonNumber = match.captured(1); + +- if (rx.indexIn(modifiedParam, 0) != -1) { +- QString hwButtonNumber = rx.cap(1); + QString kernelButtonNumber; + + if (!d->buttonMap.isEmpty()) { +@@ -167,9 +170,11 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param) + + void XsetwacomAdaptor::convertButtonShortcut (const XsetwacomProperty& property, QString& value) const + { +- QRegExp rx (QLatin1String("^Button\\s*[0-9]+$"), Qt::CaseInsensitive); ++ static const QRegularExpression rx(QLatin1String("^Button\\s*[0-9]+$"), QRegularExpression::CaseInsensitiveOption); ++ ++ const QRegularExpressionMatch match = rx.match(property.key()); + +- if (rx.indexIn(property.key(), 0) != -1) { ++ if (match.hasMatch()) { + ButtonShortcut buttonshortcut(value); + value = buttonshortcut.toString(); + } +-- +GitLab + diff --git a/kde-plasma/wacomtablet/metadata.xml b/kde-plasma/wacomtablet/metadata.xml new file mode 100644 index 000000000000..ee58c0107562 --- /dev/null +++ b/kde-plasma/wacomtablet/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/wacomtablet</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild b/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild new file mode 100644 index 000000000000..dcfe0a4c9d08 --- /dev/null +++ b/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.82.0 +QTMIN=5.15.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles" +HOMEPAGE="https://userbase.kde.org/Wacomtablet" +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz +https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz" + +LICENSE="GPL-2" +SLOT="5" +KEYWORDS="amd64 x86" + +RDEPEND=" + >=dev-libs/libwacom-0.30:= + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kdbusaddons-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + >=x11-drivers/xf86-input-wacom-0.20.0 + x11-libs/libXi + x11-libs/libxcb +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libX11 +" +BDEPEND="sys-devel/gettext" + +PATCHES=( + "${WORKDIR}/${P}-qt-5.15.patch" + "${WORKDIR}/${P}-qt-5.15-obsoletions.patch" + "${WORKDIR}/${P}-no-override-screenspace-w-missing-screen.patch" # KDE-bug 419392 + "${WORKDIR}/${P}-fix-xsetwacom-adapter.patch" + "${WORKDIR}/${P}-Intuos-M-bluetooth.patch" # KDE-bug 418827 + "${WORKDIR}/${P}-correct-icons.patch" + "${WORKDIR}/${P}-drop-empty-X-KDE-PluginInfo-Depends.patch" + "${WORKDIR}/${P}-fix-QProcess-invocation.patch" + "${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556 + "${WORKDIR}/${P}-only-show-on-X11.patch" + "${FILESDIR}/${P}-port-to-QRegularExpression.patch" # pre-requisite for below: + "${FILESDIR}/${P}-fix-incorrect-xsetwacom-call.patch" # bug 850652, KDE-bug 454947 + "${FILESDIR}/${P}-missing-include.patch" # bug 920043 +) + +src_test() { + # test needs DBus, bug 675548 + local myctestargs=( + -E "(Test.KDED.DBusTabletService)" + ) + + ecm_src_test +} diff --git a/kde-plasma/wacomtablet/wacomtablet-6.0.4.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.0.4.ebuild new file mode 100644 index 000000000000..9132cd45f468 --- /dev/null +++ b/kde-plasma/wacomtablet/wacomtablet-6.0.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles" +HOMEPAGE="https://userbase.kde.org/Wacomtablet" + +LICENSE="GPL-2" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +RDEPEND=" + >=dev-libs/libwacom-0.30:= + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + >=x11-drivers/xf86-input-wacom-0.20.0 + x11-libs/libXi + x11-libs/libxcb +" +DEPEND="${RDEPEND} + x11-base/xorg-proto + x11-libs/libX11 +" +BDEPEND="sys-devel/gettext" + +src_test() { + # test needs DBus, bug 675548 + local myctestargs=( + -E "(Test.KDED.DBusTabletService)" + ) + + ecm_src_test +} diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest index e27c85f5e95b..a5f5ddf24b29 100644 --- a/kde-plasma/xdg-desktop-portal-kde/Manifest +++ b/kde-plasma/xdg-desktop-portal-kde/Manifest @@ -1,2 +1,2 @@ -DIST xdg-desktop-portal-kde-5.24.5.tar.xz 88904 BLAKE2B b7ab407132ce8dfdae58854dc29af270c411e1d2c7c8631c6209ff0fb44c80b8287dbe13a6ed60d2e8926f4b23ed3209242bd2836906a44ee06a936d56a91131 SHA512 6314fa4f679700224c6de44726f1fbf513249cebcb9c0fae212bde3de98cb0cc040f671e2435d8e53f379ad907bde4022a6ecfe5f95424a9414ce7471c0fe401 -DIST xdg-desktop-portal-kde-5.25.2.tar.xz 103916 BLAKE2B ae4b405019529645e435456312da5353c0adb2d3ac60ade50216a9d980f0d8dce53a73f39ff96e84e3166b299bb50ec30e51f4ea2a865648dcc8ae9ef65197d1 SHA512 0bc27ec697c99fd467c66baf7c0fc4cd2233052eeb49da355793606423851b4b98c3597ddb66e5cb3827b9d231355cfeec4017e3f47a785111f53a9677ac12ec +DIST xdg-desktop-portal-kde-5.27.11.tar.xz 143652 BLAKE2B e7086d30d677385a1d1a2bed22661b935b67ae3cd15102bf47f0b75ecc8e0d3189530e54913a11d0a9eb9db9427af18bd77bfc37d856a3e4bef46cc90bfd0bc1 SHA512 39e1c4cf284558e013c24523ef1993f48e237d13fc2fb3ccfbffcea1925f18bcd623229ef933aaf301c83f460ee849656ba3344ca74fd068e416ea2eb3467621 +DIST xdg-desktop-portal-kde-6.0.4.tar.xz 163716 BLAKE2B 1835ef87a1b8f0c3e7033f92b24d7a8d45d4614fbcfec9ab504bf3ee925a7a27db1296d98041ee35885dc5dea5fda6534cf1ce0a723e4b7c38d2ae6f8d7e2c72 SHA512 7682ffc69315c4319404c13f1c29016c5ae6f4f60233fa41f035cf4532b8f56f976969536aec52ca0cc676a2399ee04e04a06972dbf598d36e0c89e0b5f92669 diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch deleted file mode 100644 index 134f55c900b5..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-close-only-streams-of-closing-session.patch +++ /dev/null @@ -1,107 +0,0 @@ -From cd8275c722aa25dd22353121131c914d3ab3b438 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Sat, 28 May 2022 03:36:14 +0200 -Subject: [PATCH] screencast: When closing a session, only close the streams - from that session - ---- - src/screencast.cpp | 11 ++++++++--- - src/session.h | 12 ++++++++++++ - src/waylandintegration.cpp | 5 +++++ - src/waylandintegration.h | 1 + - 4 files changed, 26 insertions(+), 3 deletions(-) - -diff --git a/src/screencast.cpp b/src/screencast.cpp -index 5be6210..84cc4bd 100644 ---- a/src/screencast.cpp -+++ b/src/screencast.cpp -@@ -68,8 +68,12 @@ uint ScreenCastPortal::CreateSession(const QDBusObjectPath &handle, - return 2; - } - -- connect(session, &Session::closed, []() { -- WaylandIntegration::stopAllStreaming(); -+ connect(session, &Session::closed, [session] { -+ auto screencastSession = qobject_cast<ScreenCastSession *>(session); -+ const auto streams = screencastSession->streams(); -+ for (const WaylandIntegration::Stream &stream : streams) { -+ WaylandIntegration::stopStreaming(stream.nodeId); -+ } - }); - - connect(WaylandIntegration::waylandIntegration(), &WaylandIntegration::WaylandIntegration::streamingStopped, session, &Session::close); -@@ -169,7 +173,8 @@ uint ScreenCastPortal::Start(const QDBusObjectPath &handle, - return 2; - } - -- results.insert(QStringLiteral("streams"), QVariant::fromValue(streams)); -+ session->setStreams(streams); -+ results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>(streams)); - - if (inhibitionsEnabled()) { - new NotificationInhibition(app_id, i18nc("Do not disturb mode is enabled because...", "Screen sharing in progress"), session); -diff --git a/src/session.h b/src/session.h -index a42222e..dd05680 100644 ---- a/src/session.h -+++ b/src/session.h -@@ -14,6 +14,7 @@ - - #include "remotedesktop.h" - #include "screencast.h" -+#include "waylandintegration.h" - - class Session : public QDBusVirtualObject - { -@@ -62,10 +63,21 @@ public: - return SessionType::ScreenCast; - } - -+ WaylandIntegration::Streams streams() const -+ { -+ return m_streams; -+ } -+ void setStreams(const WaylandIntegration::Streams &streams) -+ { -+ m_streams = streams; -+ } -+ - private: - bool m_multipleSources; - ScreenCastPortal::CursorModes m_cursorMode; - ScreenCastPortal::SourceType m_types; -+ -+ WaylandIntegration::Streams m_streams; - }; - - class RemoteDesktopSession : public ScreenCastSession -diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp -index 9f5a177..e05f73a 100644 ---- a/src/waylandintegration.cpp -+++ b/src/waylandintegration.cpp -@@ -89,6 +89,11 @@ void WaylandIntegration::stopAllStreaming() - globalWaylandIntegration->stopAllStreaming(); - } - -+void WaylandIntegration::stopStreaming(uint node) -+{ -+ globalWaylandIntegration->stopStreaming(node); -+} -+ - void WaylandIntegration::requestPointerButtonPress(quint32 linuxButton) - { - globalWaylandIntegration->requestPointerButtonPress(linuxButton); -diff --git a/src/waylandintegration.h b/src/waylandintegration.h -index b8e6a00..784ee12 100644 ---- a/src/waylandintegration.h -+++ b/src/waylandintegration.h -@@ -131,6 +131,7 @@ void startStreamingInput(); - Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode); - Stream startStreamingWindow(const QMap<int, QVariant> &win); - void stopAllStreaming(); -+void stopStreaming(uint node); - - void requestPointerButtonPress(quint32 linuxButton); - void requestPointerButtonRelease(quint32 linuxButton); --- -GitLab - diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch deleted file mode 100644 index 6aa94ccb7f69..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-dont-provide-every-running-stream.patch +++ /dev/null @@ -1,358 +0,0 @@ -From 3dbd366516c38d987025623feea18f79c15d72dd Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Mon, 30 May 2022 15:42:02 +0200 -Subject: [PATCH] Backport of 5f7fe7482ae3de6e5dabbd2712c283439b0eecac - -Since the codebases had diverged over time, I've backported it by hand -using the same concepts as the forementioned fix, trying to minimise the -delta with the latest released Plasma 5.24. ---- - src/remotedesktop.cpp | 12 ++------ - src/screencast.cpp | 15 ++++++---- - src/waylandintegration.cpp | 60 +++++++++++++++----------------------- - src/waylandintegration.h | 26 +++++++++++++++-- - src/waylandintegration_p.h | 15 ++-------- - 5 files changed, 61 insertions(+), 67 deletions(-) - -diff --git a/src/remotedesktop.cpp b/src/remotedesktop.cpp -index f36def4..9282ff0 100644 ---- a/src/remotedesktop.cpp -+++ b/src/remotedesktop.cpp -@@ -122,20 +122,14 @@ uint RemoteDesktopPortal::Start(const QDBusObjectPath &handle, - - if (remoteDesktopDialog->exec()) { - if (session->screenSharingEnabled()) { -- if (!WaylandIntegration::startStreamingOutput(remoteDesktopDialog->selectedScreens().first(), Screencasting::Hidden)) { -+ auto stream = WaylandIntegration::startStreamingOutput(remoteDesktopDialog->selectedScreens().first(), Screencasting::Hidden); -+ if (!stream.isValid()) { - return 2; - } - - WaylandIntegration::authenticate(); - -- QVariant streams = WaylandIntegration::streams(); -- -- if (!streams.isValid()) { -- qCWarning(XdgDesktopPortalKdeRemoteDesktop()) << "Pipewire stream is not ready to be streamed"; -- return 2; -- } -- -- results.insert(QStringLiteral("streams"), streams); -+ results.insert(QStringLiteral("streams"), QVariant::fromValue<WaylandIntegration::Streams>({stream})); - } else { - qCWarning(XdgDesktopPortalKdeRemoteDesktop()) << "Only stream input"; - WaylandIntegration::startStreamingInput(); -diff --git a/src/screencast.cpp b/src/screencast.cpp -index 210bbbb..5be6210 100644 ---- a/src/screencast.cpp -+++ b/src/screencast.cpp -@@ -147,26 +147,29 @@ uint ScreenCastPortal::Start(const QDBusObjectPath &handle, - - if (screenDialog->exec()) { - const auto selectedScreens = screenDialog->selectedScreens(); -+ WaylandIntegration::Streams streams; - for (quint32 outputid : selectedScreens) { -- if (!WaylandIntegration::startStreamingOutput(outputid, Screencasting::CursorMode(session->cursorMode()))) { -+ auto stream = WaylandIntegration::startStreamingOutput(outputid, Screencasting::CursorMode(session->cursorMode())); -+ if (!stream.isValid()) { - return 2; - } -+ streams << stream; - } - const auto selectedWindows = screenDialog->selectedWindows(); - for (const auto &win : selectedWindows) { -- if (!WaylandIntegration::startStreamingWindow(win)) { -+ auto stream = WaylandIntegration::startStreamingWindow(win); -+ if (!stream.isValid()) { - return 2; - } -+ streams << stream; - } - -- QVariant streams = WaylandIntegration::streams(); -- -- if (!streams.isValid()) { -+ if (streams.isEmpty()) { - qCWarning(XdgDesktopPortalKdeScreenCast) << "Pipewire stream is not ready to be streamed"; - return 2; - } - -- results.insert(QStringLiteral("streams"), streams); -+ results.insert(QStringLiteral("streams"), QVariant::fromValue(streams)); - - if (inhibitionsEnabled()) { - new NotificationInhibition(app_id, i18nc("Do not disturb mode is enabled because...", "Screen sharing in progress"), session); -diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp -index 44d862a..9f5a177 100644 ---- a/src/waylandintegration.cpp -+++ b/src/waylandintegration.cpp -@@ -43,7 +43,7 @@ Q_LOGGING_CATEGORY(XdgDesktopPortalKdeWaylandIntegration, "xdp-kde-wayland-integ - - Q_GLOBAL_STATIC(WaylandIntegration::WaylandIntegrationPrivate, globalWaylandIntegration) - --static QDebug operator<<(QDebug dbg, const WaylandIntegration::WaylandIntegrationPrivate::Stream &c) -+static QDebug operator<<(QDebug dbg, const WaylandIntegration::Stream &c) - { - dbg.nospace() << "Stream(" << c.map << ", " << c.nodeId << ")"; - return dbg.space(); -@@ -74,12 +74,12 @@ void WaylandIntegration::startStreamingInput() - globalWaylandIntegration->startStreamingInput(); - } - --bool WaylandIntegration::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode) -+WaylandIntegration::Stream WaylandIntegration::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode) - { - return globalWaylandIntegration->startStreamingOutput(outputName, mode); - } - --bool WaylandIntegration::startStreamingWindow(const QMap<int, QVariant> &win) -+WaylandIntegration::Stream WaylandIntegration::startStreamingWindow(const QMap<int, QVariant> &win) - { - return globalWaylandIntegration->startStreamingWindow(win); - } -@@ -124,11 +124,6 @@ QMap<quint32, WaylandIntegration::WaylandOutput> WaylandIntegration::screens() - return globalWaylandIntegration->screens(); - } - --QVariant WaylandIntegration::streams() --{ -- return globalWaylandIntegration->streams(); --} -- - // Thank you kscreen - void WaylandIntegration::WaylandOutput::setOutputType(const QString &type) - { -@@ -157,7 +152,9 @@ void WaylandIntegration::WaylandOutput::setOutputType(const QString &type) - } - } - --const QDBusArgument &operator>>(const QDBusArgument &arg, WaylandIntegration::WaylandIntegrationPrivate::Stream &stream) -+namespace WaylandIntegration -+{ -+const QDBusArgument &operator>>(const QDBusArgument &arg, Stream &stream) - { - arg.beginStructure(); - arg >> stream.nodeId; -@@ -177,7 +174,7 @@ const QDBusArgument &operator>>(const QDBusArgument &arg, WaylandIntegration::Wa - return arg; - } - --const QDBusArgument &operator<<(QDBusArgument &arg, const WaylandIntegration::WaylandIntegrationPrivate::Stream &stream) -+const QDBusArgument &operator<<(QDBusArgument &arg, const Stream &stream) - { - arg.beginStructure(); - arg << stream.nodeId; -@@ -186,9 +183,7 @@ const QDBusArgument &operator<<(QDBusArgument &arg, const WaylandIntegration::Wa - - return arg; - } -- --Q_DECLARE_METATYPE(WaylandIntegration::WaylandIntegrationPrivate::Stream) --Q_DECLARE_METATYPE(WaylandIntegration::WaylandIntegrationPrivate::Streams) -+} - - KWayland::Client::PlasmaWindowManagement *WaylandIntegration::plasmaWindowManagement() - { -@@ -207,8 +202,8 @@ WaylandIntegration::WaylandIntegrationPrivate::WaylandIntegrationPrivate() - , m_fakeInput(nullptr) - , m_screencasting(nullptr) - { -- qDBusRegisterMetaType<WaylandIntegrationPrivate::Stream>(); -- qDBusRegisterMetaType<WaylandIntegrationPrivate::Streams>(); -+ qDBusRegisterMetaType<Stream>(); -+ qDBusRegisterMetaType<Streams>(); - } - - WaylandIntegration::WaylandIntegrationPrivate::~WaylandIntegrationPrivate() = default; -@@ -228,25 +223,25 @@ void WaylandIntegration::WaylandIntegrationPrivate::startStreamingInput() - m_streamInput = true; - } - --bool WaylandIntegration::WaylandIntegrationPrivate::startStreamingWindow(const QMap<int, QVariant> &win) -+WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreamingWindow(const QMap<int, QVariant> &win) - { - auto uuid = win[KWayland::Client::PlasmaWindowModel::Uuid].toString(); - return startStreaming(m_screencasting->createWindowStream(uuid, Screencasting::Hidden), {}, win); - } - --bool WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode) -+WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode) - { - auto output = m_outputMap.value(outputName).output(); - - return startStreaming(m_screencasting->createOutputStream(output.data(), mode), output, {}); - } - --bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(ScreencastingStream *stream, -- QSharedPointer<KWayland::Client::Output> output, -- const QMap<int, QVariant> &win) -+WaylandIntegration::Stream WaylandIntegration::WaylandIntegrationPrivate::startStreaming(ScreencastingStream *stream, -+ QSharedPointer<KWayland::Client::Output> output, -+ const QMap<int, QVariant> &win) - { - QEventLoop loop; -- bool streamReady = false; -+ Stream ret; - connect(stream, &ScreencastingStream::failed, this, [&](const QString &error) { - qCWarning(XdgDesktopPortalKdeWaylandIntegration) << "failed to start streaming" << stream << error; - -@@ -255,30 +250,26 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting - notification->setText(error); - notification->setIconName(QStringLiteral("dialog-error")); - notification->sendEvent(); -- -- streamReady = false; - loop.quit(); - }); - connect(stream, &ScreencastingStream::created, this, [&](uint32_t nodeid) { -- Stream s; -- s.stream = stream; -- s.nodeId = nodeid; -+ ret.stream = stream; -+ ret.nodeId = nodeid; - if (output) { - m_streamedScreenPosition = output->globalPosition(); -- s.map = { -+ ret.map = { - {QLatin1String("size"), output->pixelSize()}, - {QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Monitor)}, - }; - } else { -- s.map = {{QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Window)}}; -+ ret.map = {{QLatin1String("source_type"), static_cast<uint>(ScreenCastPortal::Window)}}; - } -- m_streams.append(s); -+ m_streams.append(ret); - startStreamingInput(); - - connect(stream, &ScreencastingStream::closed, this, [this, nodeid] { - stopStreaming(nodeid); - }); -- streamReady = true; - - auto item = new KStatusNotifierItem(stream); - item->setStandardActionsEnabled(false); -@@ -303,10 +294,10 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting - QTimer::singleShot(3000, &loop, &QEventLoop::quit); - loop.exec(); - -- return streamReady; -+ return ret; - } - --void WaylandIntegration::WaylandIntegrationPrivate::Stream::close() -+void WaylandIntegration::Stream::close() - { - stream->deleteLater(); - } -@@ -390,11 +381,6 @@ QMap<quint32, WaylandIntegration::WaylandOutput> WaylandIntegration::WaylandInte - return m_outputMap; - } - --QVariant WaylandIntegration::WaylandIntegrationPrivate::streams() --{ -- return QVariant::fromValue<WaylandIntegrationPrivate::Streams>(m_streams); --} -- - void WaylandIntegration::WaylandIntegrationPrivate::authenticate() - { - if (!m_waylandAuthenticationRequested) { -diff --git a/src/waylandintegration.h b/src/waylandintegration.h -index 04319c9..b8e6a00 100644 ---- a/src/waylandintegration.h -+++ b/src/waylandintegration.h -@@ -9,6 +9,7 @@ - #ifndef XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H - #define XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H - -+#include <QDBusArgument> - #include <QObject> - #include <QPoint> - #include <QSize> -@@ -28,6 +29,23 @@ class ScreencastingSource; - - namespace WaylandIntegration - { -+ -+struct Stream { -+ ScreencastingStream *stream = nullptr; -+ uint nodeId; -+ QVariantMap map; -+ -+ bool isValid() const -+ { -+ return stream != nullptr; -+ } -+ -+ void close(); -+}; -+typedef QVector<Stream> Streams; -+const QDBusArgument &operator<<(QDBusArgument &arg, const Stream &stream); -+const QDBusArgument &operator>>(const QDBusArgument &arg, Stream &stream); -+ - class WaylandOutput - { - public: -@@ -110,8 +128,8 @@ bool isStreamingEnabled(); - bool isStreamingAvailable(); - - void startStreamingInput(); --bool startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode); --bool startStreamingWindow(const QMap<int, QVariant> &win); -+Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode); -+Stream startStreamingWindow(const QMap<int, QVariant> &win); - void stopAllStreaming(); - - void requestPointerButtonPress(quint32 linuxButton); -@@ -123,7 +141,6 @@ void requestPointerAxisDiscrete(Qt::Orientation axis, qreal delta); - void requestKeyboardKeycode(int keycode, bool state); - - QMap<quint32, WaylandOutput> screens(); --QVariant streams(); - - void init(); - -@@ -132,4 +149,7 @@ KWayland::Client::PlasmaWindowManagement *plasmaWindowManagement(); - WaylandIntegration *waylandIntegration(); - } - -+Q_DECLARE_METATYPE(WaylandIntegration::Stream) -+Q_DECLARE_METATYPE(WaylandIntegration::Streams) -+ - #endif // XDG_DESKTOP_PORTAL_KDE_WAYLAND_INTEGRATION_H -diff --git a/src/waylandintegration_p.h b/src/waylandintegration_p.h -index 220ad3d..e95f6a0 100644 ---- a/src/waylandintegration_p.h -+++ b/src/waylandintegration_p.h -@@ -53,15 +53,6 @@ private: - KWayland::Client::PlasmaWindowManagement *m_windowManagement = nullptr; - - public: -- struct Stream { -- ScreencastingStream *stream = nullptr; -- uint nodeId; -- QVariantMap map; -- -- void close(); -- }; -- typedef QVector<Stream> Streams; -- - void authenticate(); - - bool isStreamingEnabled() const; -@@ -69,9 +60,9 @@ public: - - void startStreamingInput(); - -- bool startStreaming(ScreencastingStream *stream, QSharedPointer<KWayland::Client::Output> output, const QMap<int, QVariant> &win); -- bool startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode); -- bool startStreamingWindow(const QMap<int, QVariant> &win); -+ Stream startStreaming(ScreencastingStream *stream, QSharedPointer<KWayland::Client::Output> output, const QMap<int, QVariant> &win); -+ Stream startStreamingOutput(quint32 outputName, Screencasting::CursorMode mode); -+ Stream startStreamingWindow(const QMap<int, QVariant> &win); - void stopStreaming(uint32_t nodeid); - void stopAllStreaming(); - --- -GitLab - diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch deleted file mode 100644 index 3c1284108b20..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-screencast-stop-stream-actively.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d74e7dce1d333107760a8ae8d2bdd7521d31a09f Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Sat, 28 May 2022 03:37:14 +0200 -Subject: [PATCH] screencast: When we stop a stream, do it actively - -We were just forgetting about it. - - -(cherry picked from commit aa531bde14a13521f99ae8e44d6e83bc8749d761) ---- - src/waylandintegration.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp -index b1b2d4d..44d862a 100644 ---- a/src/waylandintegration.cpp -+++ b/src/waylandintegration.cpp -@@ -328,6 +328,7 @@ void WaylandIntegration::WaylandIntegrationPrivate::stopStreaming(uint32_t nodei - { - for (auto it = m_streams.begin(), itEnd = m_streams.end(); it != itEnd; ++it) { - if (it->nodeId == nodeid) { -+ it->close(); - m_streams.erase(it); - break; - } --- -GitLab - diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch deleted file mode 100644 index 6b771bfede1e..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bbff465e6a005c737ee2e53eb5e072da006d9b4b Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Fri, 13 May 2022 16:47:36 +0200 -Subject: [PATCH] screenshare: Show the screen sharing notifier more - prominently - -Sets it as active, otherwise it got buried in the extended view of the -system tray. - -BUG: 452980 - - -(cherry picked from commit 3d61dae1fa334a9f3dadc505a038f75aa5846588) ---- - src/waylandintegration.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp -index e125578..b1b2d4d 100644 ---- a/src/waylandintegration.cpp -+++ b/src/waylandintegration.cpp -@@ -292,6 +292,7 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting - } - item->setOverlayIconByName("media-record"); - item->setToolTip(item->iconName(), item->title(), i18n("Press to cancel")); -+ item->setStatus(KStatusNotifierItem::Active); - connect(item, &KStatusNotifierItem::activateRequested, stream, [=] { - stopStreaming(nodeid); - stream->deleteLater(); --- -GitLab - diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild deleted file mode 100644 index 0eb9b4578030..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-libs/wayland-1.15 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5[cups] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal -" -BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" - -PATCHES=( - "${FILESDIR}/${P}-show-screenshare-notifier-more-prominently.patch" # KDE-bug 452980 - "${FILESDIR}/${P}-screencast-stop-stream-actively.patch" - "${FILESDIR}/${P}-screencast-dont-provide-every-running-stream.patch" - "${FILESDIR}/${P}-screencast-close-only-streams-of-closing-session.patch" -) diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.2.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.ebuild index d7dbec1abe5c..d7ba7d0d90b5 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.25.2.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.ebuild @@ -1,46 +1,60 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.94.0 +ECM_TEST="forceoptional" +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" LICENSE="LGPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" +# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X COMMON_DEPEND=" >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 + || ( + >=dev-qt/qtgui-${QTMIN}:5[libinput] + >=dev-qt/qtgui-${QTMIN}:5[X] + ) >=dev-qt/qtprintsupport-${QTMIN}:5[cups] + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5[dbus] >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + x11-libs/libxkbcommon " DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.7.0 + >=dev-libs/wayland-protocols-1.25 >=dev-qt/qtconcurrent-${QTMIN}:5 " RDEPEND="${COMMON_DEPEND} kde-misc/kio-fuse:5 sys-apps/xdg-desktop-portal " -BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + virtual/pkgconfig +" diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.0.4.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.0.4.ebuild new file mode 100644 index 000000000000..540f85ca6d26 --- /dev/null +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.0.4.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# dev-qt/qtbase:= slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +# dev-qt/qtbase:=[cups]: includes specifically the cups private header +# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X +COMMON_DEPEND=" + >=dev-libs/wayland-1.15 + >=dev-qt/qtbase-${QTMIN}:6=[cups,dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + || ( + >=dev-qt/qtbase-${QTMIN}:6[libinput] + >=dev-qt/qtbase-${QTMIN}:6[X] + ) + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6[dbus] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/plasma-workspace-${PVCUT}:6 + x11-libs/libxkbcommon +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 + >=dev-libs/wayland-protocols-1.25 + >=dev-qt/qtbase-${QTMIN}:6[concurrent] +" +RDEPEND="${COMMON_DEPEND} + kde-misc/kio-fuse:6 + sys-apps/xdg-desktop-portal +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + virtual/pkgconfig +" diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest index 667c2569dcaf..156526552da7 100644 --- a/kde-plasma/xembed-sni-proxy/Manifest +++ b/kde-plasma/xembed-sni-proxy/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 -DIST plasma-workspace-5.25.2.tar.xz 18581236 BLAKE2B 0c510d012c65a5472759a7eca8a16c53ba0dce57c7c513018adf77e6da6192b99759d47edb0c23057c0909a5854c26c7efce5c382adb4b2894fdf558534a95ff SHA512 5554b01919439791e991aca51446ed94438d499712f2766eb15389c057b7d9cb0c052a250f9aa432a8b2eb0b9802e51755a2cf6fc0998d3ad0a48138c70bc105 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch deleted file mode 100644 index a1f09aa93c4a..000000000000 --- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch +++ /dev/null @@ -1,60 +0,0 @@ -From da1c5074e390b2ceca3f632f14adfba55def45ab Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Thu, 24 Sep 2020 22:34:28 +0200 -Subject: [PATCH] xembed-sni-proxy: Allow standalone build - ---- - CMakeLists.txt | 36 +++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 443ff07c1..ba15b9ea5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,35 @@ -+project(xembed-sni-proxy) -+ -+if(${CMAKE_SOURCE_DIR} STREQUAL ${xembed-sni-proxy_SOURCE_DIR}) -+ set(PROJECT_VERSION "GENTOO_PV") -+ set(PROJECT_VERSION_MAJOR 5) -+ -+ cmake_minimum_required(VERSION 3.0) -+ -+ set(QT_MIN_VERSION "5.15.0") -+ set(KF5_MIN_VERSION "5.74") -+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus X11Extras) -+ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -+ -+ include(KDEInstallDirs) -+ include(KDECMakeSettings) -+ include(KDECompilerSettings NO_POLICY_SCOPE) -+ include(FeatureSummary) -+ include(ECMQtDeclareLoggingCategory) -+ include(ECMConfiguredInstall) -+ -+ find_package(KF5WindowSystem ${KF5_MIN_VERSION} REQUIRED) -+ find_package(X11 REQUIRED) -+ find_package(XCB MODULE REQUIRED COMPONENTS XCB RANDR) -+ set_package_properties(XCB PROPERTIES TYPE REQUIRED) -+ -+ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) -+else() -+ set(PROJECT_VERSION "5.20.80") -+ set(PROJECT_VERSION_MAJOR 5) -+endif() -+ - add_definitions(-DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_URL_CAST_FROM_STRING -@@ -65,3 +97,7 @@ install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) - - ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) -+ -+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") -+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+endif() --- -2.28.0 - diff --git a/kde-plasma/xembed-sni-proxy/metadata.xml b/kde-plasma/xembed-sni-proxy/metadata.xml index d925f2439758..7a4a42fc5fa8 100644 --- a/kde-plasma/xembed-sni-proxy/metadata.xml +++ b/kde-plasma/xembed-sni-proxy/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-workspace</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild deleted file mode 100644 index 4930f2576348..000000000000 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit cmake kde.org - -DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays" -HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] - x11-libs/libxcb - x11-libs/libXtst - x11-libs/xcb-util-image -" -RDEPEND="${DEPEND} - !kde-plasma/xembed-sni-proxy:0 -" - -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" ) - -src_prepare() { - cmake_src_prepare - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -} diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.11.ebuild index a946c9694bb9..18465c657337 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.25.2.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.11.ebuild @@ -1,13 +1,12 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="plasma-workspace" -KFMIN=5.94.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.4 -inherit cmake kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit cmake plasma.kde.org DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays" HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md" @@ -15,14 +14,13 @@ CMAKE_USE_DIR="${S}/${PN}" LICENSE="GPL-2" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] x11-libs/libxcb x11-libs/libXtst @@ -31,6 +29,7 @@ DEPEND=" RDEPEND="${DEPEND} !kde-plasma/xembed-sni-proxy:0 " +BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0" PATCHES=( "${FILESDIR}/${PN}-5.24.80-standalone.patch" ) |