diff options
Diffstat (limited to 'kde-plasma')
351 files changed, 6101 insertions, 5529 deletions
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index 3992ba7c9f80..dd82ee8c4ec8 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,2 +1,2 @@ -DIST bluedevil-5.20.5.tar.xz 158768 BLAKE2B 8204f1c34e64839ef9671e2c285c394c5a3408d0d4e1d11a8f69f0b51cbffaebf7fa3a7aec7f3a5182ab2754e376762ca0cf90ec84e0c146b2c7696d2db372f5 SHA512 768100b8f34e9a4d2cf1f64910ff490f15be04a2aecc241d64e72c4b57954cf1f48be93c640f93f8c455ef69548f26e659f7a4bec88228490b85130ba042328a -DIST bluedevil-5.21.5.tar.xz 162788 BLAKE2B 33961069c1997e564f9cb26dbc7b866abaed8e52d8f9b532769b017c8768f5602e821d04836198a0d2bec94f18ea57bba075e676869f3cec9c0087629885db37 SHA512 9d2f06e767551b159433e87c2e0c7180152fd881d78dce59abe8af9268780e916378b2e3b3dd385d782893a530aa54f0b178762c18169230caf3975a6798fc52 +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.21.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.21.5.ebuild deleted file mode 100644 index f8edeef6567c..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.21.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~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/kded-${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/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.20.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.27.11.ebuild index b3f2504f783c..121ed5165402 100644 --- a/kde-plasma/bluedevil/bluedevil-5.20.5.ebuild +++ b/kde-plasma/bluedevil/bluedevil-5.27.11.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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,21 +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/kded-${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-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 2fdbf33d963d..d51eb6c02db7 100644 --- a/kde-plasma/bluedevil/metadata.xml +++ b/kde-plasma/bluedevil/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/bluedevil</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest index 1384416c0a59..4634b4d6e392 100644 --- a/kde-plasma/breeze-grub/Manifest +++ b/kde-plasma/breeze-grub/Manifest @@ -1,2 +1,2 @@ -DIST breeze-grub-5.20.5.tar.xz 3153036 BLAKE2B 05a09e03e8ddb608566e6c9b1d28f117ee3b17e814baa2125b3636a872230733759ef76ab3030e288cced36d0380ad357983c1a2735600a0c98ac4eaba852251 SHA512 22524d3031689e8dca73833932bd1661fc7e85aedaeb136fc43cb9b72324efeca4c35f08fbd6d28d6c1b8333589b939ea162655173e54568c0ee4e4f1ee5d1c9 -DIST breeze-grub-5.21.5.tar.xz 3143964 BLAKE2B 96f2e3bb69dafb1ab7e2f328af0f8336431a7085ffd6ac335c6a107cabe73696bda8bb580b2529f01d0c46172e65ae46831f98af0c3ee413b80959b8ea740621 SHA512 c2f16338ad330004c961a9fda6ed48d9670e956bd8562ad05b5f804e3c45ce05c243933028caedb2de981d9fa4f6d66a627aaeb04652fabddebd71fc09b08f5f +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.21.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.27.11.ebuild index e7e9654ba6a5..7f8634d3db86 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.21.5.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-5.27.11.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" src_prepare() { default; } diff --git a/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.0.4.ebuild index 3b3d0d9f2e84..ca7bec05c14a 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.20.5.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-6.0.4.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" src_prepare() { default; } diff --git a/kde-plasma/breeze-grub/metadata.xml b/kde-plasma/breeze-grub/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/breeze-grub/metadata.xml +++ b/kde-plasma/breeze-grub/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest index 97a12b3c4dc1..8b19040d9b43 100644 --- a/kde-plasma/breeze-gtk/Manifest +++ b/kde-plasma/breeze-gtk/Manifest @@ -1,2 +1,2 @@ -DIST breeze-gtk-5.20.5.tar.xz 43068 BLAKE2B 09263f81c2a20970b6a3e0655292fef30cc3cc8a0ba4e458dbf046e306a9ea706c405fa022b670950ed8aecc762663a1e1548331f1e3f62b56fadfbd9ff3acf0 SHA512 4c159f28d6d5163cfbf6add00d1a5edd8caf4b6530e4d8b8744ad99ab6193dec3d774c267ab3a45d8eb8aeee0b3d7e3b4848ef6a21d589bef33763392a1fd6d1 -DIST breeze-gtk-5.21.5.tar.xz 47668 BLAKE2B 4f8d0980c359e9a9aaf8bc4728e8480315e35f426c8199982d2c0f34b62174736ea944689ab88af10c3431998b296049c4b7b64a115081184a3372e466881537 SHA512 afbd9348b2cfd55412df50ef4f2732d6f2fbd58356579766187ea79d20b86127b6e140caa14132edb940fb5d72b5da981869cdeca3abb1c17352782973bf0aae +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.20.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.27.11.ebuild index fa8955c15ef3..02da519e93f2 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.20.5.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-5.27.11.ebuild @@ -1,39 +1,31 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) PVCUT=$(ver_cut 1-3) -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 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" BDEPEND="${PYTHON_DEPS} dev-lang/sassc - >=dev-util/cmake-3.16 $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') >=kde-plasma/breeze-${PVCUT}:5 " 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.21.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.0.4.1.ebuild index 4865bfe4a9fa..3864c459aa31 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.21.5.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-6.0.4.1.ebuild @@ -1,39 +1,32 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -PYTHON_COMPAT=( python3_{7,8,9} ) -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 ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" BDEPEND="${PYTHON_DEPS} dev-lang/sassc $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - >=dev-util/cmake-3.16 - >=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 2fdbf33d963d..543f816c463e 100644 --- a/kde-plasma/breeze-gtk/metadata.xml +++ b/kde-plasma/breeze-gtk/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/breeze-gtk</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest index 881e884afa54..3001148933a6 100644 --- a/kde-plasma/breeze-plymouth/Manifest +++ b/kde-plasma/breeze-plymouth/Manifest @@ -1,2 +1,2 @@ -DIST breeze-plymouth-5.20.5.tar.xz 108832 BLAKE2B c0205874e22c60697e30f84cdda0d344248d772d7308fa9d3e4cbed54abc8aad56614de83b4f40daae52386110b46c6d9cef356a936738e9dbf91270eaecd578 SHA512 0c2526c14069f36b86fb4fd4a2b0ca7e283ed44f3a2a80f9b6de9efccefa5cede0d9214cd0c2a6adf43a78f72291d06d3dd00b01a10d36e517f67b1a432836b3 -DIST breeze-plymouth-5.21.5.tar.xz 108692 BLAKE2B 7b98b1fa6f2793470c550336c3205cd7846e40fbbe3cb7bc895e67fb557868ec3e73fd5e14a0efd22b055a760a2636ed301810c60ea53d27a382bca89525ae18 SHA512 7b562a9b86baf4f362e3cd97722bbe3940be4232910e68ff1f029f2de5d1e362d930dde03a3adbed738bda559f9f6b5b812ae7e1451a145edc37e60b5af66285 +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.21.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.11.ebuild index b9ecc8176c56..9e6449db1996 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.21.5.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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.20.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.0.4.1.ebuild index d751dc43126b..778c8c15c318 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.20.5.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.0.4.1.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.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-plymouth/metadata.xml b/kde-plasma/breeze-plymouth/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/breeze-plymouth/metadata.xml +++ b/kde-plasma/breeze-plymouth/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index 702964d7ef2c..48118648eab3 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,2 +1,2 @@ -DIST breeze-5.20.5.tar.xz 15695388 BLAKE2B f8ff7df9449106815c3c356d96321118a388ef84530dd69f570fcfcb96ab9c20ddda3343a58535ad86232a34bf00ca6091c60350002e04c4bab8018e12a8b673 SHA512 1be4d2c52b683b042a4b094fec75ce069b011f547f8c9f58a04a17cc933537bb018dcab826525827a09b607426a65fbaa40b66ad3232267b34d4214be0a8e13d -DIST breeze-5.21.5.tar.xz 26286020 BLAKE2B 437666f0b509fa9d63f5ad04702831dc0ec4eedf763594c831d335b5b69a6b04052af6adc2c550b903c94a084b353d700d88cec47af537778afa31f7150e38b6 SHA512 5e449624543e2bd437bd4311e7ff091ffae33c4da34da2b9968f9551970b66350d337e6aee974f9e2cd82eff877a4ab5c6f52ec52d4f2724fe93b747f021e9eb +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.21.5.ebuild b/kde-plasma/breeze/breeze-5.21.5.ebuild deleted file mode 100644 index d1a274a975e7..000000000000 --- a/kde-plasma/breeze/breeze-5.21.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~ppc64 ~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} - >=kde-frameworks/kpackage-${KFMIN}:5 -" -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.20.5.ebuild b/kde-plasma/breeze/breeze-5.27.11.ebuild index cb9d539a46ca..3740421bc973 100644 --- a/kde-plasma/breeze/breeze-5.20.5.ebuild +++ b/kde-plasma/breeze/breeze-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 x86" -IUSE="X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -30,22 +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} - >=kde-frameworks/kpackage-${KFMIN}:5 " +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 2fdbf33d963d..691fe86ecc98 100644 --- a/kde-plasma/breeze/metadata.xml +++ b/kde-plasma/breeze/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/breeze</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 98b287b605ef..45496ea47864 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,2 +1,2 @@ -DIST discover-5.20.5.tar.xz 10305280 BLAKE2B fe47718014d420947c1509577e28ec642ccdc975d2b9fa6d2000bfd190880aff4fa1f2ca4597a77980995209847647cc5fb5963bb1c0a88a8010fc1b198c49b7 SHA512 e33f1027a09c8c7733c0b9da81ee82f0c90237c736435ad93cfdb127d79e0ddee0d4d8214774032c81a4078613d278688f0fddbf287aa03a5192cfcdb1eeffa7 -DIST discover-5.21.5.tar.xz 8431164 BLAKE2B 36d539ec0efdfa9d70c6fa3d45fb8abba5228d35a1d7260fa701610a9859ce7c9bd3d98e12b67dade598358a60ceeae78300635ea5ceb1017cc7e7fa3b046c11 SHA512 933a16dd5f99c18e61fdf77330a78e3c5251d13ce6aa99daa4f7b939320a3ddde2c66ead85e1bc31e7719c0cf657ef46516f35f08863cd6f2be25efcbf156fbf +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.20.5-r1.ebuild b/kde-plasma/discover/discover-5.20.5-r1.ebuild deleted file mode 100644 index f66e12748b42..000000000000 --- a/kde-plasma/discover/discover-5.20.5-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 -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 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/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/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 - firmware? ( sys-apps/fwupd ) - flatpak? ( - dev-libs/appstream:= - sys-apps/flatpak - ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-CVE-2021-28117.patch" # bug 777777 - "${FILESDIR}/${PN}-5.21.4-missing-link.patch" # bug 785457 -) - -src_prepare() { - ecm_src_prepare - # we don't need it with PackageKitBackend off - ecm_punt_bogus_dep KF5 Archive -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -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.21.5.ebuild b/kde-plasma/discover/discover-5.27.11.ebuild index d7ff1db71470..dd1e2d9d8cb8 100644 --- a/kde-plasma/discover/discover-5.21.5.ebuild +++ b/kde-plasma/discover/discover-5.27.11.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -ECM_TEST="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +ECM_TEST="true" +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 ~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,37 +37,50 @@ 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.12.8:= - 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.25.90-tests-optional.patch" ) src_prepare() { ecm_src_prepare # we don't need it with PackageKitBackend off - ecm_punt_bogus_dep KF5 Archive + 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=( + # 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 @@ -78,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.20.5-CVE-2021-28117.patch b/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch deleted file mode 100644 index 1a2685dbc8d1..000000000000 --- a/kde-plasma/discover/files/discover-5.20.5-CVE-2021-28117.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 94478827aab63d2e2321f0ca9ec5553718798e60 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Wed, 10 Mar 2021 21:48:53 +0100 -Subject: [PATCH] Only turn http[s] links into clickable links - -CVE-2021-28117 - -(cherry picked from commit d375031ff0262cedac7d6ee2b26d6a164ddebb67) ---- - libdiscover/backends/KNSBackend/KNSResource.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libdiscover/backends/KNSBackend/KNSResource.cpp b/libdiscover/backends/KNSBackend/KNSResource.cpp -index 4394d5df..f7670c55 100644 ---- a/libdiscover/backends/KNSBackend/KNSResource.cpp -+++ b/libdiscover/backends/KNSBackend/KNSResource.cpp -@@ -87,7 +87,7 @@ QString KNSResource::longDescription() - ret.remove(QRegularExpression(QStringLiteral("\\[\\/?[a-z]*\\]"))); - // Find anything that looks like a link (but which also is not some html - // tag value or another already) and make it a link -- static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)([-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption); -+ static const QRegularExpression urlRegExp(QStringLiteral("(^|\\s)(http[-a-zA-Z0-9@:%_\\+.~#?&//=]{2,256}\\.[a-z]{2,4}\\b(\\/[-a-zA-Z0-9@:;%_\\+.~#?&//=]*)?)"), QRegularExpression::CaseInsensitiveOption); - ret.replace(urlRegExp, QStringLiteral("<a href=\"\\2\">\\2</a>")); - return ret; - } --- -GitLab - diff --git a/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch new file mode 100644 index 000000000000..50f1175116d3 --- /dev/null +++ b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch @@ -0,0 +1,85 @@ +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 + +Variable is provided by KDECMakeSettings and default enabled. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + 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, 16 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13fe64228..7453c8bfb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -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 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_ + + 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 5b4aef10c..38377d808 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 eac5a3241..e9ee78fd0 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 d52bee9d0..7d5ba8dc9 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.37.3 + diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index 2b2527d41243..13c683e94092 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="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 8920182a2906..e9adcc8487b8 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,2 +1,3 @@ -DIST drkonqi-5.20.5.tar.xz 755736 BLAKE2B 00dfcabeee2a7deae7cd4705d981000935c8ae9010cd0357b21b4245d4870a73b2d08539dc394d18db22112a77acd7be75d4c5c37cc3da738c71d22a5f21b6cd SHA512 b47c70a3fd2e9f2e7afe663e1dbdb93cbd69e3c864edcd68ca5a3af72abd554647b069d1f92a38c2a67e4a7abcc351003eee185ea751b32f26bdb164d0a0c3b4 -DIST drkonqi-5.21.5.tar.xz 774268 BLAKE2B ce58e47915577ac1eeca0c01619a3ef6c237a01c5273ae979409c004b3dc8e453855644d85165f0d5d8dabdc82dea70413b58620b4cc0b91824253b4275679c0 SHA512 ce24e52cff81cf2b9cf685dcce183cdce99110a1469d156726ca5c64e64dee6f064fe4750729619b6b455bc4e28792f92ec305c0f957f994c4e5a0aaa337f649 +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.20.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild deleted file mode 100644 index bde3cce6c04a..000000000000 --- a/kde-plasma/drkonqi/drkonqi-5.20.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 x86" -IUSE="X" - -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/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/kservice-${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 - X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) -" -DEPEND="${RDEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X Qt5X11Extras) - ) - ecm_src_configure -} - -src_test() { - # needs network access, bug #698510 - local myctestargs=( - -E "(connectiontest)" - ) - - ecm_src_test -} - -pkg_postinst() { - ecm_pkg_postinst - if ! has_version "sys-devel/gdb"; then - elog "For more usability consider installing the following package:" - elog " sys-devel/gdb - Easier debugging support" - fi -} diff --git a/kde-plasma/drkonqi/drkonqi-5.21.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild index 36714ea93ce8..5ae515f4fa32 100644 --- a/kde-plasma/drkonqi/drkonqi-5.21.5.ebuild +++ b/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.0 +ECM_TEST="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 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 ~ppc64 ~x86" -IUSE="X" +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/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 @@ -30,24 +31,34 @@ COMMON_DEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${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 - X? ( >=dev-qt/qtx11extras-${QTMIN}: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} - sys-devel/gdb + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + || ( + 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 X Qt5X11Extras) + $(cmake_use_find_package systemd Systemd) ) ecm_src_configure } @@ -59,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 2fdbf33d963d..be35b35a0d33 100644 --- a/kde-plasma/drkonqi/metadata.xml +++ b/kde-plasma/drkonqi/metadata.xml @@ -1,8 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> + <use> + <flag name="systemd">Enable Coredumpd integration</flag> + </use> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> </pkgmetadata> 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 bd8fd9cd5b62..ee0bd9f90f46 100644 --- a/kde-plasma/kactivitymanagerd/Manifest +++ b/kde-plasma/kactivitymanagerd/Manifest @@ -1,2 +1,2 @@ -DIST kactivitymanagerd-5.20.5.tar.xz 95236 BLAKE2B 1fb4803309cce1207226fb330759c2235672265d2232c8faf9e3d8505243ff2fce4cc955a6a46a83b1d5ab3719fe39c998d4cb06737145a57b4122818945a0bf SHA512 eade394ce5e10f1dffe60784142a797ec9180cf339557e6f06f235b00127fcb910ea42bf0260990fd1197cf958bdb2bb607d9c7e0cd4a5ad075fa6d46c21bbf4 -DIST kactivitymanagerd-5.21.5.tar.xz 99760 BLAKE2B ffc9499fdd2942813cf35697cab0b2813c87614db3d72312329690dfb9a06fd8abef283e7e73cf1485d2bc430e5e0a82fc81688702750fe47494d957623cd069 SHA512 097c18f39d5024a05e645e7dcf82ad39df07afb0ad0b010410699e3fa1261002f05553dbc049af63e7882c305d4c2c20d5032e9448354de7c22d9b9371a8c633 +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.20.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild deleted file mode 100644 index d16635c7b0c4..000000000000 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.20.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 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.21.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.11.ebuild index 60354aa2c005..66d57dc27b5b 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.21.5.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.11.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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 ~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/kactivitymanagerd/metadata.xml b/kde-plasma/kactivitymanagerd/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/kactivitymanagerd/metadata.xml +++ b/kde-plasma/kactivitymanagerd/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest index d281667bc804..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.20.5.tar.xz 602472 BLAKE2B b42d9e8f89cec058c2d98d37b77310737807ef63d4adc408f5b8150ecfbce5fc8076e3f44dd5a67fb1125a419202529309c04f08295bdc34ed6599153b873179 SHA512 60507745d0df94361cc506d00f82b361656e02b7a35d79f77136536b6916d7f4b5e379986fb1f20bc8401140451e90dc8d08891031b1d7c31c74658f6fb20662 -DIST kde-cli-tools-5.21.5.tar.xz 610864 BLAKE2B 5f4fbbc100d8f7baec9353f9540dafe9427cf0b01736f055aaecfed48b3e31e1fa2d0a70b90cc99f30d3df33e1bbade888781b1e2ce95e925d871ae44a9b33bd SHA512 20859f88044c6af84ba4b666b803a6a3a4fbe33748495d9c186fc0739e7b5464b234166cef4d03f0dd44540919eca4f3ea8a1f5ac7b54d480cc9dadeaa0ec3fc +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.21.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild deleted file mode 100644 index 7ad4920020ea..000000000000 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.21.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="optional" -KFMIN=5.82.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 ~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.20.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.11.ebuild index 2bf3da87f29c..5994b8dc1e81 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.20.5.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.11.ebuild @@ -1,45 +1,46 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~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/kparts-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 >=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 @@ -49,12 +50,10 @@ DEPEND=" RDEPEND="${DEPEND} kdesu? ( sys-apps/dbus[X] ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" ) -# requires running kde environment -RESTRICT+=" test" - src_configure() { local mycmakeargs=( $(cmake_use_find_package kdesu KF5Su) 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..de57efe71163 --- /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="true" +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 de312b0074df..90af160c0c88 100644 --- a/kde-plasma/kde-cli-tools/metadata.xml +++ b/kde-plasma/kde-cli-tools/metadata.xml @@ -1,10 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/kde-cli-tools</remote-id> + </upstream> <use> <flag name="kdesu">Build graphical frontend for <pkg>kde-frameworks/kdesu</pkg></flag> </use> diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest index fbede97b0c14..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.20.5.tar.xz 68208 BLAKE2B 89d52f60f0a3cd9d1407a8a537f2893107cc7ba37a5763aba532b665dc0b6c529c6bb9d5873de961e86e3be3cf386de907307bbdde119bdc6fb15b8e958f4881 SHA512 066fff2d3fee4468eb0b5cb27da857bb7d27f2d88f0ac5dd31b1eea928c051c47b3c6d7b5d7de08415cc498d7a6773af37035ede35e315aadd32893a3b0ab846 -DIST kde-gtk-config-5.21.5.tar.xz 68764 BLAKE2B 5b63ae7d4a2f7c364d202321c87a3c6cb11361d6ee74625c3786428adbfda72d792a6de1f51e32d179f6746b33ffb801afccfac8f0167b31f759973b48bc629e SHA512 7acd5036cc008fac85cabd9f3a5321dc1c0209a1133d6063342ca1b1235843dce5e37a7712e0cbbd520f09b3ff46b71a94517c61414c8e7c1c35a2d65b428347 +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.20.5-window-decorations-reloaded.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch deleted file mode 100644 index 9b790a03dd16..000000000000 --- a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.20.5-window-decorations-reloaded.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 62e272df848d6848482ceb534d14bf36c9fde241 Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wengxt@gmail.com> -Date: Sat, 9 Jan 2021 19:07:24 -0800 -Subject: [PATCH] Remove debug message to avoid polute to stdout. - -This would break application like zenity which output to stdout. ---- - window-decorations-reload-module/reloader.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/window-decorations-reload-module/reloader.c b/window-decorations-reload-module/reloader.c -index 9e367dc..606bb1f 100644 ---- a/window-decorations-reload-module/reloader.c -+++ b/window-decorations-reload-module/reloader.c -@@ -55,7 +55,6 @@ void manage_css_provider(GFileMonitor *monitor, GFile *file, GFile *other_file, - - void reload_css_provider() - { -- printf("WINDOW DECORATIONS RELOADED\n"); - if (css_provider != NULL) { - remove_css_provider(); - } --- -GitLab 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.20.5-r1.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild deleted file mode 100644 index 10b6fa2e6275..000000000000 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.20.5-r1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="GTK2 and GTK3 configurator for KDE Plasma" -HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config" - -LICENSE="GPL-3" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -BDEPEND=" - dev-lang/sassc -" -DEPEND=" - dev-cpp/glibmm:2 - dev-libs/glib:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - 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+:2 - x11-libs/gtk+:3 -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - x11-misc/xsettingsd -" - -PATCHES=( "${FILESDIR}/${PN}-5.20.5-window-decorations-reloaded.patch" ) - -src_configure() { - local mycmakeargs=( - -DDATA_INSTALL_DIR="${EPREFIX}/usr/share" - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - elog "If you notice missing icons in your GTK applications, you may have to install" - elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk" - elog "for example." -} diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.11.ebuild index c19ad83bd2c2..ade4b6476ba5 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.21.5.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.11.ebuild @@ -1,27 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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="GTK2 and GTK3 configurator for KDE Plasma" +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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -BDEPEND=" - dev-lang/sassc -" DEPEND=" - dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -32,14 +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+:2 - 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" + +PATCHES=( "${FILESDIR}/${P}-revert-6b3865a7.patch" ) src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-6.0.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.0.4.ebuild new file mode 100644 index 000000000000..ebbb0c9ae074 --- /dev/null +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-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 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +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="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-libs/glib:2 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtsvg-${QTMIN}:6 + gnome-base/gsettings-desktop-schemas + >=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}:* + x11-misc/xsettingsd +" +BDEPEND="dev-lang/sassc" + +src_configure() { + local mycmakeargs=( + -DDATA_INSTALL_DIR="${EPREFIX}/usr/share" + ) + + ecm_src_configure +} + +pkg_postinst() { + ecm_pkg_postinst + elog "If you notice missing icons in your GTK applications, you may have to install" + elog "the corresponding themes for GTK. A good guess would be x11-themes/oxygen-gtk" + elog "for example." +} diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml index 2fdbf33d963d..e3b2387f985f 100644 --- a/kde-plasma/kde-gtk-config/metadata.xml +++ b/kde-plasma/kde-gtk-config/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/kde-gtk-config</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest index 501df9049d74..8fa878a6acdc 100644 --- a/kde-plasma/kdecoration/Manifest +++ b/kde-plasma/kdecoration/Manifest @@ -1,2 +1,2 @@ -DIST kdecoration-5.20.5.tar.xz 45524 BLAKE2B 3ba5a83c51664ce45b21055ca839cd390feb206d98c8b4380895ccc81f861b741a1a01d70f0417f36020322e5e94aa58ba41e75300a2d987dd3a27f65907b5fb SHA512 020130695a865a98acc3b8ec783650877addec8beb6ee96b87bf74f7bedd63aa2d06629d3f8f59a1b76ded72b4a6c85d462d61ed6c9a37876fd2f8123af8fdfe -DIST kdecoration-5.21.5.tar.xz 46236 BLAKE2B 3fc48fd91ff5e53c4a98f37572785b25f25ba23218aefc6e07b1b7c3495055002b379f826191e0155a39ae61dd8a0052e51d50af059fa8e3bf12e3dcb22f613a SHA512 ef86f9946cad9de9a5e3767e2dce4f30436c9fb013bf73d5ca31cb852d3dae92cd3906adcb178070f74922f3776d226b8f812ea24eb82a57662c0bf675d38edb +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.20.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild deleted file mode 100644 index 19dd80902673..000000000000 --- a/kde-plasma/kdecoration/kdecoration-5.20.5.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.27.11.ebuild index 772726b619c5..c0324dc1039d 100644 --- a/kde-plasma/kdecoration/kdecoration-5.21.5.ebuild +++ b/kde-plasma/kdecoration/kdecoration-5.27.11.ebuild @@ -1,24 +1,24 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.82.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 ~x86" +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-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/kdecoration/metadata.xml b/kde-plasma/kdecoration/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/kdecoration/metadata.xml +++ b/kde-plasma/kdecoration/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest index 144944c7c4f7..6cb381e47fe0 100644 --- a/kde-plasma/kdeplasma-addons/Manifest +++ b/kde-plasma/kdeplasma-addons/Manifest @@ -1,2 +1,2 @@ -DIST kdeplasma-addons-5.20.5.tar.xz 644352 BLAKE2B 2579fafc102210006a8cdb4b303c865ec3aabe149c0d0acfa47640c272e4327fa84934f33e14f6c2fad20656fbe145793d375c81fa4028251cf623e37b243aaa SHA512 3a4f0715ac1dbc9edbb62f253b48520f9b011c29f87ef0a7ba25ea14dc24dcc698405e7d8e83593b51bab2976b274b0ac869cab8b17a50ba34902bd8121ee421 -DIST kdeplasma-addons-5.21.5.tar.xz 630108 BLAKE2B a3a4ee1885cce41621150cc1eb5fa5d6470b627f8a30231078938d82f39f888927f6482048403905cb3e680928be892718e0c4741a8da11f0e317fa06cee8106 SHA512 7c7afebd726e400c859be7051c14dc2ade658df7995b02f43595be5394f8d79322c7a7edeff6761e3980bc20aaedfc49d063308c4ee9974a400b8f855a89efe1 +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.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch deleted file mode 100644 index 485acd542a83..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch +++ /dev/null @@ -1,65 +0,0 @@ -From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 7 Jul 2020 22:22:13 +0200 -Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet - ---- - CMakeLists.txt | 7 ++++++- - applets/CMakeLists.txt | 4 +++- - dataengines/CMakeLists.txt | 4 +++- - 3 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c4697a52..e5d14bc8c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - IconThemes - KIO - KCMUtils -- Kross - Notifications - Plasma - Runner -@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - NewStuff - ) - -+find_package(KF5Kross CONFIG QUIET) -+set_package_properties(KF5Kross PROPERTIES -+ PURPOSE "Needed for Comic applet" -+ TYPE OPTIONAL -+) -+ - find_package(KF5Purpose CONFIG QUIET) - set_package_properties(KF5Purpose PROPERTIES - DESCRIPTION "Framework for cross-application services and actions" -diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt -index 93b637b1b..6af5ffc67 100644 ---- a/applets/CMakeLists.txt -+++ b/applets/CMakeLists.txt -@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator) - add_subdirectory(binary-clock) - add_subdirectory(calculator) - add_subdirectory(colorpicker) --add_subdirectory(comic) -+if(KF5Kross_FOUND) -+ add_subdirectory(comic) -+endif() - add_subdirectory(dict) - if(NOT WIN32) - # uses the command line tool 'quota', does not make sense on Windows -diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt -index 8d91dd84f..38f715b11 100644 ---- a/dataengines/CMakeLists.txt -+++ b/dataengines/CMakeLists.txt -@@ -1,3 +1,5 @@ -- add_subdirectory(comic) -+if(KF5Kross_FOUND) -+ add_subdirectory(comic) -+endif() - add_subdirectory(potd) - add_subdirectory(konsoleprofiles) --- -2.27.0 - diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch deleted file mode 100644 index 5981fe4a7ef4..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.20.5-no-kiconthemes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 88fe32d4d6543c860bcec4e63782ee82fac2c75f Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Mon, 14 Dec 2020 18:26:33 +0100 -Subject: [PATCH] Remove unused KIconThemes dependency - ---- - CMakeLists.txt | 1 - - applets/weather/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 15e121e7f..bc3782f1f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -47,7 +47,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - Declarative - Holidays - I18n -- IconThemes - KIO - KCMUtils - Kross -diff --git a/applets/weather/CMakeLists.txt b/applets/weather/CMakeLists.txt -index d88c5fcc0..fe88b68c5 100644 ---- a/applets/weather/CMakeLists.txt -+++ b/applets/weather/CMakeLists.txt -@@ -33,7 +33,6 @@ add_library(weatherplugin SHARED ${weather_SRCS}) - target_link_libraries(weatherplugin - KF5::Plasma - KF5::UnitConversion -- KF5::IconThemes - KF5::I18n - Qt5::Qml - ) --- -GitLab - diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild deleted file mode 100644 index d5e4bee93e2f..000000000000 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.20.5.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 x86" -IUSE="comic 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/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - comic? ( >=kde-frameworks/kross-${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}/${PN}-5.20.5-no-kiconthemes.patch" - "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" # downstream patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package comic KF5Kross) - $(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.21.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.11.ebuild index 7d312067f3f2..eeba0ce7ff99 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.21.5.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.11.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.82.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 ~x86" -IUSE="comic share webengine" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+alternate-calendar networkmanager share webengine" -RESTRICT+=" test" # bug 727846 +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 - comic? ( >=kde-frameworks/kross-${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}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch - src_configure() { local mycmakeargs=( - $(cmake_use_find_package comic KF5Kross) + $(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 7421b6e64e74..ca846463acd9 100644 --- a/kde-plasma/kdeplasma-addons/metadata.xml +++ b/kde-plasma/kdeplasma-addons/metadata.xml @@ -1,12 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="comic">Enable comic applet (requires deprecated <pkg>kde-frameworks/kross</pkg>)</flag> + <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 4c3e86293514..d8267cdb2c3c 100644 --- a/kde-plasma/kgamma/Manifest +++ b/kde-plasma/kgamma/Manifest @@ -1,2 +1,2 @@ -DIST kgamma5-5.20.5.tar.xz 81560 BLAKE2B b27cce9651fc78d28758f252cecbe36af52de0e76145b3a08abd0d741be015231fa1501201c115f29fc4f324bd05a3a327866cb594f5c72f34666e7c3978e67e SHA512 ea92e80a3c16e8ab357e9185d8bfaa157cb75edbb6f3d64b0c4d6f2951ee2335d52cda4c26913e160449c7dfad35114e8819acf95ebb12e011a3e7e8d4f0e654 -DIST kgamma5-5.21.5.tar.xz 83168 BLAKE2B 5b6cec28329437dbfd93ccf24e26032dad1a394133f823dc6e47a0d82e2aee1d5ca387876a4951c2dec4b072268dcddc58cf0d9c69ad107360279c9027e6e777 SHA512 31da4b0e4aceeffaa17b9d9c13a12db8a7009575e92977f5261fea4b578cc8cca1a8f159a4229a7995cac2beb76583c125448a346ac1cdfdbb774bf76b2e34ac +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.21.5.ebuild b/kde-plasma/kgamma/kgamma-5.21.5.ebuild deleted file mode 100644 index 7b67115da52f..000000000000 --- a/kde-plasma/kgamma/kgamma-5.21.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KDE_ORG_NAME="${PN}5" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Screen gamma values kcontrol module" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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.20.5.ebuild b/kde-plasma/kgamma/kgamma-5.27.11.ebuild index 6b23d08d5792..746800890d94 100644 --- a/kde-plasma/kgamma/kgamma-5.20.5.ebuild +++ b/kde-plasma/kgamma/kgamma-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KDE_ORG_NAME="${PN}5" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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 2fdbf33d963d..a9d8cabf439a 100644 --- a/kde-plasma/kgamma/metadata.xml +++ b/kde-plasma/kgamma/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/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 85e9a8f9f9f3..65f3b89eccd3 100644 --- a/kde-plasma/khotkeys/Manifest +++ b/kde-plasma/khotkeys/Manifest @@ -1,2 +1 @@ -DIST khotkeys-5.20.5.tar.xz 1856468 BLAKE2B a29c2c6dd9d34dbf2919ab4020bc6b3ec16d25f0462485ed1940598a238f99b8066176462e6ce24ec2784150601d574eabd469b1fa9760f2afb630392c4a7d4e SHA512 7a18896c40749611b333b3a7cd5c064e61449579b141856f2d75f02fe0db12924fc8e6ccada00c6cca29a57aac5877f0c791d7231dc047b8b32c168ac507e110 -DIST khotkeys-5.21.5.tar.xz 1861604 BLAKE2B 69f0057e62d4a03ce3e54092def09ea7bf73a4063ebd8e33c2fb81566d9fd1e02a1712b2e941295a491821b3ba4695f43884e5db532a5c166439a2d26389b1df SHA512 16409a928af050278dda012150e969b60617a66aa000cbb722781788defb02268ac56ef521916e55f257e4b166df8ddffcf14c9c35b49410a79491f197b4aef5 +DIST khotkeys-5.27.11.tar.xz 1895584 BLAKE2B 3f718709f945b956e468fabb82e5921a7175dd756327e3b01170a4a68c2899912d45ed32242ee436fa578819e9835d1993c84986a91d09a27e7730f28b86025b SHA512 9c39c989bce1ef80ad3334d65ddeb2d4a2da039e54b8863fa29538c25d532562e74791a97957fad1c66b6642c02b51818b24ad4dea7059185d1f7564cf0cdd7f diff --git a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch b/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch deleted file mode 100644 index 6d39c5465791..000000000000 --- a/kde-plasma/khotkeys/files/khotkeys-5.20.4-unused-dep.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5f622844605a569eec776f3cdd0954ccefd8c99b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 29 Nov 2020 11:55:10 +0100 -Subject: [PATCH] Drop unused KF5Plasma dependency - -This had been already dropped in commit 1d60f46f, which was reverted in -commit 8ba8a29c. At least that part of it was correct though. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a945dee..b49bff1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - KDELibs4Support - DBusAddons - KCMUtils -- Plasma - ) - - find_package(X11 REQUIRED OPTIONAL_COMPONENTS Xtst) --- -2.29.2 - diff --git a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild deleted file mode 100644 index be70e0fb1def..000000000000 --- a/kde-plasma/khotkeys/khotkeys-5.20.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace hotkey module" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 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 -" - -PATCHES=( "${FILESDIR}"/${PN}-5.20.4-unused-dep.patch ) diff --git a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.27.11.ebuild index c6e7519c239a..7df40ad86cfe 100644 --- a/kde-plasma/khotkeys/khotkeys-5.21.5.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KFMIN=5.82.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 workspace hotkey module" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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/khotkeys/metadata.xml b/kde-plasma/khotkeys/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/khotkeys/metadata.xml +++ b/kde-plasma/khotkeys/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest index 4cbac135c234..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.20.5.tar.xz 1286404 BLAKE2B 3420e9d73e5cf73c91733fb3c72a4315db577ef5248e11036c4a6bdb1e897deb5983276ef903c25664ceba549cbad12bff2b6e6951abc90fbca0cc97e42c60ae SHA512 c7d2eb7307682f7bdc8ac22d1905dcc8bab0e258ee5f3458c4f40e43fee4d14ecd6b423f4357b338e05924db93d7c9914d3c36756620aac9fc6d0897ea4e5a90 -DIST kinfocenter-5.21.5.tar.xz 1304704 BLAKE2B e63d261bd57f69f3941c670f7d4e45428959544f15187829a704a240706bc04a65dad4bbfeca32444050abb1a5a8c50ccb9365d261cf71149498d1ca408bb77d SHA512 2becdd6f6be00de309467fee1478bec75bc6fa7d8d233b0a5bc8e6124f780add705d549209c842c3cd621bc8931a8ecdecb5a2902ab369bcd476939580bec41a +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.20.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild deleted file mode 100644 index 80e318f9a816..000000000000 --- a/kde-plasma/kinfocenter/kinfocenter-5.20.5.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -inherit ecm 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 x86" -IUSE="gles2-only ieee1394 +opengl +pci wayland" - -REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )" - -BDEPEND=">=dev-util/cmake-3.14.3" -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/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/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/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - x11-libs/libX11 - gles2-only? ( media-libs/mesa[gles2] ) - ieee1394? ( sys-libs/libraw1394 ) - opengl? ( - media-libs/mesa[X(+)] - !gles2-only? ( media-libs/glu ) - ) - pci? ( sys-apps/pciutils ) - wayland? ( - >=kde-frameworks/kwayland-${KFMIN}:5 - media-libs/mesa[egl] - ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/systemsettings-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package ieee1394 RAW1394) - $(cmake_use_find_package pci PCIUTILS) - $(cmake_use_find_package wayland EGL) - $(cmake_use_find_package wayland KF5Wayland) - ) - - if has_version "dev-qt/qtgui[gles2-only]"; then - mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) ) - else - mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) ) - fi - - ecm_src_configure -} - -src_install() { - ecm_src_install - - # TODO: Make this fully obsolete by /etc/os-release - insinto /etc/xdg - doins "${FILESDIR}"/kcm-about-distrorc - - insinto /usr/share/${PN} - doins "${DISTDIR}"/glogo-small.png -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "NFS information module" net-fs/nfs-utils - optfeature "Samba status information module" net-fs/samba - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.27.11.ebuild index 2321b8e4c6db..35e67be31cff 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.21.5.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.27.11.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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,63 +15,43 @@ 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 ~ppc64 ~x86" -IUSE="gles2-only ieee1394 +opengl +pci wayland" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="gles2-only usb" -REQUIRED_USE="wayland? ( || ( opengl gles2-only ) )" - -BDEPEND=">=dev-util/cmake-3.14.3" 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/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/kiconthemes-${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 - x11-libs/libX11 gles2-only? ( media-libs/mesa[gles2] ) - ieee1394? ( sys-libs/libraw1394 ) - opengl? ( - media-libs/mesa[X(+)] - !gles2-only? ( media-libs/glu ) - ) - pci? ( sys-apps/pciutils ) - wayland? ( - >=kde-frameworks/kwayland-${KFMIN}:5 - media-libs/mesa[egl] - ) + 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=( - $(cmake_use_find_package ieee1394 RAW1394) - $(cmake_use_find_package pci PCIUTILS) - $(cmake_use_find_package wayland EGL) - $(cmake_use_find_package wayland KF5Wayland) + $(cmake_use_find_package usb USB1) ) - if has_version "dev-qt/qtgui[gles2-only]"; then - mycmakeargs+=( $(cmake_use_find_package gles2-only OpenGLES) ) - else - mycmakeargs+=( $(cmake_use_find_package opengl OpenGL) ) - fi - ecm_src_configure } @@ -90,6 +70,13 @@ pkg_postinst() { if [[ -z "${REPLACING_VERSIONS}" ]]; then optfeature "NFS information module" net-fs/nfs-utils optfeature "Samba status information module" net-fs/samba + optfeature "Vulkan graphics API information module" dev-util/vulkan-tools + 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 ecm_pkg_postinst } diff --git a/kde-plasma/kinfocenter/kinfocenter-6.0.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.0.4.ebuild new file mode 100644 index 000000000000..6514f41e79f6 --- /dev/null +++ b/kde-plasma/kinfocenter/kinfocenter-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_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +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="6" +KEYWORDS="~amd64" +IUSE="gles2-only usb" + +DEPEND=" + >=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/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 +} + +src_install() { + ecm_src_install + + # TODO: Make this fully obsolete by /etc/os-release + insinto /etc/xdg + doins "${FILESDIR}"/kcm-about-distrorc + + insinto /usr/share/${PN} + doins "${DISTDIR}"/glogo-small.png +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "NFS information module" net-fs/nfs-utils + optfeature "Samba status information module" net-fs/samba + optfeature "Vulkan graphics API information module" dev-util/vulkan-tools + 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 + ecm_pkg_postinst +} diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml index 25a8676da284..a7a67f3066f4 100644 --- a/kde-plasma/kinfocenter/metadata.xml +++ b/kde-plasma/kinfocenter/metadata.xml @@ -1,11 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="pci">Show advanced PCI information</flag> + <flag name="usb">Show USB device information</flag> </use> </pkgmetadata> diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest index c8cfd24e0b09..80e1fe367960 100644 --- a/kde-plasma/kmenuedit/Manifest +++ b/kde-plasma/kmenuedit/Manifest @@ -1,2 +1,2 @@ -DIST kmenuedit-5.20.5.tar.xz 893840 BLAKE2B 5fe62cd5c297a21dd4fcb5298dad813bc4607aad90884e3f465f914b49c3d509af4d15cb1797ed179d7a912ff4b82fb4c802abe6fa142e31fb008600bc3ef842 SHA512 c42ae1351ba6eaed7996078aa31864a64fe6551fd688ab84146459f30d195aaa8d412ee526a011df8c21c1e60f8cb5541a5b0fbea85f4702b2249e2571c27a15 -DIST kmenuedit-5.21.5.tar.xz 899632 BLAKE2B 8b061f883fcd8df0ab62ad8e8e2b03bba8449e43056b5def98c4c22b49454c52e9034d17cc8d6f06664e33ccedb7ce9723fe63ea72f5c3f821700a2fe7c97fc7 SHA512 a375574ac41017b033bde10d7f2bcad980b5c0758855c9787518e1f9a5185b0dbdca775f45593144fe462fe52d01001ba72e775b2b728f7a39087ffeeaae8919 +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.20.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild deleted file mode 100644 index 985b50d236f5..000000000000 --- a/kde-plasma/kmenuedit/kmenuedit-5.20.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 -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 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} - >=kde-frameworks/kinit-${KFMIN}:5 -" diff --git a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.27.11.ebuild index 5a1b40c74930..2460039ddcb9 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.21.5.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 -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 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" @@ -33,9 +33,8 @@ RDEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 " -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 -" +DEPEND="${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 2fdbf33d963d..7fe5ace1f983 100644 --- a/kde-plasma/kmenuedit/metadata.xml +++ b/kde-plasma/kmenuedit/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/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 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/kwayland-server/metadata.xml +++ b/kde-plasma/kpipewire/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index 5212735d65b6..e7109704fb92 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,2 +1,2 @@ -DIST kscreen-5.20.5.tar.xz 114932 BLAKE2B c703e4dd605fedf26dea0f04829d9ee900f8c007915123cb6e68c68bbeba8655bfb833bc180c2258c48e9e8c672d3b057bf2b3380fb7f687bbf0d4202a1217ed SHA512 c1a618605afe4861f9ea563472df104e0cd6f015b2ba1a0621ee6d18bd653598a6de0f800901dc07e8142969633d302e68d66f3b0b9650cbc4b6cd0eeca14dd1 -DIST kscreen-5.21.5.tar.xz 114956 BLAKE2B e236b765ae57f4138feb70d9652ada33f57abd0581c1ec9a5bc826a6c31a1a5a5a6236cf55bb3a24f7a4de0a1aeb088cc62a09dd6353f126aafa04f4d3b2e73b SHA512 d57a561b22aed2301574e4af37d45046f4fbd360f8eae3465303c29a490f9dcc33a93c7e38890bd2945a4d868c23719a0ac11cfcdd22e613fc8612fa53694784 +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/kscreen-5.21.5.ebuild b/kde-plasma/kscreen/kscreen-5.21.5.ebuild deleted file mode 100644 index 43e8527e51da..000000000000 --- a/kde-plasma/kscreen/kscreen-5.21.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KFMIN=5.82.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 ~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 -" diff --git a/kde-plasma/kscreen/kscreen-5.20.5.ebuild b/kde-plasma/kscreen/kscreen-5.27.11.ebuild index 6bf3ae99a3e5..6b7c8112c10b 100644 --- a/kde-plasma/kscreen/kscreen-5.20.5.ebuild +++ b/kde-plasma/kscreen/kscreen-5.27.11.ebuild @@ -1,46 +1,50 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~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 + >=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}:* " - -# bug #580440, last checked 5.6.3 -RESTRICT+=" test" +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 2fdbf33d963d..307cc9b59524 100644 --- a/kde-plasma/kscreen/metadata.xml +++ b/kde-plasma/kscreen/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/kscreen</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest index 4974beeba71f..3fed1804c982 100644 --- a/kde-plasma/kscreenlocker/Manifest +++ b/kde-plasma/kscreenlocker/Manifest @@ -1,2 +1,2 @@ -DIST kscreenlocker-5.20.5.tar.xz 115988 BLAKE2B 7a051bea3952da85c272e32bb0c04c94bd0eb5fa52e01e90d9ce7d2902b3e3fca97ae7a6ee2c0994fa775309e62c7b7f0ba8b6634f04188370809cef7142835b SHA512 0993013374b91a34fd9ff204012f83f63a4ffcde9c6562ae0f7544fce78f5d526ad0104154ad5a104742df77d77b2267290c451cf90b1931ad1b36254e2b7ec6 -DIST kscreenlocker-5.21.5.tar.xz 117420 BLAKE2B 1727425954ee4402b8e4ce6fd05ab157597867cdfd5c6a5a4d841f5ba1723c3f0a7b056ca3bc31b48891c2edacc670595ed59677a9ee479047f5c850f4cddc27 SHA512 0ed1f1399d493f39562c3655e4f541b65c25beaeac77315af34e49f79f7dfd954099b7ab91f2eab8b1d2f5dc3be8f0a54c7d53d902bc31971bffa6b94476c8af +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.21.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild deleted file mode 100644 index 88cc23577b3a..000000000000 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.21.5.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KFMIN=5.82.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 ~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 - 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.20.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.27.11.ebuild index 730f3e940151..4d0b30ed4b30 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.20.5.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.27.11.ebuild @@ -1,21 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 x86" -IUSE="+pam" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" + +RESTRICT="test" COMMON_DEPEND=" dev-libs/wayland @@ -25,7 +26,8 @@ COMMON_DEPEND=" >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5[qml] >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 @@ -33,17 +35,20 @@ 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 x11-libs/libxcb x11-libs/xcb-util-keysyms - pam? ( sys-libs/pam ) " DEPEND="${COMMON_DEPEND} x11-base/xorg-proto @@ -51,27 +56,19 @@ 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 + >=kde-frameworks/kcmutils-${KFMIN}:5 " - -RESTRICT+=" test" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" 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=( @@ -83,11 +80,6 @@ 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 + newpamd "${FILESDIR}/kde.pam" kde + newpamd "${FILESDIR}/kde-np.pam" kde-np } 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/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/kscreenlocker/metadata.xml +++ b/kde-plasma/kscreenlocker/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest index b45b0b88d865..d8f4c6c5599e 100644 --- a/kde-plasma/ksshaskpass/Manifest +++ b/kde-plasma/ksshaskpass/Manifest @@ -1,2 +1,2 @@ -DIST ksshaskpass-5.20.5.tar.xz 23516 BLAKE2B 328adfbf6ca7adcc9d9fbdb22d86e0e44b4056b4d7b3c3af13ebede5002ed587aa2102c6a90c27691f102f2c15ce08d2876e1dea6cd0c20833a21800b0b3fd21 SHA512 2dbe7b59b3469ae4ab20b896d11f354c6e335e5178a8647f1e71a311389b29c16cbba7fc925053ade3076063af9fd0497af3b8e060e554e68ba40b8fef47de55 -DIST ksshaskpass-5.21.5.tar.xz 24148 BLAKE2B 8cae47375a883948cfff373b1bf113359ce4c1d548c982dc6c9d8a9a28c16661813c1d8077f463a6ec1dc80c69b2736391c56382bf3ff2b7d2f3da24d6e64f2b SHA512 c342723383d13b8df977bb4ab3c6b50c15007d12fdd27c0e51ad41cf77bbc5ddae404a9fe10669ea22933140a55bc293e7296d8e3e488cbce36158475403d7ff +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.20.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.27.11.ebuild index 8cc4dbbecfe7..ebf18544fa10 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.20.5.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 -QTMIN=5.15.1 -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 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.0.4.ebuild index 696527628879..8bd4b1f19279 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.21.5.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-6.0.4.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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 ~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 2fdbf33d963d..8a7cc7ffebd5 100644 --- a/kde-plasma/ksshaskpass/metadata.xml +++ b/kde-plasma/ksshaskpass/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/ksshaskpass</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/ksysguard/Manifest b/kde-plasma/ksysguard/Manifest index 286f713a0680..2a1cfcc58f9e 100644 --- a/kde-plasma/ksysguard/Manifest +++ b/kde-plasma/ksysguard/Manifest @@ -1,2 +1 @@ -DIST ksysguard-5.20.5.tar.xz 564408 BLAKE2B c22fcc8280aea81007ec2366ac3f64ea7f66f1740a30ea49ffc4317c85d8e68cb5cd29ad4afd34dcb3a37ad6362bfbfdcb59b29e427d58c6de179ba107360a26 SHA512 17c96a3e19e428f90f729b813443199a5ab75608c0f46321127b1d4e2fc68a6a55df9ac8e3f194ae97ad533d3d22006c230f34ee328984e32205046e91487b08 -DIST ksysguard-5.21.5.tar.xz 604624 BLAKE2B ac95499a75be6eb2a56d8e96a560271cbaa2618c0a21493d3226cff0aeeb05ebd2644a65567f9ddae2f07016a22e2c9dbfc3c42b14b504d13e788ff1312a18c0 SHA512 53e41ae1fb14d8e3393671e2d42ab7304b144f8938c821402c16c66aa09917e3dfc8ce766df43f1bb9c09e2934a6dcd48a4a4781d379026164b278aaed95858e +DIST ksysguard-5.22.0.tar.xz 521768 BLAKE2B 0cceb54c19b5263d658fded8c603bbd3415b98c0e6ebde04fccc8d4f09a68037ba2b8666ed7beccaa1d54b9b792e537a730fa93233fd3cf1b59f915effce4b0e SHA512 07314366506d029206e6fba934eefc8d338e52ab0f8f79747c189a9f856e13f32c7b156bd49ccf1ab2bef5c37fb05924022606bae6bbf2eb4628043d7c2579a2 diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch new file mode 100644 index 000000000000..8eecf7d8e52f --- /dev/null +++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-add-StartupWMClass-to-desktop-file.patch @@ -0,0 +1,21 @@ +From 6b0c2ca25571c7d0d2dd94f1f539ba8ed6796347 Mon Sep 17 00:00:00 2001 +From: Shriraj Hegde <shriraj.hegde@gmail.com> +Date: Wed, 9 Jun 2021 08:21:46 +0000 +Subject: [PATCH] Add StartupWMClass to desktop file + +--- + gui/org.kde.ksysguard.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gui/org.kde.ksysguard.desktop b/gui/org.kde.ksysguard.desktop +index 0c59d5b7..feb4f220 100755 +--- a/gui/org.kde.ksysguard.desktop ++++ b/gui/org.kde.ksysguard.desktop +@@ -224,3 +224,4 @@ StartupNotify=true + X-DBUS-StartupType=Multi + Categories=Qt;KDE;System; + X-DBUS-ServiceName=org.kde.ksysguard ++StartupWMClass=ksysguard +-- +GitLab + diff --git a/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch new file mode 100644 index 000000000000..d8e63cf7ca8c --- /dev/null +++ b/kde-plasma/ksysguard/files/ksysguard-5.22.0-port-to-QtQuickDialogWrapper.patch @@ -0,0 +1,59 @@ +From cfd3a0f8b0d4223dbd3181ecaaee6111165a9e94 Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Thu, 5 Aug 2021 21:01:30 +0200 +Subject: [PATCH] Port to QtQuickDialogWrapper + +--- + CMakeLists.txt | 2 +- + gui/Workspace.cpp | 13 +++++-------- + 2 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 23069e76..dcb92975 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -7,7 +7,7 @@ set(KSYSGUARD_VERSION 4.98.0) + set(KSYSGUARD_STRING_VERSION "${KSYSGUARD_VERSION}") + + set(QT_MIN_VERSION "5.15.0") +-set(KF5_MIN_VERSION "5.78") ++set(KF5_MIN_VERSION "5.80") + + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +diff --git a/gui/Workspace.cpp b/gui/Workspace.cpp +index 827d63e1..bdd03743 100644 +--- a/gui/Workspace.cpp ++++ b/gui/Workspace.cpp +@@ -29,8 +29,8 @@ + #include <KMessageBox> + #include <KAcceleratorManager> + #include <KActionCollection> +-#include <KNewStuff3/KNS3/DownloadDialog> + #include <KNewStuff3/KNSCore/Engine> ++#include <KNS3/QtQuickDialogWrapper> + #include <KConfigGroup> + + #include "WorkSheet.h" +@@ -307,14 +307,11 @@ void Workspace::uploadHotNewWorksheet() + } + void Workspace::getHotNewWorksheet() + { +- KNS3::DownloadDialog dialog(QStringLiteral("ksysguard.knsrc")); +- if( dialog.exec() == QDialog::Rejected ) +- return; +- +- KNS3::Entry::List entries = dialog.installedEntries(); +- foreach(KNS3::Entry entry, entries) { ++ KNS3::QtQuickDialogWrapper dialog(QStringLiteral("ksysguard.knsrc") ); ++ const QList<KNSCore::EntryInternal> entries = dialog.exec(); ++ for (auto entry : entries) { + if(!entry.installedFiles().isEmpty()) { +- QString filename = entry.installedFiles().first(); ++ const QString filename = entry.installedFiles().constFirst(); + restoreWorkSheet(filename, true); + } + } +-- +GitLab + diff --git a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild deleted file mode 100644 index f3592b8c6825..000000000000 --- a/kde-plasma/ksysguard/ksysguard-5.20.5.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Network-enabled task manager and system monitor" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="lm-sensors +network networkmanager" - -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/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - lm-sensors? ( sys-apps/lm-sensors:= ) - network? ( - dev-libs/libnl:3 - net-libs/libpcap - sys-libs/libcap - ) - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package lm-sensors Sensors) - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) - $(cmake_use_find_package network libpcap) - $(cmake_use_find_package network NL) - ) - - ecm_src_configure -} diff --git a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild index b6ba2ea44f62..ec8ad40f2c55 100644 --- a/kde-plasma/ksysguard/ksysguard-5.21.5.ebuild +++ b/kde-plasma/ksysguard/ksysguard-5.22.0-r1.ebuild @@ -1,25 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) +KFMIN=5.88.0 QTMIN=5.15.2 VIRTUALX_REQUIRED="test" inherit ecm kde.org -DESCRIPTION="Network-enabled task manager and system monitor" +DESCRIPTION="Network-enabled resource usage monitor" +HOMEPAGE="https://apps.kde.org/ksysguard/ https://userbase.kde.org/KSysGuard" +SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="lm-sensors networkmanager" +KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +IUSE="lm-sensors" DEPEND=" - dev-libs/libnl:3 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 @@ -31,7 +31,6 @@ DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 @@ -39,21 +38,19 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - net-libs/libpcap - sys-libs/libcap - virtual/libudev:= + >=kde-plasma/libksysguard-5.22.0:5 lm-sensors? ( sys-apps/lm-sensors:= ) - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-add-StartupWMClass-to-desktop-file.patch + "${FILESDIR}"/${P}-port-to-QtQuickDialogWrapper.patch +) + src_configure() { local mycmakeargs=( $(cmake_use_find_package lm-sensors Sensors) - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) ) - ecm_src_configure } diff --git a/kde-plasma/ksysguard/metadata.xml b/kde-plasma/ksysguard/metadata.xml index 4e1b25bdbebc..d925f2439758 100644 --- a/kde-plasma/ksysguard/metadata.xml +++ b/kde-plasma/ksysguard/metadata.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> - <use> - <flag name="network">Enable per-process network statistic collection using <pkg>dev-libs/libnl</pkg></flag> - <flag name="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag> - </use> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + </upstream> </pkgmetadata> diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest new file mode 100644 index 000000000000..5a266c12ddb9 --- /dev/null +++ b/kde-plasma/ksystemstats/Manifest @@ -0,0 +1,2 @@ +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.27.11.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.27.11.ebuild new file mode 100644 index 000000000000..986e2f6c561d --- /dev/null +++ b/kde-plasma/ksystemstats/ksystemstats-5.27.11.ebuild @@ -0,0 +1,44 @@ +# 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.106.0 +PVCUT=$(ver_cut 1-3) +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 ~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}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package networkmanager KF5NetworkManagerQt) + ) + ecm_src_configure +} 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/ksystemstats/metadata.xml b/kde-plasma/ksystemstats/metadata.xml new file mode 100644 index 000000000000..9f97c6007900 --- /dev/null +++ b/kde-plasma/ksystemstats/metadata.xml @@ -0,0 +1,14 @@ +<?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="networkmanager">Enable improved backend for Network statistics using <pkg>kde-frameworks/networkmanager-qt</pkg></flag> + </use> +</pkgmetadata> diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest index e1759d6a051f..7f1063986c78 100644 --- a/kde-plasma/kwallet-pam/Manifest +++ b/kde-plasma/kwallet-pam/Manifest @@ -1,2 +1,2 @@ -DIST kwallet-pam-5.20.5.tar.xz 19812 BLAKE2B d0ad931e47a35b5589e9c34bce924f697446460bcfbfcceb4e3f0564182bbac822f13488dddc592f7b6a119d774b6176b86df8ddca55fb0c9423d0c7634fa9cc SHA512 5f728c2fbbcbfa7a2b50a2d9b60e557360b48d6a5958ce290ace3e2ae8c253b56f64178942f958d38e7e62e0baf1cad0ddb2aa28e11d145f3b507d58900dcb03 -DIST kwallet-pam-5.21.5.tar.xz 19916 BLAKE2B ee0efa7448f7f7d599e83d9a923909fe0de965aa48a8e505b984a5cb54d16c20b3f2f57efb83cd887545e23c3aa9ac4a70c14e9173fff263190c8de5c2c9449f SHA512 4dab0ac4500c6ec01fef71e2197e59afb39c318dfe1e5727832fed2137b5d961bb1aad9c52d356346794ac1dd9e9451f507032aab29028806d9c04c3c566738d +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/files/kwallet-pam-5.20.5-socket-listening-error.patch b/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch deleted file mode 100644 index 790a644003d8..000000000000 --- a/kde-plasma/kwallet-pam/files/kwallet-pam-5.20.5-socket-listening-error.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 06cd94634feb70dfa7e2f8695b97317cb2ebe44c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefano=20Alo=C3=A9?= <stefano.aloe2@gmail.com> -Date: Sun, 17 Jan 2021 23:16:57 +0100 -Subject: [PATCH] Avoid socket listening error - -Closing all file descriptor above 3 is causing problem to socket() and listen(). Setting FD_CLOEXEC on them solves the problem and should have exactly the same behavior. - -BUG: 400929 -(cherry picked from commit 8f899902e6a3be8ad4948eb1ebdf679186aa20a7) ---- - pam_kwallet.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/pam_kwallet.c b/pam_kwallet.c -index 2585a68..a099872 100644 ---- a/pam_kwallet.c -+++ b/pam_kwallet.c -@@ -21,6 +21,7 @@ - #include <stdio.h> - #include <signal.h> - #include <unistd.h> -+#include <fcntl.h> - #include <stdlib.h> - #include <string.h> - #include <errno.h> -@@ -355,12 +356,13 @@ static int drop_privileges(struct passwd *userInfo) - static void execute_kwallet(pam_handle_t *pamh, struct passwd *userInfo, int toWalletPipe[2], char *fullSocket) - { - //In the child pam_syslog does not work, using syslog directly -+ - //keep stderr open so socket doesn't returns us that fd - int x = 3; -- //Close fd that are not of interest of kwallet -+ //Set FD_CLOEXEC on fd that are not of interest of kwallet - for (; x < 64; ++x) { - if (x != toWalletPipe[0]) { -- close (x); -+ fcntl(x, F_SETFD, FD_CLOEXEC); - } - } - --- -GitLab - diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.27.11.ebuild index 852aef5a0d46..44a9bab4e37f 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.21.5.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-5.27.11.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.0.4.ebuild index bcabb32f43a0..cb964d02d812 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.20.5-r1.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-6.0.4.ebuild @@ -1,30 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.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 ~ppc64 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} net-misc/socat " -PATCHES=( "${FILESDIR}/${P}-socket-listening-error.patch" ) # bug 717606 - src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_LIBDIR="/$(get_libdir)" @@ -34,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/kwallet-pam/metadata.xml b/kde-plasma/kwallet-pam/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/kwallet-pam/metadata.xml +++ b/kde-plasma/kwallet-pam/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest index 7af17d87aa21..441d6c2f0473 100644 --- a/kde-plasma/kwayland-integration/Manifest +++ b/kde-plasma/kwayland-integration/Manifest @@ -1,2 +1,2 @@ -DIST kwayland-integration-5.20.5.tar.xz 21372 BLAKE2B 31fdacff1225d61332c8b9ffa7365a191d55dc1d698f3b0f0386adff0fc9dc2a31e7de8f182de96bdd6def85927cc02b8ab9819e3f82fddc499897785f55e562 SHA512 46b8b799082c02c045155f3cdea3defbcd2684b1f39ee851d46075cea89c78e55172a7f5c5584d6e50c0af75640c120a6d35b3d4be6feead86df17efb30d581d -DIST kwayland-integration-5.21.5.tar.xz 23336 BLAKE2B 361160eff499863787d997f7eabd9dc7acfa5e9831de700cb1fbe6a4a5f10795b9435a505ff7af40eae4e473826fefda275ad8dc15efb6ac609788d9c85b25da SHA512 87e1d71f8a18ebbaadfb76a7e2bdfb47933a500d3cccb589f697e2b368302f3b8c61a0e742cd436119adb3a885aa6d94b8d522befe2908fb2b3816def93bb282 +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.20.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild deleted file mode 100644 index 8873c34f8c0a..000000000000 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.20.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -inherit ecm kde.org - -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" -HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" - -LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 -" -RDEPEND="${DEPEND}" - -RESTRICT+=" test" # bug 668872 diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild deleted file mode 100644 index c999b25b427b..000000000000 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.21.5.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" -HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" - -LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -RESTRICT+=" test" # bug 668872 - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild new file mode 100644 index 000000000000..430cc1e0db8f --- /dev/null +++ b/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild @@ -0,0 +1,49 @@ +# 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 flag-o-matic plasma.kde.org + +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" +IUSE="" + +# 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/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/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-6.0.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-6.0.4.ebuild new file mode 100644 index 000000000000..2ce54ec08c7a --- /dev/null +++ b/kde-plasma/kwayland-integration/kwayland-integration-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 + +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm flag-o-matic plasma.kde.org + +DESCRIPTION="Provides KWindowSystem integration plugin for Wayland" +HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" + +LICENSE="LGPL-2.1" +SLOT="5" +KEYWORDS="~amd64" +IUSE="" + +# 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/kwindowsystem: Various private headers +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/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${KFMIN}:5 + x11-libs/libxkbcommon +" +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 2fdbf33d963d..7715b5766454 100644 --- a/kde-plasma/kwayland-integration/metadata.xml +++ b/kde-plasma/kwayland-integration/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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-integration</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest deleted file mode 100644 index 7895f9a23fdb..000000000000 --- a/kde-plasma/kwayland-server/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kwayland-server-5.20.5.tar.xz 220976 BLAKE2B f3f3fd6b6ef18c014457d550e0551e07a3a7d6dc0664ec661f8e1756f4b07b83dd45f0aad58a427d21ac1335e88a7486bd3cf70f7e4edb62a5ea7e3984ab8a55 SHA512 fb3ef80061541998b110b5edb20d84541704cb82c5f087bcfc6f937ab4bf44e54d37b1a4576875e46082e0425f2a4f69e63e55e043861a89f447d887232cacb5 -DIST kwayland-server-5.21.5.tar.xz 219148 BLAKE2B bae7a3a82a7251c249a8d36ffbab764c6f3372675605310f2c46d977f8a8a6f192b551b7adea590b253c64af1e22e2e8bec8671065a389396def35c83fcbe39f SHA512 ff02ee6b1fb7cd193b49a4cbcf98a6b3ab6262e9da4211d91b764d8aaaa858c17863fccee19b649d2966c3a2721ca3b7c55f8a660a91d9eb56b1eec11d0766f5 diff --git a/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild deleted file mode 100644 index 3d82baba68c5..000000000000 --- a/kde-plasma/kwayland-server/kwayland-server-5.20.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.1 -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 x86" -IUSE="" - -RDEPEND=" - >=dev-libs/wayland-1.18.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[egl] - >=dev-qt/qtwayland-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - media-libs/mesa[egl] -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 - >=dev-libs/wayland-protocols-1.18 -" - -# All failing, I guess we need a virtual wayland server -RESTRICT+=" test" diff --git a/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild deleted file mode 100644 index 1f6fa51fe042..000000000000 --- a/kde-plasma/kwayland-server/kwayland-server-5.21.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=5.82.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 ~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/mesa[egl] -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 - >=dev-libs/wayland-protocols-1.18 -" -BDEPEND="dev-util/wayland-scanner" 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 4cd5bf40d62c..504855af90c6 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,2 +1,2 @@ -DIST kwin-5.20.5.tar.xz 6329444 BLAKE2B e80890c1a353b3b8a15659ea3f88e08b84f29ee863aa41ed99758e93008def940450abc2ad66bc2f5d4c9cd391a3d6ddb21eb2ab79d3696b7373f8ae0fdb6d89 SHA512 e9186dc71e3e9b913314a83fe9413b956d61d633f0e8418fd47d82178c6f50eb75b03299c00495af351b0951df23057500ef28123123583c291a0c29ea3414f1 -DIST kwin-5.21.5.tar.xz 6394220 BLAKE2B 8a0b1ba6e1393ccd721ef8dcb925739a91ba08528ac2f61a5908b37372ade83496b3fe2dbbd9093727a12ffca35d5aac607d8888454519d33b0c924c9d030bd1 SHA512 b749892b12b027b306836bbd7b770602bff80c0ce6840db3345585a1215b415fe24fb823bbcb399f76999232f100bb2e1898d460160e1a762ea10fd24d6cf63c +DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b +DIST kwin-6.0.4.1.tar.xz 8831252 BLAKE2B 2acac2ef7b515c4c7ddb4478c7d8e48d9723d722370377b879354c270a1a4a3715214087230abca52b0b2670bf42cc423026d07a7b343e448a66ba81e200c01d SHA512 a38605dea13a225220544b77f835bff5bb191861ad34dd5ea6de06069921bc6db1f2683cb361d421ab3f7a82c58d2ff914512074a17e8e554bac3e5303f19ab5 diff --git a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch deleted file mode 100644 index 9677fc76488e..000000000000 --- a/kde-plasma/kwin/files/kwin-5.20.5-keep-focuschain-behavior-w-minimised.patch +++ /dev/null @@ -1,154 +0,0 @@ -From b3e9c819537cf292d9b1c4d19c5ce7adde00158e Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 20 Oct 2020 14:15:46 -0600 -Subject: [PATCH] [focuschain/task switcher] Add hidden option to govern - repositioning minimized windows - -Since some people apparently liked the old behavior of moving minimized -windows to the end of the focus chain, let's let them have it if they -set a hidden config option: - -`MoveMinimizedWindowsToEndOfTabBoxFocusChain=true` in the `[TabBox]` group -of the kwinrc file. - -We can add a UI for it later if needed. - -BUG: 427840 -FIXED-IN: 5.21 ---- - abstract_client.cpp | 6 +++++- - focuschain.cpp | 16 ++++++++++------ - kwin.kcfg | 3 +++ - options.cpp | 11 +++++++++++ - options.h | 6 ++++++ - 5 files changed, 35 insertions(+), 7 deletions(-) - -diff --git a/abstract_client.cpp b/abstract_client.cpp -index e44da4725..01f3081f8 100644 ---- a/abstract_client.cpp -+++ b/abstract_client.cpp -@@ -703,7 +703,11 @@ void AbstractClient::minimize(bool avoid_animation) - doMinimize(); - - updateWindowRules(Rules::Minimize); -- FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); -+ -+ if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { -+ FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); -+ } -+ - // TODO: merge signal with s_minimized - addWorkspaceRepaint(visibleRect()); - emit clientMinimized(this, !avoid_animation); -diff --git a/focuschain.cpp b/focuschain.cpp -index a68e6d3c6..347df3066 100644 ---- a/focuschain.cpp -+++ b/focuschain.cpp -@@ -227,14 +227,18 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt - void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain) - { - chain.removeAll(client); -- if (client->isMinimized()) { // add it before the first minimized ... -- for (int i = chain.count()-1; i >= 0; --i) { -- if (chain.at(i)->isMinimized()) { -- chain.insert(i+1, client); -- return; -+ if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { -+ if (client->isMinimized()) { // add it before the first minimized ... -+ for (int i = chain.count()-1; i >= 0; --i) { -+ if (chain.at(i)->isMinimized()) { -+ chain.insert(i+1, client); -+ return; -+ } - } -+ chain.prepend(client); // ... or at end of chain -+ } else { -+ chain.append(client); - } -- chain.prepend(client); // ... or at end of chain - } else { - chain.append(client); - } -diff --git a/kwin.kcfg b/kwin.kcfg -index 0b59606e3..2b06efe52 100644 ---- a/kwin.kcfg -+++ b/kwin.kcfg -@@ -295,6 +295,9 @@ - <entry name="LayoutName" type="String"> - <default>thumbnails</default> - </entry> -+ <entry name="MoveMinimizedWindowsToEndOfTabBoxFocusChain" type="Bool"> -+ <default>false</default> -+ </entry> - </group> - <group name="KDE"> - <entry name="AnimationDurationFactor" type="Double"> -diff --git a/options.cpp b/options.cpp -index 4bce7ee39..8014f8b78 100644 ---- a/options.cpp -+++ b/options.cpp -@@ -111,6 +111,7 @@ Options::Options(QObject *parent) - , m_glPreferBufferSwap(Options::defaultGlPreferBufferSwap()) - , m_glPlatformInterface(Options::defaultGlPlatformInterface()) - , m_windowsBlockCompositing(true) -+ , m_MoveMinimizedWindowsToEndOfTabBoxFocusChain(false) - , OpTitlebarDblClick(Options::defaultOperationTitlebarDblClick()) - , CmdActiveTitlebar1(Options::defaultCommandActiveTitlebar1()) - , CmdActiveTitlebar2(Options::defaultCommandActiveTitlebar2()) -@@ -679,6 +680,15 @@ void Options::setWindowsBlockCompositing(bool value) - emit windowsBlockCompositingChanged(); - } - -+void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value) -+{ -+ if (m_MoveMinimizedWindowsToEndOfTabBoxFocusChain == value) { -+ return; -+ } -+ m_MoveMinimizedWindowsToEndOfTabBoxFocusChain = value; -+ -+} -+ - void Options::setGlPreferBufferSwap(char glPreferBufferSwap) - { - if (glPreferBufferSwap == 'a') { -@@ -849,6 +859,7 @@ void Options::syncFromKcfgc() - setElectricBorderTiling(m_settings->electricBorderTiling()); - setElectricBorderCornerRatio(m_settings->electricBorderCornerRatio()); - setWindowsBlockCompositing(m_settings->windowsBlockCompositing()); -+ setMoveMinimizedWindowsToEndOfTabBoxFocusChain(m_settings->moveMinimizedWindowsToEndOfTabBoxFocusChain()); - - } - -diff --git a/options.h b/options.h -index 6d72017d3..0834f314e 100644 ---- a/options.h -+++ b/options.h -@@ -590,6 +590,10 @@ public: - return m_windowsBlockCompositing; - } - -+ bool moveMinimizedWindowsToEndOfTabBoxFocusChain() const { -+ return m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; -+ } -+ - QStringList modifierOnlyDBusShortcut(Qt::KeyboardModifier mod) const; - - // setters -@@ -651,6 +655,7 @@ public: - void setGlPreferBufferSwap(char glPreferBufferSwap); - void setGlPlatformInterface(OpenGLPlatformInterface interface); - void setWindowsBlockCompositing(bool set); -+ void setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool set); - - // default values - static WindowOperation defaultOperationTitlebarDblClick() { -@@ -881,6 +886,7 @@ private: - GlSwapStrategy m_glPreferBufferSwap; - OpenGLPlatformInterface m_glPlatformInterface; - bool m_windowsBlockCompositing; -+ bool m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; - - WindowOperation OpTitlebarDblClick; - WindowOperation opMaxButtonRightClick = defaultOperationMaxButtonRightClick(); --- -GitLab diff --git a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch b/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch deleted file mode 100644 index 7de71bf959c0..000000000000 --- a/kde-plasma/kwin/files/kwin-5.20.5-revert-new-focuschain-w-minimised.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 75fded6f11ed645b0e25bf42b05fa57b8a675197 Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Tue, 20 Oct 2020 14:05:33 -0600 -Subject: [PATCH] Revert "[focuschain/task switcher] Remove special handling - for minimized windows" - -This reverts commit cc862fa674d3407f516a89b8543acea04aa8b37d. - -It turns out that some people like this behavior and we've received -various user complaints about it. ---- - abstract_client.cpp | 1 + - focuschain.cpp | 12 +++++++++++- - focuschain.h | 3 ++- - 3 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/abstract_client.cpp b/abstract_client.cpp -index 35b7fcb61..e44da4725 100644 ---- a/abstract_client.cpp -+++ b/abstract_client.cpp -@@ -703,6 +703,7 @@ void AbstractClient::minimize(bool avoid_animation) - doMinimize(); - - updateWindowRules(Rules::Minimize); -+ FocusChain::self()->update(this, FocusChain::MakeFirstMinimized); - // TODO: merge signal with s_minimized - addWorkspaceRepaint(visibleRect()); - emit clientMinimized(this, !avoid_animation); -diff --git a/focuschain.cpp b/focuschain.cpp -index 66d209709..a68e6d3c6 100644 ---- a/focuschain.cpp -+++ b/focuschain.cpp -@@ -227,7 +227,17 @@ AbstractClient *FocusChain::nextForDesktop(AbstractClient *reference, uint deskt - void FocusChain::makeFirstInChain(AbstractClient *client, Chain &chain) - { - chain.removeAll(client); -- chain.append(client); -+ if (client->isMinimized()) { // add it before the first minimized ... -+ for (int i = chain.count()-1; i >= 0; --i) { -+ if (chain.at(i)->isMinimized()) { -+ chain.insert(i+1, client); -+ return; -+ } -+ } -+ chain.prepend(client); // ... or at end of chain -+ } else { -+ chain.append(client); -+ } - } - - void FocusChain::makeLastInChain(AbstractClient *client, Chain &chain) -diff --git a/focuschain.h b/focuschain.h -index 8baf3ea32..9a7c7e25d 100644 ---- a/focuschain.h -+++ b/focuschain.h -@@ -41,7 +41,8 @@ class FocusChain : public QObject - enum Change { - MakeFirst, - MakeLast, -- Update -+ Update, -+ MakeFirstMinimized = MakeFirst - }; - ~FocusChain() override; - /** diff --git a/kde-plasma/kwin/files/kwin-5.16.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch index 08a472ad5561..268d88a09cdb 100644 --- a/kde-plasma/kwin/files/kwin-5.16.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/kcmkwin/kwineffects/package/contents/ui/Effect.qml -+++ b/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.20.5-r1.ebuild b/kde-plasma/kwin/kwin-5.20.5-r1.ebuild deleted file mode 100644 index eb5a94484cca..000000000000 --- a/kde-plasma/kwin/kwin-5.20.5-r1.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="optional" -ECM_TEST="optional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="accessibility caps gles2-only multimedia screencast" - -RESTRICT+=" test" - -COMMON_DEPEND=" - >=dev-libs/libinput-1.14 - >=dev-libs/wayland-1.2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=] - >=dev-qt/qtscript-${QTMIN}:5 - >=dev-qt/qtsensors-${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/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/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/kio-${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/libepoxy - media-libs/mesa[egl,gbm,wayland,X(+)] - virtual/libudev:= - x11-libs/libICE - x11-libs/libSM - 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] ) - screencast? ( >=media-video/pipewire-0.3:= ) -" -# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216 -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] - 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 -" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-revert-new-focuschain-w-minimised.patch" # KDE-Bug 427840 - "${FILESDIR}/${P}-keep-focuschain-behavior-w-minimised.patch" # Plasma/5.21 -) - -src_prepare() { - ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.16.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) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - 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.21.5.ebuild b/kde-plasma/kwin/kwin-5.27.11.ebuild index ec85a4ca09f3..b0e84b231dc1 100644 --- a/kde-plasma/kwin/kwin-5.21.5.ebuild +++ b/kde-plasma/kwin/kwin-5.27.11.ebuild @@ -1,120 +1,127 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="optional" -KFMIN=5.82.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 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 ~ppc64 ~x86" -IUSE="accessibility caps gles2-only multimedia plasma screencast" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="accessibility caps gles2-only lock multimedia plasma screencast" -RESTRICT+=" test" +RESTRICT="test" COMMON_DEPEND=" - >=dev-libs/libinput-1.14 - >=dev-libs/wayland-1.2 + >=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=[gles2-only=] - >=dev-qt/qtscript-${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/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5[qml] >=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/kglobalaccel-${KFMIN}:5=[X(+)] >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kio-${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/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 + >=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/mesa[egl,gbm,wayland,X(+)] + media-libs/libglvnd + >=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/libxkbcommon-0.7.0 + >=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-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 ) screencast? ( >=media-video/pipewire-0.3:= ) " -# TODO: sys-apps/hwdata? not packaged yet; commit 33a1777a, Gentoo-bug 717216 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] - multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) + sys-apps/hwdata + x11-base/xwayland + multimedia? ( + >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] + media-plugins/gst-plugins-soup:1.0 + ) " DEPEND="${COMMON_DEPEND} + >=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 - test? ( - >=dev-libs/wayland-protocols-1.19 - >=dev-qt/qtwayland-${QTMIN}:5 - ) + x11-libs/xcb-util-image + caps? ( sys-libs/libcap ) " -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 " +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" src_prepare() { ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.16.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 - sed -e "s/^pkg_check_modules.*PipeWire/#&/" \ - -i CMakeLists.txt || die + sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die fi } 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) $(cmake_use_find_package caps Libcap) + -DKWIN_BUILD_SCREENLOCKER=$(usex lock) $(cmake_use_find_package plasma KF5Runner) ) diff --git a/kde-plasma/kwin/kwin-6.0.4.1.ebuild b/kde-plasma/kwin/kwin-6.0.4.1.ebuild new file mode 100644 index 000000000000..4d79d1d27392 --- /dev/null +++ b/kde-plasma/kwin/kwin-6.0.4.1.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="true" +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 24eb99364154..4903bdce5a1e 100644 --- a/kde-plasma/kwin/metadata.xml +++ b/kde-plasma/kwin/metadata.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="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 61d362a10f66..f8a96f628901 100644 --- a/kde-plasma/kwrited/Manifest +++ b/kde-plasma/kwrited/Manifest @@ -1,2 +1,2 @@ -DIST kwrited-5.20.5.tar.xz 20508 BLAKE2B 8555ec109bcffe731428bd379aa78498b89685a03db22f19949b7db6d609bdfd9d94aae0de9d84c8b56620a432e35fbf20c834f9f46ba13955e724a9c4fdf580 SHA512 77b2b3be3b3c3fc7689d9e8907a4c76bcfc012ca862a02d77273f6e373407e72ccf9e68d1e3a1b8eab99bfb390d472591074108a5233f48e7c97221d87f4838a -DIST kwrited-5.21.5.tar.xz 20420 BLAKE2B f761da00c5025e5f9fb11b519ba5fc057ed24366206e421683ff281255d1d5ccac7ee2c33898654f33621d39e119fd16fd8d73a6cbe338af450222ffd421a82b SHA512 b187763675cfa386ef51ff6f5bb59458d799c2010d93fd35ad0fa32c1d0898d35927eb77d82dcdfa079bbd1c8c889823cc802742016d767618e6e9e25ac417fe +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.21.5.ebuild b/kde-plasma/kwrited/kwrited-5.21.5.ebuild deleted file mode 100644 index 7e9879485783..000000000000 --- a/kde-plasma/kwrited/kwrited-5.21.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~ppc64 ~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.20.5.ebuild b/kde-plasma/kwrited/kwrited-5.27.11.ebuild index 6d28e631c91c..2e1967fda504 100644 --- a/kde-plasma/kwrited/kwrited-5.20.5.ebuild +++ b/kde-plasma/kwrited/kwrited-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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/kwrited/metadata.xml b/kde-plasma/kwrited/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/kwrited/metadata.xml +++ b/kde-plasma/kwrited/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest new file mode 100644 index 000000000000..f6ece9fd52f0 --- /dev/null +++ b/kde-plasma/layer-shell-qt/Manifest @@ -0,0 +1,2 @@ +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.27.11.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.11.ebuild new file mode 100644 index 000000000000..574e0d00c5b0 --- /dev/null +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.11.ebuild @@ -0,0 +1,36 @@ +# 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 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" +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= + 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/layer-shell-qt/layer-shell-qt-6.0.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.0.4.ebuild new file mode 100644 index 000000000000..9a1226aaba93 --- /dev/null +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.0.4.ebuild @@ -0,0 +1,31 @@ +# 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="Qt component to allow applications make use of Wayland wl-layer-shell protocol" + +LICENSE="LGPL-3+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# slot op: various private QtWaylandClient headers +RDEPEND=" + >=dev-libs/wayland-1.15 + >=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-util/wayland-scanner + virtual/pkgconfig +" diff --git a/kde-plasma/layer-shell-qt/metadata.xml b/kde-plasma/layer-shell-qt/metadata.xml new file mode 100644 index 000000000000..d925f2439758 --- /dev/null +++ b/kde-plasma/layer-shell-qt/metadata.xml @@ -0,0 +1,11 @@ +<?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> +</pkgmetadata> diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest index d2bc63190cc2..23db07dfb826 100644 --- a/kde-plasma/libkscreen/Manifest +++ b/kde-plasma/libkscreen/Manifest @@ -1,2 +1,2 @@ -DIST libkscreen-5.20.5.tar.xz 85368 BLAKE2B 886156489308315c3366d7b6efa994d715ecb7729ad51a5b36285de2265ca49eee23f712a56301388398099336e7a07dca869fe23e1e70c876d070392b207a32 SHA512 4fd9e5a2f215f2da752929a2688022d78ec16a70342613efbf5649a1b6be09f0b4e60cc780ccc985c1b725ce1b38f42c7f8b7bd92eb2cd1612aa2c5a005fbbdb -DIST libkscreen-5.21.5.tar.xz 84600 BLAKE2B a7f14446932a9e4bdd0d7d90c02916380b7f263e14c3e49d30932a2c2de50046a46b6644a24697e6f94d5e72062f17ff66a1496ca61fa65c53cde349a0b4421f SHA512 283d4cac77f106d24f6eef0ba6f7a7490aff87ef5017b2db7e52ca5fd3066a33ee4e40a190cdb4e26903a79defaa724ee0a3df360464af3f76c3386c341d2d75 +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.20.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild deleted file mode 100644 index c6b0ae7b331b..000000000000 --- a/kde-plasma/libkscreen/libkscreen-5.20.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_QTHELP="true" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plasma screen management library" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/7" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=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 -" -RDEPEND="${DEPEND}" - -# requires running session -RESTRICT+=" test" diff --git a/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild deleted file mode 100644 index 9392a06c43e0..000000000000 --- a/kde-plasma/libkscreen/libkscreen-5.21.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_QTHELP="true" -ECM_TEST="forceoptional" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plasma screen management library" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5/7" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="" - -# requires running session -RESTRICT+=" test" - -DEPEND=" - >=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 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild new file mode 100644 index 000000000000..03720e8c6c61 --- /dev/null +++ b/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild @@ -0,0 +1,40 @@ +# 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.106.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.15.9 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma screen management library" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5/8" +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/qtwayland-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + x11-libs/libxcb:= +" +DEPEND="${RDEPEND} + >=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/libkscreen/metadata.xml b/kde-plasma/libkscreen/metadata.xml index 850a6ce4f918..1ba3802b3753 100644 --- a/kde-plasma/libkscreen/metadata.xml +++ b/kde-plasma/libkscreen/metadata.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <slots> <subslots>Reflects ABI compatibility of libKF5Screen.so</subslots> </slots> diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index b89b51890e31..25705b395f05 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,2 +1,2 @@ -DIST libksysguard-5.20.5.tar.xz 699156 BLAKE2B 749cbe4b73e8377bb3dc026000492d6dd0cea34dd13aafd32754aa84636ccf416e60fc97ca17c1810ea0b2458f6ec09471a383210b1a6b025a745fded3a1c734 SHA512 56fa61e1149f8a97f1884755bbc0475a1f9a458eb785d29416b4646e9a9edb1f2bf85e56dcf49226ab1509b4a63bf4334c1ad9853026ccd0eaf68dffa79864b0 -DIST libksysguard-5.21.5.tar.xz 706172 BLAKE2B 776c9ae2c79ab644ee377ff76fa3d3ef41da15431bc628aa6e2f14a3914212566797c779c8aac7f0a0df3e89fe55bb748558fa56e5a3aa516535e59b5a53006f SHA512 1626f9489e0bdff3acad087577470818bd04d6d74d6afe95b11d02ecfe306328b3898a573704c11b0a34e73ec7a662b9c609b056be369694769a3dc2e6671fec +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.16.0-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch deleted file mode 100644 index 477f88d4e55b..000000000000 --- a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Fri, 7 Jun 2019 22:58:55 +0200 -Subject: [PATCH] Gentooify message about QtWebEngineWidgets - -Translations can not be provided for this. ---- - processui/scripting.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/processui/scripting.cpp b/processui/scripting.cpp -index 83cf895..647194a 100644 ---- a/processui/scripting.cpp -+++ b/processui/scripting.cpp -@@ -242,7 +242,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) { - mScriptingHtmlDialog->webView()->load(fileName); - #else - QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"), -- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution.")); -+ QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available.")); - #endif - } - #if HAVE_QTWEBENGINEWIDGETS --- -2.21.0 - diff --git a/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch new file mode 100644 index 000000000000..c2fcb9551d2e --- /dev/null +++ b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch @@ -0,0 +1,28 @@ +From 2e2ab674038a1102081ead255a172a42d3a1d27a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 7 Sep 2021 16:08:30 +0200 +Subject: [PATCH] Gentooify message about QtWebEngineWidgets + +Translations can not be provided for this. + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + processui/scripting.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/processui/scripting.cpp b/processui/scripting.cpp +index 1c35f72..7065cbe 100644 +--- a/processui/scripting.cpp ++++ b/processui/scripting.cpp +@@ -241,7 +241,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) { + #else + QMessageBox::critical(this, + i18n("QtWebEngineWidgets not available"), +- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution.")); ++ i18n("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available.")); + #endif + } + #if WEBENGINE_SCRIPTING_ENABLED +-- +2.33.0 + diff --git a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild deleted file mode 100644 index 7ee8bd1bfd68..000000000000 --- a/kde-plasma/libksysguard/libksysguard-5.20.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="true" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 x86" -IUSE="webengine X" - -RDEPEND=" - >=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 - 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="${RDEPEND} - !<kde-plasma/plasma-workspace-5.18.80:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" - -PATCHES=( "${FILESDIR}/${PN}-5.16.0-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() { - LC_NUMERIC="C" ecm_src_test # bug 695514 -} diff --git a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild index cc9223d34656..af3dbfb6339b 100644 --- a/kde-plasma/libksysguard/libksysguard-5.21.5.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild @@ -1,69 +1,76 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="true" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -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="Task management and system monitoring library" + LICENSE="LGPL-2+" SLOT="5/9" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="webengine X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="webengine" +# 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 + >=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/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/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="${RDEPEND} - !<kde-plasma/plasma-workspace-5.18.80:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) + x11-base/xorg-proto " +BDEPEND="sys-libs/libcap" -PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" ) +# 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/libksysguard/metadata.xml b/kde-plasma/libksysguard/metadata.xml index b9f39f2d0ec8..4bf88b5f67ae 100644 --- a/kde-plasma/libksysguard/metadata.xml +++ b/kde-plasma/libksysguard/metadata.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> <slots> <subslots>Reflects ABI compatibility by soname version</subslots> </slots> diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index c8d821785a7b..156526552da7 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f -DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch index 8c8213d002dc..85eddb74b513 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.19.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch @@ -1,4 +1,4 @@ -From 30d75ef4b3e75155e78924aa82aa9f368bb86f4f Mon Sep 17 00:00:00 2001 +From 2360505a8f6475b6988efa60c3ba746bfbe4c4d0 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> Date: Sun, 2 Feb 2020 18:29:57 +0100 Subject: [PATCH] libkworkspace: Allow standalone build @@ -8,7 +8,7 @@ Subject: [PATCH] libkworkspace: Allow standalone build 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ba097a6e..66f70c0b6 100644 +index 015c5181f..0aa635e11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,56 @@ @@ -18,10 +18,10 @@ index 7ba097a6e..66f70c0b6 100644 + set(PROJECT_VERSION "GENTOO_PV") + set(PROJECT_VERSION_MAJOR 5) + -+ cmake_minimum_required(VERSION 3.0) ++ cmake_minimum_required(VERSION 3.16) + -+ set(QT_MIN_VERSION "5.14.0") -+ set(KF5_MIN_VERSION "5.71.0") ++ set(QT_MIN_VERSION "5.15.0") ++ set(KF5_MIN_VERSION "5.82.0") + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus) + find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -39,7 +39,7 @@ index 7ba097a6e..66f70c0b6 100644 + include(ECMMarkAsTest) + include(GenerateExportHeader) + -+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Init Plasma 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) @@ -68,33 +68,33 @@ index 7ba097a6e..66f70c0b6 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp -@@ -16,9 +69,17 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +@@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") + 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}) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) -+qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Startup.xml startup_interface) ++qt_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml) +else() - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Startup.xml startup_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-shutdown/org.kde.Shutdown.xml shutdown_interface) +set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) +endif() set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml" -@@ -34,7 +95,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte - qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) - qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) +@@ -30,7 +91,6 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte + qt_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface) -set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) - qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) + qt_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface ) add_library(kworkspace ${kworkspace_LIB_SRCS}) -@@ -100,3 +160,8 @@ if(BUILD_TESTING) +@@ -98,3 +158,8 @@ if(BUILD_TESTING) add_subdirectory(autotests) add_subdirectory(tests) endif() @@ -104,5 +104,5 @@ index 7ba097a6e..66f70c0b6 100644 + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() -- -2.27.0 +2.31.1 diff --git a/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild deleted file mode 100644 index d5de9a8d1e73..000000000000 --- a/kde-plasma/libkworkspace/libkworkspace-5.21.5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~ppc64 ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) - -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 - ecm_src_prepare - if [[ ${KDE_BUILD_TYPE} = release ]]; then - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -} diff --git a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.11.ebuild index 23228e860975..f22da375b176 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.20.5.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.27.11.ebuild @@ -1,30 +1,30 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" KDE_ORG_NAME="plasma-workspace" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 x86" +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/kinit-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 x11-libs/libICE x11-libs/libSM @@ -35,24 +35,17 @@ DEPEND="${RDEPEND} >=kde-plasma/kwin-${PVCUT}:5 " -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.19.80-standalone.patch" ) - 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.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) + _EOF_ + ecm_src_prepare - if [[ ${KDE_BUILD_TYPE} = release ]]; then - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" } diff --git a/kde-plasma/libkworkspace/metadata.xml b/kde-plasma/libkworkspace/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/libkworkspace/metadata.xml +++ b/kde-plasma/libkworkspace/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> 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 b545c2548d9c..2af1b4beacc8 100644 --- a/kde-plasma/metadata.xml +++ b/kde-plasma/metadata.xml @@ -1,7 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE catmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <catmetadata> <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 393f06ee577e..bb00b7b31983 100644 --- a/kde-plasma/milou/Manifest +++ b/kde-plasma/milou/Manifest @@ -1,2 +1,2 @@ -DIST milou-5.20.5.tar.xz 55388 BLAKE2B 5d2e977c884753a315c0c424d30ff5fb2ebc04e660b0243d2c352fb105811fde54f9c57f4e96a7abf2cc043ae6ca9b348ca4d84deefcef550814ae2dcbdd7822 SHA512 a67d939dc832b77ce957cc2e1b9a9e56412618d94217e0bb958db62fa41c5ba2e6e4311e0300a79800ef1845e425ca0e275fea10ece9d9a60bdf7bf690b71b32 -DIST milou-5.21.5.tar.xz 43912 BLAKE2B 070d5ba66bfd05dea05095524c71c2635dcff640deb1742ea71c08ee02d848aaf9e3f8abbed49b2d8fee3344e7a91b155f6a5cca45d9d0852c66316fbd2f3c4e SHA512 49f029d1cd5568aaaae7e7170c98e076c917bd6eeed83ea379a412f2faf2e11ce403b5d31f287cb151a37a1ad567f6f42c5f9f48c9af437d0c1ed339aaed802f +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/files/milou-5.19.80-disable-manual-tests.patch b/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch deleted file mode 100644 index a9e3b029f910..000000000000 --- a/kde-plasma/milou/files/milou-5.19.80-disable-manual-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b239834faa093a972bd7ca33296484609f121a3b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 14 Jul 2020 20:24:01 +0200 -Subject: [PATCH] Disable test dir based on BUILD_TESTING or unavailability of - Qt5::Test - -These tests are manual; an attempt to run them ended in failure. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - lib/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index a739c5c..92dd0be 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -39,4 +39,7 @@ install(TARGETS milou EXPORT MilouLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_A - - add_subdirectory(qml) - add_subdirectory(previews) --add_subdirectory(test) -+ -+if(BUILD_TESTING AND TARGET Qt5::Test) -+ add_subdirectory(test) -+endif() --- -2.27.0 - diff --git a/kde-plasma/milou/metadata.xml b/kde-plasma/milou/metadata.xml index 2fdbf33d963d..bd104055766b 100644 --- a/kde-plasma/milou/metadata.xml +++ b/kde-plasma/milou/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/milou</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/milou/milou-5.20.5.ebuild b/kde-plasma/milou/milou-5.20.5.ebuild deleted file mode 100644 index c5f8a7ee3457..000000000000 --- a/kde-plasma/milou/milou-5.20.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 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}" - -PATCHES=( "${FILESDIR}/${PN}-5.19.80-disable-manual-tests.patch" ) # bug 732584 diff --git a/kde-plasma/milou/milou-5.21.5.ebuild b/kde-plasma/milou/milou-5.27.11.ebuild index bf862da17f31..a598d1429da6 100644 --- a/kde-plasma/milou/milou-5.21.5.ebuild +++ b/kde-plasma/milou/milou-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.82.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 ~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 new file mode 100644 index 000000000000..eca0f1b67a9d --- /dev/null +++ b/kde-plasma/oxygen-sounds/Manifest @@ -0,0 +1,2 @@ +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 new file mode 100644 index 000000000000..0a584161d508 --- /dev/null +++ b/kde-plasma/oxygen-sounds/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/oxygen-sounds</remote-id> + </upstream> +</pkgmetadata> diff --git a/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.11.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.11.ebuild new file mode 100644 index 000000000000..9d1a3e5e2f37 --- /dev/null +++ b/kde-plasma/oxygen-sounds/oxygen-sounds-5.27.11.ebuild @@ -0,0 +1,17 @@ +# 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 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" + +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 8313946cebc9..d9584dd70d57 100644 --- a/kde-plasma/oxygen/Manifest +++ b/kde-plasma/oxygen/Manifest @@ -1,2 +1,2 @@ -DIST oxygen-5.20.5.tar.xz 4471660 BLAKE2B 9ff9c4479d34020dc92aa6d68f44d80c6a5620d8f22449a67a1d02df0f6d68313b3f88c7e41e292fdafe2316f6b50145b7a5d4ce128e0961782e7cb71d18bf86 SHA512 c3dcfeca4264c460adec8a6f08a616d3647c8e7f4265a23b994ca1106d1c0a3aefd7732377f5e6a38dcecec4728eca2bd54a7290b2d52ab81a66b7b971503282 -DIST oxygen-5.21.5.tar.xz 4476864 BLAKE2B bdf9d15a44c18d4cb0f18647c3960ef927bd64b7fc2c61963781ec4f690486032c7167c6995d78b9a2918571a9f55f0d3ce5a8e9848eac4acb46acb9eb9c8e77 SHA512 f8ab4989376eedecc5402dd788b15abf1a748863c510bebd306110423904790a9d3df3a246b8ed87273c4bd0425813a9b0a51181dca08b4c2ed27dcade6c950a +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 2fdbf33d963d..d6ee381fc974 100644 --- a/kde-plasma/oxygen/metadata.xml +++ b/kde-plasma/oxygen/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/oxygen</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/oxygen/oxygen-5.21.5.ebuild b/kde-plasma/oxygen/oxygen-5.21.5.ebuild deleted file mode 100644 index 8ba5dd7c0f31..000000000000 --- a/kde-plasma/oxygen/oxygen-5.21.5.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~ppc64 ~x86" -IUSE="wayland" - -COMMON_DEPEND=" - >=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="${COMMON_DEPEND} - >=kde-frameworks/kservice-${KFMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/plasma-desktop-5.16.80 -" -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.20.5.ebuild b/kde-plasma/oxygen/oxygen-5.27.11.ebuild index a92f813c2d10..bea400c0bd6e 100644 --- a/kde-plasma/oxygen/oxygen-5.20.5.ebuild +++ b/kde-plasma/oxygen/oxygen-5.27.11.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 x86" -IUSE="wayland" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" -COMMON_DEPEND=" +RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -34,21 +34,8 @@ COMMON_DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 x11-libs/libxcb - wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} >=kde-frameworks/kservice-${KFMIN}:5 " -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/plasma-desktop-5.16.80 -" -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 adf072ee1603..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.20.5.tar.xz 193684 BLAKE2B 9144233b0a36e913328e930a59973432ad9e83066e7bdd602a672f354e991fb6a971598c788e658ab55615ed6e2e0731d9749d1f6d471f928375b4af0852a2be SHA512 d6017397dc86c5e835b914748fe9fe4c3f2b499174dfd3a0a9575446a831478deb692663b6c0b6d6ac37aa309a5a0168a5db5d56babd8e802b419022ce88f152 -DIST plasma-browser-integration-5.21.5.tar.xz 205668 BLAKE2B cf2eaff44d3bd4553e09b5802d01903be6d6a57acac312068a636af15a4daee44a855d3dfee771ff47b4de6a98e46f8d8225242986fc73d5e21eff6b1a59338c SHA512 83165c59606d32b65359ac7a9f79beabdcd50ea35becab2d6cfec3c34e0981a0bd0452176cf213e6de0db293b4adc1615631be6477048f5e8033cc5e16f1b9a0 +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/metadata.xml b/kde-plasma/plasma-browser-integration/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-browser-integration/metadata.xml +++ b/kde-plasma/plasma-browser-integration/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild deleted file mode 100644 index d7ac87616513..000000000000 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.20.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -inherit ecm kde.org - -DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" - -LICENSE="GPL-3+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 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/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}: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.21.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.11.ebuild index febe0f1383cc..2a7c4161f1e7 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.21.5.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.11.ebuild @@ -1,37 +1,42 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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 ~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 >=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/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 da175ef728f1..49ad27a8bdad 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,3 +1,3 @@ -DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b -DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57 -DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb +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.20.5-compress-new-input-notifications.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch deleted file mode 100644 index 734ae0ef46cf..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 199cad52f0599872e57a2fcb391a459e48146be0 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 31 Jan 2021 20:59:41 +0100 -Subject: [PATCH] Compress notifications about new mouse/keyboard. - -When resuming from suspend, I get 5 "new pointer" and 5 "new keyboard" -events (on a laptop with USB mouse/keyboard, but also stuff like -"Thinkpad Extra Buttons" adds more notifications than one would expect) - -KGlobalAccelImpl::x11MappingNotify is still called 15 times, but -that's better than 145 times... - -"new pointer" notifications end up calling `kcminit mouse`, better -also compress that. ---- - kcms/keyboard/xinput_helper.cpp | 30 +++++++++++++++++++++++++----- - kcms/keyboard/xinput_helper.h | 5 ++++- - 2 files changed, 29 insertions(+), 6 deletions(-) - -diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp -index 14974ada7..bade5ea33 100644 ---- a/kcms/keyboard/xinput_helper.cpp -+++ b/kcms/keyboard/xinput_helper.cpp -@@ -23,6 +23,7 @@ - #include <QCoreApplication> - #include <QX11Info> - #include <QDebug> -+#include <QTimer> - - #include <X11/X.h> - #include <X11/Xlib.h> -@@ -56,9 +57,21 @@ static const int DEVICE_POINTER = 2; - XInputEventNotifier::XInputEventNotifier(QWidget* parent): - XEventNotifier(), //TODO: destruct properly? - xinputEventType(-1), -- udevNotifier(nullptr) -+ udevNotifier(nullptr), -+ keyboardNotificationTimer(new QTimer(this)), -+ mouseNotificationTimer(new QTimer(this)) - { -- Q_UNUSED(parent) -+ Q_UNUSED(parent) -+ -+ // emit signal only once, even after X11 re-enables N keyboards after resuming from suspend -+ keyboardNotificationTimer->setSingleShot(true); -+ keyboardNotificationTimer->setInterval(500); -+ connect(keyboardNotificationTimer, &QTimer::timeout, this, &XInputEventNotifier::newKeyboardDevice); -+ -+ // same for mouse -+ mouseNotificationTimer->setSingleShot(true); -+ mouseNotificationTimer->setInterval(500); -+ connect(mouseNotificationTimer, &QTimer::timeout, this, &XInputEventNotifier::newPointerDevice); - } - - void XInputEventNotifier::start() -@@ -83,11 +96,18 @@ bool XInputEventNotifier::processOtherEvents(xcb_generic_event_t* event) - { - int newDeviceType = getNewDeviceEventType(event); - if( newDeviceType == DEVICE_KEYBOARD ) { -- emit(newKeyboardDevice()); -+ if (!keyboardNotificationTimer->isActive()) { -+ keyboardNotificationTimer->start(); -+ } - } - else if( newDeviceType == DEVICE_POINTER ) { -- emit(newPointerDevice()); -- emit(newKeyboardDevice()); // arghhh, looks like X resets xkb map even when only pointer device is connected -+ if (!mouseNotificationTimer->isActive()) { -+ mouseNotificationTimer->start(); -+ } -+ // arghhh, looks like X resets xkb map even when only pointer device is connected -+ if (!keyboardNotificationTimer->isActive()) { -+ keyboardNotificationTimer->start(); -+ } - } - return true; - } -diff --git a/kcms/keyboard/xinput_helper.h b/kcms/keyboard/xinput_helper.h -index e29fdc22a..52b6a12b4 100644 ---- a/kcms/keyboard/xinput_helper.h -+++ b/kcms/keyboard/xinput_helper.h -@@ -25,13 +25,14 @@ - #include <X11/Xlib.h> - #include <fixx11h.h> - -+class QTimer; - class UdevDeviceNotifier; - - class XInputEventNotifier: public XEventNotifier { - Q_OBJECT - - public: -- XInputEventNotifier(QWidget* parent=nullptr); -+ explicit XInputEventNotifier(QWidget* parent=nullptr); - - void start() override; - void stop() override; -@@ -51,6 +52,8 @@ private: - int xinputEventType; - Display* display; - UdevDeviceNotifier *udevNotifier; -+ QTimer* keyboardNotificationTimer; -+ QTimer* mouseNotificationTimer; - }; - - #endif /* XINPUT_HELPER_H_ */ --- -GitLab - diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch deleted file mode 100644 index a2bee27e83d3..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch +++ /dev/null @@ -1,27 +0,0 @@ -From cfdaf8636830df3760bf370d48bd4be890ada709 Mon Sep 17 00:00:00 2001 -From: David Faure <faure@kde.org> -Date: Sun, 31 Jan 2021 12:04:19 +0100 -Subject: [PATCH] kcm_keyboard: Cameras are not keyboards, don't setxkbmap when - plugging a camera - ---- - kcms/keyboard/xinput_helper.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp -index 9cae43369..14974ada7 100644 ---- a/kcms/keyboard/xinput_helper.cpp -+++ b/kcms/keyboard/xinput_helper.cpp -@@ -102,7 +102,8 @@ static bool isRealKeyboard(const char* deviceName) - return strstr(deviceName, "Video Bus") == nullptr - && strstr(deviceName, "Sleep Button") == nullptr - && strstr(deviceName, "Power Button") == nullptr -- && strstr(deviceName, "WMI hotkeys") == nullptr; -+ && strstr(deviceName, "WMI hotkeys") == nullptr -+ && strstr(deviceName, "Camera") == nullptr; - } - - int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* event) --- -GitLab - diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch deleted file mode 100644 index 3066d3a2747b..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.21.5-transparency.patch +++ /dev/null @@ -1,239 +0,0 @@ -From 6fb37dc0260c298bc35ec5e39399aa1f31693e79 Mon Sep 17 00:00:00 2001 -From: Carson Black <uhhadd@gmail.com> -Date: Thu, 6 Aug 2020 11:58:23 +0200 -Subject: [PATCH] Implement adaptive opacity for panels - ---- - .../contents/applet/CompactApplet.qml | 1 + - .../panelconfiguration/MoreSettingsMenu.qml | 35 +++++ - desktoppackage/contents/views/Panel.qml | 144 +++++++++++++++++- - 3 files changed, 174 insertions(+), 6 deletions(-) - -diff --git a/desktoppackage/contents/applet/CompactApplet.qml b/desktoppackage/contents/applet/CompactApplet.qml -index 0d4c85f52..65eb0468e 100644 ---- a/desktoppackage/contents/applet/CompactApplet.qml -+++ b/desktoppackage/contents/applet/CompactApplet.qml -@@ -153,6 +153,7 @@ PlasmaCore.ToolTipArea { - visualParent: compactRepresentation ? compactRepresentation : null - location: plasmoid.location - hideOnWindowDeactivate: plasmoid.hideOnWindowDeactivate -+ backgroundHints: (plasmoid.containmentDisplayHints & PlasmaCore.Types.DesktopFullyCovered) ? PlasmaCore.Dialog.SolidBackground : PlasmaCore.Dialog.StandardBackground - - property var oldStatus: PlasmaCore.Types.UnknownStatus - -diff --git a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml -index 2e577fbcc..d668eb3c2 100644 ---- a/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml -+++ b/desktoppackage/contents/configuration/panelconfiguration/MoreSettingsMenu.qml -@@ -131,6 +131,41 @@ PlasmaCore.Dialog { - flat: false - } - } -+ PlasmaExtras.Heading { -+ level: 3 -+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opacity") -+ visible: panel.adaptiveOpacityEnabled -+ } -+ PlasmaComponents.ButtonColumn { -+ spacing: 0 -+ visible: panel.adaptiveOpacityEnabled -+ Layout.fillWidth: true -+ Layout.minimumWidth: implicitWidth -+ PlasmaComponents.ToolButton { -+ width: Math.max(implicitWidth, parent.width) -+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Adaptive") -+ checkable: true -+ checked: configDialog.opacityMode === 0 -+ onClicked: configDialog.opacityMode = 0 -+ flat: false -+ } -+ PlasmaComponents.ToolButton { -+ width: Math.max(implicitWidth, parent.width) -+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Opaque") -+ checkable: true -+ checked: configDialog.opacityMode === 1 -+ onClicked: configDialog.opacityMode = 1 -+ flat: false -+ } -+ PlasmaComponents.ToolButton { -+ width: Math.max(implicitWidth, parent.width) -+ text: i18nd("plasma_shell_org.kde.plasma.desktop", "Translucent") -+ checkable: true -+ checked: configDialog.opacityMode === 2 -+ onClicked: configDialog.opacityMode = 2 -+ flat: false -+ } -+ } - PlasmaComponents.ToolButton { - Layout.fillWidth: true - text: i18nd("plasma_shell_org.kde.plasma.desktop", "Maximize Panel") -diff --git a/desktoppackage/contents/views/Panel.qml b/desktoppackage/contents/views/Panel.qml -index 2fd6ac4d5..cf6c04328 100644 ---- a/desktoppackage/contents/views/Panel.qml -+++ b/desktoppackage/contents/views/Panel.qml -@@ -21,17 +21,27 @@ import QtQuick.Layouts 1.1 - import QtQml 2.15 - - import org.kde.plasma.core 2.0 as PlasmaCore -+import org.kde.taskmanager 0.1 as TaskManager - --PlasmaCore.FrameSvgItem { -+Item { - id: root - -- imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background" -- -- enabledBorders: panel.enabledBorders -- - property Item containment - -- property alias panelMask: root.mask -+ property alias panelMask: privateSwapper.mask -+ -+ QtObject { -+ id: privateSwapper -+ property string completedState: "" -+ // Work around the fact that we can't use a ternary if in an alias -+ readonly property var mask: { -+ if (completedState == "opaque") { -+ return opaqueItem.mask -+ } else { -+ return translucentItem.mask -+ } -+ } -+ } - - readonly property bool verticalPanel: containment && containment.formFactor === PlasmaCore.Types.Vertical - -@@ -47,6 +57,128 @@ PlasmaCore.FrameSvgItem { - readonly property int leftPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.left, spacingAtMinSize)); - readonly property int rightPadding: Math.round(Math.min(thickPanelSvg.fixedMargins.right, spacingAtMinSize)); - -+ TaskManager.VirtualDesktopInfo { -+ id: virtualDesktopInfo -+ } -+ -+ TaskManager.ActivityInfo { -+ id: activityInfo -+ } -+ -+ PlasmaCore.SortFilterModel { -+ id: visibleWindowsModel -+ filterRole: 'IsMinimized' -+ filterRegExp: 'false' -+ sourceModel: TaskManager.TasksModel { -+ filterByVirtualDesktop: true -+ filterByActivity: true -+ filterNotMaximized: true -+ filterByScreen: true -+ -+ screenGeometry: panel.screenGeometry -+ virtualDesktop: virtualDesktopInfo.currentDesktop -+ activity: activityInfo.currentActivity -+ -+ id: tasksModel -+ groupMode: TaskManager.TasksModel.GroupDisabled -+ } -+ } -+ -+ PlasmaCore.FrameSvgItem { -+ id: translucentItem -+ enabledBorders: panel.enabledBorders -+ anchors.fill: parent -+ -+ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "widgets/panel-background" -+ } -+ -+ PlasmaCore.FrameSvgItem { -+ id: opaqueItem -+ enabledBorders: panel.enabledBorders -+ anchors.fill: parent -+ -+ imagePath: containment && containment.backgroundHints === PlasmaCore.Types.NoBackground ? "" : "solid/widgets/panel-background" -+ } -+ -+ transitions: [ -+ Transition { -+ from: "*" -+ to: "transparent" -+ SequentialAnimation { -+ ScriptAction { -+ script: { -+ translucentItem.visible = true -+ } -+ } -+ NumberAnimation { -+ target: opaqueItem -+ properties: "opacity" -+ from: 1 -+ to: 0 -+ duration: units.veryLongDuration -+ easing.type: Easing.InOutQuad -+ } -+ ScriptAction { -+ script: { -+ opaqueItem.visible = false -+ privateSwapper.completedState = "transparent" -+ root.panelMaskChanged() -+ } -+ } -+ } -+ }, -+ Transition { -+ from: "*" -+ to: "opaque" -+ SequentialAnimation { -+ ScriptAction { -+ script: { -+ opaqueItem.visible = true -+ } -+ } -+ NumberAnimation { -+ target: opaqueItem -+ properties: "opacity" -+ from: 0 -+ to: 1 -+ duration: units.veryLongDuration -+ easing.type: Easing.InOutQuad -+ } -+ ScriptAction { -+ script: { -+ translucentItem.visible = false -+ privateSwapper.completedState = "opaque" -+ root.panelMaskChanged() -+ } -+ } -+ } -+ } -+ ] -+ -+ Component.onCompleted: { -+ state = Qt.binding(function() { -+ let mstate = ''; -+ if (panel.opacityMode == 0) { -+ mstate = visibleWindowsModel.count > 0 ? "opaque" : "transparent" -+ } else if (panel.opacityMode == 1) { -+ mstate = "opaque" -+ } else { -+ mstate = "transparent" -+ } -+ if (mstate == 'opaque') { -+ containment.containmentDisplayHints |= PlasmaCore.Types.DesktopFullyCovered; -+ } else { -+ containment.containmentDisplayHints &= ~PlasmaCore.Types.DesktopFullyCovered; -+ } -+ return mstate; -+ }) -+ } -+ state: "" -+ states: [ -+ State { name: "opaque" }, -+ State { name: "transparent" } -+ ] -+ - function adjustPrefix() { - if (!containment) { - return ""; --- -GitLab - 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 e50b5d2d8301..3e49f87352a5 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -1,15 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="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="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag> <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild deleted file mode 100644 index e4402b805d6d..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild +++ /dev/null @@ -1,165 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-0" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop" - -BDEPEND="virtual/pkgconfig" -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/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 ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/kdeplasma-addons-5.15.80 - !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 - kaccounts? ( net-libs/signon-oauth2 ) - policykit? ( sys-apps/accountsservice ) -" - -PATCHES=( - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch - "${FILESDIR}/${P}-kcm_keyboard-no-setxkbmap-on-camera.patch" - "${FILESDIR}/${P}-compress-new-input-notifications.patch" -) - -src_prepare() { - ecm_src_prepare - - use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users - - 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 -} - -src_configure() { - local mycmakeargs=( - -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 scim SCIM) - $(cmake_use_find_package semantic-desktop KF5Baloo) - ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=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 -} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild index 68705edda325..f64ee0ee6e80 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.82.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="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-0" +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 ~ppc64 ~x86" -IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop" +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 @@ -44,6 +44,7 @@ COMMON_DEPEND=" >=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 @@ -59,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 @@ -92,68 +93,69 @@ COMMON_DEPEND=" ) kaccounts? ( kde-apps/kaccounts-integration:5 - net-libs/accounts-qt + net-libs/accounts-qt[qt5(+)] ) - policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}: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 - kaccounts? ( net-libs/signon-oauth2 ) - policykit? ( sys-apps/accountsservice ) + x11-misc/xdg-user-dirs + 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 - "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 + "${WORKDIR}/${XORGHDRS}/${PN}-5.27.9-override-include-dirs.patch" # downstream patch ) src_prepare() { ecm_src_prepare - if ! use policykit; then - ecm_punt_bogus_dep KF5 Wallet - cmake_run_in kcms cmake_comment_add_subdirectory users - fi - 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 + -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DSynaptics_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 scim SCIM) $(cmake_use_find_package semantic-desktop KF5Baloo) ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=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 3bb4b23c9dda..22a8f5cdefce 100644 --- a/kde-plasma/plasma-disks/Manifest +++ b/kde-plasma/plasma-disks/Manifest @@ -1,2 +1,2 @@ -DIST plasma-disks-5.20.5.tar.xz 64636 BLAKE2B 769c131e069861dc06a56ebf0e5f8aef9306ba10660228a8a1b0d6a240126556d18a8c5323255efaa237bbb116c6db2881047257e834597e112e79906d1b64ff SHA512 dd27cd4b612620de2a28001bfd3c95a3ec41fc8f96fb0421ad660885600b663df95315a8cd0710c0457f51633dff91cdefc75417b3751f9c21d50cc45fced9bd -DIST plasma-disks-5.21.5.tar.xz 71428 BLAKE2B a5f2d27afa851f84874b05531d2f4a80b02f5c4238594fb7bffd3a364883aea777379c565621350a227d3680d87d4553dbec1f86dbdde12ff1f125cb5685ddf6 SHA512 b7057416b9ea692b70865122b4f4febb727c6a6dd72ffcd1cc23c9280ecba650b30c2e0002130ecceeb78b556c3e922c3ed83ec0e0d03163e01789cfb10d9426 +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 2fdbf33d963d..9ac314a3e317 100644 --- a/kde-plasma/plasma-disks/metadata.xml +++ b/kde-plasma/plasma-disks/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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-disks</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild deleted file mode 100644 index 3959d887a406..000000000000 --- a/kde-plasma/plasma-disks/plasma-disks-5.20.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="true" -KFMIN=5.74.0 -QTMIN=5.15.1 -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 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.21.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.27.11.ebuild index a48f543b9225..669889c70f68 100644 --- a/kde-plasma/plasma-disks/plasma-disks-5.21.5.ebuild +++ b/kde-plasma/plasma-disks/plasma-disks-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="true" -KFMIN=5.82.0 -QTMIN=5.15.2 -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 ~ppc64 ~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 2585db8dfd6c..7da05ebf8672 100644 --- a/kde-plasma/plasma-firewall/Manifest +++ b/kde-plasma/plasma-firewall/Manifest @@ -1 +1,2 @@ -DIST plasma-firewall-5.21.5.tar.xz 331812 BLAKE2B 43a026a198fb61480e90c5a5235de1abbb106e3f78d4a81fe919ec8c65c4f5ca30b340436b28369d8797d9ad1eac87fd0a4e39b5e3670f68150992e6007c4a76 SHA512 93d36b12025f1918892ad02e6b92dc8c44c27d2c6426a19fb77d8b258940a25295acd923b3957d45eb1715dae097097368b0456bf27273c217b79b441dec55fd +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 2fdbf33d963d..b4a87d9ec623 100644 --- a/kde-plasma/plasma-firewall/metadata.xml +++ b/kde-plasma/plasma-firewall/metadata.xml @@ -1,8 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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">network/plasma-firewall</remote-id> + </upstream> + <use> + <flag name="firewalld">Build <pkg>net-firewall/firewalld</pkg> backend</flag> + <flag name="ufw">Build <pkg>net-firewall/ufw</pkg> backend</flag> + </use> </pkgmetadata> diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.27.11.ebuild index a417fdd8672a..c93d394f02d8 100644 --- a/kde-plasma/plasma-firewall/plasma-firewall-5.21.5.ebuild +++ b/kde-plasma/plasma-firewall/plasma-firewall-5.27.11.ebuild @@ -1,22 +1,23 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8,9} ) -KFMIN=5.82.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 ~x86" -IUSE="" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="firewalld +ufw" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -31,23 +32,29 @@ 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} - || ( - net-firewall/firewalld - net-firewall/ufw - ) + firewalld? ( net-firewall/firewalld ) + ufw? ( net-firewall/ufw ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_prepare() { ecm_src_prepare # this kind of cmake magic doesn't work for us at all. - sed -e "1 s:^.*$:\#\!/usr/bin/env python3.8:" \ + sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \ -i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die } +src_configure() { + local mycmakeargs=( + -DBUILD_FIREWALLD_BACKEND=$(usex firewalld) + -DBUILD_UFW_BACKEND=$(usex ufw) + ) + ecm_src_configure +} + pkg_postinst () { ecm_pkg_postinst diff --git a/kde-plasma/plasma-firewall/plasma-firewall-6.0.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.0.4.ebuild new file mode 100644 index 000000000000..b32a35aa7769 --- /dev/null +++ b/kde-plasma/plasma-firewall/plasma-firewall-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" +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="6" +KEYWORDS="~amd64" +IUSE="firewalld +ufw" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )" + +DEPEND=" + >=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 + # this kind of cmake magic doesn't work for us at all. + sed -e "1 s:^.*$:\#\!/usr/bin/env ${EPYTHON}:" \ + -i kcm/backends/ufw/helper/kcm_ufw_helper.py.cmake || die +} + +src_configure() { + local mycmakeargs=( + -DBUILD_FIREWALLD_BACKEND=$(usex firewalld) + -DBUILD_UFW_BACKEND=$(usex ufw) + ) + ecm_src_configure +} + +pkg_postinst () { + ecm_pkg_postinst + + if ! has_version sys-apps/systemd; then + ewarn "${PN} is not functional without sys-apps/systemd at this point." + ewarn "See also: https://bugs.gentoo.org/778527" + fi +} diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest index fe422cb33695..0efd849ea295 100644 --- a/kde-plasma/plasma-integration/Manifest +++ b/kde-plasma/plasma-integration/Manifest @@ -1,2 +1,2 @@ -DIST plasma-integration-5.20.5.tar.xz 59740 BLAKE2B 8c6e054db3047093556ac9549ebe28e6270001838f28eea92138f4acc02c79235f6c0ab8d82de764dae16efa81cc7ff7519736935bd77153612ee035f7abf337 SHA512 fa0806c756d394ab6f419252396f9d0a18652ed652adcb016dd2885f5238df843814f4661c63b193805834dcd43cb346f69ce33339520229c215d2ff45a24604 -DIST plasma-integration-5.21.5.tar.xz 60972 BLAKE2B 2122d64fa98dcd65936b18a5f8c09939680566770468817ab14d9116c92d226f234811952fd61222ca5e000fe213735c0da26ce73f3c5587cff4d61fcf88d902 SHA512 655fee4335569325431e9fb7d368bdf82b43f1e0e0f727f95f11f481a81e8dbdcdc43470c1768b9ab5701159ffaf571b551edc57510a653e1c7fedc1c4216d92 +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/metadata.xml b/kde-plasma/plasma-integration/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-integration/metadata.xml +++ b/kde-plasma/plasma-integration/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild deleted file mode 100644 index 02ab146b45d2..000000000000 --- a/kde-plasma/plasma-integration/plasma-integration-5.21.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.82.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 ~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.20.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.27.11.ebuild index cce645201cf3..056b3049e30b 100644 --- a/kde-plasma/plasma-integration/plasma-integration-5.20.5.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-5.27.11.ebuild @@ -1,25 +1,29 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -DEPEND=" +# requires running kde environment +RESTRICT="test" + +COMMON_DEPEND=" + dev-libs/wayland >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5=[dbus] >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -31,7 +35,6 @@ DEPEND=" >=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 @@ -39,10 +42,11 @@ DEPEND=" x11-libs/libXcursor x11-libs/libxcb " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.6.0 +" +RDEPEND="${COMMON_DEPEND} media-fonts/hack media-fonts/noto " - -# requires running kde environment -RESTRICT+=" test" +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 2681c26c0ebe..d99c868979a6 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -1,10 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="browser-integration">Enable integration with Chrome/Firefox with browser extensions</flag> <flag name="colord">Enable <pkg>kde-plasma/kwin</pkg> color management via <pkg>x11-misc/colord</pkg></flag> @@ -14,17 +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="qrcode">Enable support for easy WiFi network sharing using QR codes with <pkg>kde-plasma/plasma-nm</pkg></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.20.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild deleted file mode 100644 index 1d16c73d033f..000000000000 --- a/kde-plasma/plasma-meta/plasma-meta-5.20.5.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Merge this to pull in all Plasma 5 packages" -HOMEPAGE="https://kde.org/plasma-desktop" - -LICENSE="metapackage" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="bluetooth +browser-integration crypt +desktop-portal discover +display-manager -+elogind grub gtk +handbook +kwallet +legacy-systray +networkmanager -plymouth pulseaudio qrcode +sddm sdk +smart systemd thunderbolt +wallpapers" - -REQUIRED_USE="^^ ( elogind systemd )" - -RDEPEND=" - >=kde-plasma/breeze-${PV}:${SLOT} - >=kde-plasma/drkonqi-${PV}:${SLOT} - >=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/kinfocenter-${PV}:${SLOT} - >=kde-plasma/kmenuedit-${PV}:${SLOT} - >=kde-plasma/kscreen-${PV}:${SLOT} - >=kde-plasma/kscreenlocker-${PV}:${SLOT} - >=kde-plasma/ksshaskpass-${PV}:${SLOT} - >=kde-plasma/ksysguard-${PV}:${SLOT} - >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwayland-server-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} - >=kde-plasma/kwrited-${PV}:${SLOT} - >=kde-plasma/libkscreen-${PV}:${SLOT} - >=kde-plasma/libksysguard-${PV}:${SLOT} - >=kde-plasma/milou-${PV}:${SLOT} - >=kde-plasma/oxygen-${PV}:${SLOT} - >=kde-plasma/plasma-desktop-${PV}:${SLOT} - >=kde-plasma/plasma-integration-${PV}:${SLOT} - >=kde-plasma/plasma-workspace-${PV}:${SLOT} - >=kde-plasma/polkit-kde-agent-${PV}:${SLOT} - >=kde-plasma/powerdevil-${PV}:${SLOT} - >=kde-plasma/systemsettings-${PV}:${SLOT} - sys-apps/dbus[elogind?,systemd?] - sys-auth/polkit[elogind?,systemd?] - sys-fs/udisks:2[elogind?,systemd?] - bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} ) - browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} ) - crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) - desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) - discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) - display-manager? ( - sddm? ( - >=kde-plasma/sddm-kcm-${PV}:${SLOT} - x11-misc/sddm[elogind?,systemd?] - ) - !sddm? ( x11-misc/lightdm ) - ) - 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?] - qrcode? ( kde-frameworks/prison[qml] ) - ) - plymouth? ( - >=kde-plasma/breeze-plymouth-${PV}:${SLOT} - >=kde-plasma/plymouth-kcm-${PV}:${SLOT} - ) - pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} ) - sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} ) - smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} ) - thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} ) - wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} ) -" - -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" -} diff --git a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.27.11.ebuild index 240dc1de7b29..12b463bf6356 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.21.5.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Merge this to pull in all Plasma 5 packages" HOMEPAGE="https://kde.org/plasma-desktop/" LICENSE="metapackage" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 qrcode +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 )" @@ -29,30 +29,33 @@ RDEPEND=" >=kde-plasma/kscreen-${PV}:${SLOT} >=kde-plasma/kscreenlocker-${PV}:${SLOT} >=kde-plasma/ksshaskpass-${PV}:${SLOT} - >=kde-plasma/ksysguard-${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/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/milou-${PV}:${SLOT} >=kde-plasma/oxygen-${PV}:${SLOT} + >=kde-plasma/oxygen-sounds-${PV}:${SLOT} >=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?] - sys-auth/polkit[elogind?,systemd?] + sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} ) browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} ) 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? ( @@ -63,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} @@ -75,7 +79,6 @@ RDEPEND=" networkmanager? ( >=kde-plasma/plasma-nm-${PV}:${SLOT} net-misc/networkmanager[elogind?,systemd?] - qrcode? ( kde-frameworks/prison[qml] ) ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} diff --git a/kde-plasma/plasma-meta/plasma-meta-6.0.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.0.4.ebuild new file mode 100644 index 000000000000..e38e671c9a36 --- /dev/null +++ b/kde-plasma/plasma-meta/plasma-meta-6.0.4.ebuild @@ -0,0 +1,128 @@ +# 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 6 packages" +HOMEPAGE="https://kde.org/plasma-desktop/" + +LICENSE="metapackage" +SLOT="6" +KEYWORDS="~amd64" +IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt +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=" + !${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/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-${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/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}[qt5?] + >=kde-plasma/plasma-systemmonitor-${PV}:${SLOT} + >=kde-plasma/plasma-welcome-${PV}:${SLOT} + >=kde-plasma/plasma-workspace-${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?] + bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} ) + browser-integration? ( >=kde-plasma/plasma-browser-integration-${PV}:${SLOT} ) + colord? ( x11-misc/colord ) + crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} ) + crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) + cups? ( >=kde-plasma/print-manager-${PV}:${SLOT} ) + discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) + display-manager? ( + sddm? ( + >=kde-plasma/sddm-kcm-${PV}:${SLOT} + x11-misc/sddm[elogind?,systemd?] + ) + !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 + ) + kwallet? ( >=kde-plasma/kwallet-pam-${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? ( + sys-apps/systemd[pam] + 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} + accessibility? ( app-accessibility/orca ) +" + +pkg_postinst() { + 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 de56ce229a85..376530f6f73d 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1,2 @@ -DIST plasma-nm-5.20.5.tar.xz 865364 BLAKE2B 3a316674e9c9bbe7df09c34610f117bbacfa60515e93077103a7956aa1999cc8bef7e4e5add53d3ccb847557c7fadf17ab23d82e392e1b2822cecb9dc33598bb SHA512 6413dcbc6b8723384ecc6897331947343f399bedba6aff9148bc34485b54c5fd6a91b77d63390b0c398c8bcad8151de3f1746c71f3cfae9476632e2386ab6ff7 -DIST plasma-nm-5.21.5.tar.xz 902104 BLAKE2B 8b881f39e01b7de0107b897c81fffb7bfa429a0bd7d8eb58026328ac42c411d5dd8e154e843767098731174a492e64b6c8a28c8af474584862f58081d9a5e751 SHA512 ac074e50d5ee3be99bab515b02522e391b14936c1c8152ca067c7513af7a8e8b81cb55ab9b412ca703554f3e35fc9392368159c9872d8c372017089a4a65e3fa +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/files/plasma-nm-5.21.5-missing-include.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch deleted file mode 100644 index db8f98b072b7..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-5.21.5-missing-include.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8d1720ac924c8453f80ac560470d9d92bdd94b07 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <heiko.becker@kde.org> -Date: Tue, 4 May 2021 20:49:29 +0200 -Subject: [PATCH] Add missing QQueue include - -Used since 64dc6234b6980172bb53084c16a0e4e693d6011a. I suppose it's -implicitly pulled in some cases, but for me the build fails with -"networkmodel.h:126:56: error: field 'm_updateQueue' has incomplete -type 'QQueue<QPair<NetworkModel::ModelChangeType, NetworkModelItem*> >'". - -(cherry picked from commit 2bccd7c3bc3aa12ddd1886b14041f1448c634a69) ---- - libs/models/networkmodel.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libs/models/networkmodel.h b/libs/models/networkmodel.h -index ebe6db52..749cb919 100644 ---- a/libs/models/networkmodel.h -+++ b/libs/models/networkmodel.h -@@ -22,6 +22,7 @@ - #define PLASMA_NM_NETWORK_MODEL_H - - #include <QAbstractListModel> -+#include <QQueue> - - #include "networkitemslist.h" - --- -GitLab - diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml index 89ac1236a4a2..357da291c490 100644 --- a/kde-plasma/plasma-nm/metadata.xml +++ b/kde-plasma/plasma-nm/metadata.xml @@ -1,12 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="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.21.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild deleted file mode 100644 index a24d6cab271b..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.21.5.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma applet for NetworkManager" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 -" - -PATCHES=( "${FILESDIR}/${P}-missing-include.patch" ) - -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - $(cmake_use_find_package openconnect OpenConnect) - ) - - 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.20.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild index 856dae591577..1c2ec2adf0cb 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.20.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild @@ -1,36 +1,35 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 @@ -39,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:= ) @@ -57,18 +52,23 @@ 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 " -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - $(cmake_use_find_package openconnect OpenConnect) - ) +src_prepare() { + ecm_src_prepare - ecm_src_configure + # TODO: try to get a build switch upstreamed + if ! use openconnect; then + sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die + fi } 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 eb93cde7ffb7..78ac451412e3 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,2 +1,2 @@ -DIST plasma-pa-5.20.5.tar.xz 114276 BLAKE2B c41d5093af494ab0eb17452098e47dc53b56256c98181a4f034df8662aafe51b3138fbb41ae7ba0b9d31e6595bf8871d93b6838f69cec30c0981690c4df85233 SHA512 8d01c79fd75e494f816049400a10929f427bf09d79ebddd73a125d4795722fea44319450c5f4d7d8627a03fca4a8f11405e267a87ca5e85016038fedc8131bda -DIST plasma-pa-5.21.5.tar.xz 114508 BLAKE2B b33b5050e7de5dfd99e2f6b881d779e6e92fbd30c45fcd86b0ec65aec81d06b983789c4e617372b74604fcb51315e57e5f1978fcaa4cb9c6c45aeac94f4a2c85 SHA512 96a170b0ae90ff5a8015a532cde50e7a786452f9d04a30f7ee2402c9e7065ed1891e229f589bc79337ad68cd310c339840b10e7bb94551bab744ab7ae9a2ba40 +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/metadata.xml b/kde-plasma/plasma-pa/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-pa/metadata.xml +++ b/kde-plasma/plasma-pa/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild deleted file mode 100644 index 5925ffbdeefd..000000000000 --- a/kde-plasma/plasma-pa/plasma-pa-5.21.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.82.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Plasma applet for audio volume management using PulseAudio" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 - x11-themes/sound-theme-freedesktop -" diff --git a/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.27.11.ebuild index f9d149a2ea29..2939a17453ca 100644 --- a/kde-plasma/plasma-pa/plasma-pa-5.20.5.ebuild +++ b/kde-plasma/plasma-pa/plasma-pa-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 -QTMIN=5.15.1 -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 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 x11-themes/sound-theme-freedesktop " - -src_prepare() { - ecm_src_prepare - ecm_punt_bogus_dep Qt5 Widgets -} +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 54f7eabf26fb..eec68e4a7a10 100644 --- a/kde-plasma/plasma-sdk/Manifest +++ b/kde-plasma/plasma-sdk/Manifest @@ -1,2 +1,2 @@ -DIST plasma-sdk-5.20.5.tar.xz 266680 BLAKE2B e6ba310a3d089ee36a9098d9a58276cb8491a0c3016990e7643036ee905624c5f974b0d2e470047b59e5cc114a80e7426dbf1d0561bdf4fd26a218e47ade8ca8 SHA512 d10a5413835ab9ac4f1c521839f56b12862d87eed25c13d7ea70398bb892da7ab558bfc62fd2fe8451fc11ab9023d2e9a6e78c677bfa3e104c15f8e87ae1db77 -DIST plasma-sdk-5.21.5.tar.xz 270648 BLAKE2B 59e6d00cb24a392aa829bea8e0206c7f7867e8f5cdba4a6a2ab6f4f328dd83fb18d1f25c78a5b461d182e8705cdfc8f3141ea947eba6545c9dee0d159de3bece SHA512 83d27d9ffca15baba292bdf285f19a743589f5a4433c6fad8fd581a93a910be0ce98f3163c7d6872d6a95b71342e301de5ebf6ce2677fcdfb61b8e4644a0d80f +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/metadata.xml b/kde-plasma/plasma-sdk/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-sdk/metadata.xml +++ b/kde-plasma/plasma-sdk/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild deleted file mode 100644 index b63a63ef1036..000000000000 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.21.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="optional" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~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.20.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.27.11.1.ebuild index dc70503d57f6..8bd539f2e20e 100644 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.20.5.ebuild +++ b/kde-plasma/plasma-sdk/plasma-sdk-5.27.11.1.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="optional" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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..85077df74840 --- /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="true" +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 26e3374e6079..f453b551cf9f 100644 --- a/kde-plasma/plasma-systemmonitor/Manifest +++ b/kde-plasma/plasma-systemmonitor/Manifest @@ -1,2 +1,2 @@ -DIST plasma-systemmonitor-5.20.0.tar.xz 105596 BLAKE2B 93a5feb8fba244580e65b55633d803e14051b476f3ee5fde617285c61a84be7b22c5c09f4a14e0e7b9b3c88a45868c9f8c5c72e8cfd4488add192e9e1ceeb594 SHA512 56c6a5fe4646aaa2fc76c30f28362252308516b06132501efeb9905097a5c895250076b09ef2bdb7a9f4ad77435c622bd4b3f1ad5b69116f6654b3046829f2a0 -DIST plasma-systemmonitor-5.21.5.tar.xz 124792 BLAKE2B 47c55bd7ceb31c7128676e539d7c48325db68b49bcbee0a4d73cd61ed1360500e7765ed2d5d01bde542bfb74e7b6db26158c6b281aa1e65a5ba450595117777a SHA512 f21db1dc9428b9f97b4b012ae481738f7aa96c9080f35870c8a8f2dfed582b937507fd626723dbd60e66656d78984bda24279c77548d65efd847e15374b024f0 +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/metadata.xml b/kde-plasma/plasma-systemmonitor/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-systemmonitor/metadata.xml +++ b/kde-plasma/plasma-systemmonitor/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild deleted file mode 100644 index a7dd9a1198b9..000000000000 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.20.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -QTMIN=5.15.1 -inherit ecm kde.org - -DESCRIPTION="New version of KSysGuard built on top of the new KStats daemon and using QML" -HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor" - -if [[ ${KDE_BUILD_TYPE} == release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -fi - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="5" -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/knewstuff-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-plasma/libksysguard-${PV}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-frameworks/kquickcharts-${KFMIN}:5 -" diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.11.ebuild index 9b428635ce8e..a661ce1a6006 100644 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.21.5.ebuild +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PVCUT=$(ver_cut 1-3) -KFMIN=5.82.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org -DESCRIPTION="New version of KSysGuard built on top of the new KStats daemon and using QML" -HOMEPAGE="https://invent.kde.org/plasma/plasma-systemmonitor" +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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -28,8 +28,10 @@ DEPEND=" >=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-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/libksysguard-${PVCUT}:5 " RDEPEND="${DEPEND} @@ -37,5 +39,5 @@ RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/ksysguard-${PVCUT}:5 + >=kde-plasma/ksystemstats-${PVCUT}:5 " 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 aec9fa9a1900..bfe3b9cced60 100644 --- a/kde-plasma/plasma-thunderbolt/Manifest +++ b/kde-plasma/plasma-thunderbolt/Manifest @@ -1,2 +1,2 @@ -DIST plasma-thunderbolt-5.20.5.tar.xz 56824 BLAKE2B eb3289a0e9959cf291d1eed2d52597d9ffdc8993096ec0b1ba850720c726fe412ac43bfcf8f7b4c721d6a982ce1f127e323b420ec57da33dcd206438d9602ba7 SHA512 ce07bfd0733f6dda4429b77afbe699edb85e46cc31656ccb7a6cbf366fdba2720b4d92e4327edfdb164867873bbe7d21dd2da5e8764bb36e8b3c154ab8f3088e -DIST plasma-thunderbolt-5.21.5.tar.xz 56556 BLAKE2B 9f80e1848693fccb15cb56f8d6ce89136efa1baa60dfd42498a49f59c9e688ea454aa52b40e8791999fb12dc540308bcdb855cd7462b79079a257a58a29004c8 SHA512 b627ee07e0fe308b70b11c2a887443b8eb3997cb9895a67f8d7760a4294bf36eb612ff888c981ba63a6485180ae7d1cee3d9c7c0bb741a3db3599a2650ba6843 +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 2fdbf33d963d..507f645eef1a 100644 --- a/kde-plasma/plasma-thunderbolt/metadata.xml +++ b/kde-plasma/plasma-thunderbolt/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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-thunderbolt</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild deleted file mode 100644 index 952807b2c0bd..000000000000 --- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.21.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~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.20.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.11.ebuild index 22fd773a72e7..98e1bee10aa6 100644 --- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.20.5.ebuild +++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.11.ebuild @@ -1,22 +1,25 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_TEST="true" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 x86" +KEYWORDS="amd64 ~loong ~riscv x86" IUSE="" +# tests require DBus +RESTRICT="test" + DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 @@ -33,6 +36,4 @@ RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 sys-apps/bolt " - -# tests require DBus -RESTRICT+=" test" +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 8b1252482994..70912fa89bd0 100644 --- a/kde-plasma/plasma-vault/Manifest +++ b/kde-plasma/plasma-vault/Manifest @@ -1,2 +1,2 @@ -DIST plasma-vault-5.20.5.tar.xz 159080 BLAKE2B 2aa427337eb69b016eef9d5849c465cc8f55a900cd35739a88c51f622ce01d5b4a8676442ba78fc0b555e09de7a31b3ed6499c85968f5178d3613b88a6d114fc SHA512 2e3d6b221fdf363763b732f2e0d82afc63aaa727bae8755940c6e53eecb9ad6526071162202a24c93065a3e80598b3c25a71255a2fe032c71a771e611bc80c9d -DIST plasma-vault-5.21.5.tar.xz 160084 BLAKE2B a893a8cb9a3911eebb7cc1933f5bd6ee527a639e0ffaabfd9db864acc15962127e87abe3838a24311c65e87f2bd2320f788a731ee2145909e7d2605fccc9184f SHA512 bb3a4471e6a7cfc98eb4867142467cb009456c7643e87f274372e6d9d8cff1b97c6e70c1a3a51e21b72cc0d7a63a801f4681e3977339eac6a9ab108b13dc6d5c +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/metadata.xml b/kde-plasma/plasma-vault/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-vault/metadata.xml +++ b/kde-plasma/plasma-vault/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild deleted file mode 100644 index 3504bc63378c..000000000000 --- a/kde-plasma/plasma-vault/plasma-vault-5.20.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 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.21.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.27.11.ebuild index 6487b75bfa37..018fbaf45b59 100644 --- a/kde-plasma/plasma-vault/plasma-vault-5.21.5.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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 ~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 85fabda791f4..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.20.5.tar.xz 45932988 BLAKE2B f97004b26d967acf8dc4e24b9d5efeb99c56d69f640d03662162ecf9782c9e0343d99c5ba2813ebab9d9811a03ca37c6ad73ed420f0bb88a393a49e1dce69a76 SHA512 60719b4d963b8e8e4306c2ced7433aa8a009029de7f5fe5e1d4a1743a2554bbf5a64d572a839c2210a474a51e849c7a5bae74dd121f06ca80f076d85bc8eb8b0 -DIST plasma-workspace-wallpapers-5.21.5.tar.xz 48099464 BLAKE2B 1cf45627c00ebce5ac6960cbc1c773f4239398de247a2e29866de8daa53e7a9804b2185d148c3a8c507eac1c6a333c9c6a5472b37d26979029df3652e69913c0 SHA512 d0a7862b55238bafc106b654bd584cd6e2fbeead8d6694cc71df23e74a2da02c0b25b2f412514b45c1d2b04567e7758ef7d77b6fc5bd814b5f5bdee0c26926ca +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/metadata.xml b/kde-plasma/plasma-workspace-wallpapers/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/plasma-workspace-wallpapers/metadata.xml +++ b/kde-plasma/plasma-workspace-wallpapers/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.11.ebuild index c46c7d6c1304..36c00c8005b0 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.20.5.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 ~ppc64 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.21.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.0.4.ebuild index d290aa752bae..a4488992a794 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.21.5.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.0.4.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 ~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 c8d821785a7b..36fb5b6ad962 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1,2 @@ -DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f -DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 +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.14.2-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch deleted file mode 100644 index f12d9f4daf5b..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.14.2-split-libkworkspace.patch +++ /dev/null @@ -1,35 +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 e587a386..d1a63527 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,6 +46,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" - - find_package(KF5TextEditor) - find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(LibKWorkspace 5.14.1) - - find_package(KScreenLocker 5.13.80 REQUIRED) - find_package(ScreenSaverDBusInterface CONFIG REQUIRED) -@@ -135,7 +136,10 @@ endif() - add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - - 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) - --- -2.19.1 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch deleted file mode 100644 index effea7fdc8e1..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-avoid-render-invisible-contents.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 45e0a722fb85bb5d1ab8bef92080e934254b13aa Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Thu, 7 Jan 2021 13:36:29 +0000 -Subject: [PATCH] [lookandfeel] Avoid rendering invisible contents - -An opacity of 0 but still visible still results in nodes in the -scenegraph, which is wasteful. This is shown in gammaray with some -warnings. - -Enabled is also bound to visible as if a text field has focus it still -animates the cursor icon even if inivisble, producing wakeups. - -BUG: 347772 -FIXED-IN: 5.21 ---- - lookandfeel/contents/lockscreen/LockScreenUi.qml | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml -index a2eba8e6d..83564fc0a 100644 ---- a/lookandfeel/contents/lockscreen/LockScreenUi.qml -+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml -@@ -228,6 +228,12 @@ PlasmaCore.ColorScope { - height: lockScreenRoot.height + units.gridUnit * 3 - focus: true //StackView is an implicit focus scope, so we need to give this focus so the item inside will have it - -+ // this isn't implicit, otherwise items still get processed for the scenegraph -+ visible: opacity > 0 -+ // changing enabled will toggle if an item can have activeFocus, which otherwise -+ //keeps the text cursor blinking even when invisble -+ enabled: visible -+ - initialItem: MainBlock { - id: mainBlock - lockScreenUiVisible: lockScreenRoot.uiVisible --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch deleted file mode 100644 index 58f3a50c4911..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-crash-on-screen-changes.patch +++ /dev/null @@ -1,63 +0,0 @@ -From fa2bafea8f0cd9fac0864ac23f23c955d5f15b73 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Tue, 5 Jan 2021 23:57:19 +0000 -Subject: [PATCH] [panel] Fix crash on screen changes - -There is an error handling path when we fetch the relevant config() - -``` -KConfigGroup PanelView::panelConfig(... -{ - if (!containment || !screen) { - return KConfigGroup(); - } -``` - -which we indiscrimiately call parent() on. - -This patch guards that case, which is presumably screen being -temporarily null. - -This code is also Plasma 5.8 compatibility fallback, so arguably we -could get rid of it. - -BUG: 425711 ---- - shell/panelview.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/shell/panelview.cpp b/shell/panelview.cpp -index 28e86d2d3..991364e97 100644 ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -561,7 +561,8 @@ void PanelView::resizePanel() - - void PanelView::restore() - { -- if (!containment()) { -+ KConfigGroup panelConfig = config(); -+ if (!panelConfig.isValid()) { - return; - } - -@@ -572,7 +573,7 @@ void PanelView::restore() - //but if fails read it from the resolution dependent one as - //the place for this config key is changed in Plasma 5.9 - //Do NOT use readConfigValueWithFallBack -- setAlignment((Qt::Alignment)config().parent().readEntry<int>("alignment", config().readEntry<int>("alignment", m_alignment))); -+ setAlignment((Qt::Alignment)panelConfig.parent().readEntry<int>("alignment", panelConfig.readEntry<int>("alignment", m_alignment))); - - // All the other values are read from screen independent values, - // but fallback on the screen independent section, as is the only place -@@ -599,7 +600,7 @@ void PanelView::restore() - //but if fails read it from the resolution dependent one as - //the place for this config key is changed in Plasma 5.9 - //Do NOT use readConfigValueWithFallBack -- setVisibilityMode((VisibilityMode)config().parent().readEntry<int>("panelVisibility", config().readEntry<int>("panelVisibility", (int)NormalPanel))); -+ setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel))); - m_initCompleted = true; - resizePanel(); - positionPanel(); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch deleted file mode 100644 index a7580b44475a..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-digitalclock-agenda-view.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aa5215a0b3f8febfe9eda2ab586d9bf8ba647c7c Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Mon, 11 Jan 2021 16:03:31 +0100 -Subject: [PATCH] [applets/digitalclock] Fix showing agenda view when enabling - plugins - -The agenda view is only shown when at least one event source is active. -When going from 0 to 1 active sources the view wasn't updated correctly. - -This was because the visibility of rightColumn was bound to the -visibility of its child, but since the visibility of the parent affects -the visibility of its childred (https://doc.qt.io/qt-5/qml-qtquick-item.html#visible-prop) that resulted in a broken binding. - -Bind to the source property directly to avoid this - -BUG: 431433 -(cherry picked from commit 56064d80ff2e798460967b28243c8117ee6ebaec) ---- - applets/digital-clock/package/contents/ui/CalendarView.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/digital-clock/package/contents/ui/CalendarView.qml b/applets/digital-clock/package/contents/ui/CalendarView.qml -index a7104100e..1541a3501 100644 ---- a/applets/digital-clock/package/contents/ui/CalendarView.qml -+++ b/applets/digital-clock/package/contents/ui/CalendarView.qml -@@ -145,7 +145,7 @@ PlasmaComponents3.Page { - ColumnLayout { - id: rightColumn - -- visible: agenda.visible || worldClocks.visible -+ visible: calendar.showAgenda || calendar.showClocks - - Layout.minimumWidth: units.gridUnit * 14 - --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch deleted file mode 100644 index 8d2c0ddfbdb8..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-fix-wake-screensaver-mode-w-keypress.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 13057013d55ae19e76d29b9edc96510e52da2a7a Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Fri, 8 Jan 2021 12:40:07 +0000 -Subject: [PATCH] [lookandfeel] Fix wake existing screensaver mode with key - presses - -In commit 45e0a722fb85bb5d1ab8bef92080e934254b13aa we changed the focus -on the textfield with the intention of fixing the cusor blinking. - -This had the unfortunate side effect of breaking waking out of the -screensaver mode with just the keyboard. - -That screensaver mode was bound to: -``` -property bool blockUI: mainBlock.mainPasswordBox.text.length > 0 -``` -for that to change, we need to have focus. - -Instead this patches cursor blinking more explicity. - -Doing it only in the lock screen (as opposed to the toolkit) makes sense -as this only happens due to somewhat unusual usage inside the -lockscreen. - -BUG: 431286 - - -(cherry picked from commit 2cbd7e4c70d0592d16cdaf58ed43effe4a716aa4) ---- - lookandfeel/contents/lockscreen/LockScreenUi.qml | 3 --- - lookandfeel/contents/lockscreen/MainBlock.qml | 6 ++++++ - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml -index d2f8a2b7d..c4f9e8a45 100644 ---- a/lookandfeel/contents/lockscreen/LockScreenUi.qml -+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml -@@ -229,9 +229,6 @@ PlasmaCore.ColorScope { - - // this isn't implicit, otherwise items still get processed for the scenegraph - visible: opacity > 0 -- // changing enabled will toggle if an item can have activeFocus, which otherwise -- //keeps the text cursor blinking even when invisble -- enabled: visible - - initialItem: MainBlock { - id: mainBlock -diff --git a/lookandfeel/contents/lockscreen/MainBlock.qml b/lookandfeel/contents/lockscreen/MainBlock.qml -index 4bd5df0e5..e8f5ced47 100644 ---- a/lookandfeel/contents/lockscreen/MainBlock.qml -+++ b/lookandfeel/contents/lockscreen/MainBlock.qml -@@ -66,6 +66,12 @@ SessionManagementScreen { - enabled: !authenticator.graceLocked - revealPasswordButtonShown: true - -+ // In Qt this is implicitly active based on focus rather than visibility -+ // in any other application having a focussed invisible object would be weird -+ // but here we are using to wake out of screensaver mode -+ // We need to explicitly disable cursor flashing to avoid unnecessary renders -+ cursorVisible: visible -+ - onAccepted: { - if (lockScreenUiVisible) { - startLogin(); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch deleted file mode 100644 index 37f3ae7ece47..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-revert-activate-krunner.patch +++ /dev/null @@ -1,56 +0,0 @@ -From e350342bfc42f7803c58dafea0c0ad190507430b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Tue, 2 Feb 2021 13:28:06 +0100 -Subject: [PATCH] Revert "Activate KRunner instead of running the binary" - -Causes applications to be started with cwd "/". - -See also: https://bugs.gentoo.org/767478 - -This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477. ---- - krunner/CMakeLists.txt | 3 ++- - krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%) - -diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt -index 59d50e464..02b2c5731 100644 ---- a/krunner/CMakeLists.txt -+++ b/krunner/CMakeLists.txt -@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION} - install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) - --install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) -+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) - - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface") - configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in -diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake -similarity index 94% -rename from krunner/krunner.desktop -rename to krunner/krunner.desktop.cmake -index 85c91dbad..457daaaa7 100644 ---- a/krunner/krunner.desktop -+++ b/krunner/krunner.desktop.cmake -@@ -1,5 +1,5 @@ - [Desktop Entry] --Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.display -+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner - Name=KRunner - Name[ar]=مشغّل.ك - Name[ast]=KRunner -@@ -59,7 +59,7 @@ Actions=RunClipboard - X-KDE-Wayland-Interfaces=org_kde_plasma_window_management - - [Desktop Action RunClipboard] --Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents -+Exec=krunner -c - Name=Run command on clipboard contents - Name[az]=Əmri, mübadilə buferindən başlatmaq - Name[ca]=Executa una ordre al contingut del porta-retalls --- -2.30.0 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch deleted file mode 100644 index 3018b73cefa0..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.20.5-wayland-fix-XKB-variable-setup.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2a6718ff53aa70d3a6c0d9a78a7aaa491907b130 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fabian@ritter-vogt.de> -Date: Mon, 18 Jan 2021 12:56:00 +0000 -Subject: [PATCH] startplasma-wayland: Fix XKB variable setup - -When this was ported to C++, it missed the actual variable assignments. - - -(cherry picked from commit 76088e21ea2ec09d13bd462d61c4b8ffc7bc4729) ---- - startkde/startplasma-wayland.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/startkde/startplasma-wayland.cpp b/startkde/startplasma-wayland.cpp -index 500435853..38e325843 100644 ---- a/startkde/startplasma-wayland.cpp -+++ b/startkde/startplasma-wayland.cpp -@@ -61,10 +61,10 @@ int main(int argc, char** argv) - qputenv(var, r.toUtf8()); - }; - -- queryAndSet("X11MODEL", QStringLiteral("X11Model")); -- queryAndSet("X11LAYOUT", QStringLiteral("X11Layout")); -- queryAndSet("X11VARIANT", QStringLiteral("X11Variant")); -- queryAndSet("X11OPTIONS", QStringLiteral("X11Options")); -+ queryAndSet("XKB_DEFAULT_MODEL", QStringLiteral("X11Model")); -+ queryAndSet("XKB_DEFAULT_LAYOUT", QStringLiteral("X11Layout")); -+ queryAndSet("XKB_DEFAULT_VARIANT", QStringLiteral("X11Variant")); -+ queryAndSet("XKB_DEFAULT_OPTIONS", QStringLiteral("X11Options")); - } else { - qWarning() << "not a reply org.freedesktop.locale1" << resultMessage; - } --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch deleted file mode 100644 index f04bb866d5d3..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-dangerous-shortcuts.patch +++ /dev/null @@ -1,45 +0,0 @@ -From e8e17c5ef8734fa56a78405e32277568e4e1095e Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Thu, 22 Apr 2021 08:38:18 -0600 -Subject: [PATCH] [ksmserver] Remove default shortcuts for "Without - Confirmation" actions - -These actions bypass the user setting for whether or not to show the -logout screen and always log out/reboot/etc. immediately. Because they -have default keyboard shortcuts, they can be triggered by accident and -cause unexpected logouts/reboots/etc. - -BUG: 435954 -FIXED-IN: 5.22 ---- - ksmserver/server.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/ksmserver/server.cpp b/ksmserver/server.cpp -index ac9da9f09..6f3179fb9 100644 ---- a/ksmserver/server.cpp -+++ b/ksmserver/server.cpp -@@ -880,17 +880,17 @@ void KSMServer::setupShortcuts() - - a = actionCollection->addAction(QStringLiteral("Log Out Without Confirmation")); - a->setText(i18n("Log Out Without Confirmation")); -- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_Delete); -+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); - connect(a, &QAction::triggered, this, &KSMServer::logoutWithoutConfirmation); - - a = actionCollection->addAction(QStringLiteral("Halt Without Confirmation")); - a->setText(i18n("Halt Without Confirmation")); -- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageDown); -+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); - connect(a, &QAction::triggered, this, &KSMServer::haltWithoutConfirmation); - - a = actionCollection->addAction(QStringLiteral("Reboot Without Confirmation")); - a->setText(i18n("Reboot Without Confirmation")); -- KGlobalAccel::self()->setGlobalShortcut(a, QList<QKeySequence>() << Qt::ALT + Qt::CTRL + Qt::SHIFT + Qt::Key_PageUp); -+ KGlobalAccel::self()->setGlobalShortcut(a, QKeySequence()); - connect(a, &QAction::triggered, this, &KSMServer::rebootWithoutConfirmation); - } - } --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch deleted file mode 100644 index c2637286da10..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-revert-activate-krunner.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9bdae154bb3711b0220d0a8a685b2329f487d1f2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Mon, 15 Feb 2021 17:35:19 +0100 -Subject: [PATCH] Revert "Activate KRunner instead of running the binary" - -Causes applications to be started with cwd "/". - -See also: https://bugs.gentoo.org/767478 - -This reverts commit 0e575a20ef36532b5b40a40ea30f915976942477. ---- - krunner/CMakeLists.txt | 3 ++- - krunner/{krunner.desktop => krunner.desktop.cmake} | 4 ++-- - 2 files changed, 4 insertions(+), 3 deletions(-) - rename krunner/{krunner.desktop => krunner.desktop.cmake} (94%) - -diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt -index 07d27c1dc..8e1f2e3bd 100644 ---- a/krunner/CMakeLists.txt -+++ b/krunner/CMakeLists.txt -@@ -31,7 +31,8 @@ target_compile_definitions(krunner PRIVATE -DPROJECT_VERSION="${PROJECT_VERSION} - install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) - --install(FILES krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) -+configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY) -+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) - - set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface") - configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in -diff --git a/krunner/krunner.desktop b/krunner/krunner.desktop.cmake -similarity index 94% -rename from krunner/krunner.desktop -rename to krunner/krunner.desktop.cmake -index 7a0398696..c4c8c9d92 100644 ---- a/krunner/krunner.desktop -+++ b/krunner/krunner.desktop.cmake -@@ -1,5 +1,5 @@ - [Desktop Entry] --Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.toggleDisplay -+Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner - Name=KRunner - Name[ar]=مشغّل.ك - Name[ast]=KRunner -@@ -60,7 +60,7 @@ Actions=RunClipboard - X-KDE-Wayland-Interfaces=org_kde_plasma_window_management - - [Desktop Action RunClipboard] --Exec=dbus-send --type=method_call --dest=org.kde.krunner /App org.kde.krunner.App.displayWithClipboardContents -+Exec=krunner -c - Name=Run command on clipboard contents - Name[az]=Əmri, mübadilə buferindən başlatmaq - Name[ca]=Executa una ordre al contingut del porta-retalls --- -2.31.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch deleted file mode 100644 index fb7993e6db72..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency-panelConfig.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1cf02aad96bfe650a1f4d1465ae15234205fb061 Mon Sep 17 00:00:00 2001 -From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com> -Date: Mon, 26 Apr 2021 18:47:51 +0000 -Subject: [PATCH] Load panelOpacity from config parent, not from config - -BUG: 434285 -FIXED-IN: 5.22 ---- - shell/panelview.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shell/panelview.cpp b/shell/panelview.cpp -index 5ed743024..4533e856f 100644 ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -633,7 +633,7 @@ void PanelView::restore() - // the place for this config key is changed in Plasma 5.9 - // Do NOT use readConfigValueWithFallBack - setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel))); -- setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive)); -+ setOpacityMode((OpacityMode)config().parent().readEntry<int>("panelOpacity", configDefaults().parent().readEntry<int>("panelOpacity", PanelView::OpacityMode::Adaptive))); - m_initCompleted = true; - resizePanel(); - positionPanel(); --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch deleted file mode 100644 index 1a925a137cef..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-transparency.patch +++ /dev/null @@ -1,376 +0,0 @@ -From 7db8d5ee551f30576588d31470fe287b6ad2adcd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Niccol=C3=B2=20Venerandi?= <niccolo@venerandi.com> -Date: Mon, 1 Mar 2021 22:14:43 +0000 -Subject: [PATCH] Add support for adaptive opacity panels - -Co-authored-by: Jan Blackquill <uhhadd@gmail.com> ---- - libtaskmanager/taskfilterproxymodel.cpp | 26 ++++++++++++++++++ - libtaskmanager/taskfilterproxymodel.h | 19 ++++++++++++++ - libtaskmanager/tasksmodel.cpp | 11 ++++++++ - libtaskmanager/tasksmodel.h | 19 ++++++++++++++ - shell/panelconfigview.cpp | 11 ++++++++ - shell/panelconfigview.h | 5 ++++ - shell/panelview.cpp | 35 +++++++++++++++++++++++++ - shell/panelview.h | 28 ++++++++++++++++++++ - 8 files changed, 154 insertions(+) - -diff --git a/libtaskmanager/taskfilterproxymodel.cpp b/libtaskmanager/taskfilterproxymodel.cpp -index 37a3076fd..6bb27537a 100644 ---- a/libtaskmanager/taskfilterproxymodel.cpp -+++ b/libtaskmanager/taskfilterproxymodel.cpp -@@ -40,6 +40,7 @@ public: - bool filterByScreen = false; - bool filterByActivity = false; - bool filterNotMinimized = false; -+ bool filterNotMaximized = false; - bool filterSkipTaskbar = true; - bool filterSkipPager = false; - -@@ -185,6 +186,22 @@ void TaskFilterProxyModel::setFilterNotMinimized(bool filter) - } - } - -+bool TaskFilterProxyModel::filterNotMaximized() const -+{ -+ return d->filterNotMaximized; -+} -+ -+void TaskFilterProxyModel::setFilterNotMaximized(bool filter) -+{ -+ if (d->filterNotMaximized != filter) { -+ d->filterNotMaximized = filter; -+ -+ invalidateFilter(); -+ -+ emit filterNotMaximizedChanged(); -+ } -+} -+ - bool TaskFilterProxyModel::filterSkipTaskbar() const - { - return d->filterSkipTaskbar; -@@ -301,6 +318,15 @@ bool TaskFilterProxyModel::acceptsRow(int sourceRow) const - } - } - -+ // Filter not maximized. -+ if (d->filterNotMaximized) { -+ bool isMaximized = sourceIdx.data(AbstractTasksModel::IsMaximized).toBool(); -+ -+ if (!isMaximized) { -+ return false; -+ } -+ } -+ - return true; - } - -diff --git a/libtaskmanager/taskfilterproxymodel.h b/libtaskmanager/taskfilterproxymodel.h -index 7ad2cb9ce..88ba3adab 100644 ---- a/libtaskmanager/taskfilterproxymodel.h -+++ b/libtaskmanager/taskfilterproxymodel.h -@@ -52,6 +52,7 @@ class TASKMANAGER_EXPORT TaskFilterProxyModel : public QSortFilterProxyModel, pu - Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged) - Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged) - Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged) -+ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximizedChanged) - Q_PROPERTY(bool filterSkipTaskbar READ filterSkipTaskbar WRITE setFilterSkipTaskbar NOTIFY filterSkipTaskbarChanged) - Q_PROPERTY(bool filterSkipPager READ filterSkipPager WRITE setFilterSkipPager NOTIFY filterSkipPagerChanged) - -@@ -212,6 +213,23 @@ public: - **/ - void setFilterNotMinimized(bool filter); - -+ /** -+ * Whether non-maximized tasks should be filtered. Defaults to -+ * @c false. -+ * -+ * @see setFilterNotMaximized -+ * @returns @c true if non-maximized tasks should be filtered. -+ **/ -+ bool filterNotMaximized() const; -+ -+ /** -+ * Set whether non-maximized tasks should be filtered. -+ * -+ * @see filterNotMaximized -+ * @param filter Whether non-maximized tasks should be filtered. -+ **/ -+ void setFilterNotMaximized(bool filter); -+ - /** - * Whether tasks which should be omitted from 'task bars' should be - * filtered. Defaults to @c true. -@@ -285,6 +303,7 @@ Q_SIGNALS: - void filterByScreenChanged() const; - void filterByActivityChanged() const; - void filterNotMinimizedChanged() const; -+ void filterNotMaximizedChanged() const; - void filterSkipTaskbarChanged() const; - void filterSkipPagerChanged() const; - void demandingAttentionSkipsFiltersChanged() const; -diff --git a/libtaskmanager/tasksmodel.cpp b/libtaskmanager/tasksmodel.cpp -index c6e66926b..11eb53fdf 100644 ---- a/libtaskmanager/tasksmodel.cpp -+++ b/libtaskmanager/tasksmodel.cpp -@@ -302,6 +302,7 @@ void TasksModel::Private::initModels() - QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByScreenChanged, q, &TasksModel::filterByScreenChanged); - QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterByActivityChanged, q, &TasksModel::filterByActivityChanged); - QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMinimizedChanged, q, &TasksModel::filterNotMinimizedChanged); -+ QObject::connect(filterProxyModel, &TaskFilterProxyModel::filterNotMaximizedChanged, q, &TasksModel::filterNotMaximizedChanged); - - groupingProxyModel = new TaskGroupingProxyModel(q); - groupingProxyModel->setSourceModel(filterProxyModel); -@@ -1152,6 +1153,16 @@ void TasksModel::setFilterNotMinimized(bool filter) - d->filterProxyModel->setFilterNotMinimized(filter); - } - -+bool TasksModel::filterNotMaximized() const -+{ -+ return d->filterProxyModel->filterNotMaximized(); -+} -+ -+void TasksModel::setFilterNotMaximized(bool filter) -+{ -+ d->filterProxyModel->setFilterNotMaximized(filter); -+} -+ - TasksModel::SortMode TasksModel::sortMode() const - { - return d->sortMode; -diff --git a/libtaskmanager/tasksmodel.h b/libtaskmanager/tasksmodel.h -index 18e3d9bb4..8c84012d0 100644 ---- a/libtaskmanager/tasksmodel.h -+++ b/libtaskmanager/tasksmodel.h -@@ -73,6 +73,7 @@ class TASKMANAGER_EXPORT TasksModel : public QSortFilterProxyModel, public Abstr - Q_PROPERTY(bool filterByScreen READ filterByScreen WRITE setFilterByScreen NOTIFY filterByScreenChanged) - Q_PROPERTY(bool filterByActivity READ filterByActivity WRITE setFilterByActivity NOTIFY filterByActivityChanged) - Q_PROPERTY(bool filterNotMinimized READ filterNotMinimized WRITE setFilterNotMinimized NOTIFY filterNotMinimizedChanged) -+ Q_PROPERTY(bool filterNotMaximized READ filterNotMaximized WRITE setFilterNotMaximized NOTIFY filterNotMaximized) - - Q_PROPERTY(SortMode sortMode READ sortMode WRITE setSortMode NOTIFY sortModeChanged) - Q_PROPERTY(bool separateLaunchers READ separateLaunchers WRITE setSeparateLaunchers NOTIFY separateLaunchersChanged) -@@ -295,6 +296,23 @@ public: - **/ - void setFilterNotMinimized(bool filter); - -+ /** -+ * Whether non-maximized tasks should be filtered. Defaults to -+ * @c false. -+ * -+ * @see setFilterNotMaximized -+ * @returns @c true if non-maximized tasks should be filtered. -+ **/ -+ bool filterNotMaximized() const; -+ -+ /** -+ * Set whether non-maximized tasks should be filtered. -+ * -+ * @see filterNotMaximized -+ * @param filter Whether non-maximized tasks should be filtered. -+ **/ -+ void setFilterNotMaximized(bool filter); -+ - /** - * The sort mode used in sorting tasks. Defaults to SortAlpha. - * -@@ -848,6 +866,7 @@ Q_SIGNALS: - void filterByScreenChanged() const; - void filterByActivityChanged() const; - void filterNotMinimizedChanged() const; -+ void filterNotMaximizedChanged() const; - void sortModeChanged() const; - void separateLaunchersChanged() const; - void launchInPlaceChanged() const; -diff --git a/shell/panelconfigview.cpp b/shell/panelconfigview.cpp -index a331c0bb2..5637f3233 100644 ---- a/shell/panelconfigview.cpp -+++ b/shell/panelconfigview.cpp -@@ -289,6 +289,17 @@ PanelView::VisibilityMode PanelConfigView::visibilityMode() const - return m_panelView->visibilityMode(); - } - -+void PanelConfigView::setOpacityMode(PanelView::OpacityMode mode) -+{ -+ m_panelView->setOpacityMode(mode); -+ emit opacityModeChanged(); -+} -+ -+PanelView::OpacityMode PanelConfigView::opacityMode() const -+{ -+ return m_panelView->opacityMode(); -+} -+ - Plasma::FrameSvg::EnabledBorders PanelConfigView::enabledBorders() const - { - return m_enabledBorders; -diff --git a/shell/panelconfigview.h b/shell/panelconfigview.h -index 8e0abd314..db2af6bf9 100644 ---- a/shell/panelconfigview.h -+++ b/shell/panelconfigview.h -@@ -51,6 +51,7 @@ class PanelConfigView : public PlasmaQuick::ConfigView - { - Q_OBJECT - Q_PROPERTY(PanelView::VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged) -+ Q_PROPERTY(PanelView::OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged) - Q_PROPERTY(Plasma::FrameSvg::EnabledBorders enabledBorders READ enabledBorders NOTIFY enabledBordersChanged) - - public: -@@ -62,6 +63,9 @@ public: - PanelView::VisibilityMode visibilityMode() const; - void setVisibilityMode(PanelView::VisibilityMode mode); - -+ PanelView::OpacityMode opacityMode() const; -+ void setOpacityMode(PanelView::OpacityMode mode); -+ - Plasma::FrameSvg::EnabledBorders enabledBorders() const; - - protected: -@@ -84,6 +88,7 @@ private Q_SLOTS: - - Q_SIGNALS: - void visibilityModeChanged(); -+ void opacityModeChanged(); - void enabledBordersChanged(); - - private: -diff --git a/shell/panelview.cpp b/shell/panelview.cpp -index 4654a7a72..a699cc84c 100644 ---- a/shell/panelview.cpp -+++ b/shell/panelview.cpp -@@ -64,6 +64,7 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent - , m_alignment(Qt::AlignLeft) - , m_corona(corona) - , m_visibilityMode(NormalPanel) -+ , m_opacityMode(Adaptive) - , m_backgroundHints(Plasma::Types::StandardBackground) - , m_shellSurface(nullptr) - { -@@ -76,8 +77,10 @@ PanelView::PanelView(ShellCorona *corona, QScreen *targetScreen, QWindow *parent - setClearBeforeRendering(true); - setColor(QColor(Qt::transparent)); - setFlags(Qt::FramelessWindowHint | Qt::WindowDoesNotAcceptFocus); -+ updateAdaptiveOpacityEnabled(); - - connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateMask); -+ connect(&m_theme, &Plasma::Theme::themeChanged, this, &PanelView::updateAdaptiveOpacityEnabled); - connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateMask); - connect(this, &PanelView::backgroundHintsChanged, this, &PanelView::updateEnabledBorders); - // TODO: add finished/componentComplete signal to QuickViewSharedEngine, -@@ -405,6 +408,37 @@ PanelView::VisibilityMode PanelView::visibilityMode() const - return m_visibilityMode; - } - -+PanelView::OpacityMode PanelView::opacityMode() const -+{ -+ if (!m_theme.adaptiveTransparencyEnabled()) { -+ return PanelView::Translucent; -+ } -+ return m_opacityMode; -+} -+ -+bool PanelView::adaptiveOpacityEnabled() -+{ -+ return m_theme.adaptiveTransparencyEnabled(); -+} -+ -+void PanelView::setOpacityMode(PanelView::OpacityMode mode) -+{ -+ if (m_opacityMode != mode) { -+ m_opacityMode = mode; -+ if (config().isValid() && config().parent().isValid()) { -+ config().parent().writeEntry("panelOpacity", (int)mode); -+ m_corona->requestApplicationConfigSync(); -+ } -+ emit opacityModeChanged(); -+ } -+} -+ -+void PanelView::updateAdaptiveOpacityEnabled() -+{ -+ emit opacityModeChanged(); -+ emit adaptiveOpacityEnabledChanged(); -+} -+ - void PanelView::positionPanel() - { - if (!containment()) { -@@ -599,6 +633,7 @@ void PanelView::restore() - // the place for this config key is changed in Plasma 5.9 - // Do NOT use readConfigValueWithFallBack - setVisibilityMode((VisibilityMode)panelConfig.parent().readEntry<int>("panelVisibility", panelConfig.readEntry<int>("panelVisibility", (int)NormalPanel))); -+ setOpacityMode((OpacityMode)readConfigValueWithFallBack("panelOpacity", PanelView::OpacityMode::Adaptive)); - m_initCompleted = true; - resizePanel(); - positionPanel(); -diff --git a/shell/panelview.h b/shell/panelview.h -index 60e4d446e..c312d4907 100644 ---- a/shell/panelview.h -+++ b/shell/panelview.h -@@ -100,6 +100,18 @@ class PanelView : public PlasmaQuick::ContainmentView - */ - Q_PROPERTY(VisibilityMode visibilityMode READ visibilityMode WRITE setVisibilityMode NOTIFY visibilityModeChanged) - -+ /** -+ * Property that determines how a panel's opacity behaves. -+ * -+ * @see OpacityMode -+ */ -+ Q_PROPERTY(OpacityMode opacityMode READ opacityMode WRITE setOpacityMode NOTIFY opacityModeChanged) -+ -+ /** -+ /* Property that determines whether adaptive opacity is used. -+ */ -+ Q_PROPERTY(bool adaptiveOpacityEnabled READ adaptiveOpacityEnabled NOTIFY adaptiveOpacityEnabledChanged) -+ - public: - enum VisibilityMode { - NormalPanel = 0, /** default, always visible panel, the windowmanager reserves a places for it */ -@@ -109,6 +121,14 @@ public: - }; - Q_ENUM(VisibilityMode) - -+ /** Enumeration of possible opacity modes. */ -+ enum OpacityMode { -+ Adaptive = 0, /** The panel will change opacity depending on the presence of a maximized window */ -+ Opaque, /** The panel will always be opaque */ -+ Translucent /** The panel will always be translucent */ -+ }; -+ Q_ENUM(OpacityMode) -+ - explicit PanelView(ShellCorona *corona, QScreen *targetScreen = nullptr, QWindow *parent = nullptr); - ~PanelView() override; - -@@ -147,6 +167,11 @@ public: - VisibilityMode visibilityMode() const; - void setVisibilityMode(PanelView::VisibilityMode mode); - -+ PanelView::OpacityMode opacityMode() const; -+ bool adaptiveOpacityEnabled(); -+ void setOpacityMode(PanelView::OpacityMode mode); -+ void updateAdaptiveOpacityEnabled(); -+ - /** - * @returns the geometry of the panel given a distance - */ -@@ -185,6 +210,8 @@ Q_SIGNALS: - // QWindow does not have a property for screen. Adding this property requires re-implementing the signal - void screenToFollowChanged(QScreen *screen); - void visibilityModeChanged(); -+ void opacityModeChanged(); -+ void adaptiveOpacityEnabledChanged(); - - protected Q_SLOTS: - /** -@@ -235,6 +262,7 @@ private: - ShellCorona *m_corona; - QTimer m_strutsTimer; - VisibilityMode m_visibilityMode; -+ OpacityMode m_opacityMode; - Plasma::Theme m_theme; - QTimer m_positionPaneltimer; - QTimer m_unhideTimer; --- -GitLab - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch new file mode 100644 index 000000000000..27db136c2949 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.22.5-krunner-cwd-at-home.patch @@ -0,0 +1,30 @@ +Commit 7ca34e0baa7fa65efc929eee5b6b0c3d2104db8e already reverted one +change that caused the cwd of all apps spawned by krunner to +erroneously be set to the root dir. + +That regressions is back so it's more robust to fix in within krunner. + +Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> +--- + krunner/main.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/krunner/main.cpp b/krunner/main.cpp +index 4593687ca..fa4a62ac4 100644 +--- a/krunner/main.cpp ++++ b/krunner/main.cpp +@@ -12,6 +12,7 @@ + #include <QDBusConnection> + #include <QDBusMessage> + #include <QDebug> ++#include <QDir> + #include <QQuickWindow> + #include <QSessionManager> + #include <QUrl> +@@ -112,5 +113,6 @@ int main(int argc, char **argv) + } + }); + ++ QDir::setCurrent(QDir::homePath()); + return app.exec(); + } diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch new file mode 100644 index 000000000000..e605473e3546 --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.80-split-libkworkspace.patch @@ -0,0 +1,37 @@ +From 19bbdcf391ea51c4798c770e87c7eada24f252b8 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 21 Feb 2022 12:24:56 +0100 +Subject: [PATCH] libkworkspace: Allow standalone build + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3ec5f0893..b022a20b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -78,6 +78,7 @@ set_package_properties(Qalculate PROPERTIES DESCRIPTION "Qalculate Library" + ) + + find_package(KWinDBusInterface CONFIG REQUIRED) ++find_package(LibKWorkspace 5.21.5) + + find_package(KF5Screen CONFIG REQUIRED) + find_package(KScreenLocker 5.13.80 REQUIRED) +@@ -233,7 +234,10 @@ option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma + if(KF5DocTools_FOUND) + add_subdirectory(doc) + endif() +-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) + +-- +2.35.1 + diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index c5f5b9be610c..427c617b6684 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -1,16 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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="appstream">Enable AppStream software metadata support</flag> - <flag name="calculator">Enable calculator runner using <pkg>sci-libs/libqalculate</pkg></flag> <flag name="geolocation">Enables dataengine providing location information</flag> - <flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</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.20.5-r4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild deleted file mode 100644 index a56b5b45abb8..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.20.5-r4.ebuild +++ /dev/null @@ -1,209 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="appstream +calendar +fontconfig geolocation gps qalculate screencast +semantic-desktop systemd telemetry" - -REQUIRED_USE="gps? ( geolocation )" -RESTRICT+=" test" - -BDEPEND="virtual/pkgconfig" -COMMON_DEPEND=" - >=dev-libs/wayland-1.15 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5=[jpeg] - >=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/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/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/kidletime-${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/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/libkscreen-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - 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? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/xcb-util-image - ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - qalculate? ( sci-libs/libqalculate:= ) - screencast? ( - >=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.1.1 - >=dev-qt/qtconcurrent-${QTMIN}:5 - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) -" -RDEPEND="${COMMON_DEPEND} - app-text/iso-codes - >=dev-qt/qdbus-${QTMIN}:5 - >=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-19.04.3:5 - >=kde-frameworks/kdesu-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/ksysguard-${PVCUT}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !<kde-plasma/plasma-desktop-5.19.80:5 -" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" - "${FILESDIR}/${P}-avoid-render-invisible-contents.patch" # KDE-Bug 347772 - "${FILESDIR}/${P}-fix-wake-screensaver-mode-w-keypress.patch" # KDE-Bug 431286 - "${FILESDIR}/${P}-fix-crash-on-screen-changes.patch" # KDE-Bug 425711 - "${FILESDIR}/${P}-fix-digitalclock-agenda-view.patch" # KDE-Bug 431433 - "${FILESDIR}/${P}-wayland-fix-XKB-variable-setup.patch" - "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478 -) - -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 -} - -src_configure() { - local mycmakeargs=( - -DBUILD_xembed-sni-proxy=OFF - $(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 qalculate Qalculate) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) - - 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 - - # Clean up pre-5.17.4 dirs - rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null - - 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.21.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.ebuild index 35b280c763ac..19bf008b5923 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.21.5.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.ebuild @@ -1,43 +1,45 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="optional" ECM_TEST="forceoptional" -KFMIN=5.82.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="KDE Plasma workspace" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" -IUSE="appstream +calculator +calendar +fontconfig geolocation gps screencast -+semantic-desktop systemd telemetry" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="appstream +calendar +fontconfig geolocation gps +policykit +screencast +semantic-desktop telemetry +wallpaper-metadata" REQUIRED_USE="gps? ( geolocation )" -RESTRICT+=" test" +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] - >=dev-qt/qtgui-${QTMIN}:5=[jpeg] + >=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/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/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -46,7 +48,6 @@ COMMON_DEPEND=" >=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 @@ -60,26 +61,32 @@ 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 >=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/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 x11-libs/libSM @@ -91,100 +98,117 @@ COMMON_DEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calculator? ( sci-libs/libqalculate:= ) + appstream? ( <dev-libs/appstream-1[qt5] ) calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) fontconfig? ( + >=dev-qt/qtprintsupport-${QTMIN}:5 media-libs/fontconfig - media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) gps? ( sci-geosciences/gpsd ) + 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.1.1 + >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/wayland-protocols-1.31 >=dev-qt/qtconcurrent-${QTMIN}:5 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) " 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}:5 + >=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-19.04.3:5 - >=kde-frameworks/kdesu-${KFMIN}:5 + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/ksysguard-${PVCUT}:5 + >=kde-plasma/kactivitymanagerd-${PVCUT}: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 - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !<kde-plasma/plasma-desktop-5.19.80:5 + policykit? ( sys-apps/accountsservice ) " -BDEPEND="virtual/pkgconfig" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 +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}:*" PATCHES=( - "${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch" - "${FILESDIR}/${P}-revert-activate-krunner.patch" # bug 767478 - "${FILESDIR}/${P}-transparency.patch" # KDE-bug 434202 - "${FILESDIR}/${P}-transparency-panelConfig.patch" # KDE-bug 434285 - "${FILESDIR}/${P}-dangerous-shortcuts.patch" # KDE-bug 435954 + "${FILESDIR}/${PN}-5.24.80-split-libkworkspace.patch" # downstream + "${FILESDIR}/${PN}-5.22.5-krunner-cwd-at-home.patch" # TODO upstream: KDE-bug 432975, bug 767478 ) src_prepare() { - rm po/ta/kcm_autostart.po || die # spurious file - 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 + 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 - # KDE-bug: 433730 - use calculator || - cmake_run_in runners cmake_comment_add_subdirectory calculator + # 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 } src_configure() { local mycmakeargs=( -DBUILD_xembed-sni-proxy=OFF + -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) ) - use geolocation && mycmakeargs+=( $(cmake_use_find_package gps libgps) ) - ecm_src_configure } @@ -203,9 +227,6 @@ src_install() { pkg_postinst () { ecm_pkg_postinst - # Clean up pre-5.17.4 dirs - rmdir -v "${EROOT}"/etc/plasma{/startup,/shutdown,} 2> /dev/null - 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-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 a044398039d8..d65a5f5dc9c9 100644 --- a/kde-plasma/plymouth-kcm/Manifest +++ b/kde-plasma/plymouth-kcm/Manifest @@ -1,2 +1,2 @@ -DIST plymouth-kcm-5.20.5.tar.xz 43024 BLAKE2B d7a2a6a347484f27d73ade549da7cd338ca23f2e69543c8f2724222e3585fe0f49067ea94c1a70e8fdead16634e408fbf742aa798c5b594e0040b96eb54263ad SHA512 a150c77aad5cc663dd8f2d718ddf06472563782ff5d831bc3ade5b790cb8eb4a15890181c7587e5c74d73db0b2f05185b705ff1288c43b3940461aecc87b5e78 -DIST plymouth-kcm-5.21.5.tar.xz 43356 BLAKE2B 46130ebb6ce4a9522546d87f7f42d65cf41f1eb9dfc5a454732a55d8cf0b6b73bf5f2a9286f05aa21bce73218c10499de7953fe06f3ecbd369071fd9a70e2b0c SHA512 d8b8187ecce7bfdd2a3c22dec9b4ea2b085614a7e3b495671226bb9c5fe0a674d75ea03c74bfc3cc58f0ae3a7fc82ec2261d1ace5483658fd65333f61f95ba07 +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 2fdbf33d963d..485b99be0e32 100644 --- a/kde-plasma/plymouth-kcm/metadata.xml +++ b/kde-plasma/plymouth-kcm/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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_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.21.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild deleted file mode 100644 index bf306e6bc990..000000000000 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.21.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -BOGUS=1 -KFMIN=5.82.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 -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.11.ebuild index 7fe46dfc20fe..7c9c3c65222a 100644 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.20.5.ebuild +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -BOGUS=1 -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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=" @@ -34,7 +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}:* " - -DOCS=( CONTRIBUTORS ) +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 c1903dd2be09..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.20.5.tar.xz 44792 BLAKE2B 41adcf417e8ce207b3f2a28f8c5a9b2e7c4da155290c55742529101319cf8ead12de22d59b4fe8bf7e67b6e6b48fc7b8afbf9655d58903d5fed3447e85bf7d2e SHA512 fcc06391ec8d8bb8a01d86ef1f8bdc45cb0ee5fef23429b5488a62497036ac6001a928d1920e92306b3ec77669ea73ab2f1071652cde12786e497fa48adf8328 -DIST polkit-kde-agent-1-5.21.5.tar.xz 45848 BLAKE2B 1776b97fc4ea6a5d4ff13b90b054379997226ea3726c94ff886ba719f5445c8548d0680c3634b7ecd3f6cc2e9e1d2416e8ec58e8b822e465cbbc0c2e719053c5 SHA512 840e63d962054e6be2204f0ca5142249338050a1d3df3db66667275ae3fb1930bd3d9f4ea37b85feee73b33822c8b34015028b981d7a100afeaab793f1525ea9 +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/metadata.xml b/kde-plasma/polkit-kde-agent/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/polkit-kde-agent/metadata.xml +++ b/kde-plasma/polkit-kde-agent/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild deleted file mode 100644 index 4d7c33a4a505..000000000000 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.21.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_ORG_NAME="${PN}-1" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~ppc64 ~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.20.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.11.ebuild index 1026cdfd32b4..9a3e74aae971 100644 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.20.5.ebuild +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 KDE_ORG_NAME="${PN}-1" -KFMIN=5.74.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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 9beef6165f57..ba7e41b69f4b 100644 --- a/kde-plasma/powerdevil/Manifest +++ b/kde-plasma/powerdevil/Manifest @@ -1,2 +1,2 @@ -DIST powerdevil-5.20.5.tar.xz 610300 BLAKE2B 9d392db560a7685a3cef29bf61ae553a8bc8e3d6e30e22ccc5316117d78d7087c35060e777912962ff421cb0f23481fa558cda59237254c7ce201da97031d89c SHA512 c862314d5ad446fb48c08f3e6cbcc72bad0f1825756954ae0d2bd1ceac55e3324124698d3d0803103ff35561bf4fcddaa00831b7b4cb93763d17876a348a3c6f -DIST powerdevil-5.21.5.tar.xz 617468 BLAKE2B a67f409ea8e5a6c3353deb749db65f64bbf4e40d8ea84b6d8df6385e62bc1fce34552bfcc7dbe63f19161af59098173c0ad1854d3ab8ff30457e6b44985b2af2 SHA512 0d6b9cbd5cbf5cf3d34e3053f352d86586ed3672ddfae068531b899827d65b9e42c5ec0013f684deca501528590ec5074371fa7699aae4d6a20b120e319b625c +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 d57aa5b34097..a24d6661f302 100644 --- a/kde-plasma/powerdevil/metadata.xml +++ b/kde-plasma/powerdevil/metadata.xml @@ -1,12 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/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.20.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild deleted file mode 100644 index 052d374512d5..000000000000 --- a/kde-plasma/powerdevil/powerdevil-5.20.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 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/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.21.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.27.11.ebuild index 4541c8b19d68..3adfa345818f 100644 --- a/kde-plasma/powerdevil/powerdevil-5.21.5.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.82.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 ~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 @@ -34,18 +33,19 @@ DEPEND=" >=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 + >=kde-plasma/plasma-activities-${KFMIN}:5 virtual/libudev:= x11-libs/libxcb - brightness-control? ( app-misc/ddcutil ) + brightness-control? ( app-misc/ddcutil:= ) caps? ( sys-libs/libcap ) wireless? ( >=kde-frameworks/bluez-qt-${KFMIN}:5 @@ -53,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 97690b2b85f7..6c82e19f0d47 100644 --- a/kde-plasma/sddm-kcm/Manifest +++ b/kde-plasma/sddm-kcm/Manifest @@ -1,2 +1,2 @@ -DIST sddm-kcm-5.20.5.tar.xz 64796 BLAKE2B dc2365a08f64ebf0709ceda56599e7a183c0fd2c7ba33a05efb5132438c2e92c9c8b7d5e775c305e5739d04e633dd15119939e352e5842572d06930d7ffe9ec3 SHA512 96511d979046bd97da1513be559312f851e63b3e319ee2f78ac83b275cf748e30ded430d3f6b9736da21e7710802dfed31ae23187888d367537e3642aed1769f -DIST sddm-kcm-5.21.5.tar.xz 64672 BLAKE2B 4c8f3059a4d6fb57f517eb17008bf923c91ee8cd18385b117666ca294b5ebb912280281e7be624d9be803272a644ed4dd01ff3e8b6e358c9248d7daa0cee3f98 SHA512 fc2fdaf67c144cccc8d2f68cc20e50027c1a083d6b33d37e8c8e7fa703b2904c11b63fc9acca63422688013346f565c77a1f02721c7f8dfcaf52bc97c7b07dbb +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 2fdbf33d963d..ef73ee478dde 100644 --- a/kde-plasma/sddm-kcm/metadata.xml +++ b/kde-plasma/sddm-kcm/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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/sddm-kcm</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild deleted file mode 100644 index a9ac0a53cc13..000000000000 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.20.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 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/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - x11-misc/sddm -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.27.11.ebuild index bfb383decbbd..d430bade52bb 100644 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.21.5.ebuild +++ b/kde-plasma/sddm-kcm/sddm-kcm-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -KFMIN=5.82.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 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -26,17 +26,20 @@ DEPEND=" >=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/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 616f9c095b56..0081caf51e75 100644 --- a/kde-plasma/systemsettings/Manifest +++ b/kde-plasma/systemsettings/Manifest @@ -1,2 +1,2 @@ -DIST systemsettings-5.20.5.tar.xz 193844 BLAKE2B ec81542b9bc06931eff60204f87e2d6aec8de57f97d57d4e057a8805bb4c1b02278c9fb12a9545bdb632d0896a6ec30833ef024e5b4232fe41baafce5af517dd SHA512 c68669f5a5d08ce52a9b0034d319f691a9419cb035ecd04895313e7c853cf6c01e72c8ee1fa15f92f7f22a9734d45b2373d9a4807d576783dfd7f5b5de14c994 -DIST systemsettings-5.21.5.tar.xz 199680 BLAKE2B a37300b6f3b53f5c62ffa5ff06581f1988720e87bbcb64f5c8048cdb99834b5aa37528c80615a07f8dc8f1e2bb246543479777e5c2b2c5499b1187ffca041b45 SHA512 fac4f4081583079b20c4935e694ef05908d0ef62938e4560cdf9a3119234fa3d0c13f973854b83535fde3594e713b0bfdbfbc0db36994a9a507c4063b714a410 +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/metadata.xml b/kde-plasma/systemsettings/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/systemsettings/metadata.xml +++ b/kde-plasma/systemsettings/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild deleted file mode 100644 index 0db6d4e59dad..000000000000 --- a/kde-plasma/systemsettings/systemsettings-5.21.5.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.82.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 ~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/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kpackage-${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 - >=kde-frameworks/kirigami-${KFMIN}:5 -" - -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.20.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.27.11.ebuild index 63b5eaf0ceaf..4dd8d8440f8c 100644 --- a/kde-plasma/systemsettings/systemsettings-5.20.5.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -ECM_HANDBOOK="forceoptional" -KFMIN=5.74.0 +ECM_HANDBOOK="optional" +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 ~ppc64 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 @@ -31,23 +29,25 @@ DEPEND=" >=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 + >=kde-plasma/plasma-activities-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 " pkg_postinst() { 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 e18990325db4..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.20.5.tar.xz 81876 BLAKE2B 9a0a8052a7a7d9d0200723440176bef37ae6e29417ccea67b222096f0b65e3c371ad83071d93ab05ec6d7de377383e61c126da3775f31189ff1bdd3c4a947933 SHA512 618abd6182e561664b10bd751792622dd88f05932c88505e141ee143e475b228727d2daa509bf113906a97ffc507cbd11f51e15b729f2e55210d9c0000f742a1 -DIST xdg-desktop-portal-kde-5.21.5.tar.xz 82860 BLAKE2B 583dd6f5360282d3b86d73b65ab5ddd136b5f251ad3b41a977248c44f99ab7c407868a8238307184d3206b35c987adaaa8aa15df5abb2a8ecf2aa31b4591e6a6 SHA512 98fe44d4a00cb16f3e3ebd30b184e836dd77efafbca7625b555852b0dcd45c4ecf71ab5d93659e3d508f2b3b42696422516a08e2ae759bbe916fa5f9fef6010e +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/metadata.xml b/kde-plasma/xdg-desktop-portal-kde/metadata.xml index 2fdbf33d963d..d925f2439758 100644 --- a/kde-plasma/xdg-desktop-portal-kde/metadata.xml +++ b/kde-plasma/xdg-desktop-portal-kde/metadata.xml @@ -1,8 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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> </pkgmetadata> diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild deleted file mode 100644 index 826ade43e358..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.20.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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/qtwayland-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${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/plasma-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal -" diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild deleted file mode 100644 index 8f474386d973..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.21.5.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KFMIN=5.82.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 ~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/qtwayland-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${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/plasma-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal -" diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.ebuild new file mode 100644 index 000000000000..d7ba7d0d90b5 --- /dev/null +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.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=5.106.0 +PVCUT=$(ver_cut 1-3) +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" +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[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[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-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 + 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 c8d821785a7b..156526552da7 100644 --- a/kde-plasma/xembed-sni-proxy/Manifest +++ b/kde-plasma/xembed-sni-proxy/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.20.5.tar.xz 9041964 BLAKE2B b0bef6f74999d503064d55fdc670bd320a141c4619c0cfb7491158485096dfd636ad31dfbb4e9d7be3d86eca7b52bce97acb7aefe57377cce9e6a5ce1ad3cb9b SHA512 bd63502fdaa79deb380d254a3649a2810e4b2c6e748e9a38606f561cc46573a6e75631584a340a220742135f4682f9deea28c78b7fe4ad88ee6491f190b3212f -DIST plasma-workspace-5.21.5.tar.xz 9724000 BLAKE2B 2688c8aacd4e5584bb2660a287563aa683af4d469aad45f3521d31ec569d403204cceeb167062a9d8dfe591972db3758d5f46c21ca7c30453cd6740f3e3b470a SHA512 6918c1a29e977ac7f3ebf6ac7308f20f20712db96bf10599f3372987509630aa2ca8bc6adf0b1af4e543ccd2a2001e38ce02d759d25f09588c7c1aaa358af1b4 +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.14.90-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch deleted file mode 100644 index 8fb3c1709042..000000000000 --- a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.14.90-standalone.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 42008129f1659bc34c454ce14632fd279679f556 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Mon, 22 Oct 2018 21:44:33 +0200 -Subject: [PATCH] xembed-sni-proxy: Allow standalone build - ---- - CMakeLists.txt | 35 +++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c2f67ac6..30b2c1b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,34 @@ -+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.11.0") -+ set(KF5_MIN_VERSION "5.54.0") -+ 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) -+ -+ 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.14.90") -+ set(PROJECT_VERSION_MAJOR 5) -+endif() -+ - add_definitions(-DQT_NO_CAST_TO_ASCII - -DQT_NO_CAST_FROM_ASCII - -DQT_NO_URL_CAST_FROM_STRING -@@ -64,3 +95,7 @@ target_link_libraries(xembedsniproxy - install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) - install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) - -+if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") -+ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) -+endif() -+ --- -2.19.1 - 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.24.80-standalone.patch index a1f09aa93c4a..f6e8413e3763 100644 --- 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.24.80-standalone.patch @@ -1,16 +1,16 @@ -From da1c5074e390b2ceca3f632f14adfba55def45ab Mon Sep 17 00:00:00 2001 +From a381c7441140e77208c0ed3a8dd45cb61197afd9 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 +++++++++++++++++++++++++++++++++ + xembed-sni-proxy/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 +diff --git a/xembed-sni-proxy/CMakeLists.txt b/xembed-sni-proxy/CMakeLists.txt +index bcc583bfa..41d50d112 100644 +--- a/xembed-sni-proxy/CMakeLists.txt ++++ b/xembed-sni-proxy/CMakeLists.txt @@ -1,3 +1,35 @@ +project(xembed-sni-proxy) + @@ -18,10 +18,10 @@ index 443ff07c1..ba15b9ea5 100644 + set(PROJECT_VERSION "GENTOO_PV") + set(PROJECT_VERSION_MAJOR 5) + -+ cmake_minimum_required(VERSION 3.0) ++ cmake_minimum_required(VERSION 3.16) + + set(QT_MIN_VERSION "5.15.0") -+ set(KF5_MIN_VERSION "5.74") ++ set(KF5_MIN_VERSION "5.89") + 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}) @@ -40,21 +40,21 @@ index 443ff07c1..ba15b9ea5 100644 + + configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h) +else() -+ set(PROJECT_VERSION "5.20.80") ++ set(PROJECT_VERSION "5.24.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}) + -DQT_NO_CAST_FROM_BYTEARRAY) +@@ -64,3 +96,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}) + ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) + +if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}") + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +endif() -- -2.28.0 +2.34.1 diff --git a/kde-plasma/xembed-sni-proxy/metadata.xml b/kde-plasma/xembed-sni-proxy/metadata.xml index 2fdbf33d963d..7a4a42fc5fa8 100644 --- a/kde-plasma/xembed-sni-proxy/metadata.xml +++ b/kde-plasma/xembed-sni-proxy/metadata.xml @@ -1,8 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!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-workspace</remote-id> + </upstream> </pkgmetadata> diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild deleted file mode 100644 index 4c36c2b98841..000000000000 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.20.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.74.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.1 -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 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.14.90-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.21.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.11.ebuild index 7049a2e9643a..18465c657337 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.21.5.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.11.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 KDE_ORG_NAME="plasma-workspace" -KFMIN=5.82.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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" +CMAKE_USE_DIR="${S}/${PN}" LICENSE="GPL-2" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~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 @@ -30,14 +29,13 @@ DEPEND=" RDEPEND="${DEPEND} !kde-plasma/xembed-sni-proxy:0 " +BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0" -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.24.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" + -i ${PN}/CMakeLists.txt || die "Failed to prepare CMakeLists.txt" } |