diff options
Diffstat (limited to 'kde-plasma')
330 files changed, 5223 insertions, 5466 deletions
diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index f9382b305060..7d2f19156d4f 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,2 +1,2 @@ -DIST bluedevil-5.24.4.tar.xz 173188 BLAKE2B 5a576132bdc2b96960bb5e374f84cf0e4653f8b1973147ebf31a432d4a0246ef0e4038ee4de3b0c4bc37e06946e094fd6452d1c8f35ea7fb7ec91877572770ef SHA512 90501c9b71a2a509275d105b3d29b397c9845ce6c66239168f38fb54e89909744210243cab41ac24dcdb38e5988429b94622bf05715537edcd011508b6bf5957 -DIST bluedevil-5.24.5.tar.xz 173184 BLAKE2B dfd62b0b9310be5e3389fc0059a1c2c3b5e62fe15f50c4b6bd0515cd36b697e63995f0cdfc0682f785dd42f9a6c23b453cc115a07bd2a96ad56d24d03fabd8ba SHA512 02b24ba96169d733166ac6b906d995414bcf31b4a459d695ec018e7120b6e69ba01ec0f8bfa6e73d1fc8c965fc6fc285bbcefaea86a9dc230cd6a0247e566757 +DIST bluedevil-5.27.11.tar.xz 366752 BLAKE2B 707c44f6cc918d80b9a93619b4fc47c8d3c7caf6436dfa34a1a336c3c7e4bf8c9b9409a7f07c56c55463301bac62c0c9a9d512ed74e52c0087fc530dbf7206cb SHA512 8eefad775088347456fc3a4ee04e13f83678867cde2076ade6905355a5c2847d7a177d449ba909c627be791584e16e6e0e8c13c2e46b42eb18dd9547a4d0deee +DIST bluedevil-6.0.5.1.tar.xz 369344 BLAKE2B d9d112a755e1869cae218ad68faddbdb4830125cf11d67858a21b2399056b1b6c15cecf21914935d64afc4455da1c306e83c63f7c4ba46fa8e80741d12f351b2 SHA512 9aab7e0ec355d2db8812fd8483f137a8f4c64444b0102222eeb9b40f7047a8ba7211e3cec0839c33150db83254ba2ab7814ccc2ba51574464a9439d36bcb4318 diff --git a/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild deleted file mode 100644 index 0f52e59f206e..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.24.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/bluez-qt-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild b/kde-plasma/bluedevil/bluedevil-5.27.11.ebuild index b556abdcbb05..121ed5165402 100644 --- a/kde-plasma/bluedevil/bluedevil-5.24.4.ebuild +++ b/kde-plasma/bluedevil/bluedevil-5.27.11.ebuild @@ -1,21 +1,23 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +ECM_HANDBOOK="forceoptional" +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Bluetooth stack for KDE Plasma" HOMEPAGE="https://invent.kde.org/plasma/bluedevil" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -23,19 +25,20 @@ DEPEND=" >=dev-qt/qtwidgets-${QTMIN}:5 >=kde-frameworks/bluez-qt-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=kde-plasma/libplasma-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/bluedevil/bluedevil-6.0.5.1.ebuild b/kde-plasma/bluedevil/bluedevil-6.0.5.1.ebuild new file mode 100644 index 000000000000..07560c681986 --- /dev/null +++ b/kde-plasma/bluedevil/bluedevil-6.0.5.1.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Bluetooth stack for KDE Plasma" +HOMEPAGE="https://invent.kde.org/plasma/bluedevil" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/bluez-qt-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-plasma/libplasma-${PVCUT}:6 +" +RDEPEND="${DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/bluedevil/metadata.xml b/kde-plasma/bluedevil/metadata.xml index d925f2439758..d51eb6c02db7 100644 --- a/kde-plasma/bluedevil/metadata.xml +++ b/kde-plasma/bluedevil/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/bluedevil</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest index 2adcb658cf49..97df0e2bfc4a 100644 --- a/kde-plasma/breeze-grub/Manifest +++ b/kde-plasma/breeze-grub/Manifest @@ -1,2 +1,2 @@ -DIST breeze-grub-5.24.4.tar.xz 3143308 BLAKE2B 522acf1644e325b9bb965dabaa49a257b7eff12351a483dc9acff4f7565f0f6d8fb9ea2b808aa869a54422161c8abacd9e3d38531c87c622a4ee0a29ddace3b7 SHA512 0275e69f046ac61c1b159cc4f4eb78a605fffa9be809fd3b9752fa928906e94ff7af085a1ed917b2973ac626c260c2f3528b17afb2cd07171a650089bad26425 -DIST breeze-grub-5.24.5.tar.xz 3144676 BLAKE2B 078525e002b90569ed8cba208a11ed5392898851f8fade092ababe3ec59ac950751f084dc5f251385d1f5c5f64513343013d63bcd9bd41d32238eb309f74947b SHA512 5ffba2c633f0442c6bb109df6f6ce73d527788c93487818f4c93f6140935eaeae76b7d1efb00d570a766054e2aac5bfea17f6ae7439b04c9dc0f6d8e02d10355 +DIST breeze-grub-5.27.11.tar.xz 3145680 BLAKE2B 0143cefba69d45aacca005567b9f94b4e4abda728d0c2e8ec35543bd5ca5b007a78b4781a87f19417c7db339e3ecb05be8f80a3815b60c410de4dd27c0bd6ca0 SHA512 36f2c36d7d013ecdbf1ff80d6270e42ac06ab8fbcc12ba27d604657346b92f43661723e1ddfb6a3df7d76b3195f6808b8cce0bb8481783de5a46f6ab84442ff6 +DIST breeze-grub-6.0.5.tar.xz 1460956 BLAKE2B f84237388483bc8d89d5c4824fa4479d01a6f59b3ce59c3f32aca9ff47b9c40d3b8641babfe35e93e78090895c54939c9ce34a38762bfdc0eb7304bb04728b69 SHA512 bc88f78204083f244ea38960beefef229f8d7473707f8280f10bb65a95d7f83b2d008baec0c350fd975ea83bd6a1b8429e12a636126dd75d4b1d0a117f9dd2a5 diff --git a/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.27.11.ebuild index af842b702646..7f8634d3db86 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.24.5.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-5.27.11.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit kde.org +inherit plasma.kde.org DESCRIPTION="Breeze theme for GRUB" LICENSE="GPL-3+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" src_prepare() { default; } diff --git a/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.0.5.ebuild index 7551a15b6314..ca7bec05c14a 100644 --- a/kde-plasma/breeze-grub/breeze-grub-5.24.4.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-6.0.5.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit kde.org +inherit plasma.kde.org DESCRIPTION="Breeze theme for GRUB" LICENSE="GPL-3+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" src_prepare() { default; } diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest index 8484606f6991..99df3bc97188 100644 --- a/kde-plasma/breeze-gtk/Manifest +++ b/kde-plasma/breeze-gtk/Manifest @@ -1,2 +1,2 @@ -DIST breeze-gtk-5.24.4.tar.xz 43796 BLAKE2B 2aa910eecd6030d10dbfa91cd8011386512fe7afb491aedd289acf2b69f5a4c6af4feb236e9ca92a51c4f90d705b470bbae299776bc5a9bef910512d548a27e7 SHA512 f131efd7405cbfbf8e577bd2fa9f499963809f9a4fce003add737523b758e062f4735ce8969a60c1641d97445a141d05bfe03dd7785106c372bbc78ebf6c1602 -DIST breeze-gtk-5.24.5.tar.xz 43816 BLAKE2B ef24e2f3116dc21e8877cbe5d08f727c546c18f94b1b0ab91c789fd421884b2a02c6f2c24b48efee2ba4e8d65458e0e351ce9faa5192aae1af25e7b5a828aad3 SHA512 6bf656a94a1c4f708ad83c9d2c23b15d29387975558494502613df07dbd298580b372a83dd16c1077d8c91057c92d74b47f279e1f92eb53fa9c8783fe98c3c29 +DIST breeze-gtk-5.27.11.tar.xz 40688 BLAKE2B 0843870e93b21f890ef12c16e1ba25b02ba26774588a22a6fc77d1f6205769992ed30001cd2ffbfa85890581077f009b8bcaa02d00cb0bc5f1d9686a65f7dd89 SHA512 0d9f86142342d124cb31151695038c8cb03b5c7c16f21443e0e1613ec184c37ed7eebc46fadd74f6c553a1081d60846d53072e979e39ba455ca517825eaab846 +DIST breeze-gtk-6.0.5.tar.xz 40680 BLAKE2B bc8f0baf359cef24629f24ef4dc724971ea492707c3a9d5484daa9082e0989605348b84f4f8d9169a308d64bbbcfcc10192fc20ae92d23ddd83fa886edade719 SHA512 36f3c4b6ad2cd6d45f5b9c6eb6b854c62177cb869b3ee7865c3e525fdeae150167fdd24726f24b2b370073090a3b7ebb4d7ed121c33b1adfdf33d8fc467670ef diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.27.11.ebuild index db378cc0e98b..02da519e93f2 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.24.4.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -PYTHON_COMPAT=( python3_{8..10} ) -inherit ecm kde.org python-any-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit ecm plasma.kde.org python-any-r1 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style" HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk" LICENSE="LGPL-2.1+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" BDEPEND="${PYTHON_DEPS} @@ -22,17 +22,10 @@ BDEPEND="${PYTHON_DEPS} " python_check_deps() { - has_version "dev-python/pycairo[${PYTHON_USEDEP}]" + python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]" } pkg_setup() { python-any-r1_pkg_setup ecm_pkg_setup } - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.0.5.ebuild index 325c2a0fc59f..3864c459aa31 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.24.5.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-6.0.5.ebuild @@ -1,38 +1,32 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -PYTHON_COMPAT=( python3_{8..10} ) -inherit ecm kde.org python-any-r1 +PYTHON_COMPAT=( python3_{10..12} ) +inherit ecm plasma.kde.org python-any-r1 DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style" HOMEPAGE="https://invent.kde.org/plasma/breeze-gtk" LICENSE="LGPL-2.1+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" BDEPEND="${PYTHON_DEPS} dev-lang/sassc $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/breeze-${PVCUT}:6 " python_check_deps() { - has_version "dev-python/pycairo[${PYTHON_USEDEP}]" + python_has_version "dev-python/pycairo[${PYTHON_USEDEP}]" } pkg_setup() { python-any-r1_pkg_setup ecm_pkg_setup } - -src_configure() { - local mycmakeargs=( - -DPython3_EXECUTABLE="${PYTHON}" - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze-gtk/metadata.xml b/kde-plasma/breeze-gtk/metadata.xml index d925f2439758..543f816c463e 100644 --- a/kde-plasma/breeze-gtk/metadata.xml +++ b/kde-plasma/breeze-gtk/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/breeze-gtk</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest index adf2face6e3f..b045b2c541d5 100644 --- a/kde-plasma/breeze-plymouth/Manifest +++ b/kde-plasma/breeze-plymouth/Manifest @@ -1,2 +1,2 @@ -DIST breeze-plymouth-5.24.4.tar.xz 110792 BLAKE2B 4a8e7f9328e20a0c5d0fe182be0af32ee009ed8210c50adff7e8ff25956dc17309e92c9d3ac64a6b2b79826bd00f74a30d6d49a68bf88d6744db6894e9220592 SHA512 b5cb5b845a28c3bb2eb39df5896f95fe46f280cd7d736bba11cebe52c43f77f989e96200d7cb861d57067ec908da34126d44b6f1847507135a1190812fb14436 -DIST breeze-plymouth-5.24.5.tar.xz 110824 BLAKE2B 76642ca51c025aada9062287a75ca07f5d5a50678cb62ae8188d78d7dbc0654e3d9028b977af4a514702e55546c66f68ed44d5c223154d94ad8f4854ee491d16 SHA512 d34813e6d039228c98bf8c4203ed33c84fac65d4204f08dc04eb93811d2602b2721cb2f60144f9f1aa8e91f4f5d18fa55f6ba8077e124be742cf13e29a54532f +DIST breeze-plymouth-5.27.11.tar.xz 111328 BLAKE2B 19fe9b59d0b5816f2dde0366cc4b1c364892624949eba38ca518a1ad7733ac13cb27af4d816b8a7510f174ac68854a3adb82c406c064c670db18cce2478bb54d SHA512 fcd681089d1f78aa96546d3e9ed0a03ed091646f2874d4b6152bdd4056946a3a566a35c2aa01ec16bb593b87bf3d7677ebd6689bf76c6f0686db2a08bf7fdfef +DIST breeze-plymouth-6.0.5.tar.xz 111244 BLAKE2B 3f4caeb0e5109dfea41726a4bcd969015e4fea5e6d906d58471b9dc7c670a761999db9b0706382e5e3522df043c39b7562530c83fe29b39d3d4a1f6dde7a6842 SHA512 3fcdd12400b85c5342affbd6916f6297c23d660cd67640d0f90266ca511e2681ccf19ab280de33da40fee0e2389bd2bfbc27d0009da1aa0de151689199e10bb0 diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.11.ebuild index 9f8cb32ddecb..9e6449db1996 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.5.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.102.0 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +inherit cmake plasma.kde.org DESCRIPTION="Breeze theme for Plymouth" LICENSE="GPL-2+ GPL-3+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86" IUSE="" -BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5" +BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0" DEPEND="sys-boot/plymouth" RDEPEND="${DEPEND}" diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.0.5.ebuild index 188483457ed0..778c8c15c318 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.24.4.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.0.5.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +inherit cmake plasma.kde.org DESCRIPTION="Breeze theme for Plymouth" LICENSE="GPL-2+ GPL-3+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" -BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:5" +BDEPEND=">=kde-frameworks/extra-cmake-modules-${KFMIN}:0" DEPEND="sys-boot/plymouth" RDEPEND="${DEPEND}" diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index 9163eae66b0a..85b8a4d31397 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,2 +1,2 @@ -DIST breeze-5.24.4.tar.xz 43037332 BLAKE2B 2ce9d430291610f58aec732b7dcf8dc36c591a17ba0481f891faf18c7b2b2bbe3dbc0ba0a519a25c7b083de75d899bbab95886fed3b3b3c51ad8b300f1caffbd SHA512 476d01b61696bc0886c172b883df382ca9cd9128b81fadbcf3135e0f2e70789faa96a536a998267074f31e9145b4b2de4c62e47e8752b352f2702e797023e6ce -DIST breeze-5.24.5.tar.xz 43037308 BLAKE2B 68fce5bac9abc097a1c91db68fa97a2215ea4e43d91e5ac9e86f803c64229f2d9e96c318417450acea0ef79316c0f2596d6bc9c0cd5513aa3249a616bc3f8007 SHA512 25e5744589130f7d339c727e17e662a28bdecc3f0598b9683735ccdfd2dcdeada46a49baa5564a7cf7d59a3f6ac34802ae2172857e704941d64cf879b3583df0 +DIST breeze-5.27.11.tar.xz 87586968 BLAKE2B de90aa5203e6252c2e5400daf46f187d522319888f1c44006eeaaa4f57e87de97911511a9448fb286218b64b0526546ca341868c05f83f135bbe85ca9910ea1c SHA512 71d0b7421c7fa80e67410777fc37aa5ac0f51e74d593baa5ebd38e7f0313986974a1eb606e26c1b335b9ceb4b95717f43d6a45a25dd8de705d49d5a3f74e2bd6 +DIST breeze-6.0.5.tar.xz 58033068 BLAKE2B 05ced18e08f228310f5f6b32dc1b33c29ccce7fcc548da4f738e7fc43040fad0afc6464a692704c2cdf7f897023d944f0cfd039a6c9134382ceac9e31c9e2f1c SHA512 3c7a79431aa918f891da8a59ef9f11b024425d4bfaa48e92730117f9d0b0ae85750456f13def90dc0c1a949cded674bff91d822028f54449aca49a9e19444ecd diff --git a/kde-plasma/breeze/breeze-5.24.5.ebuild b/kde-plasma/breeze/breeze-5.24.5.ebuild deleted file mode 100644 index 85267450136c..000000000000 --- a/kde-plasma/breeze/breeze-5.24.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.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 ~riscv ~x86" -IUSE="X" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - X? ( x11-libs/libxcb ) -" -DEPEND="${RDEPEND}" -PDEPEND=" - >=kde-frameworks/breeze-icons-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X XCB) - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze/breeze-5.24.4.ebuild b/kde-plasma/breeze/breeze-5.27.11.ebuild index 3d50e72e704a..3740421bc973 100644 --- a/kde-plasma/breeze/breeze-5.24.4.ebuild +++ b/kde-plasma/breeze/breeze-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Breeze visual style for the Plasma desktop" HOMEPAGE="https://invent.kde.org/plasma/breeze" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -30,20 +30,14 @@ RDEPEND=" >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 - X? ( x11-libs/libxcb ) " DEPEND="${RDEPEND}" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" PDEPEND=" - >=kde-frameworks/breeze-icons-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-plasma/kde-cli-tools-${PVCUT}:* " - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package X XCB) - ) - ecm_src_configure -} diff --git a/kde-plasma/breeze/breeze-6.0.5.ebuild b/kde-plasma/breeze/breeze-6.0.5.ebuild new file mode 100644 index 000000000000..7e324701f8a9 --- /dev/null +++ b/kde-plasma/breeze/breeze-6.0.5.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KF5MIN=5.115.0 +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QT5MIN=5.15.12 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Breeze visual style for the Plasma desktop" +HOMEPAGE="https://invent.kde.org/plasma/breeze" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="qt5" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/frameworkintegration-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-plasma/kdecoration-${PVCUT}:6 + qt5? ( + >=dev-qt/qtdbus-${QT5MIN}:5 + >=dev-qt/qtdeclarative-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=dev-qt/qtx11extras-${QT5MIN}:5 + >=kde-frameworks/frameworkintegration-${KF5MIN}:5 + >=kde-frameworks/kcmutils-${KF5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kconfigwidgets-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kguiaddons-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kiconthemes-${KF5MIN}:5 + >=kde-frameworks/kirigami-${KF5MIN}:5 + >=kde-frameworks/kwidgetsaddons-${KF5MIN}:5 + >=kde-frameworks/kwindowsystem-${KF5MIN}:5 + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:6 + qt5? ( >=kde-frameworks/kcmutils-${KF5MIN}:5 ) +" +PDEPEND=" + >=kde-frameworks/breeze-icons-${KFMIN}:* + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=$(usex qt5) + ) + ecm_src_configure +} diff --git a/kde-plasma/breeze/metadata.xml b/kde-plasma/breeze/metadata.xml index d925f2439758..691fe86ecc98 100644 --- a/kde-plasma/breeze/metadata.xml +++ b/kde-plasma/breeze/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/breeze</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index 47a13aa1d86b..b5472e7ba165 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,2 +1,2 @@ -DIST discover-5.24.4.tar.xz 8260620 BLAKE2B 3e908ee51eaac93254ab11be2f5961ad7f1fd0162335c855db412067db489e1c47846f089e61ff13096bc567b94329a18bedbcbf18712b68f0119c353a07c5c5 SHA512 d11fa406c9a44047de94b1e4047367205d35a142aecda79df934603a0c2cf04b761054235b3acd28030d6ee48f64005b44baf154ca4a279b5396268f75fc7191 -DIST discover-5.24.5.tar.xz 8261960 BLAKE2B 0123ef536559ec9a739f1ffd1d04174f7e845eccdc481caac822294ebc39bc299bc831e741e8355d444df9e018bc457e0de7f591ca095da1c7b55f4d6976f8d1 SHA512 bfef0e3b0f3911d5ad2247abb0dcec6dc284bdfaa69472d35af1a28ddb6f14fedf1697269e35c1c29bd8b7017317b1ec69fb67cf55a32320d30e22445e354518 +DIST discover-5.27.11.tar.xz 881132 BLAKE2B 8f60d92745f38aef3a767f41c763d12fe07a915ea7f89ce03a37f1ed4bae1814081d08761be496e1020998a986650269f217eb6820a15b7bbb84aa056034ce60 SHA512 3393b99df506314420c18d2fbf05f7476dd86d4b27c1a153f5da4ebce03add63b0001194d1717b90d0f4bb34f106f34ed4f54f06bcdbf7aa3de492b94a470e37 +DIST discover-6.0.5.tar.xz 1002416 BLAKE2B f7ec128c2fc38883fe74de35da89a34c4beb9cb76bfcbd7d4a2b79f7738b5666805a16b62ebf7e3570bda8a6d60c94caddccec37eabd893d4afbe742be1cb408 SHA512 0be89b2a20c1591021a9fc324679a48f7df0f0883ba1a5385d890b0f08e3add818fdeac4149e0106b0cafbfbce266ee455d9cc516dce2ddf38f5449ae98effb6 diff --git a/kde-plasma/discover/discover-5.24.5.ebuild b/kde-plasma/discover/discover-5.24.5.ebuild deleted file mode 100644 index 67d530c388e1..000000000000 --- a/kde-plasma/discover/discover-5.24.5.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma resources management GUI" -HOMEPAGE="https://userbase.kde.org/Discover" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+firmware flatpak telemetry" - -# libmarkdown (app-text/discount) only used in PackageKitBackend -DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/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-1.5.0 ) - flatpak? ( - >=dev-libs/appstream-0.14.4:= - sys-apps/flatpak - ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" - -PATCHES=( "${FILESDIR}/${PN}-5.21.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.*RpmOstree/#&/" \ - -e "s/^pkg_check_modules.*Ostree/#&/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DWITH_KCM=OFF - -DBUILD_FlatpakBackend=$(usex flatpak) - $(cmake_use_find_package flatpak AppStreamQt) - -DBUILD_FwupdBackend=$(usex firmware) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -src_test() { - # bug 686392: needs network connection - local myctestargs=( - -E "(knsbackendtest)" - ) - - ecm_src_test -} diff --git a/kde-plasma/discover/discover-5.24.4.ebuild b/kde-plasma/discover/discover-5.27.11.ebuild index be46b5a49318..dd1e2d9d8cb8 100644 --- a/kde-plasma/discover/discover-5.24.4.ebuild +++ b/kde-plasma/discover/discover-5.27.11.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma resources management GUI" HOMEPAGE="https://userbase.kde.org/Discover" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="+firmware flatpak telemetry" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+firmware flatpak snap telemetry webengine" # libmarkdown (app-text/discount) only used in PackageKitBackend DEPEND=" + >=dev-libs/appstream-0.15.3:=[qt5(-)] >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -39,24 +37,24 @@ DEPEND=" >=kde-frameworks/kidletime-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/purpose-${KFMIN}:5 firmware? ( >=sys-apps/fwupd-1.5.0 ) - flatpak? ( - >=dev-libs/appstream-0.14.4:= - sys-apps/flatpak - ) - telemetry? ( dev-libs/kuserfeedback:5 ) + flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt5(-)] ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 + snap? ( app-containers/snapd ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" -PATCHES=( "${FILESDIR}/${PN}-5.21.90-tests-optional.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) src_prepare() { ecm_src_prepare @@ -70,13 +68,19 @@ src_prepare() { src_configure() { local mycmakeargs=( + # TODO: Port PackageKit's portage back-end to python3 -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON + # Automated updates will not work for us + # https://invent.kde.org/plasma/discover/-/merge_requests/142 -DWITH_KCM=OFF + -DBUILD_DummyBackend=OFF -DBUILD_FlatpakBackend=$(usex flatpak) - $(cmake_use_find_package flatpak AppStreamQt) -DBUILD_FwupdBackend=$(usex firmware) + -DBUILD_RpmOstreeBackend=OFF + -DBUILD_SnapBackend=$(usex snap) + -DBUILD_SteamOSBackend=OFF $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package webengine Qt5WebView) ) ecm_src_configure @@ -85,7 +89,7 @@ src_configure() { src_test() { # bug 686392: needs network connection local myctestargs=( - -E "(knsbackendtest)" + -E "(knsbackendtest|flatpaktest)" ) ecm_src_test diff --git a/kde-plasma/discover/discover-6.0.5.ebuild b/kde-plasma/discover/discover-6.0.5.ebuild new file mode 100644 index 000000000000..7a4ff24ff1ed --- /dev/null +++ b/kde-plasma/discover/discover-6.0.5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma resources management GUI" +HOMEPAGE="https://userbase.kde.org/Discover" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="+firmware flatpak snap telemetry webengine" + +# libmarkdown (app-text/discount) only used in PackageKitBackend +DEPEND=" + >=dev-libs/appstream-1.0.0:=[qt6] + dev-libs/kirigami-addons:6 + >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/attica-${KFMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/purpose-${KFMIN}:6 + firmware? ( >=sys-apps/fwupd-1.9.4 ) + flatpak? ( sys-apps/flatpak ) + snap? ( sys-libs/snapd-glib:=[qt6(-)] ) + telemetry? ( >=kde-frameworks/kuserfeedback-${KFMIN}:6 ) + webengine? ( >=dev-qt/qtwebview-${QTMIN}:6 ) +" +RDEPEND="${DEPEND} + snap? ( app-containers/snapd ) +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" + +PATCHES=( "${FILESDIR}/${PN}-5.25.90-tests-optional.patch" ) + +src_prepare() { + ecm_src_prepare + # we don't need it with PackageKitBackend off + ecm_punt_kf_module Archive + # we don't do anything with this + sed -e "s/^pkg_check_modules.*Markdown/#&/" \ + -e "s/^pkg_check_modules.*RpmOstree/#&/" \ + -e "s/^pkg_check_modules.*Ostree/#&/" \ + -i CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + # TODO: Port PackageKit's portage back-end to python3 + -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt6=ON + # Automated updates will not work for us + # https://invent.kde.org/plasma/discover/-/merge_requests/142 + -DWITH_KCM=OFF + -DBUILD_DummyBackend=OFF + -DBUILD_FlatpakBackend=$(usex flatpak) + -DBUILD_FwupdBackend=$(usex firmware) + -DBUILD_RpmOstreeBackend=OFF + -DBUILD_SnapBackend=$(usex snap) + -DBUILD_SteamOSBackend=OFF + $(cmake_use_find_package telemetry KF6UserFeedback) + $(cmake_use_find_package webengine Qt6WebView) + ) + + ecm_src_configure +} + +src_test() { + # bug 686392: needs network connection + local myctestargs=( + -E "(knsbackendtest|flatpaktest)" + ) + + ecm_src_test +} diff --git a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch index 43976d145baf..50f1175116d3 100644 --- a/kde-plasma/discover/files/discover-5.21.90-tests-optional.patch +++ b/kde-plasma/discover/files/discover-5.25.90-tests-optional.patch @@ -1,4 +1,4 @@ -From f9e0be7a43665a7020e4bfffde0f48b332ec366b Mon Sep 17 00:00:00 2001 +From 8706a81bccfbaf9d06a3aedf9f968d760757af07 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <asturm@gentoo.org> Date: Fri, 14 May 2021 12:38:57 +0200 Subject: [PATCH] Use BUILD_TESTING to make tests optional @@ -7,39 +7,30 @@ Variable is provided by KDECMakeSettings and default enabled. Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> --- - CMakeLists.txt | 6 +++++- + CMakeLists.txt | 4 ++++ libdiscover/CMakeLists.txt | 4 +++- libdiscover/backends/DummyBackend/CMakeLists.txt | 4 +++- libdiscover/backends/FlatpakBackend/CMakeLists.txt | 4 +++- libdiscover/backends/KNSBackend/CMakeLists.txt | 4 +++- - 5 files changed, 17 insertions(+), 5 deletions(-) + 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73061dde..7d230317 100644 +index 13fe64228..7453c8bfb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,7 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) - - set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") - --find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Test Network Xml Concurrent DBus Quick X11Extras) -+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED CONFIG COMPONENTS Widgets Network Xml Concurrent DBus Quick X11Extras) - include(KDEInstallDirs) - include(KDECMakeSettings) - include(KDECompilerSettings NO_POLICY_SCOPE) -@@ -23,6 +23,10 @@ include(ECMQtDeclareLoggingCategory) - include(KDEClangFormat) - include(KDEGitCommitHooks) +@@ -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(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) ++ 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 ItemModels KIO Declarative KCMUtils IdleTime) + 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 661c371b..56c72008 100644 +index 023b110fd..7778fab0c 100644 --- a/libdiscover/CMakeLists.txt +++ b/libdiscover/CMakeLists.txt @@ -4,7 +4,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-paths.h.cmake ${CMAKE_CURRENT_ @@ -54,7 +45,7 @@ index 661c371b..56c72008 100644 set(discovercommon_SRCS Category/Category.cpp diff --git a/libdiscover/backends/DummyBackend/CMakeLists.txt b/libdiscover/backends/DummyBackend/CMakeLists.txt -index 5b4aef10..38377d80 100644 +index 5b4aef10c..38377d808 100644 --- a/libdiscover/backends/DummyBackend/CMakeLists.txt +++ b/libdiscover/backends/DummyBackend/CMakeLists.txt @@ -1,4 +1,6 @@ @@ -66,7 +57,7 @@ index 5b4aef10..38377d80 100644 set(dummy-backend_SRCS DummyResource.cpp diff --git a/libdiscover/backends/FlatpakBackend/CMakeLists.txt b/libdiscover/backends/FlatpakBackend/CMakeLists.txt -index 2006a829..810238f0 100644 +index eac5a3241..e9ee78fd0 100644 --- a/libdiscover/backends/FlatpakBackend/CMakeLists.txt +++ b/libdiscover/backends/FlatpakBackend/CMakeLists.txt @@ -1,4 +1,6 @@ @@ -78,7 +69,7 @@ index 2006a829..810238f0 100644 set(flatpak-backend_SRCS FlatpakResource.cpp diff --git a/libdiscover/backends/KNSBackend/CMakeLists.txt b/libdiscover/backends/KNSBackend/CMakeLists.txt -index e2cb4e52..195cb98a 100644 +index d52bee9d0..7d5ba8dc9 100644 --- a/libdiscover/backends/KNSBackend/CMakeLists.txt +++ b/libdiscover/backends/KNSBackend/CMakeLists.txt @@ -1,4 +1,6 @@ @@ -90,5 +81,5 @@ index e2cb4e52..195cb98a 100644 add_library(kns-backend MODULE KNSBackend.cpp -- -2.31.1 +2.37.3 diff --git a/kde-plasma/discover/metadata.xml b/kde-plasma/discover/metadata.xml index 0c430bd5a1dd..13c683e94092 100644 --- a/kde-plasma/discover/metadata.xml +++ b/kde-plasma/discover/metadata.xml @@ -7,9 +7,12 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="cpe">cpe:/a:kde:discover</remote-id> </upstream> <use> <flag name="firmware">Enable support for firmware upgrades using <pkg>sys-apps/fwupd</pkg></flag> <flag name="flatpak">Enable support for flatpak repositories using <pkg>sys-apps/flatpak</pkg></flag> + <flag name="snap">Enable support for snap packages using <pkg>app-containers/snapd</pkg></flag> + <flag name="webengine">Enable webflow support using <pkg>dev-qt/qtwebview</pkg> and <pkg>dev-qt/qtwebengine</pkg> instead of default URL handler</flag> </use> </pkgmetadata> diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest index 483bb4fe5d86..2a886e410706 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,2 +1,3 @@ -DIST drkonqi-5.24.4.tar.xz 795152 BLAKE2B 8dcd661657a529bbfbdac60ddd71fbb424c6646122945ac3587c29e7f4667556bf6e4730c25a4658279308b4b109cefe2663d5a9612cfe4cbc7d16cf23a935c2 SHA512 9b0fb85a7df964e670761d4a1e9ea8601c64a478247ada2ec7a1a8d420a64f33b85b94f2d7f6db20365f499656653644cfc703bf8f10311fefa42fdebeaac9f1 -DIST drkonqi-5.24.5.tar.xz 795452 BLAKE2B 80a52ca807f2879640ac75581984789e60c8e41af3ed7c697c68fd2c1729248e96fc0c48d31f86fc9f970991cf266a798adc6bb4c1c04f3a06cde76d1be6c6fd SHA512 e1b5986f687da629d5e5f3e9034f551db4fec26870ff6801922da64cb7cff6d3089ae171ede47a6a733bb383cbb6dd54a691db962829027ad1449e71f2c45405 +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.5.tar.xz 873668 BLAKE2B 46253c929cdbefe157ddc7af6b1f54068c2e18bd9dda365851c211bf406abf02159a4880fefac59f6ec93a65ea6aa4aa05548d1d3898ae91585f8ea1a975309d SHA512 7ec305d2818211f40a239e0e4fd8b7648df95dd6096d32192d6fd5c42b11aa2d3b99ea32a2e51a84293d406e7572ac4e648c4325bb1bd236c45ec1fde9bd3d6e diff --git a/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild deleted file mode 100644 index 0489a66fa83a..000000000000 --- a/kde-plasma/drkonqi/drkonqi-5.24.4.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - || ( - sys-devel/gdb - dev-util/lldb - ) -" - -src_test() { - # needs network access, bug #698510 - local myctestargs=( - -E "(connectiontest)" - ) - ecm_src_test -} diff --git a/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild deleted file mode 100644 index 7b77a04bebbb..000000000000 --- a/kde-plasma/drkonqi/drkonqi-5.24.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/syntax-highlighting-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - || ( - sys-devel/gdb - dev-util/lldb - ) -" - -src_test() { - # needs network access, bug #698510 - local myctestargs=( - -E "(connectiontest)" - ) - ecm_src_test -} diff --git a/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild b/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild new file mode 100644 index 000000000000..5ae515f4fa32 --- /dev/null +++ b/kde-plasma/drkonqi/drkonqi-5.27.11.ebuild @@ -0,0 +1,81 @@ +# 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 systemd + +DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="systemd" + +COMMON_DEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcrash-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kidletime-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/syntax-highlighting-${KFMIN}:5 + systemd? ( + >=dev-qt/qtnetwork-${QTMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + sys-apps/systemd:= + ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtconcurrent-${QTMIN}:5 + test? ( >=dev-qt/qtnetwork-${QTMIN}:5 ) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] + || ( + dev-debug/gdb + dev-debug/lldb + ) +" + +PATCHES=( "${WORKDIR}/${PN}-5.27.8-revert-add-sentry-support.patch" ) # bug 871759 + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package systemd Systemd) + ) + ecm_src_configure +} + +src_test() { + # needs network access, bug #698510 + local myctestargs=( + -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/drkonqi-6.0.5.ebuild b/kde-plasma/drkonqi/drkonqi-6.0.5.ebuild new file mode 100644 index 000000000000..8aa7561985d8 --- /dev/null +++ b/kde-plasma/drkonqi/drkonqi-6.0.5.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{11..12} ) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org python-single-r1 systemd + +DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PN}-5.27.8-revert-add-sentry-support.patch.xz" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="systemd" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +COMMON_DEPEND="${PYTHON_DEPS} + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/syntax-highlighting-${KFMIN}:6 + systemd? ( + >=dev-qt/qtbase-${QTMIN}:6[network] + >=kde-frameworks/kservice-${KFMIN}:6 + sys-apps/systemd:= + >=sys-auth/polkit-qt-0.175.0[qt6] + ) +" +DEPEND="${COMMON_DEPEND} + >=dev-qt/qtbase-${QTMIN}:6[concurrent] + test? ( >=dev-qt/qtbase-${QTMIN}:6[network] ) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 + $(python_gen_cond_dep ' + dev-python/psutil[${PYTHON_USEDEP}] + dev-python/pygdbmi[${PYTHON_USEDEP}] + dev-python/sentry-sdk[${PYTHON_USEDEP}] + ') + || ( + dev-debug/gdb + dev-debug/lldb + ) +" + +pkg_setup() { + ecm_pkg_setup + python-single-r1_pkg_setup +} + +src_configure() { + local mycmakeargs=( + -DWITH_PYTHON_VENDORING=OFF + $(cmake_use_find_package systemd Systemd) + ) + ecm_src_configure +} + +src_test() { + # needs network access, bug #698510 + local myctestargs=( + -E "(connectiontest)" + ) + ecm_src_test +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]] && systemd_is_booted ; then + elog "For systemd, steps are needed for integration with systemd-coredumpd." + elog "As root, run the following:" + elog "1. systemctl enable drkonqi-coredump-processor@.service" + elog "2. systemctl --user enable --now --global drkonqi-coredump-launcher.socket" + fi +} diff --git a/kde-plasma/drkonqi/metadata.xml b/kde-plasma/drkonqi/metadata.xml index d925f2439758..be35b35a0d33 100644 --- a/kde-plasma/drkonqi/metadata.xml +++ b/kde-plasma/drkonqi/metadata.xml @@ -5,6 +5,9 @@ <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <use> + <flag name="systemd">Enable Coredumpd integration</flag> + </use> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> diff --git a/kde-plasma/flatpak-kcm/Manifest b/kde-plasma/flatpak-kcm/Manifest new file mode 100644 index 000000000000..fcfffb4770f0 --- /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.5.tar.xz 239272 BLAKE2B 7ba05127ce885948b08c30c23ad3e9cfc0eb3e2f4e5fa94a3a974750df4fc2caf12dfe138be8b62ce92d097d302ab86911fe7b474f539f73d78a8359c474dab9 SHA512 8b446d5a73598299298c1b70e871d6d388504bbe08eca6f1a7924d0ab04c2800e8afdd19185e15211f9c680241350e7f47c7be9d8f61a623d056b91f0e72ec03 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.5.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.0.5.ebuild new file mode 100644 index 000000000000..44f463616b06 --- /dev/null +++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.0.5.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 6a6f28465e9e..b0862f46c8e3 100644 --- a/kde-plasma/kactivitymanagerd/Manifest +++ b/kde-plasma/kactivitymanagerd/Manifest @@ -1,2 +1,2 @@ -DIST kactivitymanagerd-5.24.4.tar.xz 105184 BLAKE2B db0a37ec38410352c5ebbda15be0b4c3502626841cfdaf998df7af0cfd64345244e2d0aa4aa34826affac3a1deb72c50be80e49ad981da5cb26ec8f165231c72 SHA512 8d088d018db467fe838104a0217d23fe0649f863b66e72d7c75947d77f71204270f682bfd7dfd6c7ccf2aac4d3591f02dca9ebd3c70a2fc184ef9fc5689cd326 -DIST kactivitymanagerd-5.24.5.tar.xz 105216 BLAKE2B be8c117f6b4030a38d10d5abb6c5c090b70aa2368dc821d87168e2e3e9990f08d557e277bb488c94c74245153b4e3c733d7e93afb27903ba233c41236536cf95 SHA512 971105d22e7058b4c62ae00bef160b629cdef59e84cfc1d5fe6f7d9e43d12e71f8c93a56ef933f58729f71ead1d6b5c2247828a5a99bbe8300e0312888421b9c +DIST kactivitymanagerd-5.27.11.tar.xz 126972 BLAKE2B 8e293e6ef19de7ce2048aceaa5152d10d4488e082f032ec805a0df6932fd74d29a3f8879cf109f0554881ece2b1e45ec695e12fbc80c9e7469b343b9ae4230a2 SHA512 0174babd75a7c13d2014d9bc3bf65b20a6851d19eeed2d2421524ca31db0ffab3dc973f7da753e4805096e9411632df082ba289ce9870898b58522fc7410ce17 +DIST kactivitymanagerd-6.0.5.tar.xz 109908 BLAKE2B 2fa0684a36132fc8938929565a3ccd9d622e7ff12c68e7b7c7797e81610caf24e66063f437e0234cd3b57728d371880fa8506dc1605ec50d7b36edcad3245600 SHA512 067558a5755439c4db83619278b1faa10a211066a4ae87ba9bc261e46d258ac52915506031585aa6484415dbf9cc2d683bcb2b65acaaeac10bdabc3927d3cfcc diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild deleted file mode 100644 index 87126d8750aa..000000000000 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5[sqlite] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 -" -DEPEND="${RDEPEND} - dev-libs/boost -" diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.11.ebuild index a2e2bf34c5d2..66d57dc27b5b 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.24.4.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.27.11.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="System service to manage user's activities, track the usage patterns etc." LICENSE="|| ( GPL-2 GPL-3 )" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -28,7 +29,7 @@ RDEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 " DEPEND="${RDEPEND} diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.0.5.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.0.5.ebuild new file mode 100644 index 000000000000..fc206357fa3f --- /dev/null +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.0.5.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="System service to manage user's activities, track the usage patterns etc." + +LICENSE="|| ( GPL-2 GPL-3 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,sqlite,widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 +" +DEPEND="${RDEPEND} + dev-libs/boost +" diff --git a/kde-plasma/kde-cli-tools/Manifest b/kde-plasma/kde-cli-tools/Manifest index baab021370cf..3956c10377f3 100644 --- a/kde-plasma/kde-cli-tools/Manifest +++ b/kde-plasma/kde-cli-tools/Manifest @@ -1,2 +1,2 @@ -DIST kde-cli-tools-5.24.4.tar.xz 632548 BLAKE2B d98bb0bfea948812f119d3f500967fe4bc4288bf2f74fa06c6ea967e52ef94fefce052c4b3aa35e5dfa9545f0981ad5f1940ff4b72116a4634c78ceef97f32a3 SHA512 3526ebf755475f6f32d1d74c74f1808fba36945891f2af2b113c95279508cf4576c72e445fe79e7a054fffc8b5be16c5952935f4f3557c17775e4266549b7b6f -DIST kde-cli-tools-5.24.5.tar.xz 632976 BLAKE2B b5fb19eb0ed76f0217a066357744cfb1aa341a6220e79d32db96147c152b8d73e7b1807d8fb6a94d76b9d97b88f0988dbe0b1639321f88bbce07e8bf7140afcd SHA512 db89474ea3c88978123012430249677405b245628b0b12fda917b70fca9ea36e060f351420d0dd94f64e3a479a04a768064df27830884e2a8883db9104b90844 +DIST kde-cli-tools-5.27.11.tar.xz 670892 BLAKE2B 56463030f1935dd722212282000f9fd5e337de7171cc2f9ec08fdae66ed681463680af33fa5ac6b21c93e9eebbb4b415a211f0e72f075521960084afa69bfdb0 SHA512 8f6bbe39df4e491a28d3c6576c58bcbf74971f54157a8cdbc3bb7d4719a31d83f38bae45402cb8f48f11bd37d907bb625f89b929b83a2bb459d7c9c836d78006 +DIST kde-cli-tools-6.0.5.tar.xz 628940 BLAKE2B 6ffc7bc6453d902d582c53f1eb5474ebe5f1e601e53d48e952b80a1e8a3e8a2ee7c458ee64c132dcd031d29d7324f1fa109e6a24f03d28e12262084c4e042cb6 SHA512 506c87d13d8793eab08f499178eb45a08d34d5b4506c5e816a0f42a72b1fd3bbf6c7558fde75e4aea98a40aa5d2fcc656fa8e025b0b3083901dad5f414b6e8ca diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild deleted file mode 100644 index 01626b69fa9a..000000000000 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.5.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="optional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system" -HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="kdesu X" - -REQUIRED_USE="kdesu? ( X )" -# requires running kde environment -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - kdesu? ( >=kde-frameworks/kdesu-${KFMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - ) -" -RDEPEND="${DEPEND} - kdesu? ( sys-apps/dbus[X] ) -" - -PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package kdesu KF5Su) - $(cmake_use_find_package X Qt5X11Extras) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - use kdesu && dosym ../$(get_libdir)/libexec/kf5/kdesu /usr/bin/kdesu -} diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.11.ebuild index a004399d626b..5994b8dc1e81 100644 --- a/kde-plasma/kde-cli-tools/kde-cli-tools-5.24.4.ebuild +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-5.27.11.ebuild @@ -1,22 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="optional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Tools based on KDE Frameworks 5 to better interact with the system" HOMEPAGE="https://invent.kde.org/plasma/kde-cli-tools" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="kdesu X" REQUIRED_USE="kdesu? ( X )" @@ -28,20 +27,20 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=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 @@ -51,6 +50,7 @@ DEPEND=" RDEPEND="${DEPEND} kdesu? ( sys-apps/dbus[X] ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" PATCHES=( "${FILESDIR}/${PN}-5.12.80-tests-optional.patch" ) diff --git a/kde-plasma/kde-cli-tools/kde-cli-tools-6.0.5.ebuild b/kde-plasma/kde-cli-tools/kde-cli-tools-6.0.5.ebuild new file mode 100644 index 000000000000..de57efe71163 --- /dev/null +++ b/kde-plasma/kde-cli-tools/kde-cli-tools-6.0.5.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 c20b86d4f7a1..90af160c0c88 100644 --- a/kde-plasma/kde-cli-tools/metadata.xml +++ b/kde-plasma/kde-cli-tools/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kde-cli-tools</remote-id> </upstream> <use> <flag name="kdesu">Build graphical frontend for <pkg>kde-frameworks/kdesu</pkg></flag> diff --git a/kde-plasma/kde-gtk-config/Manifest b/kde-plasma/kde-gtk-config/Manifest index bd04d3621de7..cb948d241fad 100644 --- a/kde-plasma/kde-gtk-config/Manifest +++ b/kde-plasma/kde-gtk-config/Manifest @@ -1,2 +1,2 @@ -DIST kde-gtk-config-5.24.4.tar.xz 71580 BLAKE2B 438334ecffacd6ec3c1dbb130b64fa566d509f96e81920205278d0928c47196cde62bca34602041bd05594ea79548f633733d711b9501e722c0091e731b7b7c3 SHA512 ac2df456007925879027bb44b28aedab50d1cefd3c493e3688764dad90536958fb27990cc340e1956434bf6fd1440f46bc5e8a95f7f9f5b7e33420d4c32e42b1 -DIST kde-gtk-config-5.24.5.tar.xz 71564 BLAKE2B fbfdaac7a4ff1cd18e39b7b0602c0b1c643a96c4658bbd96af210f7da1c3de764b9ad43e23f1e632fee268dfe38469fbf4c37b6a88feb9ca189baf769cab9c42 SHA512 0cc7a76aca458ec093b55ea148637a82fa53467f3944d4192f4138f7eb93c88a2a65cd64e7438814f11182a390d39629982850b6939902738fd1d2a2af65319d +DIST kde-gtk-config-5.27.11.tar.xz 77516 BLAKE2B db2d4a03aa563cfd4df9c227400ccab51acbbace4b403dac30d9ef05ecca76186256435fdd62e46995fc7594d20a95109d1ecc6c941735bb22cca34e35a3b9a2 SHA512 5887631ba33ce1c121843412a713bc6fc3099a16a8961c9651919e66d9cce83f8391c47d7f6a5f4ad32ec5a497095755b315dfbbeb47ab5b3fa71b9166bf0ba0 +DIST kde-gtk-config-6.0.5.tar.xz 78332 BLAKE2B 8159ccb289a3d6417aa61ef1dd594e22249b4528154b22b81168132cbf84164e9ccf7c419f4cfd9de45d495e81a8dc986a0b0e8410bd99b4e179ae0c6d4b8d73 SHA512 61ad8817ee27bdc3b0bd6e279950170969dd32b19c5b4270770a7a929ef1c2d4b908df00ea756acbf707ce0b7e0bf406a91bfac7473576dda0210ac949d783ab diff --git a/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.27.11-revert-6b3865a7.patch b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.27.11-revert-6b3865a7.patch new file mode 100644 index 000000000000..18373f7e5051 --- /dev/null +++ b/kde-plasma/kde-gtk-config/files/kde-gtk-config-5.27.11-revert-6b3865a7.patch @@ -0,0 +1,42 @@ +From 6f324aabdd4f118a81bb5c898689a0151e09d2e0 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +Date: Wed, 6 Mar 2024 15:31:41 +0000 +Subject: [PATCH] Revert "Round x11GlobalScaleFactor instead of flooring it" + +This reverts commit 6b3865a72baff3932fbe89ef0c44ff1b9bb4cd10 +--- + kded/gtkconfig.cpp | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp +index 8e825fd..85272ce 100644 +--- a/kded/gtkconfig.cpp ++++ b/kded/gtkconfig.cpp +@@ -197,14 +197,9 @@ void GtkConfig::setEnableAnimations() const + } + } + +-static double roundPreferFloor(double d) +-{ +- return (d - floor(d)) > 0.5 ? ceil(d) : floor(d); +-} +- + void GtkConfig::setGlobalScale() const + { +- const unsigned scaleFactor = roundPreferFloor(configValueProvider->x11GlobalScaleFactor()); ++ const unsigned scaleFactor = configValueProvider->x11GlobalScaleFactor(); + XSettingsEditor::setValue(QStringLiteral("Gdk/WindowScalingFactor"), scaleFactor); + GSettingsEditor::setValue("scaling-factor", scaleFactor); // For IntelliJ IDEA + } +@@ -212,7 +207,7 @@ void GtkConfig::setGlobalScale() const + void GtkConfig::setTextScale() const + { + const double x11Scale = configValueProvider->x11GlobalScaleFactor(); +- const int x11ScaleIntegerPart = int(roundPreferFloor(x11Scale)); ++ const int x11ScaleIntegerPart = int(x11Scale); + + const int forceFontDpi = configValueProvider->fontDpi(); + +-- +GitLab + diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.11.ebuild index 8bbe52c868c7..ade4b6476ba5 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.4.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-5.27.11.ebuild @@ -1,24 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications" HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config" LICENSE="GPL-3" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" - dev-cpp/glibmm:2 dev-libs/glib:2 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 @@ -29,16 +27,17 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/kguiaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 - x11-libs/gtk+:3 + x11-libs/gtk+:3[X] " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* x11-misc/xsettingsd " -BDEPEND=" - dev-lang/sassc -" +BDEPEND="dev-lang/sassc" + +PATCHES=( "${FILESDIR}/${P}-revert-6b3865a7.patch" ) src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.0.5.ebuild index 0292f04f0263..ebbb0c9ae074 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-5.24.5.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.0.5.ebuild @@ -1,44 +1,40 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=6.6.2 +inherit ecm plasma.kde.org DESCRIPTION="Syncs KDE Plasma theme settings to GTK applications" HOMEPAGE="https://invent.kde.org/plasma/kde-gtk-config" LICENSE="GPL-3" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" DEPEND=" - dev-cpp/glibmm:2 dev-libs/glib:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtsvg-${QTMIN}:6 gnome-base/gsettings-desktop-schemas - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - x11-libs/gtk+:3 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-plasma/kdecoration-${PVCUT}:6 + x11-libs/gtk+:3[X] " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* x11-misc/xsettingsd " -BDEPEND=" - dev-lang/sassc -" +BDEPEND="dev-lang/sassc" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/kde-gtk-config/metadata.xml b/kde-plasma/kde-gtk-config/metadata.xml index d925f2439758..e3b2387f985f 100644 --- a/kde-plasma/kde-gtk-config/metadata.xml +++ b/kde-plasma/kde-gtk-config/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kde-gtk-config</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kdecoration/Manifest b/kde-plasma/kdecoration/Manifest index fe5f82499f9b..db9df100266f 100644 --- a/kde-plasma/kdecoration/Manifest +++ b/kde-plasma/kdecoration/Manifest @@ -1,2 +1,2 @@ -DIST kdecoration-5.24.4.tar.xz 48784 BLAKE2B 0714c129101481aa19b134bd04f6dbbbf41436513cd513097ee45e131818f75bad454b66baf9e9b3defc0239fe07f85a21d3b9b59bcb90d0e08be2944e223857 SHA512 2c8d3a276c71be757b333de58aa5b667cf182b606e8553f75db51414c51a5b38adc140da9c11b9753b1c0ba438ca267d3c32023d9c3c4eec43a2ed88c9fc56a8 -DIST kdecoration-5.24.5.tar.xz 48772 BLAKE2B 79ae2d1001e771388161917882206971fdae13461278ddc2ff1094b3a1f6e5666fa1fb18c18d51f1a97166b4d7cd0553b2c19983a6cd6c365586394e4aab0b69 SHA512 d523e8515868685a15c20deead4ece798369736b117b1c29b14fa4849d6fc0a409a5b2a3eaa2756694e12ae0e22440a670ed6b79aecef7197b67d591b384d11a +DIST kdecoration-5.27.11.tar.xz 52748 BLAKE2B 8d3e7bd7e27dddd3b1f6ceb728291235fe1ae58c39d5eb242643aa27553c942062cf85d5f638c6a47fc45ad93f7a9ec8609dd1815c1b70ca7ebd246d32270966 SHA512 dd687d9925a56630df9b9e7b1ac58c1536efea97307a75b3f0fc43357d2f118c8727ed425cf4267ffee13fc9ec96c0f592d94b77835ce819b576dba00bb25037 +DIST kdecoration-6.0.5.tar.xz 54520 BLAKE2B d942c8d5e8f26e94e911314f5f375ec81586a48d3ff44e8a0710f4ce1d2fa4cc26405ddaf32ead13a5c7994f874f7cb0b9e42cf39ead3a0486bb89e644092e6a SHA512 b15201b938f956672d9d20304a2618c939ad5568c32cd331b4a75ebc622c66c5d58a9606ece2dc1692f200427406d21c9f8767df2081ec923d41845186fb99ff diff --git a/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild b/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild deleted file mode 100644 index 8b05ae4be600..000000000000 --- a/kde-plasma/kdecoration/kdecoration-5.24.5.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild b/kde-plasma/kdecoration/kdecoration-5.27.11.ebuild index dd18504d63bf..c0324dc1039d 100644 --- a/kde-plasma/kdecoration/kdecoration-5.24.4.ebuild +++ b/kde-plasma/kdecoration/kdecoration-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plugin based library to create window decorations" LICENSE="|| ( LGPL-2.1 LGPL-3 )" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kdecoration/kdecoration-6.0.5.ebuild b/kde-plasma/kdecoration/kdecoration-6.0.5.ebuild new file mode 100644 index 000000000000..67c2a06f36d6 --- /dev/null +++ b/kde-plasma/kdecoration/kdecoration-6.0.5.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plugin based library to create window decorations" + +LICENSE="|| ( LGPL-2.1 LGPL-3 )" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/ki18n-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest index eaf879aac46e..609d3301f1d2 100644 --- a/kde-plasma/kdeplasma-addons/Manifest +++ b/kde-plasma/kdeplasma-addons/Manifest @@ -1,2 +1,2 @@ -DIST kdeplasma-addons-5.24.4.tar.xz 635392 BLAKE2B 5297560f822a44d3bfe2e73517df64c80f0f7917f25f955b6964dd36e422d9015854fa94c19d347a0859938691ef1b99e61a2a360371e3e9c9747966899ab554 SHA512 0adae68e67615838dc61a718ee1bd210aeda56e013193e311f330e92b0e13b8d7055c1884cfeebf31a68bbfb4b36f9746cbef03656c3db85d9978b5bca542ad4 -DIST kdeplasma-addons-5.24.5.tar.xz 635292 BLAKE2B baadba07cc223ae0dd87718202177c284a8db4efd8538297c456a2623df2b28449bcb0e55aec346a7aa76fe148c72bdf6ba354f1ccd897b8639153e5c31ceaa7 SHA512 de69d14ef6ffb23824bc646c1582cddfcac7334e7543a1414075f3debd8aab46d51d01983617ffec371ad1df703756b5f8d6c38eebb80ad10b6fe4d320747669 +DIST kdeplasma-addons-5.27.11.tar.xz 828464 BLAKE2B e1510944a45d20c0fbb46204e5ecd029a6de92396c40eadfe6fd932e8319c101befdb6862b385e0c8f02a5d91890927a576e1557563dab591d4dca745087318f SHA512 fdb9fdecba5e3b389ebc1ef165de3a988b52989bf4d38e38e46629355c937967b82f7cda8843641c16cd4927eddf6c35038168ffb739106eb33b356c9d939c86 +DIST kdeplasma-addons-6.0.5.tar.xz 867992 BLAKE2B f130fc0483f01c8948f6dd7bda2716f4569a109f496d51755ba0891dba81e73c00a5cc355acd2eaef1f0f17e27f3fdc6fb724864338e8c12bdb0288a58cfeece SHA512 317a3cfbeafa1e55a574484476b932d9669e551a9757aa8a690289e88f21579f46f2cffc0e18ceefe23774d685a702bd8709d8b1d33f48a002bef58f3f08229c diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch deleted file mode 100644 index 4cb01a05ba84..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.4-fix-comic-widget-dataengine.patch +++ /dev/null @@ -1,61 +0,0 @@ -https://invent.kde.org/plasma/kdeplasma-addons/-/commit/27710b95a3fd53019b4b053cbdf720354fd939d2 -https://bugs.kde.org/show_bug.cgi?id=452596 -https://bugs.gentoo.org/840755 - -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Sun, 17 Apr 2022 06:26:35 +0200 -Subject: [PATCH] Remove unneeded check for comic Dataengine being valid - -BUG: 452596 - -We do not really care, if the metadata of the plugin is valid, as long as we can -properly create the dataengine from it. - -Test Plan: -With plasma-frameworks master, and this on Plasma/5.24 based revision, the dataengine can properly be loaded. - -When intenitionally exporting a defunct plugin: -```cpp -class Dummy : public QObject -{ - Q_OBJECT - -public: - Dummy(QObject *parent, const QVariantList &args) { - } -}; -K_PLUGIN_CLASS_WITH_JSON(Dummy, "plasma-dataengine-comic.json") -``` -The applet does not crash. ---- a/applets/comic/comic.cpp -+++ b/applets/comic/comic.cpp -@@ -465,7 +465,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix) - const QString id = mCurrent.id(); - setConfigurationRequired(id.isEmpty()); - -- if (!id.isEmpty() && mEngine && mEngine->isValid()) { -+ if (!id.isEmpty() && mEngine) { - setBusy(true); - - const QString identifier = id + QLatin1Char(':') + identifierSuffix; -@@ -485,7 +485,7 @@ void ComicApplet::updateComic(const QString &identifierSuffix) - slotScaleToContent(); - } else { - qWarning() << "Either no identifier was specified or the engine could not be created:" -- << "id" << id << "engine valid:" << (mEngine && mEngine->isValid()); -+ << "id" << id << "engine valid:" << mEngine; - setConfigurationRequired(true); - } - updateContextMenu(); ---- a/applets/comic/comicarchivejob.cpp -+++ b/applets/comic/comicarchivejob.cpp -@@ -80,7 +80,7 @@ bool ComicArchiveJob::isValid() const - break; - } - -- return mEngine->isValid() && mZip && mZip->isOpen(); -+ return mZip && mZip->isOpen(); - } - - void ComicArchiveJob::setToIdentifier(const QString &toIdentifier) -GitLab diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch deleted file mode 100644 index 5e692fa1fedb..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d3bb3dc1d96ef7d734503e6d78dc3ce35106a628 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Thu, 5 May 2022 10:16:45 +0800 -Subject: [PATCH] wallpapers/potd: Give random chooser a seed in - simonstalenhagprovider - -Make the seed depend on the current date. - -CCBUG: 453391 ---- - dataengines/potd/simonstalenhagprovider.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/dataengines/potd/simonstalenhagprovider.cpp b/dataengines/potd/simonstalenhagprovider.cpp -index ebcb3423f..fe273ec79 100644 ---- a/dataengines/potd/simonstalenhagprovider.cpp -+++ b/dataengines/potd/simonstalenhagprovider.cpp -@@ -6,10 +6,11 @@ - - #include "simonstalenhagprovider.h" - -+#include <random> -+ - #include <QDebug> - #include <QJsonArray> - #include <QJsonDocument> --#include <QRandomGenerator> - - #include <KIO/Job> - #include <KPluginFactory> -@@ -28,8 +29,11 @@ static QJsonValue randomArrayValueByKey(const QJsonObject &object, QLatin1String - return result; - } - -- auto arraySize = array.size(); -- return array.at(QRandomGenerator::global()->bounded(arraySize)); -+ // Plasma 5.24.0 release date -+ std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate())); -+ std::uniform_int_distribution<int> distrib(0, array.size() - 1); -+ -+ return array.at(distrib(randomEngine)); - } - - SimonStalenhagProvider::SimonStalenhagProvider(QObject *parent, const QVariantList &args) --- -GitLab - diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch deleted file mode 100644 index af9ef33516e9..000000000000 --- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.24.5-fix-potd-wallpapers-change-freq-2.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 326ae3a24ccb1f1b526f4742a84e4ce24046effd Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Thu, 5 May 2022 10:19:22 +0800 -Subject: [PATCH] wallpapers/potd: Give random chooser a seed in flickrprovider - -Make the seed depend on the current date. - -BUG: 453391 -FIXED-IN: 5.24.6 ---- - dataengines/potd/flickrprovider.cpp | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp -index fe542f2b5..3861bd700 100644 ---- a/dataengines/potd/flickrprovider.cpp -+++ b/dataengines/potd/flickrprovider.cpp -@@ -7,8 +7,9 @@ - - #include "flickrprovider.h" - -+#include <random> -+ - #include <QDebug> --#include <QRandomGenerator> - #include <QRegularExpression> - #include <QUrlQuery> - -@@ -127,7 +128,11 @@ void FlickrProvider::xmlRequestFinished(KJob *_job) - } - - if (m_photoList.begin() != m_photoList.end()) { -- QUrl url(m_photoList.at(QRandomGenerator::global()->bounded(m_photoList.size()))); -+ // Plasma 5.24.0 release date -+ std::mt19937 randomEngine(QDate(2022, 2, 3).daysTo(QDate::currentDate())); -+ std::uniform_int_distribution<int> distrib(0, m_photoList.size() - 1); -+ -+ QUrl url(m_photoList.at(distrib(randomEngine))); - KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); - connect(imageJob, &KIO::StoredTransferJob::finished, this, &FlickrProvider::imageRequestFinished); - } else { --- -GitLab - diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild deleted file mode 100644 index 2005be239a27..000000000000 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.4-r1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv x86" -IUSE="share webengine" - -RESTRICT="test" # bug 727846 - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kholidays-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kunitconversion-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-comic-widget-dataengine.patch -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package share KF5Purpose) - $(cmake_use_find_package webengine Qt5WebEngine) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Disk quota applet" sys-fs/quota - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.11.ebuild index 9a10ede0eccc..eeba0ce7ff99 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.24.5-r1.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.27.11.ebuild @@ -1,32 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature DESCRIPTION="Extra Plasma applets and engines" LICENSE="GPL-2 LGPL-2" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="share webengine" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="+alternate-calendar networkmanager share webengine" RESTRICT="test" # bug 727846 DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 @@ -41,25 +39,23 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kunitconversion-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + alternate-calendar? ( dev-libs/icu:= ) + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) share? ( >=kde-frameworks/purpose-${KFMIN}:5 ) webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 ) " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 " -PATCHES=( - "${FILESDIR}"/${P}-fix-potd-wallpapers-change-freq-{1,2}.patch # KDE-bug 453391 -) - src_configure() { local mycmakeargs=( + $(cmake_use_find_package alternate-calendar ICU) + $(cmake_use_find_package networkmanager KF5NetworkManagerQt) $(cmake_use_find_package share KF5Purpose) $(cmake_use_find_package webengine Qt5WebEngine) ) diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.0.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.0.5.ebuild new file mode 100644 index 000000000000..7db0147028d1 --- /dev/null +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.0.5.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org optfeature + +DESCRIPTION="Extra Plasma applets and engines" + +LICENSE="GPL-2 LGPL-2" +SLOT="6" +KEYWORDS="~amd64" +IUSE="+alternate-calendar share webengine" + +RESTRICT="test" # bug 727846, +missing selenium-webdriver-at-spi + +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdeclarative-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kholidays-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kunitconversion-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + alternate-calendar? ( dev-libs/icu:= ) + share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) +" +RDEPEND="${DEPEND} + dev-libs/kirigami-addons:6 + >=dev-qt/qtquick3d-${QTMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/kitemmodels-${KFMIN}:6 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package alternate-calendar ICU) + $(cmake_use_find_package share KF6Purpose) + $(cmake_use_find_package webengine Qt6WebEngine) + ) + + ecm_src_configure +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + optfeature "Disk quota applet" "sys-fs/quota" + fi + ecm_pkg_postinst +} diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml index 8aace809aa2b..ca846463acd9 100644 --- a/kde-plasma/kdeplasma-addons/metadata.xml +++ b/kde-plasma/kdeplasma-addons/metadata.xml @@ -9,6 +9,8 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> + <flag name="alternate-calendar">Support alternate calendar systems (currently Chinese or Indian) via <pkg>dev-libs/icu</pkg></flag> + <flag name="networkmanager">Disable wallpaper update when using metered connections</flag> <flag name="share">Enable applet for quickly sharing data to a variety of sources</flag> <flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag> </use> diff --git a/kde-plasma/kgamma/Manifest b/kde-plasma/kgamma/Manifest index a95f4d3b6c58..a136126a314b 100644 --- a/kde-plasma/kgamma/Manifest +++ b/kde-plasma/kgamma/Manifest @@ -1,2 +1,2 @@ -DIST kgamma5-5.24.4.tar.xz 83524 BLAKE2B eaf9d141212b7ac00abeb2a65e18b733f437237c9383cb05fa7088364326ecded1311666fbcc229fea1833ecb28d54539fb5defcf4bd127b3507984d407a2bfd SHA512 ea8d6c064aef3d89b80b5a8f1f83993eccda65e473b2da81ae55709407e0fb146e0b61d8dfcc940374a908de73cafc4c395c3d9f898d5cf0d5744b965f8c010e -DIST kgamma5-5.24.5.tar.xz 83552 BLAKE2B ea89b6eb7ac288a75ab417716541e8997bc3927abf6312b944949e2ae03b3fca7ea88fd121ecd3681da57b794e8706b00fe55e432c9bdc9ac886f7347b49180f SHA512 a7f4c9fbc370c69ba9df2aa0ae2c75b896cc90adafd97c5ae214a05e8ae0261e94050e0acd1924c16f94b632209fe4803ed475555d882ee6e57d5271691ddc2f +DIST kgamma-5.27.11.tar.xz 88576 BLAKE2B 67cd1a9b0f2f080f66871c889825826d16e7b32477928555abdcf0e7de5d8dfeadfb4ea66b792568a136c88889d76d6d3ec9d6c34f5ab7decf9abe04542a6da0 SHA512 853f09c6bdefb8ed3474131785475f9fccbe17edb949308049eda3060609a57ba53d9eae2074e399eedc8a731581063888b2205f59fec396e7296cc062caa309 +DIST kgamma-6.0.5.tar.xz 86504 BLAKE2B f528028e3e50bd78cd66c54c7fca833d3d7d7447716daadf0f1acfc77e07bf7f0d61bbffa5a40267759643f56537102d63ad2dfcbcf8829643ae8a53572ca0be SHA512 6e89153fb7b79b5d134086d1b30669db83351b9b95fcea32826cfba16ff24483c693bd9199f52c22a733975d35942ff9cc76daf29f7a4e2b8458cd8d37ae8f73 diff --git a/kde-plasma/kgamma/kgamma-5.24.5.ebuild b/kde-plasma/kgamma/kgamma-5.24.5.ebuild deleted file mode 100644 index da312bb63954..000000000000 --- a/kde-plasma/kgamma/kgamma-5.24.5.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KDE_ORG_NAME="${PN}5" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - x11-libs/libX11 - x11-libs/libXxf86vm -" -DEPEND="${RDEPEND} - x11-base/xorg-proto -" diff --git a/kde-plasma/kgamma/kgamma-5.24.4.ebuild b/kde-plasma/kgamma/kgamma-5.27.11.ebuild index 30f59eedc23c..746800890d94 100644 --- a/kde-plasma/kgamma/kgamma-5.24.4.ebuild +++ b/kde-plasma/kgamma/kgamma-5.27.11.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KDE_ORG_NAME="${PN}5" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Screen gamma values kcontrol module" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" diff --git a/kde-plasma/kgamma/kgamma-6.0.5.ebuild b/kde-plasma/kgamma/kgamma-6.0.5.ebuild new file mode 100644 index 000000000000..a4ee42b7876e --- /dev/null +++ b/kde-plasma/kgamma/kgamma-6.0.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Screen gamma values kcontrol module" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + x11-libs/libX11 + x11-libs/libXxf86vm +" +DEPEND="${RDEPEND} + x11-base/xorg-proto +" diff --git a/kde-plasma/kgamma/metadata.xml b/kde-plasma/kgamma/metadata.xml index d925f2439758..a9d8cabf439a 100644 --- a/kde-plasma/kgamma/metadata.xml +++ b/kde-plasma/kgamma/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kgamma</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kglobalacceld/Manifest b/kde-plasma/kglobalacceld/Manifest new file mode 100644 index 000000000000..44e020dc38ab --- /dev/null +++ b/kde-plasma/kglobalacceld/Manifest @@ -0,0 +1 @@ +DIST kglobalacceld-6.0.5.tar.xz 53148 BLAKE2B 912d66f4074d2fea987af44cfab51547dc1b9cc6758e3d4b0eda4a28c35aae1b5716a13a9d1d6807758ba65595f131fcd28d3fac0808fc47f74275e11d0602ed SHA512 5b073828d453bdeac7ff7e30133dd1d245934438435886a591e8a36a200b207aaf99abc565e589041d39c1ffb31d51638d7212a38cf4cacadc7c8e93b6c92a1d diff --git a/kde-plasma/kglobalacceld/kglobalacceld-6.0.5.ebuild b/kde-plasma/kglobalacceld/kglobalacceld-6.0.5.ebuild new file mode 100644 index 000000000000..9f882bf4630d --- /dev/null +++ b/kde-plasma/kglobalacceld/kglobalacceld-6.0.5.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 000df04463b0..65f3b89eccd3 100644 --- a/kde-plasma/khotkeys/Manifest +++ b/kde-plasma/khotkeys/Manifest @@ -1,2 +1 @@ -DIST khotkeys-5.24.4.tar.xz 1852708 BLAKE2B 9de6c96a3638ca739f198233e9fd0ebb56a44da2f64fee7e6a0eb39807c5ee1f9b13dcd42acd8e8b2bd08c2489f5bbf1a1c7f420e3fe8972805ae2e1437d5e05 SHA512 8c2b436a541b9be707081118aa69f1a2b6e45ea2be07e87abe736d932bbe456bdbf0be7cdbae4ca34c942311bc991447904eda09ec7da1199ab51e88d2963c5f -DIST khotkeys-5.24.5.tar.xz 1853496 BLAKE2B f06865ced3dd0e97b6dae96cc96aed105192cb6055aedebd991955bd4a473ff085acac0f35fd509fc7465cb100bb43860f2bb23f618d7fc994eb115c2b0ce38d SHA512 b12373b8295cf8e7909a72a07fab8847d8cf26053814b02acf215e912156b797c3a7c3cd459f04e9b6b47cd09d5941d1f3433ee4e8b128e49d3dc9832fbb3876 +DIST khotkeys-5.27.11.tar.xz 1895584 BLAKE2B 3f718709f945b956e468fabb82e5921a7175dd756327e3b01170a4a68c2899912d45ed32242ee436fa578819e9835d1993c84986a91d09a27e7730f28b86025b SHA512 9c39c989bce1ef80ad3334d65ddeb2d4a2da039e54b8863fa29538c25d532562e74791a97957fad1c66b6642c02b51818b24ad4dea7059185d1f7564cf0cdd7f diff --git a/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild b/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild deleted file mode 100644 index 5957d8997942..000000000000 --- a/kde-plasma/khotkeys/khotkeys-5.24.5.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace hotkey module" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5[X] - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - x11-libs/libX11 - x11-libs/libXtst -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto - x11-libs/libxcb - x11-libs/libXtst -" -RDEPEND="${COMMON_DEPEND} - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild b/kde-plasma/khotkeys/khotkeys-5.27.11.ebuild index 09d090616a7d..7df40ad86cfe 100644 --- a/kde-plasma/khotkeys/khotkeys-5.24.4.ebuild +++ b/kde-plasma/khotkeys/khotkeys-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" # not optional until !kdelibs4support -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma workspace hotkey module" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" COMMON_DEPEND=" @@ -46,5 +46,5 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kded-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " diff --git a/kde-plasma/kinfocenter/Manifest b/kde-plasma/kinfocenter/Manifest index 841f836db9dd..ab7c2eb7933a 100644 --- a/kde-plasma/kinfocenter/Manifest +++ b/kde-plasma/kinfocenter/Manifest @@ -1,3 +1,3 @@ DIST glogo-small.png 24583 BLAKE2B 0af2ceae708e56f217120e5d8b880fb71401e3761ab26c4af5e74c0622368aa4e34b05160fae15fbfbbc832077810ab5c1e424826632748299fd22997cbe665c SHA512 648be463ec3812a2edcdab54d7a230bf2bd7e6895f4ffe72321d8fca28a5e1e0980f6e3b9a32f369c8369943ceb802a65a94b9dad820dcf2c81d4581d814cb48 -DIST kinfocenter-5.24.4.tar.xz 719404 BLAKE2B fb79a2c3ab6b6a7d7411a3c601b5e7e32b9c09e153baf15a76ff562570016b8d981f717f1866b5e23293537f85bc79ba335291751be7460dc0ed1700291739a3 SHA512 91fffdeb61e2dc67ab2abee6b1f0db9e7a9dcbd71005f27d644d654dbcd806e60fb1a4a54530477fb9a1eb91cea006a05575c4dc3e9461e8b8f18830d957f187 -DIST kinfocenter-5.24.5.tar.xz 719404 BLAKE2B 49ac1db6f1e98fdd2575f43891ebb27448f211d61d811496f4a54170806ed2df80211f7248bec093e45855625b3ba6f768ec66b070b196de9452205b632fbbcf SHA512 598d7993808ac6f32ae89c2a50624caf81c4d7a355ae155469d79fda923d3bcd4256077863186a42d594ddd36c06ffb5c3fd02987cf638b2bc88dffdb9b47883 +DIST kinfocenter-5.27.11.tar.xz 1018276 BLAKE2B 921832d3c52abfe35d3b77f34161c630d54c6fe8675eac6b2dcc343ab21b7c30b501216c9762aa90a8f5bfc036d2d8859a7419478ec38a85afcbf90315788cc1 SHA512 24a9df9fb28637e39293669569e4be896956ecfc3a27719821a1498f541aed220e7ebcd0e1a0b63051562690a9400b7fefc9c1217763c87009745e886573205e +DIST kinfocenter-6.0.5.tar.xz 834140 BLAKE2B f05712d2a2655b951de8dde766243f93acadcbfae1fb5d9715666d32915dfcd2765218c7725651a89c689b36c7d84af418959a73db2fad1e4e8e6042ce509374 SHA512 ed5b9ffa7a0fe961e2f265941fec7ffbae2e2640ac2b49e39ae3eb8b1e83a6f29dc475fff2f1481b4cd8a8d3493c3be238908d8636c8f25d78680dd6a7c924af diff --git a/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild b/kde-plasma/kinfocenter/kinfocenter-5.27.11.ebuild index b08d48776b71..35e67be31cff 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.24.4.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-5.27.11.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.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,7 +15,7 @@ SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-s LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="gles2-only usb" DEPEND=" @@ -23,6 +23,7 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5[gles2-only=] >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -38,11 +39,13 @@ DEPEND=" usb? ( virtual/libusb:1 ) " RDEPEND="${DEPEND} + dev-qt/qdbus:* >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* >=kde-plasma/systemsettings-${PVCUT}:5 " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_configure() { local mycmakeargs=( @@ -71,6 +74,7 @@ pkg_postinst() { optfeature "advanced CPU information module" sys-apps/util-linux fi optfeature "Wayland information module" app-misc/wayland-utils + optfeature "Firmware security module" "app-text/aha sys-apps/fwupd" optfeature "OpenGL information module" x11-apps/mesa-progs optfeature "PCI devices information module" sys-apps/pciutils optfeature "X Server information module" x11-apps/xdpyinfo diff --git a/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.0.5.ebuild index ecad66875ea1..43dfc6644006 100644 --- a/kde-plasma/kinfocenter/kinfocenter-5.24.5.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-6.0.5.ebuild @@ -1,52 +1,56 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 +KFMIN=6.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org optfeature +QTMIN=6.6.2 +inherit ecm plasma.kde.org optfeature DESCRIPTION="Utility providing information about the computer hardware" HOMEPAGE="https://userbase.kde.org/KInfoCenter" SRC_URI+=" https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png" LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="gles2-only usb" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[gles2-only=] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - gles2-only? ( media-libs/mesa[gles2] ) + >=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-24.1.0_rc1[opengl] + <media-libs/mesa-24.1.0_rc1[gles2] + ) ) usb? ( virtual/libusb:1 ) " RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/systemsettings-${PVCUT}:5 + || ( + >=dev-qt/qttools-${QTMIN}:6[qdbus] + dev-qt/qdbus:* + ) + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + >=kde-plasma/systemsettings-${PVCUT}:6 " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" src_configure() { local mycmakeargs=( $(cmake_use_find_package usb USB1) + -DCMAKE_DISABLE_FIND_PACKAGE_SeleniumWebDriverATSPI=ON # missing ) ecm_src_configure @@ -71,6 +75,7 @@ pkg_postinst() { optfeature "advanced CPU information module" sys-apps/util-linux fi optfeature "Wayland information module" app-misc/wayland-utils + optfeature "Firmware security module" "app-text/aha sys-apps/fwupd" optfeature "OpenGL information module" x11-apps/mesa-progs optfeature "PCI devices information module" sys-apps/pciutils optfeature "X Server information module" x11-apps/xdpyinfo diff --git a/kde-plasma/kinfocenter/metadata.xml b/kde-plasma/kinfocenter/metadata.xml index d925f2439758..a7a67f3066f4 100644 --- a/kde-plasma/kinfocenter/metadata.xml +++ b/kde-plasma/kinfocenter/metadata.xml @@ -8,4 +8,7 @@ <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> + <use> + <flag name="usb">Show USB device information</flag> + </use> </pkgmetadata> diff --git a/kde-plasma/kmenuedit/Manifest b/kde-plasma/kmenuedit/Manifest index 78d6f4edb50b..32f1af76da26 100644 --- a/kde-plasma/kmenuedit/Manifest +++ b/kde-plasma/kmenuedit/Manifest @@ -1,2 +1,2 @@ -DIST kmenuedit-5.24.4.tar.xz 901428 BLAKE2B 02dbb6b3c02dae6d9f51bc2c1e1a5ccd0a82e0e789e2497d250bc0cf3d14c69c8b52b5ec657cffdb48a89acd946a199e648a8d6601f2abe23555f55c374bd575 SHA512 cb6af1b86695895324b1011ae5dcfe33d57ed9df176f5a454ea2274a0ce26291cd23e5d9583250cbd1ab753b98da91cb089d270e17625d18ff7b6193b0dc0c66 -DIST kmenuedit-5.24.5.tar.xz 901504 BLAKE2B da12126c44a5094433ac14665ca35fed6ff9e9f11daa6d9ad399b07e3c2e08df64bed95b92df42aa621a3513a8bb63df0f29ab0fab53afe2b6840856c540e6c6 SHA512 c637b662b366691a179d8ea67a91062a10a6d40467a72b3858f6f43f20ea6e03bfa65e1861e4cafd329098a8fd1b7976c565c355496df7f5199d8316e930b759 +DIST kmenuedit-5.27.11.tar.xz 932088 BLAKE2B b9e85a079b9a2059ed64a31e61bad93ffc9862efed1106e8ef5adaa2637ff10a355b5b48e1a91761fbd6e8444917cb7e3278a36603e708ca286313dd96614cc2 SHA512 5dcfcd5be25a109fc3b42c42bf4476a7738b312aefb78e71c8191901758afd7be77481b0beabadc42955afd6852977b556d597e8ac8437598788e62302e66863 +DIST kmenuedit-6.0.5.tar.xz 930484 BLAKE2B 34d658262c3058b83236e1f986d2c039342ffe188c8bb6887642001dbde048d6d86177ea427135ba283258e81d6a6681958721e22b7e89f1c925fe727dfbaa8c SHA512 1812f3d4ea485247bc9381dd681042a9d87278b34b6415724a6dc42d42f0ef4ec87c417f77037a5ab4f03cf60d5b484638d5ab49eb78c6f2b72d84fb391305be diff --git a/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild deleted file mode 100644 index 96a6d5d9342b..000000000000 --- a/kde-plasma/kmenuedit/kmenuedit-5.24.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma menu editor" -HOMEPAGE="https://invent.kde.org/plasma/kmenuedit" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 -" -DEPEND="${RDEPEND}" diff --git a/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild b/kde-plasma/kmenuedit/kmenuedit-5.27.11.ebuild index ec4bfa6adfbb..2460039ddcb9 100644 --- a/kde-plasma/kmenuedit/kmenuedit-5.24.4.ebuild +++ b/kde-plasma/kmenuedit/kmenuedit-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.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 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" @@ -33,6 +33,7 @@ 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 " diff --git a/kde-plasma/kmenuedit/kmenuedit-6.0.5.ebuild b/kde-plasma/kmenuedit/kmenuedit-6.0.5.ebuild new file mode 100644 index 000000000000..2d894dc5152f --- /dev/null +++ b/kde-plasma/kmenuedit/kmenuedit-6.0.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma menu editor" +HOMEPAGE="https://invent.kde.org/plasma/kmenuedit" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets,xml] + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kitemviews-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 +" +DEPEND="${RDEPEND}" diff --git a/kde-plasma/kmenuedit/metadata.xml b/kde-plasma/kmenuedit/metadata.xml index d925f2439758..7fe5ace1f983 100644 --- a/kde-plasma/kmenuedit/metadata.xml +++ b/kde-plasma/kmenuedit/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kmenuedit</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kpipewire/Manifest b/kde-plasma/kpipewire/Manifest new file mode 100644 index 000000000000..d24ceb2f4fe0 --- /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.5.tar.xz 144756 BLAKE2B 865327f925afd99b726d670759121c1e23ea82b05e08deae7e57a140d8d876c3833d50dd6596e7c9ec58099d1ec697b8e4b0b4bfb47b3afd62d761cb82ff8581 SHA512 1f72c721ea9bc9b5c5110868121f988eac9cafaf89556196f8e787ee367226fd555bae8872ec9b07f079b9ff8b0a259cb124a0b87a901728fcdac6a009d305ee 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.5.ebuild b/kde-plasma/kpipewire/kpipewire-6.0.5.ebuild new file mode 100644 index 000000000000..3f81e119669c --- /dev/null +++ b/kde-plasma/kpipewire/kpipewire-6.0.5.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PVCUT=$(ver_cut 1-3) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Components relating to Flatpak pipewire use in Plasma" + +LICENSE="LGPL-2.1+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + media-libs/libepoxy + media-libs/libglvnd + media-libs/libva:= + media-video/ffmpeg:= + >=media-video/pipewire-0.3:= + x11-libs/libdrm +" +DEPEND="${COMMON_DEPEND} + test? ( + dev-libs/plasma-wayland-protocols + dev-libs/wayland + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-plasma/kwayland-${PVCUT}:6 + ) +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + x11-themes/sound-theme-freedesktop + test? ( >=dev-qt/qtwayland-${QTMIN}:6 ) +" diff --git a/kde-plasma/kwayland-server/metadata.xml b/kde-plasma/kpipewire/metadata.xml index d925f2439758..d925f2439758 100644 --- a/kde-plasma/kwayland-server/metadata.xml +++ b/kde-plasma/kpipewire/metadata.xml diff --git a/kde-plasma/kscreen/Manifest b/kde-plasma/kscreen/Manifest index 2c1e32054122..b087d7f86767 100644 --- a/kde-plasma/kscreen/Manifest +++ b/kde-plasma/kscreen/Manifest @@ -1,2 +1,2 @@ -DIST kscreen-5.24.4.tar.xz 137288 BLAKE2B 9cb6efcb1ac2d8fffbee75c5f486f0f19bcd793bd4b9ada2020fe3b835ba92f797eea59fbe94e891136e67de2f6d1bc9024dce68a326fe243eb3a81427018482 SHA512 d3a395a92a4569aed3dc69b8a5b90be5fca30d7348f148161a6eed71ab882c2ca3066cadf8edb41111e8ad4cea97ca39563e34acca760fe24012b2036e6ad63b -DIST kscreen-5.24.5.tar.xz 137332 BLAKE2B ef48b057356ed1df376cd5a64384ea1f184b78e8da1d0712287342cba41eb9bad99216bc8e9f8d52d5e080798436124bd39f2bff71c4a25ba28c8d8e10fd0a59 SHA512 770dfb968f8f8bf96b6ad3bf71f18f5baca35b2a4daa72b8806957ad1e050003158319edba84ebf999134e106ef916d829d391c33d79c58edb1000f503f67c97 +DIST kscreen-5.27.11.tar.xz 186972 BLAKE2B 8c0ac5a2b4f80c7c65234755f858d816fe2d5b8d5288c86675f11d7af86fd5060eb97822b906d25e659ccc644f0439ddbc0db2bf594f8b1bbff787377280a313 SHA512 7f84eeb95972014878afea09568f7c1a465b2a6c519492f67964fd35fe8ec50fb8d815e0e935ada426ff9ee437fb8cc456b11b10d7cedf6b3bb3f6294312b633 +DIST kscreen-6.0.5.tar.xz 203696 BLAKE2B 1d7da9622207fc3dced2dbb2d067cca42cdfbecb051424c84d41fc3308a2219ed1bcdc6399cbe8ae3ccbbf7c5d2857a1296d8fdcc2717bbff6880b621c882feb SHA512 6180e7b91bd7474b8cbc269c5c6c1087275abedfba55e806a9383a96a3d481ab01bf6e9bc79cbad6aeb4b7bed9b1184ab45b6b9220759c8e1078d81d81e825a9 diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch deleted file mode 100644 index d2efce69b9e5..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ff8dc215e8d2691fcf41d0bb305f820531d95150 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Sat, 14 May 2022 01:29:01 +0200 -Subject: [PATCH] Fix connecting external monitors when a monitor is rotated - -It would be placed right by the unrotated geometry and after rotating it -the new output would end up floating in the logical space. -This happened because the explicitLogicalSize is cached and needs -updating after changing its settings. - - -(cherry picked from commit cc832fd4296440fcd9298cb03b0cc736a99ed8bb) ---- - kded/generator.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kded/generator.cpp b/kded/generator.cpp -index e5117a9..e311b04 100644 ---- a/kded/generator.cpp -+++ b/kded/generator.cpp -@@ -85,6 +85,7 @@ KScreen::ConfigPtr Generator::idealConfig(const KScreen::ConfigPtr ¤tConfi - - for (const auto &output : connectedOutputs) { - initializeOutput(output, config->supportedFeatures()); -+ output->setExplicitLogicalSize(config->logicalSizeForOutput(*output)); - } - - if (connectedOutputs.count() == 1) { --- -GitLab - diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch deleted file mode 100644 index 2d0d3ba1e851..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-choosing-refresh-rate.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6ecb832923612820c721f58d1d12dd176e10528a Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Thu, 5 May 2022 18:27:38 +0200 -Subject: [PATCH] kcm: fix choosing the refresh rate - -It always chose the last one, and not the highest one - - -(cherry picked from commit 5e1be88dbe6e5160dcc232631df81d9bdc9d179e) ---- - kcm/output_model.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp -index 92e4ea3..3672b49 100644 ---- a/kcm/output_model.cpp -+++ b/kcm/output_model.cpp -@@ -394,6 +394,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex) - auto it = modes.begin(); - while (it != modes.end()) { - if ((*it)->size() == size && (*it)->refreshRate() > bestRefreshRate) { -+ bestRefreshRate = (*it)->refreshRate(); - modeIt = it; - } - it++; --- -GitLab - diff --git a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch b/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch deleted file mode 100644 index e7d85fd87013..000000000000 --- a/kde-plasma/kscreen/files/kscreen-5.24.5-kcm-fix-refresh-rate-list-not-updated.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 584ed8a067a7c0329e1572dd9970b6e3dae6a56f Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Thu, 5 May 2022 18:22:46 +0200 -Subject: [PATCH] kcm: fix refresh rate list not being updated - -BUG: 453392 - - -(cherry picked from commit 8c1e2cffda762fef83ea48658a08847382c71486) ---- - kcm/output_model.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kcm/output_model.cpp b/kcm/output_model.cpp -index fcdb738..92e4ea3 100644 ---- a/kcm/output_model.cpp -+++ b/kcm/output_model.cpp -@@ -417,7 +417,7 @@ bool OutputModel::setResolution(int outputIndex, int resIndex) - QModelIndex index = createIndex(outputIndex, 0); - // Calling this directly ignores possible optimization when the - // refresh rate hasn't changed in fact. But that's ok. -- Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRateIndexRole}); -+ Q_EMIT dataChanged(index, index, {ResolutionIndexRole, ResolutionRole, SizeRole, RefreshRatesRole, RefreshRateIndexRole}); - Q_EMIT sizeChanged(); - return true; - } --- -GitLab - diff --git a/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild b/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild deleted file mode 100644 index 0fa224e22205..000000000000 --- a/kde-plasma/kscreen/kscreen-5.24.5-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma screen management" -HOMEPAGE="https://invent.kde.org/plasma/kscreen" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -# bug #580440, last checked 5.6.3 -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtsensors-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-kcm-fix-refresh-rate-list-not-updated.patch" # KDE-bug 453392 - "${FILESDIR}/${P}-kcm-fix-choosing-refresh-rate.patch" - "${FILESDIR}/${P}-fix-connect-ext-monitors-when-a-monitor-is-rotated.patch" -) diff --git a/kde-plasma/kscreen/kscreen-5.24.4.ebuild b/kde-plasma/kscreen/kscreen-5.27.11.ebuild index 631a5b4e57a0..6b7c8112c10b 100644 --- a/kde-plasma/kscreen/kscreen-5.24.4.ebuild +++ b/kde-plasma/kscreen/kscreen-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma screen management" HOMEPAGE="https://invent.kde.org/plasma/kscreen" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # bug #580440, last checked 5.6.3 @@ -26,21 +26,25 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtsensors-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/kglobalaccel-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 + >=kde-plasma/layer-shell-qt-${PVCUT}:5 + >=kde-plasma/libkscreen-${PVCUT}:5= + >=kde-plasma/libplasma-${KFMIN}:5 + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXi " RDEPEND="${DEPEND} >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/kscreen/kscreen-6.0.5.ebuild b/kde-plasma/kscreen/kscreen-6.0.5.ebuild new file mode 100644 index 000000000000..35c334bcfcb4 --- /dev/null +++ b/kde-plasma/kscreen/kscreen-6.0.5.ebuild @@ -0,0 +1,48 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma screen management" +HOMEPAGE="https://invent.kde.org/plasma/kscreen" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +# bug #580440, last checked 5.6.3 +RESTRICT="test" + +# qtbase slot up: GuiPrivate use in kded daemon +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] + >=dev-qt/qtsensors-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6= + >=kde-plasma/libplasma-${PVCUT}:6 + x11-libs/libX11 + x11-libs/libxcb:= + x11-libs/libXi +" +RDEPEND="${DEPEND} + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/kscreen/metadata.xml b/kde-plasma/kscreen/metadata.xml index d925f2439758..307cc9b59524 100644 --- a/kde-plasma/kscreen/metadata.xml +++ b/kde-plasma/kscreen/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kscreen</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest index 622043e47a3e..26b6457070e4 100644 --- a/kde-plasma/kscreenlocker/Manifest +++ b/kde-plasma/kscreenlocker/Manifest @@ -1,2 +1,2 @@ -DIST kscreenlocker-5.24.4.tar.xz 119424 BLAKE2B ff054103476d908e9c66a3408587788bc0b871a12ddee418c4a67f801123c544f52f8f61ac1eeed5e4b593dd06a707bb1fb8c2fa85a08496c1bf76f4306adc7a SHA512 410402d131311867206cb015fbbc085960a2e6988d8a15675abfad663a3e667c697fe44f5625e4ae40ce3554104e0d11fd895e3b364820371faaa7e58e0b17dd -DIST kscreenlocker-5.24.5.tar.xz 119436 BLAKE2B 9a9885e683d474308feb82be9e33047f37ba1e9d127ce435e205d44311c5edc9ca1fae391858409058226a80e80a783852ca53e03800c0ddd74867681182a072 SHA512 c3252ead5f6cedece82ea94d88324b968938d0218ec05182f07fea85ead5ec451bc04bf417fc4f7a0f37aa56358caeb893175eae8cbb74ea748f843de9aaab83 +DIST kscreenlocker-5.27.11.tar.xz 160796 BLAKE2B 6ab6060ee7ce2b01a0a29f6d0aebbaba052fabaa6c229e92603b52d32ea473c438b8647cc2f2bdbf48edfa98c05aa7e22ce0b75964d9a8ab6d914c32254fdfcb SHA512 cfaaa6242253f6c511f645bb7f9023328a5d5bb58616284f85db949da969e04303f4e0e28283a08ed0fb02845840be67a76785d4b4596ef057ec7069cda92a3a +DIST kscreenlocker-6.0.5.tar.xz 164868 BLAKE2B 7f45a07762f49b667dbd356281a82b5a0bf3320de03d07a2026f6610727c55741b2f73b29d269d216e2df6ed9b179ed45da1894fbe1afc957b085937f009784f SHA512 58da244c278dd755c43348b12c5c6bb4007d2894bba09e7e8098510a4ab8c9f5bea5d06fa47fe7995d859fdb0846058380f29e71f57ba240e8f0a4d2f78faad2 diff --git a/kde-plasma/kscreenlocker/files/kde-fingerprint.pam b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam new file mode 100644 index 000000000000..6ca0ba1f09e6 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-fingerprint.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 + +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_faillock.so preauth +-auth required pam_fprintd.so +auth required pam_env.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde-r1.pam b/kde-plasma/kscreenlocker/files/kde-r1.pam new file mode 100644 index 000000000000..ce9e84d58840 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-r1.pam @@ -0,0 +1,9 @@ +#%PAM-1.0 + +auth include system-local-login + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/files/kde-smartcard.pam b/kde-plasma/kscreenlocker/files/kde-smartcard.pam new file mode 100644 index 000000000000..694fc1e905b0 --- /dev/null +++ b/kde-plasma/kscreenlocker/files/kde-smartcard.pam @@ -0,0 +1,13 @@ +#%PAM-1.0 + +auth required pam_shells.so +auth required pam_nologin.so +auth required pam_faillock.so preauth +-auth required pam_pkcs11.so wait_for_card card_only +auth required pam_env.so + +account include system-local-login + +password include system-local-login + +session include system-local-login diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild deleted file mode 100644 index 55afaed895ad..000000000000 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.24.5.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org pam - -DESCRIPTION="Library and components for secure lock screen architecture" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="+pam" - -RESTRICT="test" - -COMMON_DEPEND=" - dev-libs/wayland - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/layer-shell-qt-${PVCUT}:5 - x11-libs/libX11 - x11-libs/libXi - x11-libs/libxcb - x11-libs/xcb-util-keysyms - pam? ( sys-libs/pam ) -" -DEPEND="${COMMON_DEPEND} - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" -BDEPEND="dev-util/wayland-scanner" - -src_prepare() { - ecm_src_prepare - use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests -} - -src_configure() { - local mycmakeargs=( - -DPAM_REQUIRED=$(usex pam) - $(cmake_use_find_package pam PAM) - ) - ecm_src_configure -} - -src_test() { - # requires running environment - local myctestargs=( - -E x11LockerTest - ) - ecm_src_test -} - -src_install() { - ecm_src_install - - if use pam; then - newpamd "${FILESDIR}/kde.pam" kde - newpamd "${FILESDIR}/kde-np.pam" kde-np - else - chown root "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die - chmod +s "${ED}"/usr/$(get_libdir)/libexec/kcheckpass || die - fi -} diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.27.11.ebuild index 5ebb504f19e5..4d0b30ed4b30 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.24.4.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.27.11.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv x86" -IUSE="+pam" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" RESTRICT="test" @@ -28,7 +27,7 @@ COMMON_DEPEND=" >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kcmutils-${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 @@ -36,18 +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 @@ -55,24 +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" +BDEPEND=" + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 +" +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=( @@ -84,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.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.0.5.ebuild new file mode 100644 index 000000000000..671e7ee625cc --- /dev/null +++ b/kde-plasma/kscreenlocker/kscreenlocker-6.0.5.ebuild @@ -0,0 +1,80 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org pam + +DESCRIPTION="Library and components for secure lock screen architecture" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +RESTRICT="test" + +# qtbase slot up: GuiPrivate use in greeter +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kidletime-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/layer-shell-qt-${PVCUT}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libkscreen-${PVCUT}:6 + sys-libs/pam + x11-libs/libX11 + x11-libs/libXi + x11-libs/libxcb + x11-libs/xcb-util-keysyms +" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 +" +BDEPEND=" + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:6 +" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" + +src_prepare() { + ecm_src_prepare + use test || cmake_run_in greeter cmake_comment_add_subdirectory autotests +} + +src_test() { + # requires running environment + local myctestargs=( + -E x11LockerTest + ) + ecm_src_test +} + +src_install() { + ecm_src_install + + newpamd "${FILESDIR}/kde-r1.pam" kde + newpamd "${FILESDIR}/kde-fingerprint.pam" kde-fingerprint + newpamd "${FILESDIR}/kde-smartcard.pam" kde-smartcard +} diff --git a/kde-plasma/ksshaskpass/Manifest b/kde-plasma/ksshaskpass/Manifest index ca99c803432d..a42d1b979af4 100644 --- a/kde-plasma/ksshaskpass/Manifest +++ b/kde-plasma/ksshaskpass/Manifest @@ -1,2 +1,2 @@ -DIST ksshaskpass-5.24.4.tar.xz 24720 BLAKE2B fc204675ed6590e263b97b10490b1d5e60e97cdabf76c3bd7effa8c9106182740f90e400232a865cd12dd9db2d246a5f59288d3e69e6cdcb48c04fe2e68a1138 SHA512 181788f8b8ce72f3d0e17d2d8cf46eb5ca31eef5533d275f86b8f573c3b1365eaea48a9fb940177c701b071caf241ab4ca7cbf1d0e2bda29e0d153b7574cf79d -DIST ksshaskpass-5.24.5.tar.xz 24708 BLAKE2B e6937ec76b6cadff437c77eaceb075d7050e6d3581e64b66c1a07491352e335e63dc58b6655da6f5532919295bfad0e13da6855370b4c0a3c1eacb9698dc1759 SHA512 e4d7358eb213105a4e479eb3c9d229a87d86c4ebda199f486f9952f81dc1e91b43ba30d834907586f9badbb7e2933e44af5713119caa2e3bc060f16936e9a457 +DIST ksshaskpass-5.27.11.tar.xz 27980 BLAKE2B 4fa35480f0ed7389bf41f56fc8266fccb8a33060c37f6df2c1edc44f49466267dbd45584e0afff6aaa79a3b5ffc1aca916c36a7ad768e36a457c081bfa53f217 SHA512 85c4091faa4ec4a6d068d4a0d464601054b88187ccfa05f4156b146dd3b3900dc15bcb3f9f9b0b057fb9b5687eabf55bb34d06d98a9e26ddb6a0afba1684feee +DIST ksshaskpass-6.0.5.tar.xz 28880 BLAKE2B 40e623de164f9f9bd4c1571c49af48b6825901eb35930272826f73334c0a0b675c11abb6b27fc81e1719808f1e473145e41955f395c82925792ca2dd2ddf1045 SHA512 78501f93534a95fc03005ce1e84a0ebb67ffacd6c16af84b18ed0fd1a98ec72783423c66fb79ae788ecd2ce1e1b68a401fc62b2c202f042ce5603e7ce712b641 diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-5.27.11.ebuild index e198cd959e39..ebf18544fa10 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.24.4.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 -QTMIN=5.15.2 -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 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild b/kde-plasma/ksshaskpass/ksshaskpass-6.0.5.ebuild index 6cc8bba6f520..8bd4b1f19279 100644 --- a/kde-plasma/ksshaskpass/ksshaskpass-5.24.5.ebuild +++ b/kde-plasma/ksshaskpass/ksshaskpass-6.0.5.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org DESCRIPTION="Implementation of ssh-askpass with KDE Wallet integration" HOMEPAGE+=" https://invent.kde.org/plasma/ksshaskpass" LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" DEPEND=" - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[widgets] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kwallet-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 " RDEPEND="${DEPEND}" @@ -34,7 +34,7 @@ src_install() { pkg_postinst() { ecm_pkg_postinst - elog "In order to have ssh-agent start with Plasma 5," + elog "In order to have ssh-agent start with Plasma 6," elog "edit /etc/xdg/plasma-workspace/env/10-agent-startup.sh" elog "and uncomment the lines enabling ssh-agent." elog @@ -43,10 +43,7 @@ pkg_postinst() { elog "to properly kill the agent when the session ends." elog elog "${PN} has been installed as your default askpass application" - elog "for Plasma 5 sessions." + elog "for Plasma 6 sessions." elog "If that's not desired, select the one you want to use in" elog "/etc/xdg/plasma-workspace/env/05-ksshaskpass.sh" - - # Clean up pre-5.17.4 dirs - rmdir -v "${EROOT}"/etc/plasma{/startup,} 2> /dev/null } diff --git a/kde-plasma/ksshaskpass/metadata.xml b/kde-plasma/ksshaskpass/metadata.xml index d925f2439758..8a7cc7ffebd5 100644 --- a/kde-plasma/ksshaskpass/metadata.xml +++ b/kde-plasma/ksshaskpass/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/ksshaskpass</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/ksystemstats/Manifest b/kde-plasma/ksystemstats/Manifest index d21fe3a673e1..5a2cf64944ac 100644 --- a/kde-plasma/ksystemstats/Manifest +++ b/kde-plasma/ksystemstats/Manifest @@ -1,2 +1,2 @@ -DIST ksystemstats-5.24.4.tar.xz 94616 BLAKE2B 4daaff46dd7f3d18a680219fa2f60a8d8915fc98724dab5be67fbcb47d80c9b32c8ffe119d4f9650b6853edbd46790db7ce8c67fb58793bda4e8cc0c536cbb8b SHA512 0238815273ac1a939b25e31ec727df71d1fa1a060d5334068f87b1a75ae0016c2c508c853b49998e35a868d080849d372df74a8bfa395095065223614fa36be2 -DIST ksystemstats-5.24.5.tar.xz 94604 BLAKE2B e0cbdf1b51a34ae8471c6ea795535930a6a6dc53b2e47a730c4a846d4113611d9866ca24bfb7be3c95ac730df397fb0fecb6ad347bb9b919c9172a3128e7a7a1 SHA512 6bbcf6512c223fc97203c02baca5bb230ef86c8012318307e32bc030160f31fc2797a28d95af442826b5f48656673213f6cdde487e1782a50300a9bc96e22969 +DIST ksystemstats-5.27.11.tar.xz 115812 BLAKE2B e2bd3cff153a4e48e119f4086d41f6b0ddef68ac3b6ef7613a4bec1358d8a9d2443bd92886e5ff746e7e51d46e23bf1c70e8c8d494b52f1db3aada2714da2422 SHA512 3fe1687bbe8b3aa6e7852e613f2938f0e2264bd98d3f743a0091b22132e60e710c946b7754b1d1b8085165506d89acd4f29db08d92d50822820287ed5d957621 +DIST ksystemstats-6.0.5.tar.xz 124932 BLAKE2B b918ea1fc72301b6f1c67e8580e679f5358b42bb49b5f0f60b61c55b4d50004114bd8d5a4926ae52699cdab26d8f7cc6c91ef8269af0c1272d404cc6be1ee9bd SHA512 764a0700cae0061a96f6a35915c2cda2f044aa54d41088d17a51d256f601c1aa7abce721bd1828f0a9e9aa99f2313e7e534cc6b4dfc5e2607fae4956b2b0d3c8 diff --git a/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild deleted file mode 100644 index 3d7f191dca31..000000000000 --- a/kde-plasma/ksystemstats/ksystemstats-5.24.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Plugin-based system monitoring daemon" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="networkmanager" - -DEPEND=" - dev-libs/libnl:3 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - net-libs/libpcap - sys-apps/lm-sensors:= - sys-libs/libcap - virtual/libudev:= - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) - ) - ecm_src_configure -} diff --git a/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild b/kde-plasma/ksystemstats/ksystemstats-5.27.11.ebuild index 84530f541465..986e2f6c561d 100644 --- a/kde-plasma/ksystemstats/ksystemstats-5.24.4.ebuild +++ b/kde-plasma/ksystemstats/ksystemstats-5.27.11.ebuild @@ -1,21 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +VIRTUALX_REQUIRED="test" # bug 909312 (test fails) +inherit ecm plasma.kde.org virtualx DESCRIPTION="Plugin-based system monitoring daemon" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="networkmanager" DEPEND=" @@ -34,9 +34,7 @@ DEPEND=" virtual/libudev:= networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) " -RDEPEND="${DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 -" +RDEPEND="${DEPEND}" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/ksystemstats/ksystemstats-6.0.5.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.0.5.ebuild new file mode 100644 index 000000000000..0ef2de0a4f4c --- /dev/null +++ b/kde-plasma/ksystemstats/ksystemstats-6.0.5.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +VIRTUALX_REQUIRED="test" # bug 909312 (test fails) +inherit ecm plasma.kde.org virtualx + +DESCRIPTION="Plugin-based system monitoring daemon" + +LICENSE="GPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="networkmanager" + +DEPEND=" + dev-libs/libnl:3 + >=dev-qt/qtbase-${QTMIN}:6[dbus,network] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + >=kde-plasma/libksysguard-${PVCUT}:6 + net-libs/libpcap + sys-apps/lm-sensors:= + sys-libs/libcap + virtual/libudev:= + networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package networkmanager KF6NetworkManagerQt) + ) + ecm_src_configure +} diff --git a/kde-plasma/kwallet-pam/Manifest b/kde-plasma/kwallet-pam/Manifest index 446957392455..969362db8f23 100644 --- a/kde-plasma/kwallet-pam/Manifest +++ b/kde-plasma/kwallet-pam/Manifest @@ -1,2 +1,2 @@ -DIST kwallet-pam-5.24.4.tar.xz 20480 BLAKE2B e54dd5271f9bbca2167f3fed7a7c96f92164d8a6c833f2a69976344918d03537b0300c1ec5b23213a82f7a946bf77cf067a42485df29265a40f3e8fb2cacf997 SHA512 e9da7f2b5c390bfc9406d9e2511689fc42313643a519ebc146cf3a79e2701625aa841dc40c6ad457ee73520d55bc66dc7e7a617c0f90b9f8d3314eaacfd8a759 -DIST kwallet-pam-5.24.5.tar.xz 20480 BLAKE2B 10597c6fd3905ace5a64a28585b051cee0325a63b184b171a3b8a066bc3cd8891be7fbcfccd054acc6627bbee282c1ae5553f65d902e754a9cd51bd2d38fa1c2 SHA512 9ce9862b5cc6525b183911cd9d96edeae585cd0d54055fc38a7f2f41febfeb388d31b4aa18f1c36a7068898457af53f560e22a2f5a8a4a015910d56fa70aa740 +DIST kwallet-pam-5.27.11.tar.xz 22948 BLAKE2B 1c0cf86bb7e57696e44ac34a4392d1f81a6ade8fbaef6c61eefc79df39890aa1799ddbb39ec59fbde3ea4536c1113c1147b28bcdfc898049e847af99b107267b SHA512 b52177df434bf71214874a2410637240bb5a23f0fd06d41f3b62630d90e5262a231012c4f11119f96c151bb222e73652e5e8506ccc26c7cc451090f3bd156b6a +DIST kwallet-pam-6.0.5.tar.xz 22932 BLAKE2B 33861653ead6396930cb8acbbd4ced76bbe453ac7ebfb0dbb0f43a06ac6cc33835b0080a79904e551307e0a92349fd3388cc524d12696f4bb8a69406c729e2ed SHA512 c20f626e8572f34e1c8065b464984a9616ad8270bdb003587272d25c05ad9d746b68d624994117ac6df6cb7c7f3381624a171e30033ddceda99abf818460b060 diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-5.27.11.ebuild index 8ddb3f24688e..44a9bab4e37f 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.24.4.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-5.27.11.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.102.0 PVCUT=$(ver_cut 1-3) -inherit ecm kde.org +inherit ecm plasma.kde.org DESCRIPTION="PAM module to not enter KWallet password again after login" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild b/kde-plasma/kwallet-pam/kwallet-pam-6.0.5.ebuild index 940910a2e750..cb964d02d812 100644 --- a/kde-plasma/kwallet-pam/kwallet-pam-5.24.5.ebuild +++ b/kde-plasma/kwallet-pam/kwallet-pam-6.0.5.ebuild @@ -1,22 +1,22 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.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 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" DEPEND=" dev-libs/libgcrypt:0= - >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:6 sys-libs/pam " RDEPEND="${DEPEND} @@ -32,6 +32,6 @@ src_configure() { pkg_postinst() { ecm_pkg_postinst - elog "This package enables auto-unlocking of kde-frameworks/kwallet:5." + elog "This package enables auto-unlocking of kde-frameworks/kwallet:6." elog "See also: https://wiki.gentoo.org/wiki/KDE#KWallet_auto-unlocking" } diff --git a/kde-plasma/kwayland-integration/Manifest b/kde-plasma/kwayland-integration/Manifest index a4364081aace..ce951a675e22 100644 --- a/kde-plasma/kwayland-integration/Manifest +++ b/kde-plasma/kwayland-integration/Manifest @@ -1,2 +1,2 @@ -DIST kwayland-integration-5.24.4.tar.xz 24828 BLAKE2B 54eccc48b640118adc558eca19a92473ade03b9481ebafdfa7c4597bd64f846ace567038b44c601b76712b883f8cc7c54fdcc827dfbd9fe92af07bc6155c41d7 SHA512 0a3a0404fd895a87d44bed4a3d12d7627207c5b28aac979327b85e1cb5de70292129df54b8d7ca259566afde79393ab21c72a77f5c818d5b26db66192956e536 -DIST kwayland-integration-5.24.5.tar.xz 24844 BLAKE2B 99fedecea63c3b3792b6c275143b7e32283f32c38d098f039ec09a2b98facbd79c89753bf32fdd82c39115d2fd603626f67328a0c2a0dcac7cb3cec5f914c580 SHA512 ebdfb1cef57e82081c22394b6d4309e5662a91aaf925df1186a17765bf49a2d07a810be7767f5d9de18cae942584fbbdef42dc6bb59dc0c4896e7ff8abf117ac +DIST kwayland-integration-5.27.11.tar.xz 25708 BLAKE2B 67fe2d113955b2cdec1c3d621efbe84b2565aa3f22e0d15eb95f1a2bce1a6c7fe87da9c2974d93fb2f1939d92d64d2ab2a2a1db609df5973ded5ac4a02f214cf SHA512 c5f19a03e8161b346dbd89fb0d1b72d7906c19a7d55535878d9d75b7d96025d61808161f6b0ccaf9b5fef1d112f8e0ba1033ce149e42aec2cd261351d5ffb1c9 +DIST kwayland-integration-6.0.5.tar.xz 26416 BLAKE2B ce036d41d79d889941aaff8590fc2f72f62f55a41d2a7e877e8bccac046b7dd91664b3af7e4825c602285a50ce324a45fe59edb86669f13288c40386bffaae6e SHA512 394043d5efaa8b3f417145918f2fe297478ebcf3cc4fd44f1993ffb9e713df7ece7a69dffd2fb51925e301ba751dd08ea12d2fabe9e8d2af0b3cd40c5bceba7f diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild index 84eca0211ad6..430cc1e0db8f 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.5.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-5.27.11.ebuild @@ -1,45 +1,49 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm flag-o-matic plasma.kde.org -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" +DESCRIPTION="Provides KWindowSystem integration plugin for Wayland" HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" -RESTRICT="test" # bug 668872 - # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X # slot ops: +# dev-qt/qtgui: QtXkbCommonSupportPrivate # dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff -# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h # kde-frameworks/kwindowsystem: Various private headers DEPEND=" >=dev-libs/wayland-1.15 + >=dev-qt/qtgui-${QTMIN}:5= || ( >=dev-qt/qtgui-${QTMIN}:5[libinput] >=dev-qt/qtgui-${QTMIN}:5[X] ) >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtwayland-${QTMIN}:5= - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxkbcommon " RDEPEND="${DEPEND}" BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner virtual/pkgconfig " + +src_prepare() { + ecm_src_prepare + ecm_punt_kf_module IdleTime + cmake_comment_add_subdirectory autotests # only contains idletime test + cmake_run_in src cmake_comment_add_subdirectory idletime + filter-lto # bug 921430 +} diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-6.0.5.ebuild index 7ea29d557359..2ce54ec08c7a 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.24.4.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-6.0.5.ebuild @@ -1,45 +1,48 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.115.0 +QTMIN=5.15.12 +inherit ecm flag-o-matic plasma.kde.org -DESCRIPTION="Provides integration plugins for various KDE frameworks for Wayland" +DESCRIPTION="Provides KWindowSystem integration plugin for Wayland" HOMEPAGE="https://invent.kde.org/plasma/kwayland-integration" LICENSE="LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="~amd64" IUSE="" -RESTRICT="test" # bug 668872 - # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X # slot ops: +# dev-qt/qtgui: QtXkbCommonSupportPrivate # dev-qt/qtwayland: Qt::WaylandClientPrivate (private/qwayland*_p.h) stuff -# kde-frameworks/kidletime: KIdleTime/private/abstractsystempoller.h # kde-frameworks/kwindowsystem: Various private headers -DEPEND=" +RDEPEND=" >=dev-libs/wayland-1.15 + >=dev-qt/qtgui-${QTMIN}:5= || ( >=dev-qt/qtgui-${QTMIN}:5[libinput] >=dev-qt/qtgui-${QTMIN}:5[X] ) >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtwayland-${QTMIN}:5= - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxkbcommon " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + dev-libs/plasma-wayland-protocols +" BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 + dev-util/wayland-scanner virtual/pkgconfig " + +src_configure() { + filter-lto # bug 921430 + ecm_src_configure +} diff --git a/kde-plasma/kwayland-integration/metadata.xml b/kde-plasma/kwayland-integration/metadata.xml index d925f2439758..7715b5766454 100644 --- a/kde-plasma/kwayland-integration/metadata.xml +++ b/kde-plasma/kwayland-integration/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/kwayland-integration</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/kwayland-server/Manifest b/kde-plasma/kwayland-server/Manifest deleted file mode 100644 index efd2337d9a36..000000000000 --- a/kde-plasma/kwayland-server/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST kwayland-server-5.24.4.tar.xz 221412 BLAKE2B efc970b7f7d99e5195e74a71480039b6a6de15d23f4af9ea776a5b4f45494d8323fee8729e8b2633ed0e25167c99c2a73b63f08ce4e1cdd75d0870258e8d65ea SHA512 9281261b96ceccfb59b1d4eef247572424a196951cf927ae2d65eb6153cb0a9409059e789c7479ef04d8df750c109abfe202395a0a1f49010c40b1190cc2e640 -DIST kwayland-server-5.24.5.tar.xz 221388 BLAKE2B 38a1e66c1290c32db10a6818b10e57097fef70ac376797e272c329e9a49556bf423da4a731e46718bf39a30131def4adf90f1742589425ad040bc125c84fcffa SHA512 72159618a22233b9b49cab8ee1a804f629763e903a2e711c8c23f990544d79b5d27e768c33f8d844c916e41a6d3a2af5ddcab69d0448569adc247e0f737975f5 diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch deleted file mode 100644 index 4ddd9737e759..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-crash-on-screen-setup-change.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 40364d2ee670a5a74318ef96c643762293ca95f0 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Fri, 8 Apr 2022 12:44:33 +0300 -Subject: [PATCH] Simplify code that announces available modes and current mode - -If no mode has the current flag set, the first mode object will be -announced twice. - -There's also no benefit from sending the current mode as last. If the -current mode changes, the compositor will send the current_mode event, -not the mode event. - -BUG: 452318 - - -(cherry picked from commit b40c4e3f4108b9a0be9b4f5d437e72f7c2aa3fea) ---- - src/server/outputdevice_v2_interface.cpp | 35 ++++++++---------------- - 1 file changed, 11 insertions(+), 24 deletions(-) - -diff --git a/src/server/outputdevice_v2_interface.cpp b/src/server/outputdevice_v2_interface.cpp -index 31ab16ca..9093bd2f 100644 ---- a/src/server/outputdevice_v2_interface.cpp -+++ b/src/server/outputdevice_v2_interface.cpp -@@ -31,7 +31,7 @@ public: - - void sendGeometry(Resource *resource); - wl_resource *sendNewMode(Resource *resource, OutputDeviceModeV2Interface *mode); -- void sendCurrentMode(Resource *resource, OutputDeviceModeV2Interface *mode); -+ void sendCurrentMode(Resource *resource); - void sendDone(Resource *resource); - void sendUuid(Resource *resource); - void sendEdid(Resource *resource); -@@ -180,7 +180,7 @@ void OutputDeviceV2Interface::setCurrentMode(OutputDeviceModeV2Interface *mode) - const auto clientResources = d->resourceMap(); - for (auto it = clientResources.begin(); it != clientResources.end(); ++it) { - auto resource = *it; -- d->sendCurrentMode(resource, d->currentMode); -+ d->sendCurrentMode(resource); - d->sendDone(resource); - } - d->updateGeometry(); -@@ -257,22 +257,10 @@ void OutputDeviceV2InterfacePrivate::kde_output_device_v2_bind_resource(Resource - sendName(resource); - sendSerialNumber(resource); - -- auto currentModeIt = modes.end(); -- for (auto it = modes.begin(); it != modes.end(); ++it) { -- auto &mode = *it; -- if (mode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) { -- // needs to be sent as last mode -- currentModeIt = it; -- continue; -- } -+ for (OutputDeviceModeV2Interface *mode : std::as_const(modes)) { - sendNewMode(resource, mode); - } -- -- if (currentModeIt != modes.end()) { -- auto modeResource = sendNewMode(resource, *currentModeIt); -- send_current_mode(resource->handle, modeResource); -- } -- -+ sendCurrentMode(resource); - sendUuid(resource); - sendEdid(resource); - sendEnabled(resource); -@@ -296,9 +284,9 @@ wl_resource *OutputDeviceV2InterfacePrivate::sendNewMode(Resource *resource, Out - return modeResource->handle; - } - --void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource, OutputDeviceModeV2Interface *mode) -+void OutputDeviceV2InterfacePrivate::sendCurrentMode(Resource *outputResource) - { -- const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(mode)->findResource(outputResource); -+ const auto modeResource = OutputDeviceModeV2InterfacePrivate::get(currentMode)->findResource(outputResource); - send_current_mode(outputResource->handle, modeResource->handle); - } - -@@ -506,12 +494,12 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface * - d->modes << outputDeviceMode; - outputDeviceMode->setParent(this); - -+ for (auto resource : clientResources) { -+ d->sendNewMode(resource, outputDeviceMode); -+ } -+ - if (outputDeviceMode->flags().testFlag(OutputDeviceModeV2Interface::ModeFlag::Current)) { - d->currentMode = outputDeviceMode; -- } else { -- for (auto resource : clientResources) { -- d->sendNewMode(resource, outputDeviceMode); -- } - } - } - -@@ -520,8 +508,7 @@ void OutputDeviceV2Interface::setModes(const QList<OutputDeviceModeV2Interface * - } - - for (auto resource : clientResources) { -- d->sendNewMode(resource, d->currentMode); -- d->sendCurrentMode(resource, d->currentMode); -+ d->sendCurrentMode(resource); - } - - qDeleteAll(oldModes.crbegin(), oldModes.crend()); --- -GitLab - diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch deleted file mode 100644 index a3a0b2067f5d..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-layer-shell-reset.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 97df88c6c8af925382bb1f59b7c6ad75f28142a0 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Tue, 5 Apr 2022 13:26:26 +0100 -Subject: [PATCH] Fix layer shell reset - -In the current form any client committing multiple times without -attaching a buffer would unset the cached state and trigger an error. - -It's legal (though weird) to commit multiple times before attaching a -buffer. - -We should only reset the state if we commit an empty buffer after having -committed an existing buffer. This brings us in line with XdgShell. - - -(cherry picked from commit a5c55b68589a8771cde0bf4ce552702da6fca41c) ---- - src/server/layershell_v1_interface.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/server/layershell_v1_interface.cpp b/src/server/layershell_v1_interface.cpp -index 17086334..19fcd68e 100644 ---- a/src/server/layershell_v1_interface.cpp -+++ b/src/server/layershell_v1_interface.cpp -@@ -69,6 +69,7 @@ public: - bool isClosed = false; - bool isConfigured = false; - bool isCommitted = false; -+ bool firstBufferAttached = false; - - protected: - void zwlr_layer_surface_v1_destroy_resource(Resource *resource) override; -@@ -290,8 +291,10 @@ void LayerSurfaceV1InterfacePrivate::commit() - return; - } - -- if (!surface->isMapped() && isCommitted) { -+ // detect reset -+ if (!surface->isMapped() && firstBufferAttached) { - isCommitted = false; -+ firstBufferAttached = false; - isConfigured = false; - - current = LayerSurfaceV1State(); -@@ -303,6 +306,9 @@ void LayerSurfaceV1InterfacePrivate::commit() - const LayerSurfaceV1State previous = std::exchange(current, pending); - - isCommitted = true; // Must set the committed state before emitting any signals. -+ if (surface->isMapped()) { -+ firstBufferAttached = true; -+ } - - if (previous.acceptsFocus != current.acceptsFocus) { - Q_EMIT q->acceptsFocusChanged(); --- -GitLab - diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch deleted file mode 100644 index 1799a711b472..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-fix-race-in-wp_drm_lease_v1.patch +++ /dev/null @@ -1,73 +0,0 @@ -From dc09ce85f00b3a790e2817888067c3826280dd8e Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wengxt@gmail.com> -Date: Sat, 16 Apr 2022 00:01:12 -0700 -Subject: [PATCH] Fix race in wp_drm_lease_v1. - -Basically this is a well known issue in wayland for globals. If bind -comes after destroyed, it will raise a invalid global error. The common -practice is to delay the destroy of global. Similar technique is also -applied to wl_output. - -CCBUG: 452435 -(cherry picked from commit cdc9dcfb0a1f0445c46ee2cefa114329a2408555) ---- - src/server/drmleasedevice_v1_interface.cpp | 14 +++++--------- - src/server/drmleasedevice_v1_interface_p.h | 2 +- - 2 files changed, 6 insertions(+), 10 deletions(-) - -diff --git a/src/server/drmleasedevice_v1_interface.cpp b/src/server/drmleasedevice_v1_interface.cpp -index bffd22cd..7e338022 100644 ---- a/src/server/drmleasedevice_v1_interface.cpp -+++ b/src/server/drmleasedevice_v1_interface.cpp -@@ -84,10 +84,6 @@ void DrmLeaseDeviceV1InterfacePrivate::remove() - request->connectors.clear(); - } - globalRemove(); -- removed = true; -- if (resourceMap().isEmpty()) { -- delete this; -- } - } - - void DrmLeaseDeviceV1InterfacePrivate::registerConnector(DrmLeaseConnectorV1Interface *connector) -@@ -144,6 +140,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_release(Resource * - - void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Resource *resource) - { -+ if (isGlobalRemoved()) { -+ return; -+ } - if (!hasDrmMaster) { - pendingFds << resource->handle; - return; -@@ -161,12 +160,9 @@ void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_bind_resource(Reso - } - } - --void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_resource(Resource *resource) -+void DrmLeaseDeviceV1InterfacePrivate::wp_drm_lease_device_v1_destroy_global() - { -- Q_UNUSED(resource) -- if (removed && resourceMap().isEmpty()) { -- delete this; -- } -+ delete this; - } - - -diff --git a/src/server/drmleasedevice_v1_interface_p.h b/src/server/drmleasedevice_v1_interface_p.h -index 4bef36e4..085aac85 100644 ---- a/src/server/drmleasedevice_v1_interface_p.h -+++ b/src/server/drmleasedevice_v1_interface_p.h -@@ -44,7 +44,7 @@ protected: - void wp_drm_lease_device_v1_create_lease_request(Resource *resource, uint32_t id) override; - void wp_drm_lease_device_v1_release(Resource *resource) override; - void wp_drm_lease_device_v1_bind_resource(Resource *resource) override; -- void wp_drm_lease_device_v1_destroy_resource(Resource *resource) override; -+ void wp_drm_lease_device_v1_destroy_global() override; - }; - - class DrmLeaseConnectorV1InterfacePrivate : public QObject, public QtWaylandServer::wp_drm_lease_connector_v1 --- -GitLab - diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch deleted file mode 100644 index e40189ab2744..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.4-guard-subsurface-parent-access.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6dcf73adaafeaa40c05e22df5f1c10af88df362b Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 30 Mar 2022 14:57:12 +0100 -Subject: [PATCH] Guard subsurface parent access. - -Whilst a subsurface must have a parent at the time of creation, the -lifespan is not guaranteed afterwards. - -It's a weird thing for a client to do, but we need to not crash -afterwards. - -If the parent surface is destroyed we should consider the surface -unmapped. - -BUG: 452044 - - -(cherry picked from commit 1d2424a56a13dc55aeab699a38234a7cafa091d8) ---- - src/server/surface_interface.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/server/surface_interface.cpp b/src/server/surface_interface.cpp -index ef2584f4..8bfac95f 100644 ---- a/src/server/surface_interface.cpp -+++ b/src/server/surface_interface.cpp -@@ -678,7 +678,13 @@ void SurfaceInterfacePrivate::commitFromCache() - - bool SurfaceInterfacePrivate::computeEffectiveMapped() const - { -- return bufferRef && (!subSurface || subSurface->parentSurface()->isMapped()); -+ if (!bufferRef) { -+ return false; -+ } -+ if (subSurface) { -+ return subSurface->parentSurface() && subSurface->parentSurface()->isMapped(); -+ } -+ return true; - } - - void SurfaceInterfacePrivate::updateEffectiveMapped() --- -GitLab - diff --git a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch b/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch deleted file mode 100644 index 6e03d215ed43..000000000000 --- a/kde-plasma/kwayland-server/files/kwayland-server-5.24.5-fix-supported-action-init.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f669d7002b3966f53f8e17275123b24ec41e8e21 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Mon, 16 May 2022 16:28:53 +0300 -Subject: [PATCH] wayland: Fix supported action initialization in data offer - interface - -Currently we guess the supported and preferred dnd actions in data offer -for version >= 3. This can create problems because kwin may not send the -right action events when the supported dnd actions actually change. ---- - src/server/dataoffer_interface.cpp | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/src/server/dataoffer_interface.cpp b/src/server/dataoffer_interface.cpp -index ed682172..d78abeca 100644 ---- a/src/server/dataoffer_interface.cpp -+++ b/src/server/dataoffer_interface.cpp -@@ -25,9 +25,8 @@ public: - DataOfferInterface *q; - QPointer<AbstractDataSource> source; - -- // defaults are set to sensible values for < version 3 interfaces -- DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move; -- DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy; -+ DataDeviceManagerInterface::DnDActions supportedDnDActions = DataDeviceManagerInterface::DnDAction::None; -+ DataDeviceManagerInterface::DnDAction preferredDnDAction = DataDeviceManagerInterface::DnDAction::None; - - protected: - void data_offer_destroy_resource(Resource *resource) override; -@@ -43,6 +42,11 @@ DataOfferInterfacePrivate::DataOfferInterfacePrivate(AbstractDataSource *_source - , q(_q) - , source(_source) - { -+ // defaults are set to sensible values for < version 3 interfaces -+ if (wl_resource_get_version(resource) < WL_DATA_OFFER_ACTION_SINCE_VERSION) { -+ supportedDnDActions = DataDeviceManagerInterface::DnDAction::Copy | DataDeviceManagerInterface::DnDAction::Move; -+ preferredDnDAction = DataDeviceManagerInterface::DnDAction::Copy; -+ } - } - - void DataOfferInterfacePrivate::data_offer_accept(Resource *resource, uint32_t serial, const QString &mime_type) --- -GitLab - diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild deleted file mode 100644 index 466f2ec10616..000000000000 --- a/kde-plasma/kwayland-server/kwayland-server-5.24.4-r2.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Wayland Server Components built on KDE Frameworks" -HOMEPAGE="https://invent.kde.org/plasma/kwayland-server" - -LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -# All failing, I guess we need a virtual wayland server -RESTRICT="test" - -RDEPEND=" - >=dev-libs/wayland-1.19.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[egl] - >=dev-qt/qtwayland-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - media-libs/libglvnd -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 - >=dev-libs/wayland-protocols-1.24 -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-layer-shell-reset.patch - "${FILESDIR}"/${P}-guard-subsurface-parent-access.patch # KDE-bug 452044 - "${FILESDIR}"/${P}-fix-crash-on-screen-setup-change.patch # KDE-bug 452318 - "${FILESDIR}"/${P}-fix-race-in-wp_drm_lease_v1.patch # KDE-bug 452435 -) diff --git a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild b/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild deleted file mode 100644 index bba4549022b8..000000000000 --- a/kde-plasma/kwayland-server/kwayland-server-5.24.5-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="true" -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-2) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Wayland Server Components built on KDE Frameworks" -HOMEPAGE="https://invent.kde.org/plasma/kwayland-server" - -LICENSE="LGPL-2.1" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -# All failing, I guess we need a virtual wayland server -RESTRICT="test" - -RDEPEND=" - >=dev-libs/wayland-1.19.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5[egl] - >=dev-qt/qtwayland-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - media-libs/libglvnd -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 - >=dev-libs/wayland-protocols-1.24 -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-supported-action-init.patch -) diff --git a/kde-plasma/kwayland/Manifest b/kde-plasma/kwayland/Manifest new file mode 100644 index 000000000000..633324c475f7 --- /dev/null +++ b/kde-plasma/kwayland/Manifest @@ -0,0 +1,3 @@ +DIST kwayland-5.115.0.tar.xz 337404 BLAKE2B f03eb7d0b4ad86733dae5f7488f6f902c4ce0c17ef90a8fcf9df4ca1d5b184bf8b2ad402580c407a2076be4409f81155eff565e2134221ae4ea277d593f1745a SHA512 d4279353a7179001f19bd6962595c321161ec5f5fa24518af4326b21dab56caeed5a86cc82c5335cd8288c0b348feccfb59ec8e3ee0ec0f418972c29d48832ec +DIST kwayland-5.116.0.tar.xz 337540 BLAKE2B e238af4a122317fde2b207762858fb913005afde60f1b9cf2dfd90163021d8c3d7d9c3b055a4bb3ae26b5d0560e90c9e0d1e1e51480315bf1a5bc5592a231d11 SHA512 48b24c88872a21d237274868fea601120fb9700f888ab0a7531651dc6501db8559af3a70b6131d89d31010e1f32013222d42e9d1244ae91bf9972588494957a9 +DIST kwayland-6.0.5.tar.xz 133720 BLAKE2B 6a02720655391fc63dfad709b9b3c2642b45ed7064e7f0294c5bf36fba229b4ab43651272d52317442ba565dc697722c9cd4eae410cd5b4fe36cdf35abf29f3c SHA512 85007a154b223bf87d5b66f00671d8a011125145797e19d60631e0f3d7c95d301bd0004180b9cfaa2fa6790c4057f68b614462870703076e1dcccc09bbc3a84b 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-5.116.0.ebuild b/kde-plasma/kwayland/kwayland-5.116.0.ebuild new file mode 100644 index 000000000000..5f362f3d51ea --- /dev/null +++ b/kde-plasma/kwayland/kwayland-5.116.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.5.ebuild b/kde-plasma/kwayland/kwayland-6.0.5.ebuild new file mode 100644 index 000000000000..20d88c070389 --- /dev/null +++ b/kde-plasma/kwayland/kwayland-6.0.5.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 0eb8c11148ea..a882725ae787 100644 --- a/kde-plasma/kwin/Manifest +++ b/kde-plasma/kwin/Manifest @@ -1,2 +1,2 @@ -DIST kwin-5.24.4.tar.xz 6448844 BLAKE2B 3e58ae22d2ff254f4c08a8c6662702e5dae97dd207ca8d1d51cc203826d4b68a5eecffea69cd6eb4de5894e09e73340cda540e41db3753873cab72a76936e6d4 SHA512 2e1389a68e373791bd397294c834fb1cdbab24f32253eeaf505bb1878b8a8a5cd02d1250cae181c00dc73d6a524ff44cd1fbf2e101f13adf915f30f15c738df3 -DIST kwin-5.24.5.tar.xz 6453932 BLAKE2B cd042dd8c9168e11bc39d15969c57a97fd5c47b1af3e3a6235cabad166c4925c51541d52f7bf96f3132b3ecfeb91547845d6af3893ab5f31b41df4a926e83993 SHA512 4fad8b39a588a44f89e2640358d8e563047fa889a9bdaf246c1c87d320aa5f5b9d3d6bef702314fb06d2bfe16d0445efe736de60d94b4409f9b5efcdac48d089 +DIST kwin-5.27.11.tar.xz 7644856 BLAKE2B a21fa8d60418bf109b3f651f266185b1e97bdc92e7c7d7ab4b73271d91e8c2b629fd22851b3fff88d7ecd8277fdd8a70bf1c3bd93aa1e379377b86f56cfe2bd2 SHA512 8c76695f71ce67142d16ad16aed342375ae3aefa59ff2628a28003025701bc6b48999adaac79fc5ab09ec22c8d8407fc29f011fd3da6f992c36531fd6c3fc37b +DIST kwin-6.0.5.tar.xz 8835880 BLAKE2B 6298438b079d4df0d48aba969ef10daa1bbd8fb3ac422c4da93d6a35426f35a3160e35b4bb7ef478d4d4051ec0b28722f2160ad1e78d013eb934e6bf5f84145a SHA512 ae4004f846f663339e44f88cad9ffc3decde2f6efb1fd50212a86a8b78138f91b0ba7d510b9508e4ccd274a9a6116fb171d8baded62573e3ddf3aedff718f757 diff --git a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch deleted file mode 100644 index 38d4771c2345..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-dont-perm-disable-vrr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a5404234dbd26e170acb97789599fbcd705cf6cb Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Fri, 8 Apr 2022 17:47:09 +0200 -Subject: [PATCH] backends/drm: don't permanently disable VRR when the test - commit fails - -In 5.24, the same code path is used for testing direct scanout, so that -causes false negatives. Generally though, the user setting shouldn't be -touched, it's not really proper feedback for the driver or KWin having -problems. - - -(cherry picked from commit 2ef6215a517e4220f147f5327e7ecdad02762b64) ---- - src/backends/drm/drm_output.cpp | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/backends/drm/drm_output.cpp b/src/backends/drm/drm_output.cpp -index bd08631cf7..048803883b 100644 ---- a/src/backends/drm/drm_output.cpp -+++ b/src/backends/drm/drm_output.cpp -@@ -337,7 +337,6 @@ bool DrmOutput::present(const QSharedPointer<DrmBuffer> &buffer, QRegion damaged - m_pipeline->applyPendingChanges(); - } else { - m_pipeline->revertPendingChanges(); -- setVrrPolicy(RenderLoop::VrrPolicy::Never); - } - } - if (m_pipeline->present(buffer)) { --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch b/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch deleted file mode 100644 index 16c7756d33e2..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-backends-drm-fetch-immutable-blobs.patch +++ /dev/null @@ -1,214 +0,0 @@ -From 82c2324b5675ea2d5e3b962f270bda1d186e7326 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Mon, 4 Apr 2022 20:19:05 +0200 -Subject: [PATCH] backends/drm: fetch immutable blobs in DrmProperty - -If the blob is fetched while there is no kernel-visible reference to it, -the driver may re-use the blob ID. When DrmProperty is created or updated, -KWin holds a reference on the blob via drmModeObjectProperties, so this -should prevent any possible issues. - -CCBUG: 449285 ---- - src/backends/drm/drm_object_connector.cpp | 13 +++----- - src/backends/drm/drm_object_plane.cpp | 39 +++++++++++------------ - src/backends/drm/drm_property.cpp | 27 +++++++++++++++- - src/backends/drm/drm_property.h | 7 +++- - 4 files changed, 54 insertions(+), 32 deletions(-) - -diff --git a/src/backends/drm/drm_object_connector.cpp b/src/backends/drm/drm_object_connector.cpp -index a0045290df..0cdbd70b4f 100644 ---- a/src/backends/drm/drm_object_connector.cpp -+++ b/src/backends/drm/drm_object_connector.cpp -@@ -337,16 +337,11 @@ bool DrmConnector::updateProperties() - } - - // parse edid -- auto edidProp = getProp(PropertyIndex::Edid); -- if (edidProp) { -- DrmScopedPointer<drmModePropertyBlobRes> blob(drmModeGetPropertyBlob(gpu()->fd(), edidProp->current())); -- if (blob && blob->data) { -- m_edid = Edid(blob->data, blob->length); -- if (!m_edid.isValid()) { -- qCWarning(KWIN_DRM) << "Couldn't parse EDID for connector" << this; -- } -+ if (const auto edidProp = getProp(PropertyIndex::Edid); edidProp && edidProp->immutableBlob()) { -+ m_edid = Edid(edidProp->immutableBlob()->data, edidProp->immutableBlob()->length); -+ if (!m_edid.isValid()) { -+ qCWarning(KWIN_DRM) << "Couldn't parse EDID for connector" << this; - } -- deleteProp(PropertyIndex::Edid); - } else { - qCDebug(KWIN_DRM) << "Could not find edid for connector" << this; - } -diff --git a/src/backends/drm/drm_object_plane.cpp b/src/backends/drm/drm_object_plane.cpp -index 6967fdd50d..c4dcca96d4 100644 ---- a/src/backends/drm/drm_object_plane.cpp -+++ b/src/backends/drm/drm_object_plane.cpp -@@ -73,29 +73,26 @@ bool DrmPlane::init() - checkSupport(5, Transformation::ReflectY); - - // read formats from blob if available and if modifiers are supported, and from the plane object if not -- if (auto formatProp = getProp(PropertyIndex::In_Formats); formatProp && gpu()->addFB2ModifiersSupported()) { -- DrmScopedPointer<drmModePropertyBlobRes> propertyBlob(drmModeGetPropertyBlob(gpu()->fd(), formatProp->current())); -- if (propertyBlob && propertyBlob->data) { -- auto blob = static_cast<drm_format_modifier_blob*>(propertyBlob->data); -- auto modifiers = reinterpret_cast<drm_format_modifier*>(reinterpret_cast<uint8_t*>(blob) + blob->modifiers_offset); -- uint32_t *formatarr = reinterpret_cast<uint32_t*>(reinterpret_cast<uint8_t*>(blob) + blob->formats_offset); -- -- for (uint32_t f = 0; f < blob->count_formats; f++) { -- auto format = formatarr[f]; -- QVector<uint64_t> mods; -- for (uint32_t m = 0; m < blob->count_modifiers; m++) { -- auto modifier = &modifiers[m]; -- // The modifier advertisement blob is partitioned into groups of 64 formats -- if (m < modifier->offset || m > modifier->offset + 63) { -- continue; -- } -- if (!(modifier->formats & (1 << (f - modifier->offset)))) { -- continue; -- } -- mods << modifier->modifier; -+ if (const auto formatProp = getProp(PropertyIndex::In_Formats); formatProp && formatProp->immutableBlob() && gpu()->addFB2ModifiersSupported()) { -+ auto blob = static_cast<drm_format_modifier_blob *>(formatProp->immutableBlob()->data); -+ auto modifiers = reinterpret_cast<drm_format_modifier *>(reinterpret_cast<uint8_t *>(blob) + blob->modifiers_offset); -+ uint32_t *formatarr = reinterpret_cast<uint32_t *>(reinterpret_cast<uint8_t *>(blob) + blob->formats_offset); -+ -+ for (uint32_t f = 0; f < blob->count_formats; f++) { -+ auto format = formatarr[f]; -+ QVector<uint64_t> mods; -+ for (uint32_t m = 0; m < blob->count_modifiers; m++) { -+ auto modifier = &modifiers[m]; -+ // The modifier advertisement blob is partitioned into groups of 64 formats -+ if (m < modifier->offset || m > modifier->offset + 63) { -+ continue; - } -- m_supportedFormats.insert(format, mods); -+ if (!(modifier->formats & (1 << (f - modifier->offset)))) { -+ continue; -+ } -+ mods << modifier->modifier; - } -+ m_supportedFormats.insert(format, mods); - } - } else { - for (uint32_t i = 0; i < p->count_formats; i++) { -diff --git a/src/backends/drm/drm_property.cpp b/src/backends/drm/drm_property.cpp -index 28af8ec07f..8ab0dc0e5a 100644 ---- a/src/backends/drm/drm_property.cpp -+++ b/src/backends/drm/drm_property.cpp -@@ -24,6 +24,7 @@ DrmProperty::DrmProperty(DrmObject *obj, drmModePropertyRes *prop, uint64_t val, - , m_next(val) - , m_current(val) - , m_immutable(prop->flags & DRM_MODE_PROP_IMMUTABLE) -+ , m_isBlob(prop->flags & DRM_MODE_PROP_BLOB) - , m_obj(obj) - { - if (!enumNames.isEmpty()) { -@@ -35,6 +36,7 @@ DrmProperty::DrmProperty(DrmObject *obj, drmModePropertyRes *prop, uint64_t val, - m_minValue = prop->values[0]; - m_maxValue = prop->values[1]; - } -+ updateBlob(); - } - - DrmProperty::~DrmProperty() = default; -@@ -110,7 +112,10 @@ bool DrmProperty::needsCommit() const - - void DrmProperty::setCurrent(uint64_t value) - { -- m_current = value; -+ if (m_current != value) { -+ updateBlob(); -+ m_current = value; -+ } - } - - uint64_t DrmProperty::current() const -@@ -122,10 +127,12 @@ QVector<QByteArray> DrmProperty::enumNames() const - { - return m_enumNames; - } -+ - bool DrmProperty::hasEnum(uint64_t value) const - { - return m_enumMap.contains(value); - } -+ - bool DrmProperty::hasAllEnums() const - { - return m_enumMap.count() == m_enumNames.count(); -@@ -166,4 +173,22 @@ uint64_t DrmProperty::maxValue() const - return m_maxValue; - } - -+void DrmProperty::updateBlob() -+{ -+ if (m_immutable && m_isBlob) { -+ if (m_current != 0) { -+ m_immutableBlob.reset(drmModeGetPropertyBlob(m_obj->gpu()->fd(), m_current)); -+ if (m_immutableBlob && (!m_immutableBlob->data || !m_immutableBlob->length)) { -+ m_immutableBlob.reset(); -+ } -+ } else { -+ m_immutableBlob.reset(); -+ } -+ } -+} -+ -+drmModePropertyBlobRes *DrmProperty::immutableBlob() const -+{ -+ return m_immutableBlob.get(); -+} - } -diff --git a/src/backends/drm/drm_property.h b/src/backends/drm/drm_property.h -index 48bdeafdc2..1ae547f41e 100644 ---- a/src/backends/drm/drm_property.h -+++ b/src/backends/drm/drm_property.h -@@ -9,9 +9,9 @@ - */ - - #pragma once -+#include "drm_pointer.h" - - #include <xf86drmMode.h> -- - #include <QVector> - #include <QMap> - #include <QByteArray> -@@ -59,6 +59,7 @@ public: - - void setCurrent(uint64_t value); - uint64_t current() const; -+ drmModePropertyBlobRes *immutableBlob() const; - - uint64_t minValue() const; - uint64_t maxValue() const; -@@ -78,6 +79,8 @@ public: - } - - private: -+ void updateBlob(); -+ - uint32_t m_propId = 0; - QByteArray m_propName; - -@@ -89,6 +92,7 @@ private: - uint64_t m_next = 0; - // the value currently set for or by the kernel - uint64_t m_current = 0; -+ DrmScopedPointer<drmModePropertyBlobRes> m_immutableBlob; - - uint64_t m_minValue = -1; - uint64_t m_maxValue = -1; -@@ -96,6 +100,7 @@ private: - QMap<uint32_t, uint64_t> m_enumMap; - QVector<QByteArray> m_enumNames; - const bool m_immutable; -+ const bool m_isBlob; - bool m_legacy = false; - const DrmObject *m_obj; - }; --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch b/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch deleted file mode 100644 index acd7bf4149ab..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-dont-send-geom-to-text-input.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a35e3075a7aa4616c8930ccd3869dc4cca5d287e Mon Sep 17 00:00:00 2001 -From: Weng Xuetian <wengxt@gmail.com> -Date: Sat, 9 Apr 2022 07:25:44 -0700 -Subject: [PATCH] Do not send overlay geometry to text input. - -(cherry picked from commit 374e94918238f3ddb9d00c542f281d3d8a309efb) ---- - src/inputmethod.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp -index e7951d9580..5b8e54efbc 100644 ---- a/src/inputmethod.cpp -+++ b/src/inputmethod.cpp -@@ -615,7 +615,7 @@ void InputMethod::updateInputPanelState() - const bool bottomKeyboard = m_inputClient && m_inputClient->mode() != InputPanelV1Client::Overlay && m_inputClient->isShown(); - m_trackedClient->setVirtualKeyboardGeometry(bottomKeyboard ? m_inputClient->inputGeometry() : QRect()); - -- if (m_inputClient) { -+ if (m_inputClient && m_inputClient->mode() != InputPanelV1Client::Overlay) { - overlap = m_trackedClient->frameGeometry() & m_inputClient->inputGeometry(); - overlap.moveTo(m_trackedClient->mapToLocal(overlap.topLeft())); - } --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch b/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch deleted file mode 100644 index 667b91b8dc5c..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-dont-use-xcb-in-wayland.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7a26f93cb579cf6b1cbc1e32790f93be70013157 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Tue, 12 Apr 2022 15:45:52 +0200 -Subject: [PATCH] effects/kscreen: don't use xcb on Wayland - -BUG: 450564 -FIXED-IN: 5.24.5 -(cherry picked from commit db3f27336f2172fd70be3411874d9bbeb3db6a24) ---- - src/effects/kscreen/kscreen.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/effects/kscreen/kscreen.cpp b/src/effects/kscreen/kscreen.cpp -index 9484399756..0673915aad 100644 ---- a/src/effects/kscreen/kscreen.cpp -+++ b/src/effects/kscreen/kscreen.cpp -@@ -44,15 +44,15 @@ namespace KWin - - KscreenEffect::KscreenEffect() - : Effect() -- , m_atom(effects->announceSupportProperty("_KDE_KWIN_KSCREEN_SUPPORT", this)) -+ , m_atom(effects->waylandDisplay() ? XCB_ATOM_NONE : effects->announceSupportProperty("_KDE_KWIN_KSCREEN_SUPPORT", this)) - { - initConfig<KscreenConfig>(); -- connect(effects, &EffectsHandler::propertyNotify, this, &KscreenEffect::propertyNotify); -- connect(effects, &EffectsHandler::xcbConnectionChanged, this, -- [this] { -+ if (!effects->waylandDisplay()) { -+ connect(effects, &EffectsHandler::propertyNotify, this, &KscreenEffect::propertyNotify); -+ connect(effects, &EffectsHandler::xcbConnectionChanged, this, [this]() { - m_atom = effects->announceSupportProperty(QByteArrayLiteral("_KDE_KWIN_KSCREEN_SUPPORT"), this); -- } -- ); -+ }); -+ } - reconfigure(ReconfigureAll); - - const QList<EffectScreen *> screens = effects->screens(); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch b/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch deleted file mode 100644 index 195d33b1f3a2..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-fix-current-VD-always-added.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c1d7919ad7cc8a7e55f5b93ec84de63547bc53b9 Mon Sep 17 00:00:00 2001 -From: Ismael Asensio <isma.af@gmail.com> -Date: Fri, 8 Apr 2022 22:53:08 +0200 -Subject: [PATCH] AbstractClient: Fix the current VD being always added to the - plasma interface - -When setting-up the plasma window interface we need to call -`setOnAllDesktops()` after the actual virtual desktops have -been set. - -Otherwise, the current desktop would be always added to the -interface (as if the user were unsetting the "onAllDesktops" -flag) and the plasma interface and KWin can get un-synced, -specially if there are specific window rules. - -BUG: 452171 -FIXED-IN: 5.24.5 - - -(cherry picked from commit 4c8711f121430caa658f9848070e4e25c4a12208) ---- - src/abstract_client.cpp | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/abstract_client.cpp b/src/abstract_client.cpp -index 7e8a7eec04..0714b9ac3f 100644 ---- a/src/abstract_client.cpp -+++ b/src/abstract_client.cpp -@@ -1488,7 +1488,6 @@ void AbstractClient::setupWindowManagementInterface() - w->setKeepBelow(keepBelow()); - w->setMaximized(maximizeMode() == KWin::MaximizeFull); - w->setMinimized(isMinimized()); -- w->setOnAllDesktops(isOnAllDesktops()); - w->setDemandsAttention(isDemandingAttention()); - w->setCloseable(isCloseable()); - w->setMaximizeable(isMaximizable()); -@@ -1620,6 +1619,10 @@ void AbstractClient::setupWindowManagementInterface() - for (const auto vd : qAsConst(m_desktops)) { - w->addPlasmaVirtualDesktop(vd->id()); - } -+ // We need to set `OnAllDesktops` after the actual VD list has been added. -+ // Otherwise it will unconditionally add the current desktop to the interface -+ // which may not be the case, for example, when using rules -+ w->setOnAllDesktops(isOnAllDesktops()); - - //Plasma Virtual desktop management - //show/hide when the window enters/exits from desktop --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch b/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch deleted file mode 100644 index 9e9a4dabc998..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-fix-unlocking-wayland-sessions.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ee625b2d8acad2ba81693107740a12d8a03863c0 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Mon, 28 Mar 2022 03:40:12 +0200 -Subject: [PATCH] Fix unlocking wayland sessions - -We were never issuing a repaint which confused thoroughly the -compositor. - -BUG: 447705 ---- - src/wayland_server.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp -index eb3600f824..9e60787465 100644 ---- a/src/wayland_server.cpp -+++ b/src/wayland_server.cpp -@@ -15,6 +15,7 @@ - #include "inputpanelv1integration.h" - #include "keyboard_input.h" - #include "screens.h" -+#include "scene.h" - #include "layershellv1integration.h" - #include "main.h" - #include "xdgshellintegration.h" -@@ -610,6 +611,7 @@ void WaylandServer::initScreenLocker() - connect(seat, &KWaylandServer::SeatInterface::timestampChanged, - screenLockerApp, &ScreenLocker::KSldApp::userActivity); - } -+ Compositor::self()->scene()->addRepaintFull(); - } - ); - -@@ -627,6 +629,7 @@ void WaylandServer::initScreenLocker() - screenLockerApp, &ScreenLocker::KSldApp::userActivity); - } - ScreenLocker::KSldApp::self()->setWaylandFd(-1); -+ Compositor::self()->scene()->addRepaintFull(); - } - ); - --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch deleted file mode 100644 index 4defd5ae5945..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-lockScreenShown.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 9d38f57d84fb9a6f2c4e60f7051f685842f34e0f Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Mon, 28 Mar 2022 18:08:59 +0200 -Subject: [PATCH] waylandserver: only signal lockScreenShown once it has - actually been shown - -When the system goes to suspend and screen locking for suspend is enabled, -suspend is inhibited until ScreenLocker::KSldApp::self()->lockScreenShown() -gets called, in order to make sure that the lockscreen is shown before the -system goes to standby, and thus also when the system wakes (instead of -potentially sensitive user information). -However, signalling that when the lockscreen gets mapped can't work reliably, -as it's then a matter of timing whether or not KWin actually presents an -image with the lockscreen before suspending. To fix that, this commit replaces -that logic with only calling lockScreenShown once every output actually got a -lockscreen presented. ---- - src/wayland_server.cpp | 25 +++++++++++++++++++++---- - src/wayland_server.h | 10 ++++++++++ - 2 files changed, 31 insertions(+), 4 deletions(-) - -diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp -index c850a1b697..6d5e1206a5 100644 ---- a/src/wayland_server.cpp -+++ b/src/wayland_server.cpp -@@ -213,10 +213,6 @@ KWaylandServer::ClientConnection *WaylandServer::inputMethodConnection() const - - void WaylandServer::registerShellClient(AbstractClient *client) - { -- if (client->isLockScreen()) { -- ScreenLocker::KSldApp::self()->lockScreenShown(); -- } -- - if (client->readyForPainting()) { - Q_EMIT shellClientAdded(client); - } else { -@@ -623,6 +619,8 @@ void WaylandServer::initScreenLocker() - m_screenLockerClientConnection = nullptr; - } - -+ new LockScreenPresentationWatcher(this); -+ - const QVector<SeatInterface *> seatIfaces = m_display->seats(); - for (auto *seat : seatIfaces) { - disconnect(seat, &KWaylandServer::SeatInterface::timestampChanged, -@@ -797,4 +795,23 @@ QString WaylandServer::socketName() const - return QString(); - } - -+WaylandServer::LockScreenPresentationWatcher::LockScreenPresentationWatcher(WaylandServer *server) -+{ -+ connect(server, &WaylandServer::shellClientAdded, this, [this](AbstractClient *client) { -+ if (client->isLockScreen()) { -+ connect(client->output()->renderLoop(), &RenderLoop::framePresented, this, [this, client]() { -+ // only signal lockScreenShown once all outputs have been presented at least once -+ m_signaledOutputs << client->output(); -+ if (m_signaledOutputs.size() == kwinApp()->platform()->enabledOutputs().size()) { -+ ScreenLocker::KSldApp::self()->lockScreenShown(); -+ delete this; -+ } -+ }); -+ } -+ }); -+ QTimer::singleShot(1000, this, [this]() { -+ ScreenLocker::KSldApp::self()->lockScreenShown(); -+ delete this; -+ }); -+} - } -diff --git a/src/wayland_server.h b/src/wayland_server.h -index bf1ba6eee5..58dda9a7a2 100644 ---- a/src/wayland_server.h -+++ b/src/wayland_server.h -@@ -243,6 +243,16 @@ private: - void handleOutputRemoved(AbstractOutput *output); - void handleOutputEnabled(AbstractOutput *output); - void handleOutputDisabled(AbstractOutput *output); -+ -+ class LockScreenPresentationWatcher : public QObject -+ { -+ public: -+ LockScreenPresentationWatcher(WaylandServer *server); -+ -+ private: -+ QSet<AbstractOutput *> m_signaledOutputs; -+ }; -+ - KWaylandServer::Display *m_display = nullptr; - KWaylandServer::CompositorInterface *m_compositor = nullptr; - KWaylandServer::SeatInterface *m_seat = nullptr; --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch b/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch deleted file mode 100644 index 0607e2ff3030..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-waylandserver-move-LockScreenPresentationWatcher.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 388402c3b1b37d9f72597aae8d6670e8c0edeb14 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Wed, 6 Apr 2022 21:08:25 +0200 -Subject: [PATCH] waylandserver: move LockScreenPresentationWatcher to the - correct place - -CCBUG: 452334 ---- - src/wayland_server.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp -index 6d5e1206a5..eb3600f824 100644 ---- a/src/wayland_server.cpp -+++ b/src/wayland_server.cpp -@@ -603,6 +603,8 @@ void WaylandServer::initScreenLocker() - } - ScreenLocker::KSldApp::self()->setWaylandFd(clientFd); - -+ new LockScreenPresentationWatcher(this); -+ - const QVector<SeatInterface *> seatIfaces = m_display->seats(); - for (auto *seat : seatIfaces) { - connect(seat, &KWaylandServer::SeatInterface::timestampChanged, -@@ -619,8 +621,6 @@ void WaylandServer::initScreenLocker() - m_screenLockerClientConnection = nullptr; - } - -- new LockScreenPresentationWatcher(this); -- - const QVector<SeatInterface *> seatIfaces = m_display->seats(); - for (auto *seat : seatIfaces) { - disconnect(seat, &KWaylandServer::SeatInterface::timestampChanged, --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch b/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch deleted file mode 100644 index 8efa6b637222..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.4-xdgactivation-demand-attention.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5390a4978f3a3903ede15ecd94a750b37931fbd2 Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Wed, 6 Apr 2022 00:33:21 +0200 -Subject: [PATCH] xdgactivation: Demand attention when a process fails to - resolve its token - -In xdg_activation_v1, if a process fails to negotiate activation, at -least decorate it as demanding attention. -This will give apps ways to indicate attention is required. It can can also -help detect clients doing weird things. - - -(cherry picked from commit 52035f43b90738e2efb4fd7b482719c1ea458578) ---- - src/xdgactivationv1.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/xdgactivationv1.cpp b/src/xdgactivationv1.cpp -index e2270a3393..97f8575c29 100644 ---- a/src/xdgactivationv1.cpp -+++ b/src/xdgactivationv1.cpp -@@ -76,6 +76,7 @@ void XdgActivationV1Integration::activateSurface(SurfaceInterface *surface, cons - - if (!m_currentActivationToken || m_currentActivationToken->token != token) { - qCDebug(KWIN_CORE) << "Refusing to activate " << client << " (provided token: " << token << ", current token:" << (m_currentActivationToken ? m_currentActivationToken->token : QStringLiteral("null")) << ")"; -+ client->demandAttention(); - return; - } - --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch b/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch deleted file mode 100644 index d5b1f8c3864e..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-effects-overview-hide-panels.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7fcf36d636f62f101397d88ad6c448f54da79e46 Mon Sep 17 00:00:00 2001 -From: Marco Martin <notmart@gmail.com> -Date: Fri, 13 May 2022 15:37:13 +0000 -Subject: [PATCH] effects/overview: hide panels - -This makes it consistent with WindowView (and the panel window doesn't respond -to input anyways even if shown, which is misleading). - -BUG: 444274 -FIXED-IN: 5.24.6 - - -(cherry picked from commit db2af5500f964f3eefde60183b69f21125aeb194) ---- - src/effects/overview/qml/ScreenView.qml | 20 ++++++++------------ - 1 file changed, 8 insertions(+), 12 deletions(-) - -diff --git a/src/effects/overview/qml/ScreenView.qml b/src/effects/overview/qml/ScreenView.qml -index 40cc29f4c7..39119e40b9 100644 ---- a/src/effects/overview/qml/ScreenView.qml -+++ b/src/effects/overview/qml/ScreenView.qml -@@ -70,16 +70,8 @@ FocusScope { - } - } - -- ExpoArea { -- id: heapArea -- screen: targetScreen -- } -- - Column { -- x: heapArea.x -- y: heapArea.y -- width: heapArea.width -- height: heapArea.height -+ anchors.fill: parent - - Item { - id: topBar -@@ -176,15 +168,19 @@ FocusScope { - - KWinComponents.WindowThumbnailItem { - id: windowThumbnail -- visible: !model.client.hidden -+ visible: !model.client.hidden && opacity > 0 - wId: model.client.internalId - x: model.client.x - targetScreen.geometry.x - y: model.client.y - targetScreen.geometry.y - width: model.client.width - height: model.client.height -+ opacity: container.effect.gestureInProgress -+ ? 1 - container.effect.partialActivationFactor -+ : (model.client.hidden || container.organized) ? 0 : 1 - -- TapHandler { -- onTapped: effect.deactivate(); -+ Behavior on opacity { -+ enabled: !container.effect.gestureInProgress -+ NumberAnimation { duration: animationDuration; easing.type: Easing.OutCubic } - } - } - } --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch deleted file mode 100644 index 53c05da522ec..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-fix-multi-gpu-double-copy.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3b58fe4bde0722b352e4114adb992a2ed2c96423 Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Sat, 7 May 2022 21:23:17 +0200 -Subject: [PATCH] backends/drm: consider escaped separators KWIN_DRM_DEVICES - -':' conflicts with the file names in /dev/dri/by-path, so allow it to be -escaped with '\' - -CCBUG: 453386 - - -(cherry picked from commit a110aabbccf56019bdc324b3c751112f35ec3f6c) ---- - src/backends/drm/drm_backend.cpp | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/src/backends/drm/drm_backend.cpp b/src/backends/drm/drm_backend.cpp -index 272dba702c..567ea3f696 100644 ---- a/src/backends/drm/drm_backend.cpp -+++ b/src/backends/drm/drm_backend.cpp -@@ -57,12 +57,34 @@ - namespace KWin - { - -+static QStringList splitPathList(const QString &input, const QChar delimiter) -+{ -+ QStringList ret; -+ QString tmp; -+ for (int i = 0; i < input.size(); i++) { -+ if (input[i] == delimiter) { -+ if (i > 0 && input[i - 1] == '\\') { -+ tmp[tmp.size() - 1] = delimiter; -+ } else if (!tmp.isEmpty()) { -+ ret.append(tmp); -+ tmp = QString(); -+ } -+ } else { -+ tmp.append(input[i]); -+ } -+ } -+ if (!tmp.isEmpty()) { -+ ret.append(tmp); -+ } -+ return ret; -+} -+ - DrmBackend::DrmBackend(QObject *parent) - : Platform(parent) - , m_udev(new Udev) - , m_udevMonitor(m_udev->monitor()) - , m_session(Session::create(this)) -- , m_explicitGpus(qEnvironmentVariable("KWIN_DRM_DEVICES").split(':', Qt::SkipEmptyParts)) -+ , m_explicitGpus(splitPathList(qEnvironmentVariable("KWIN_DRM_DEVICES"), ':')) - , m_dpmsFilter() - { - setSupportsPointerWarping(true); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch b/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch deleted file mode 100644 index d38e11375bbe..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-fix-nvidia-render-glitches.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e2d271b6365188a86755af82745ad37535ceb4d7 Mon Sep 17 00:00:00 2001 -From: Erik Kurzinger <ekurzinger@nvidia.com> -Date: Sun, 8 May 2022 12:16:20 -0700 -Subject: [PATCH] platforms/drm: set read buffer in - GbmSurface::makeContextCurrent - -The first time the GBM backend's EGL context is made current after -creation, both the read and draw surfaces are set to EGL_NO_SURFACE. -This will set the GL read and draw buffers to GL_NONE in accordance with -the EGL spec. - -When a real surface is later made current, however, the spec is arguably -unclear on whether the read and draw buffers should remain set to -GL_NONE or whether they should be restored to the default GL_BACK. The -Mesa driver does the latter, the NVIDIA driver does the former. - -To work around this difference, Kwin has an explicit call to -glDrawBuffer in GbmSurface::makeContextCurrent. It does not have a -corresponding call to glReadBuffer, though, which can cause some desktop -effects such as background contrast to render incorrectly with the -NVIDIA driver. This change adds that missing call. - -(cherry picked from commit e6d2bc153f499d1ec3510c02badca38d4c42c340) ---- - src/backends/drm/egl_gbm_backend.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/backends/drm/egl_gbm_backend.cpp b/src/backends/drm/egl_gbm_backend.cpp -index 5a0be7ccaf..b34fa1320b 100644 ---- a/src/backends/drm/egl_gbm_backend.cpp -+++ b/src/backends/drm/egl_gbm_backend.cpp -@@ -377,6 +377,7 @@ bool EglGbmBackend::makeContextCurrent(const Output::RenderData &render) const - } - if (!GLPlatform::instance()->isGLES()) { - glDrawBuffer(GL_BACK); -+ glReadBuffer(GL_BACK); - } - return true; - } --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch b/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch deleted file mode 100644 index f79d4bba71ce..000000000000 --- a/kde-plasma/kwin/files/kwin-5.24.5-tabbox-dont-dismiss-popups.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f7b1edc79e9526fe6bad69a8ad475a5d77e5aead Mon Sep 17 00:00:00 2001 -From: Xaver Hugl <xaver.hugl@gmail.com> -Date: Tue, 10 May 2022 13:07:03 +0200 -Subject: [PATCH] tabbox: don't dismiss popups - -The glitches that dismissing popups was supposed to prevent are apparently -no longer present. - -BUG: 446318 -(cherry picked from commit 94b0ca814688bf3622aa53f4d4d26f97d8de7306) ---- - src/tabbox/tabbox.cpp | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/src/tabbox/tabbox.cpp b/src/tabbox/tabbox.cpp -index a1c50b27fc..76a50795ad 100644 ---- a/src/tabbox/tabbox.cpp -+++ b/src/tabbox/tabbox.cpp -@@ -1020,10 +1020,6 @@ void TabBox::navigatingThroughWindows(bool forward, const QKeySequence &shortcut - // CDE style raise / lower - CDEWalkThroughWindows(forward); - } else { -- workspace()->forEachAbstractClient([](Toplevel *toplevel) { -- if (toplevel->isPopupWindow()) -- toplevel->popupDone(); -- }); - if (areModKeysDepressed(shortcut)) { - if (startKDEWalkThroughWindows(mode)) - KDEWalkThroughWindows(forward); --- -GitLab - diff --git a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch index 15936e6dd311..268d88a09cdb 100644 --- a/kde-plasma/kwin/files/kwin-5.21.80-gstreamer-optional.patch +++ b/kde-plasma/kwin/files/kwin-5.26.80-gstreamer-optional.patch @@ -1,17 +1,17 @@ -From b5b277996322b0a37ed8a9443724183b82800e81 Mon Sep 17 00:00:00 2001 +From e15641e466b4802f73b34ea2e510df7f78c50afd Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> Date: Tue, 6 Aug 2019 22:36:44 +0200 Subject: [PATCH] Disable the effect video button if gstreamer is missing --- - kcmkwin/kwineffects/package/contents/ui/Effect.qml | 2 +- + src/kcms/effects/package/contents/ui/Effect.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/kcmkwin/kwineffects/package/contents/ui/Effect.qml b/kcmkwin/kwineffects/package/contents/ui/Effect.qml -index 71dbc5935..86ddf40b3 100644 ---- a/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml -+++ b/src/kcmkwin/kwineffects/package/contents/ui/Effect.qml -@@ -112,7 +112,7 @@ Kirigami.SwipeListItem { +diff --git a/src/kcms/effects/package/contents/ui/Effect.qml b/src/kcms/effects/package/contents/ui/Effect.qml +index f8a36c03e..ce673728e 100644 +--- a/src/kcms/effects/package/contents/ui/Effect.qml ++++ b/src/kcms/effects/package/contents/ui/Effect.qml +@@ -116,7 +116,7 @@ Kirigami.SwipeListItem { } actions: [ Kirigami.Action { @@ -21,5 +21,5 @@ index 71dbc5935..86ddf40b3 100644 tooltip: i18nc("@info:tooltip", "Show/Hide Video") onTriggered: videoItem.showHide() -- -2.22.0 +2.39.0 diff --git a/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch new file mode 100644 index 000000000000..3bf872a6e30f --- /dev/null +++ b/kde-plasma/kwin/files/kwin-6.0.2-qtgui-accessibility-optional.patch @@ -0,0 +1,41 @@ +From ade5d72c3a7e2078025ecbb3c9a354c20a8d9c90 Mon Sep 17 00:00:00 2001 +From: Aleix Pol Gonzalez <aleixpol@kde.org> +Date: Wed, 21 Feb 2024 12:25:09 +0000 +Subject: [PATCH] qpa: Don't build SPI support if Qt wasn't build with it + +Signed-off-by: Falko Becker <falko.becker@mbition.io> +--- + src/plugins/qpa/integration.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/qpa/integration.cpp b/src/plugins/qpa/integration.cpp +index 9a9195d8173..238a2e60628 100644 +--- a/src/plugins/qpa/integration.cpp ++++ b/src/plugins/qpa/integration.cpp +@@ -33,9 +33,12 @@ + #include <QtGui/private/qgenericunixeventdispatcher_p.h> + #include <QtGui/private/qgenericunixfontdatabase_p.h> + #include <QtGui/private/qgenericunixthemes_p.h> +-#include <QtGui/private/qspiaccessiblebridge_p.h> + #include <QtGui/private/qunixeventdispatcher_qpa_p.h> + ++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) ++#include <QtGui/private/qspiaccessiblebridge_p.h> ++#endif ++ + namespace KWin + { + +@@ -160,7 +163,9 @@ QPlatformOpenGLContext *Integration::createPlatformOpenGLContext(QOpenGLContext + QPlatformAccessibility *Integration::accessibility() const + { + if (!m_accessibility) { ++#if !defined(QT_NO_ACCESSIBILITY_ATSPI_BRIDGE) + m_accessibility.reset(new QSpiAccessibleBridge()); ++#endif + } + return m_accessibility.get(); + } +-- +GitLab + diff --git a/kde-plasma/kwin/kwin-5.24.4-r1.ebuild b/kde-plasma/kwin/kwin-5.24.4-r1.ebuild deleted file mode 100644 index 354b862b91c3..000000000000 --- a/kde-plasma/kwin/kwin-5.24.4-r1.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="optional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="Flexible, composited Window Manager for windowing systems on Linux" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="accessibility caps gles2-only multimedia plasma screencast" - -RESTRICT="test" - -COMMON_DEPEND=" - >=dev-libs/libinput-1.19 - >=dev-libs/wayland-1.2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[gles2-only=,libinput] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5= - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5= - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwayland-server-${PVCUT}:5 - media-libs/fontconfig - media-libs/freetype - media-libs/lcms:2 - media-libs/libepoxy - >=media-libs/mesa-21.1[egl(+),gbm(+),wayland,X] - virtual/libudev:= - x11-libs/libX11 - x11-libs/libXi - x11-libs/libdrm - >=x11-libs/libxcb-1.10 - >=x11-libs/libxkbcommon-0.7.0 - x11-libs/xcb-util-cursor - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms - x11-libs/xcb-util-wm - accessibility? ( media-libs/libqaccessibilityclient:5 ) - caps? ( sys-libs/libcap ) - gles2-only? ( media-libs/mesa[gles2] ) - plasma? ( >=kde-frameworks/krunner-${KFMIN}:5 ) - screencast? ( >=media-video/pipewire-0.3:= ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - sys-apps/hwdata - x11-base/xwayland - multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) -" -DEPEND="${COMMON_DEPEND} - >=dev-qt/designer-${QTMIN}:5 - >=dev-qt/qtconcurrent-${QTMIN}:5 - x11-base/xorg-proto - test? ( - dev-libs/plasma-wayland-protocols - >=dev-libs/wayland-protocols-1.19 - ) -" -BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}"/${P}-waylandserver-lockScreenShown.patch - "${FILESDIR}"/${P}-xdgactivation-demand-attention.patch - "${FILESDIR}"/${P}-waylandserver-move-LockScreenPresentationWatcher.patch - "${FILESDIR}"/${P}-backends-drm-dont-perm-disable-vrr.patch - "${FILESDIR}"/${P}-backends-drm-fetch-immutable-blobs.patch # KDE-bug 449285 - "${FILESDIR}"/${P}-dont-send-geom-to-text-input.patch - "${FILESDIR}"/${P}-fix-current-VD-always-added.patch # KDE-bug 452171 - "${FILESDIR}"/${P}-dont-use-xcb-in-wayland.patch # KDE-bug 450564 - "${FILESDIR}"/${P}-fix-unlocking-wayland-sessions.patch # KDE-bug 447705 -) - -src_prepare() { - ecm_src_prepare - use multimedia || eapply "${FILESDIR}/${PN}-5.21.80-gstreamer-optional.patch" - - # TODO: try to get a build switch upstreamed - if ! use screencast; then - sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package accessibility QAccessibilityClient) - $(cmake_use_find_package caps Libcap) - $(cmake_use_find_package plasma KF5Runner) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - optfeature "color management support" x11-misc/colord - elog - elog "In Plasma 5.20, default behavior of the Task Switcher to move minimised" - elog "windows to the end of the list was changed so that it remains in the" - elog "original order. To revert to the well established behavior:" - elog - elog " - Edit ~/.config/kwinrc" - elog " - Find [TabBox] section" - elog " - Add \"MoveMinimizedWindowsToEndOfTabBoxFocusChain=true\"" -} diff --git a/kde-plasma/kwin/kwin-5.24.5-r1.ebuild b/kde-plasma/kwin/kwin-5.27.11.ebuild index 12d15b83a199..b0e84b231dc1 100644 --- a/kde-plasma/kwin/kwin-5.24.5-r1.ebuild +++ b/kde-plasma/kwin/kwin-5.27.11.ebuild @@ -1,114 +1,111 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="optional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm 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 ~riscv ~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" COMMON_DEPEND=" - >=dev-libs/libinput-1.19 - >=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=,libinput] + >=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/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 + >=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-21.1[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:= ) " RDEPEND="${COMMON_DEPEND} + !kde-plasma/kwayland-server >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtvirtualkeyboard-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] sys-apps/hwdata x11-base/xwayland - multimedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] ) + multimedia? ( + >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer,qml] + media-plugins/gst-plugins-soup:1.0 + ) " DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-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/plasma-wayland-protocols - >=dev-libs/wayland-protocols-1.19 - ) + x11-libs/xcb-util-image + caps? ( sys-libs/libcap ) " -BDEPEND="test? ( >=dev-qt/qtwaylandscanner-${QTMIN}:5 )" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}"/${P}-fix-multi-gpu-double-copy.patch # KDE-bug 453386 - "${FILESDIR}"/${P}-tabbox-dont-dismiss-popups.patch # KDE-bug 446318 - "${FILESDIR}"/${P}-effects-overview-hide-panels.patch # KDE-bug 444274 - "${FILESDIR}"/${P}-fix-nvidia-render-glitches.patch -) +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.21.80-gstreamer-optional.patch" + use multimedia || eapply "${FILESDIR}/${PN}-5.26.80-gstreamer-optional.patch" # TODO: try to get a build switch upstreamed if ! use screencast; then @@ -117,9 +114,14 @@ src_prepare() { } src_configure() { + # ODR violation (bug #921558) + filter-lto + local mycmakeargs=( + # KWIN_BUILD_NOTIFICATIONS exists, but kdeclarative still hard-depends on it $(cmake_use_find_package accessibility QAccessibilityClient) $(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.5.ebuild b/kde-plasma/kwin/kwin-6.0.5.ebuild new file mode 100644 index 000000000000..5a1121feb3cd --- /dev/null +++ b/kde-plasma/kwin/kwin-6.0.5.ebuild @@ -0,0 +1,140 @@ +# 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-24.1.0_rc1[opengl] + <media-libs/mesa-24.1.0_rc1[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 5c6a9ef157a9..4903bdce5a1e 100644 --- a/kde-plasma/kwin/metadata.xml +++ b/kde-plasma/kwin/metadata.xml @@ -9,7 +9,9 @@ <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 430dc5e6db2b..c8915b9df7b3 100644 --- a/kde-plasma/kwrited/Manifest +++ b/kde-plasma/kwrited/Manifest @@ -1,2 +1,2 @@ -DIST kwrited-5.24.4.tar.xz 20920 BLAKE2B 82d55a6d16cb4ac81180eee7a9b4a52f85421008f4a71c816b6258cbde446e9ef3e56ab1a1c67b3dcbdb95ee5e1648530df713ac68510e172306e4c7625f4cb8 SHA512 ea2903fa66404beed68c7485edd88e85fcb6edc357ec1044a781895bf338fdd376edcf2d9662f5170615f5c2d729f1e642b70086a568501ca714c86842dac152 -DIST kwrited-5.24.5.tar.xz 20904 BLAKE2B 84068117f8c2c890df1f3ebc4d305a7e417eddc6670340f653b9378118d07c666a16c96376868d6f6f6765e5c42a842161343856563e553b3146c0a140839323 SHA512 3fd38606fd81017f54df910e47f62bdc82758205fdeacae80a5bca6c5fe7ce9413a4f3f7c3ce2735107c6cd6ebecbc5a929b809eef52a593cc69c358c7c38af4 +DIST kwrited-5.27.11.tar.xz 23492 BLAKE2B c37d142111e4bf2892b7795fc689452ab210a8cfc099aa89d75c0766975d62670f5a04039f1e10154d1a0b1d0025a7b8cc12fc68bc6042fcf1640c0c1154d6fe SHA512 b4a541832d567dbc2b0d391f7aa1463f17b89e62b3bb28447f728f7d32f640c2b5bd1011ef2224c37cbaa517f90e7bb17d0eadd9209af2af22db1986d6ab401a +DIST kwrited-6.0.5.tar.xz 23696 BLAKE2B 9adf727283d5b4794b54bcad3e66834f178a54ef63bb81eb33910ecd67a0956bf8a08485f196e005b592d33c5c5052e59884910fcc244f46f10461f5d2e57ffd SHA512 06410c11e7ba0d0490febeb0e1281becd124ed40b93895f147f8500be6764d0a79fced020ae99c0af71a53ba56c97e97719fdc99ce51da9c3c5a82d6a92369ce diff --git a/kde-plasma/kwrited/kwrited-5.24.5.ebuild b/kde-plasma/kwrited/kwrited-5.24.5.ebuild deleted file mode 100644 index 638d75a36625..000000000000 --- a/kde-plasma/kwrited/kwrited-5.24.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/kwrited/kwrited-5.24.4.ebuild b/kde-plasma/kwrited/kwrited-5.27.11.ebuild index 7292d7ecfbba..2e1967fda504 100644 --- a/kde-plasma/kwrited/kwrited-5.24.4.ebuild +++ b/kde-plasma/kwrited/kwrited-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma daemon listening for wall and write messages" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/kwrited/kwrited-6.0.5.ebuild b/kde-plasma/kwrited/kwrited-6.0.5.ebuild new file mode 100644 index 000000000000..2c44074a0ede --- /dev/null +++ b/kde-plasma/kwrited/kwrited-6.0.5.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="KDE Plasma daemon listening for wall and write messages" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpty-${KFMIN}:6 +" +RDEPEND="${DEPEND}" diff --git a/kde-plasma/layer-shell-qt/Manifest b/kde-plasma/layer-shell-qt/Manifest index 1bf5bd7f0490..3b2cb882c09f 100644 --- a/kde-plasma/layer-shell-qt/Manifest +++ b/kde-plasma/layer-shell-qt/Manifest @@ -1,2 +1,2 @@ -DIST layer-shell-qt-5.24.4.tar.xz 17876 BLAKE2B 42132f550ed135dd7d8c9d7b9fca1265c288ceb1f4dffb72e7db95697d475c6175e033cbda11b3557b19771d95f549b62f5cc22a5e7d24df1726e34b5ce0185a SHA512 6ed294219947d27cbf71777f4f1df7a2a2b0f67369b1e7bb018d2a0c3d464aecf6f62cba3fe8dc45c090a441a503648950198ae6eb681b200ab416274578ff9d -DIST layer-shell-qt-5.24.5.tar.xz 17892 BLAKE2B c6874b199bb72fad4923cd7a36f5605483f19e12c71d65bd67a074c23ccee9de398fdf4c314b2eb69a0dc758122489dac759d1d0fbf22203a80f982c1dea9cfd SHA512 e9aeb94d7200543eef03950f6e3ccf3a60faf66bcf048760ea35d27c621bbced712411501f9d48fdaf98a36708a1a202c0531bbc94df0ccf99278ffd106b7abc +DIST layer-shell-qt-5.27.11.tar.xz 18488 BLAKE2B 3c56db129c4d525ee1968e3016f77f5adcf9ed121f6a7b28a6331ca06a1e1ad0df091c4d8afeb64e12176094332da5de33e91e219551c17ce22adc463dbe6b92 SHA512 9a7439a5653fe684967445109624989fbb11f8bc46815afd3eadf44f5753f4442d1d9d59c0721f1f383715f16aae845e3edc8c62409ccabee324dca219fb3429 +DIST layer-shell-qt-6.0.5.tar.xz 20928 BLAKE2B dfa70c4416b92b90fcbc25798cf10b2b9ca47a7eff651a7757f664d52b1f948dcfaa1119b01e4923d77dfaddf6bc35aa3bef98a8ba297ba245b1842482a320bb SHA512 8da7612be743e9445b492c3e9b19f62e8112a419d9686138aa9dc009b3ec02ac180c156f5bbe74bc71fc13453a00f7bbaf7caa0818985898463eb0d2d218d397 diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.11.ebuild index 3b6ca14f2ea1..574e0d00c5b0 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.4.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-5.27.11.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol" LICENSE="LGPL-3+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X diff --git a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild b/kde-plasma/layer-shell-qt/layer-shell-qt-6.0.5.ebuild index 853077c48cf6..9a1226aaba93 100644 --- a/kde-plasma/layer-shell-qt/layer-shell-qt-5.24.5.ebuild +++ b/kde-plasma/layer-shell-qt/layer-shell-qt-6.0.5.ebuild @@ -1,36 +1,31 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org DESCRIPTION="Qt component to allow applications make use of Wayland wl-layer-shell protocol" LICENSE="LGPL-3+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" -# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X # slot op: various private QtWaylandClient headers RDEPEND=" >=dev-libs/wayland-1.15 - >=dev-qt/qtdeclarative-${QTMIN}:5 - || ( - >=dev-qt/qtgui-${QTMIN}:5[libinput] - >=dev-qt/qtgui-${QTMIN}:5[X] - ) - >=dev-qt/qtwayland-${QTMIN}:5= + >=dev-qt/qtbase-${QTMIN}:6[gui] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6= x11-libs/libxkbcommon " DEPEND="${RDEPEND} dev-libs/wayland-protocols " BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 dev-util/wayland-scanner virtual/pkgconfig " diff --git a/kde-plasma/libkscreen/Manifest b/kde-plasma/libkscreen/Manifest index c94bac22876d..8e07a444878b 100644 --- a/kde-plasma/libkscreen/Manifest +++ b/kde-plasma/libkscreen/Manifest @@ -1,2 +1,2 @@ -DIST libkscreen-5.24.4.tar.xz 99476 BLAKE2B db545a542a77832d5ac877c953cd7a36dcc3b4df4495768543570deb2973e1aee6572942a9fecd17746e6f8708b4c1016cca57bb65151cd7246f8802d2b23706 SHA512 72be6b77f5fe4d77ef29c07d8bab2d1c5a94cd9aa31a324cf6d883a2e6132ee923c0fa02a4bc2432df7da4171dfbdd3a608117eeccfafe9155002cc8d50b3020 -DIST libkscreen-5.24.5.tar.xz 99464 BLAKE2B 544a2a6def8fc58c839247bb080c2650bae73dc6850a5436b5d9ed1666d8d8744af75f213f32008e3c331db90d151f5dd567f6fcc919b61dbe1d3c8d14d2fff5 SHA512 780abc702ee6bd53703dc5671e56dc59e10e62ce33c3714454c3c8b5a7a5cf43d4402906f9b1c7c1c19e9dc36cb323c07eb20603a0fb44c73281844c879c8370 +DIST libkscreen-5.27.11.tar.xz 116052 BLAKE2B a727284888faa02f86c12ed332daa7fd5bf3fa2611664a5cd37608d61821a59023fb11b19afe26210735d5ffe5ee2e56a3a3b737b66d99aae8177061bb5cba5b SHA512 46cca0d7f91be8a284cbee951183d5559a1f298b987e5f76d5bf4b9a3d292d8ccf363f409582080d04aee692083f3e0a073bae15444f53e0f77565bb7c2255ba +DIST libkscreen-6.0.5.tar.xz 117804 BLAKE2B 05a5c1a48bbf8a6ce214e0dc510b17b844a151c549530c744af0d61dc87d025bdfc69f9b3c8397e3b824935751885aaebfd41d319d49c4dc1139098c3b633243 SHA512 39f90cde99f299f152589747e9e454288c4a555eac174965a71aef5b9e7efcb913b453b39d534aa54ed5e694a8ab0fbef7d73b9668a2323042b8f727eff2a66a diff --git a/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild b/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild deleted file mode 100644 index 8aed7bcf7d06..000000000000 --- a/kde-plasma/libkscreen/libkscreen-5.24.5.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_QTHELP="true" -ECM_TEST="forceoptional" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -# requires running session -RESTRICT="test" - -RDEPEND=" - dev-libs/wayland - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - x11-libs/libxcb -" -DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - dev-util/wayland-scanner -" diff --git a/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild index e1bbeb4e5445..03720e8c6c61 100644 --- a/kde-plasma/libkscreen/libkscreen-5.24.4.ebuild +++ b/kde-plasma/libkscreen/libkscreen-5.27.11.ebuild @@ -1,21 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_QTHELP="true" ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plasma screen management library" LICENSE="GPL-2" # TODO: CHECK -SLOT="5/7" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="5/8" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # requires running session @@ -25,15 +24,17 @@ RDEPEND=" dev-libs/wayland >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - x11-libs/libxcb + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + x11-libs/libxcb:= " DEPEND="${RDEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/plasma-wayland-protocols-1.10.0 " BDEPEND=" + >=dev-qt/linguist-tools-${QTMIN}:5 >=dev-qt/qtwaylandscanner-${QTMIN}:5 dev-util/wayland-scanner " diff --git a/kde-plasma/libkscreen/libkscreen-6.0.5.ebuild b/kde-plasma/libkscreen/libkscreen-6.0.5.ebuild new file mode 100644 index 000000000000..77117e7ed6eb --- /dev/null +++ b/kde-plasma/libkscreen/libkscreen-6.0.5.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_QTHELP="true" +ECM_TEST="forceoptional" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma screen management library" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6/8" +KEYWORDS="~amd64" +IUSE="" + +# requires running session +RESTRICT="test" + +# slot op: Uses Qt::GuiPrivate for qtx11extras_p.h +RDEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui] + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + x11-libs/libxcb:= +" +DEPEND="${RDEPEND} + >=dev-libs/plasma-wayland-protocols-1.12.0 +" +BDEPEND=" + >=dev-qt/qttools-${QTMIN}:6[linguist] + >=dev-qt/qtwayland-${QTMIN}:6 + dev-util/wayland-scanner +" diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index f9461f019009..5849e24114c1 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,2 +1,2 @@ -DIST libksysguard-5.24.4.tar.xz 767300 BLAKE2B cfb42c1da82bb90c33ab14d87351e009759afd294b3cd44ab98f2310f0dba520f421c26d3db4f1031d8d8c6086e63b14eebcc3ceaa4db2d9479d6571c409450b SHA512 a43c10109ee36d4840fae30ef73209e0a0bf43c076e94d57642aa6f89aadb95928751281342e52f01357b2b1dde788c5d034c595e22f5fc6ce1c2da3979dc5c2 -DIST libksysguard-5.24.5.tar.xz 768040 BLAKE2B 1b4defe6a174db5258a4d85c12d469a78dd1b709f5df07b8d3076076da1b72d6446307b5d1ab360c91ee6e2bddc0f5bcb837db994e16ab2a9e49450e19e63c58 SHA512 133c5923ee616515b1934c4e2c30509d407f40b7afc3914ac2417d7c961f3a1921bd3b5bfd1ca73942ddb17777fbf4d96950c130129135eae2b8d1b8daac9fa5 +DIST libksysguard-5.27.11.tar.xz 890640 BLAKE2B 61a657f8fbc1042e57ec6e4ba85a6900db680547c61a611200dddc15b94af76f5183db6dc2c867138ccfc2af67f185d16eaff130999c525b3c8b7c23e38adc42 SHA512 21ac0f398c969146a9901cb184508cfab8f1d6e75e364ca638f85e87b0a25f9c901f81696c0bd6ee060f35c54204718f891510e7816858c190d78c2b25004544 +DIST libksysguard-6.0.5.tar.xz 294984 BLAKE2B 8392e14a71fd0ab0f71c4c4fb2a3f5676ba3d1711a3cada3a9c5e11c67cd6f44709df3ebecb22b8096cc885e39330a4bab28095ac0cdd804f84b38b722edcb02 SHA512 1024dcc439931742cde927c937df625e82629baf0d2e3e7aaaca81a7641e9c753424f64b1e94eb18007878d2f1c8d68e6c5ce76b73e283c885ce5181d1122751 diff --git a/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild deleted file mode 100644 index 8a5ba3fd7afa..000000000000 --- a/kde-plasma/libksysguard/libksysguard-5.24.4.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_DESIGNERPLUGIN="true" -ECM_TEST="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Task management and system monitoring library" - -LICENSE="LGPL-2+" -SLOT="5/9" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="webengine X" - -COMMON_DEPEND=" - dev-libs/libnl:3 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - net-libs/libpcap - sys-apps/lm-sensors:= - sys-libs/libcap - sys-libs/zlib - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:5 - >=dev-qt/qtwebengine-${QTMIN}:5 - ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXres - ) -" -DEPEND="${COMMON_DEPEND} - >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 - !<kde-plasma/plasma-workspace-5.18.80:5 -" - -PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" ) - -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.24.5.ebuild b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild index 5b960e03fd26..af3dbfb6339b 100644 --- a/kde-plasma/libksysguard/libksysguard-5.24.5.ebuild +++ b/kde-plasma/libksysguard/libksysguard-5.27.11.ebuild @@ -1,76 +1,76 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Task management and system monitoring library" LICENSE="LGPL-2+" SLOT="5/9" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="webengine X" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="webengine" -COMMON_DEPEND=" +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +RDEPEND=" dev-libs/libnl:3 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 + >=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/libcap sys-libs/zlib + x11-libs/libX11 + x11-libs/libXres webengine? ( >=dev-qt/qtwebchannel-${QTMIN}:5 >=dev-qt/qtwebengine-${QTMIN}:5 ) - X? ( - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libX11 - x11-libs/libXres - ) " -DEPEND="${COMMON_DEPEND} +DEPEND="${RDEPEND} >=kde-frameworks/kiconthemes-${KFMIN}:5 - X? ( x11-base/xorg-proto ) -" -RDEPEND="${COMMON_DEPEND} - !<kde-plasma/ksysguard-5.21.90:5 - !<kde-plasma/plasma-workspace-5.18.80:5 + x11-base/xorg-proto " +BDEPEND="sys-libs/libcap" +# downstream patch PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" ) src_configure() { local mycmakeargs=( $(cmake_use_find_package webengine Qt5WebChannel) $(cmake_use_find_package webengine Qt5WebEngineWidgets) - $(cmake_use_find_package X X11) ) ecm_src_configure } src_test() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) LC_NUMERIC="C" ecm_src_test # bug 695514 } diff --git a/kde-plasma/libksysguard/libksysguard-6.0.5.ebuild b/kde-plasma/libksysguard/libksysguard-6.0.5.ebuild new file mode 100644 index 000000000000..360b1e840f19 --- /dev/null +++ b/kde-plasma/libksysguard/libksysguard-6.0.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_DESIGNERPLUGIN="true" +ECM_TEST="true" +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Task management and system monitoring library" + +LICENSE="LGPL-2+" +SLOT="6/9" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + dev-libs/libnl:3 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + net-libs/libpcap + sys-apps/lm-sensors:= + sys-libs/zlib +" +DEPEND="${RDEPEND}" +BDEPEND="sys-libs/libcap" + +src_test() { + # bugs 797898, 889942: flaky test + local myctestargs=( + -E "(sensortreemodeltest)" + ) + LC_NUMERIC="C" ecm_src_test # bug 695514 +} diff --git a/kde-plasma/libkworkspace/Manifest b/kde-plasma/libkworkspace/Manifest index be5c47e6ef60..156526552da7 100644 --- a/kde-plasma/libkworkspace/Manifest +++ b/kde-plasma/libkworkspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 -DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 diff --git a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch index 971dc941d0fc..85eddb74b513 100644 --- a/kde-plasma/libkworkspace/files/libkworkspace-5.22.80-standalone.patch +++ b/kde-plasma/libkworkspace/files/libkworkspace-5.27.9-standalone.patch @@ -39,7 +39,7 @@ index 015c5181f..0aa635e11 100644 + include(ECMMarkAsTest) + include(GenerateExportHeader) + -+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n Init WindowSystem) ++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Config CoreAddons I18n WindowSystem) + + find_package(KWinDBusInterface CONFIG REQUIRED) + find_package(KScreenLocker 5.13.80 REQUIRED) @@ -69,7 +69,7 @@ index 015c5181f..0aa635e11 100644 set(kworkspace_LIB_SRCS kdisplaymanager.cpp kworkspace.cpp @@ -12,9 +65,17 @@ add_definitions(-DTRANSLATION_DOMAIN=\"libkworkspace\") - qt_add_dbus_interface(kworkspace_LIB_SRCS ${KINIT_DBUS_INTERFACES_DIR}/kf5_org.kde.KLauncher.xml klauncher_interface) + qt_add_dbus_interface(kworkspace_LIB_SRCS kf5_org.kde.KLauncher.xml klauncher_interface) qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface ) qt_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface ) +if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR}) diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild deleted file mode 100644 index 7b3149edc1d7..000000000000 --- a/kde-plasma/libkworkspace/libkworkspace-5.24.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau -" -DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 -" - -S="${S}/${PN}" - -src_prepare() { - # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi - - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die - cat >> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - - ecm_src_prepare -} diff --git a/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild b/kde-plasma/libkworkspace/libkworkspace-5.27.11.ebuild index 14acef8df3b4..f22da375b176 100644 --- a/kde-plasma/libkworkspace/libkworkspace-5.24.4.ebuild +++ b/kde-plasma/libkworkspace/libkworkspace-5.27.11.ebuild @@ -1,20 +1,21 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Workspace library to interact with the Plasma session manager" +S="${S}/${PN}" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" RDEPEND=" @@ -31,21 +32,16 @@ RDEPEND=" x11-libs/libXau " DEPEND="${RDEPEND} - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 " -S="${S}/${PN}" - src_prepare() { # delete colliding libkworkspace translations, let ecm_src_prepare do its magic - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die - rm -rf po/*/docs || die - cp -a ../po ./ || die - fi + find ../po -type f -name "*po" -and -not -name "libkworkspace*" -delete || die + rm -rf po/*/docs || die + cp -a ../po ./ || die - eapply "${FILESDIR}/${PN}-5.22.80-standalone.patch" + eapply "${FILESDIR}/${PN}-5.27.9-standalone.patch" sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" -i CMakeLists.txt || die cat >> CMakeLists.txt <<- _EOF_ || die ki18n_install(po) diff --git a/kde-plasma/libplasma/Manifest b/kde-plasma/libplasma/Manifest new file mode 100644 index 000000000000..58f24ce0e855 --- /dev/null +++ b/kde-plasma/libplasma/Manifest @@ -0,0 +1,3 @@ +DIST libplasma-6.0.5.tar.xz 2116800 BLAKE2B 6d9fd7d3decc6fec1864d70ab82eee03ae09a3a92e1a4923b5bc28a3241ebbba1d2ee6c59af26affb3e727bdb81a9af0e69196517bf5a9758fe005ecd5238457 SHA512 40ef4d9100edf16bfba138570e85849715df8047e22cd5c6e7fc3334996ae5a8bb1f95b681b16d2e4ffc5aad93fb16bd444d1316f82205e4a36847648b0509ae +DIST plasma-framework-5.115.0.tar.xz 3310792 BLAKE2B 495d1a5de3839a50a0511099f5c839ecfb498ec3e71181e11a07f339bd4ae057f8ac51f5d8b28b7c96e81f89218b90b259bb31a45ebf202af033599db957ef32 SHA512 46ff7c6e93c7be3bb6998010b8b613f7c90cb9b3313290d6ebf0b94ed896e676c245aa090f0beb74c4c68576909f7dc7b6f580e386c18a923be90f74bdc1fbb6 +DIST plasma-framework-5.116.0.tar.xz 3311836 BLAKE2B ca47628891705bda2ae02728a680296e0ac2e4754f779a65685a85dd364ada9217e485ac9e10130c6c37fd0b98137263cb919941933fdbc0ba4c44febb6a99fd SHA512 d15a1379d14a13c17932c1278b209b0a2f6a07f1abc15cb436f73765f8df12564297541c29bf453991e4dc7d469c5b83ecc53e9e97480d10d8d897597acfe804 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-5.116.0.ebuild b/kde-plasma/libplasma/libplasma-5.116.0.ebuild new file mode 100644 index 000000000000..987b3ba7565e --- /dev/null +++ b/kde-plasma/libplasma/libplasma-5.116.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.5.ebuild b/kde-plasma/libplasma/libplasma-6.0.5.ebuild new file mode 100644 index 000000000000..1e916937ef5b --- /dev/null +++ b/kde-plasma/libplasma/libplasma-6.0.5.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_NONGUI="true" +ECM_QTHELP="true" +ECM_TEST="true" +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Plasma library and runtime components based upon KF6 and Qt6" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="gles2-only wayland" + +RESTRICT="test" + +# kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras +COMMON_DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gles2-only=,gui,widgets,X] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-libs/wayland-1.15.0 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6[qml] + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kirigami-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/ksvg-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + =kde-plasma/plasma-activities-${PVCUT}*:6 + media-libs/libglvnd + x11-libs/libX11 + x11-libs/libxcb + !gles2-only? ( media-libs/libglvnd[X] ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 + x11-base/xorg-proto +" +RDEPEND="${COMMON_DEPEND} + !${CATEGORY}/${PN}:5[-kf6compat(-)] +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + >=dev-util/wayland-scanner-1.19.0 +" + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package !gles2-only OpenGL) + ) + + ecm_src_configure +} diff --git a/kde-plasma/libplasma/metadata.xml b/kde-plasma/libplasma/metadata.xml new file mode 100644 index 000000000000..ab1489f0a20c --- /dev/null +++ b/kde-plasma/libplasma/metadata.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="project"> + <email>kde@gentoo.org</email> + <name>Gentoo KDE Project</name> + </maintainer> + <upstream> + <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/libplasma</remote-id> + </upstream> + <use> + <flag name="kf6compat">Disable components colliding with KF6, depend on KF6 components instead</flag> + </use> + <slots> + <subslots> + Must only be used by packages that are known to use private parts of the Frameworks API. + </subslots> + </slots> +</pkgmetadata> diff --git a/kde-plasma/metadata.xml b/kde-plasma/metadata.xml index 73b0ca8d1a31..2af1b4beacc8 100644 --- a/kde-plasma/metadata.xml +++ b/kde-plasma/metadata.xml @@ -4,4 +4,8 @@ <longdescription lang="en"> The kde-plasma category contains KDE Plasma </longdescription> + <longdescription lang="de"> + Die Kategorie kde-plasma enthält Pakete für die Desktop-Umgebung + KDE Plasma. + </longdescription> </catmetadata> diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest index dd0172b231c7..b9ee67d78085 100644 --- a/kde-plasma/milou/Manifest +++ b/kde-plasma/milou/Manifest @@ -1,2 +1,2 @@ -DIST milou-5.24.4.tar.xz 48236 BLAKE2B 286f746a3fe632098531f03557b763f636390eb73e94c31bbb8e5aa70b7ec67066121544d327fdc5e2f669ffba9930bc6d1d3a546fb216e9bb7bf2493eb4bcb9 SHA512 ef41d274970e38f45e26bc986948e3ba49d0ef54a907e64fc36f15ed9369d3c4cd5e2566b25a2d3499b123cb0ec20eca9c777ab3a66248e6a5a824d7b7c4ae96 -DIST milou-5.24.5.tar.xz 48264 BLAKE2B 00ee42f530a73038198f0abbd04e54c54bb60fc449129a634dfdaefc56331ad0a55cfa7ccd4ae0fc60643b4ec5f8d89bc27382b27a23f36172fcc1956376b026 SHA512 b6a2979b6ab4717d53e0f58605ba43a08f78836a287c0988aeb9461f6d4cb42f71d1081ec1261dcb957ee97b67f8eba42f3c6861e96d6a2e796142edac74ea7c +DIST milou-5.27.11.tar.xz 58672 BLAKE2B 8b9cee6958c1437a239fc737d67a4677aab1c9a7d0d00873824512191a5be0d13550eae7db0c02d784328c22d7709c11b8beaecfe73649c51fc59b51fe49b91f SHA512 62fb06f50130a5836d50824ac1d9828463eb525787baa94489726e1fbfec270e1cf8b7f18a45430bdcbf3629eed0560a5d890cacd8d1d824dcc1362d53e50d9f +DIST milou-6.0.5.tar.xz 49868 BLAKE2B 995a946d9c63f3cee1ee3ace45204a945765702a67ca4e146ea3799cd9ee31ea0d2ac87f6abb8cb52252df64c30e6f1bd6109e0b838cb581885158f35b01f4f8 SHA512 c310c0bbfd50df8a6723a42bb3e25b40a616f81e8cffc7e69316f7d8a9ed1370a37bc4b119ab55aa6e33ba1bb67c74fb04360cf497fae4ff9481709cfd12075e diff --git a/kde-plasma/milou/metadata.xml b/kde-plasma/milou/metadata.xml index d925f2439758..bd104055766b 100644 --- a/kde-plasma/milou/metadata.xml +++ b/kde-plasma/milou/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/milou</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/milou/milou-5.24.5.ebuild b/kde-plasma/milou/milou-5.24.5.ebuild deleted file mode 100644 index 5aa3ceefc899..000000000000 --- a/kde-plasma/milou/milou-5.24.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/milou/milou-5.24.4.ebuild b/kde-plasma/milou/milou-5.27.11.ebuild index f74c41e92e5c..a598d1429da6 100644 --- a/kde-plasma/milou/milou-5.24.4.ebuild +++ b/kde-plasma/milou/milou-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Dedicated search application built on top of Baloo" HOMEPAGE="https://invent.kde.org/plasma/milou" LICENSE="GPL-2 LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -28,6 +28,6 @@ DEPEND=" >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/milou/milou-6.0.5.ebuild b/kde-plasma/milou/milou-6.0.5.ebuild new file mode 100644 index 000000000000..dfeb9a2fb38e --- /dev/null +++ b/kde-plasma/milou/milou-6.0.5.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..b280bb49d6bf --- /dev/null +++ b/kde-plasma/ocean-sound-theme/Manifest @@ -0,0 +1 @@ +DIST ocean-sound-theme-6.0.5.tar.xz 1209292 BLAKE2B 4c6ffa1e86f44b75b735d698bd449a012be83f2ef9518c981ebc39658636c07bd78d6d84cdd7089237e01e6d8e6fca565ccdefe3b2e47ff78d907e03ca8f91a2 SHA512 89f8777d552ea63def82694b8d89065d26cc28ef371da06bae445e150f9bf5684ff2d37307848afb8131e3dfed1ed4f2be9d54d14a7bcd32b9571050460ab30f 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.5.ebuild b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.0.5.ebuild new file mode 100644 index 000000000000..a2a91e818a06 --- /dev/null +++ b/kde-plasma/ocean-sound-theme/ocean-sound-theme-6.0.5.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..da185f36b0a8 --- /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.5.tar.xz 1936352 BLAKE2B aae9460dc5c1a279aa37d8779169b5c548aec0acf05d12a079c9e3bf90e020e42ccd947e7ab8f910f8129f11a821068d251052906a3740ff1dd5b99577615d14 SHA512 aaa1de2a573e314e4d1247ce7f370166c8f7a24f4c6df7cf8fccb68f7f6ca8ecf798484c189ab16b5bb244bc352b6ecf16bc9c484e7d55e7284be894e56e8613 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.5.ebuild b/kde-plasma/oxygen-sounds/oxygen-sounds-6.0.5.ebuild new file mode 100644 index 000000000000..09a626bef723 --- /dev/null +++ b/kde-plasma/oxygen-sounds/oxygen-sounds-6.0.5.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 895d0849e124..2c526d28904a 100644 --- a/kde-plasma/oxygen/Manifest +++ b/kde-plasma/oxygen/Manifest @@ -1,2 +1,2 @@ -DIST oxygen-5.24.4.tar.xz 4615036 BLAKE2B e6a6aea36d9de13ebf5bbbcb02be1631a86d415d7e838fd5d389bca8c6bc8ad34257f30d1bb040015bb1f0cf20611b54012072fb6ffe99aa0a3f4149d3028906 SHA512 dad2ef40a6daacf36e37bc6f5285229917b68e66c986cd4e73998a1caadfec0b078a2751ad59aa20d41f5a9ac3ebc1b94e5f5a89eba02523fdec3f28b21728cc -DIST oxygen-5.24.5.tar.xz 4615504 BLAKE2B d937770d2919f2318cfce3fc0b90f9c8009aa1c80ce9f491d3c9863c383fd3d8b0ff61582a454d7bb7cc066183ac514c4058d48b523aec68b635ffd1b3e93606 SHA512 90df776e36014b07849c9454632bb73a3b75d5d146eeec8d9de88b63d0bdbd68fabd9f1eaac0166f47057a61c48f7b531630f48d6b037d1a266e18e36febbaa2 +DIST oxygen-5.27.11.tar.xz 2783000 BLAKE2B 06bbf12c5e45f4fee4e5b7f572b7f6b57debc084bbd533afd7f839e1bd9bba119cf040b1a028a743d88fa7f50d9ea44f84e6eaca731c4d1d7c419d39210260c5 SHA512 8448d3f3d885175f0967bf8a3e1c2924846484c7e3794073f2b82ce9288468a2767f7361d1520a9c24a2a457f9f96deb752b73fc773d87c86609b4e148465c5e +DIST oxygen-6.0.5.tar.xz 2786828 BLAKE2B 8e5022d86745e6c8c9f316d6bfeb582e9b5cf969e52e882e5c80534e300a263bfe61aebe3969a5e581212a18a52a90e75715974c6f0b99e737edf86cad46dc89 SHA512 002c834e5cab013acf870d730538fb8b9217f2de6d3e5d97279e023f61bf2ca1c4f2c2976dcd7aca51305b9bcffa3dc7c00c51a69f86d882ec331d75448a0eda diff --git a/kde-plasma/oxygen/metadata.xml b/kde-plasma/oxygen/metadata.xml index d925f2439758..d6ee381fc974 100644 --- a/kde-plasma/oxygen/metadata.xml +++ b/kde-plasma/oxygen/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/oxygen</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/oxygen/oxygen-5.24.5.ebuild b/kde-plasma/oxygen/oxygen-5.24.5.ebuild deleted file mode 100644 index f5157fff7655..000000000000 --- a/kde-plasma/oxygen/oxygen-5.24.5.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Oxygen visual style for the Plasma desktop" -HOMEPAGE="https://invent.kde.org/plasma/oxygen" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="wayland" - -RDEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/frameworkintegration-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-plasma/kdecoration-${PVCUT}:5 - x11-libs/libxcb - wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/kservice-${KFMIN}:5 -" -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package wayland KF5Wayland) - ) - ecm_src_configure -} diff --git a/kde-plasma/oxygen/oxygen-5.24.4.ebuild b/kde-plasma/oxygen/oxygen-5.27.11.ebuild index 1f0f9efb675b..bea400c0bd6e 100644 --- a/kde-plasma/oxygen/oxygen-5.24.4.ebuild +++ b/kde-plasma/oxygen/oxygen-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Oxygen visual style for the Plasma desktop" HOMEPAGE="https://invent.kde.org/plasma/oxygen" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="wayland" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="" RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -34,18 +34,8 @@ RDEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/kdecoration-${PVCUT}:5 x11-libs/libxcb - wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) " DEPEND="${RDEPEND} >=kde-frameworks/kservice-${KFMIN}:5 " -PDEPEND=" - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package wayland KF5Wayland) - ) - ecm_src_configure -} +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" diff --git a/kde-plasma/oxygen/oxygen-6.0.5.ebuild b/kde-plasma/oxygen/oxygen-6.0.5.ebuild new file mode 100644 index 000000000000..0b7dc7063608 --- /dev/null +++ b/kde-plasma/oxygen/oxygen-6.0.5.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..083905b385fa --- /dev/null +++ b/kde-plasma/plasma-activities-stats/Manifest @@ -0,0 +1,3 @@ +DIST kactivities-stats-5.115.0.tar.xz 84596 BLAKE2B 3be9008bde4bd020cb02ce12e659adab977be31af0a83000086a938fb91a9736dc414ec051b7bfd62e6feb381a2e3d64c679e97cf2acc6c39924f73b23533f51 SHA512 873d9497cb55583659cbf7dfd108991acc473e71803f06128ce33f396b64d86ec60b8e71613da6d7b40d13e4597582370e8ea1e626b33e7d251d982c92825520 +DIST kactivities-stats-5.116.0.tar.xz 84584 BLAKE2B 89cf9fdce57c6eaeab9438c47127b682ef4e10d08cce4041ae8aecb07b8a492f0c1a21d96c5a906869db97f8c06d81c17a8addf48c6d47584dfbbe544bcf0970 SHA512 a50b84e989aecc551064c28f8e330ebc9054edc459cf085924ea61f17fcce8fa5037c39c485c5a58acdab5d93898e34648c292f91c450d075a09d0a0a18a610e +DIST plasma-activities-stats-6.0.5.tar.xz 83240 BLAKE2B a6fa20af4802c0af0d61a3cb600da5dd8fe2473f11825a0c810991c33baf7cee3c8d0519be9fd5588472f156a4ca3f64cc560878faa51f5583efaeef002a4311 SHA512 a69a952c6285368335f40ecec2033cbaa827b0bdbf3534b8a5482478de093d2c38d4eaae498f8370f4e1de91e374a7feea4bba78da2a001d457fa7a57a5029fe 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-5.116.0.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.116.0.ebuild new file mode 100644 index 000000000000..34d3ee318abd --- /dev/null +++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-5.116.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.5.ebuild b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.0.5.ebuild new file mode 100644 index 000000000000..72c0dacced5a --- /dev/null +++ b/kde-plasma/plasma-activities-stats/plasma-activities-stats-6.0.5.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..758bd9d64983 --- /dev/null +++ b/kde-plasma/plasma-activities/Manifest @@ -0,0 +1,3 @@ +DIST kactivities-5.115.0.tar.xz 73552 BLAKE2B b3d50bbef065937345e550367235073800ea0ef7d6dd46452d93574b83ce8d783d5e35550425c372972950243ab57e0f041dfa876ad953eaae7a50de60d8cbf6 SHA512 8addffc50b40a4b8a13f26d625b6cf76cfa1758c2aa78b9eb1578f4b9447044e21b643f4140f0dcda0bab7f4b0598a1cce6246c0c0c31ae9a49d33cb31382a3b +DIST kactivities-5.116.0.tar.xz 73556 BLAKE2B 16a978a9df89bb74aa97553e53c7cd4a1ac69c99868a381090b46d37702cc38c847ae404b989adee9b00511f228ffa07b4e5b830802f9aa923d0f79508ea24ff SHA512 d36755cbf3e28262086da2d737c99eb6829c75c374972b97f8dfa7ba0f5d2c02c4d00e833702d23c04d02a6883d14735950cbdc0d92bb6dfa3fe615a488d5adf +DIST plasma-activities-6.0.5.tar.xz 71028 BLAKE2B 1624c644d2714342d2576adf587196bd4d32ef6486f07938a158e74047c614be4266374c786dfcbebe412711112e36b31e1a2d3715ddbc708c458c05bb860519 SHA512 50791e43e4ac2cbc6a6ba77acb5b5c6fdf4d5d51c4b94504493b585d658f1ff8b2a193f1eaec5272b90be84c5728c48f24abd993b6baec41ff60db8dbfadd604 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-5.116.0.ebuild b/kde-plasma/plasma-activities/plasma-activities-5.116.0.ebuild new file mode 100644 index 000000000000..e8a1ac72337c --- /dev/null +++ b/kde-plasma/plasma-activities/plasma-activities-5.116.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.5.ebuild b/kde-plasma/plasma-activities/plasma-activities-6.0.5.ebuild new file mode 100644 index 000000000000..b4f0416592b6 --- /dev/null +++ b/kde-plasma/plasma-activities/plasma-activities-6.0.5.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 55e7fed28f43..ea98f8e36ea5 100644 --- a/kde-plasma/plasma-browser-integration/Manifest +++ b/kde-plasma/plasma-browser-integration/Manifest @@ -1,2 +1,2 @@ -DIST plasma-browser-integration-5.24.4.tar.xz 222496 BLAKE2B 098422fd62b8fc80c722a43d8c6854f35e651797d949a38741daa19512171988146db7fb5b9ef2a26001cec3ed3aef99d9109ecc2f09100c942e8d362239dd05 SHA512 999991a300676bd90a85bc4cc1f8364c351a62146876a8bef499ebd481cbf204ef712443960cf4aa8cfa1246285106a3a4eeb4d320c959afae109da79dc83871 -DIST plasma-browser-integration-5.24.5.tar.xz 222452 BLAKE2B 6caca77f50f401a230e5936b36b7babdf6186d6a11a7fb1bda2a0423a7bea5b3f7a66d12e7d569b406e93636b980bb9308c20452a8a9b62197b4170988361aab SHA512 f34885920f1d4859d57ce3c96523c46d392f5835bce6b7d73afb30ea60827e5d520c168ccf45d2d46cec8027b0d9abe2bfc0c5b4ecfbf3b4433bb3ed0b405497 +DIST plasma-browser-integration-5.27.11.tar.xz 212584 BLAKE2B 0ee27e9da1efa965b9babd18731e3a31d6fe30a23f786154f6a0de773f31c9e85b9d7ba7cda72ba53e031f3a626be79a1a579ab19e5fb3cd3479158abe575ea0 SHA512 5d887ab92221a9ae83ac1a927195e659b6508155c7e2062884f1b8ae8dddbdceea4a4a66ce1704179343ceef493240dd7ad68c461b3aa5f257c43f6062c0e7b0 +DIST plasma-browser-integration-6.0.5.tar.xz 219636 BLAKE2B c63989eccdba4e579bc3ecba988bbf3fb59892e430991d04f0abd2317775026b9fdc8624aa49be597a9193c279aae23077ad27427562ea755c7abe12e58fcdb2 SHA512 ae87b3b8b1153c559848e870efba33e70628c6183b9842b6bc90f2c93375c6d851b1e001617265d023babd77f355b8d27ce9fa52623922b87748cc0418025011 diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild deleted file mode 100644 index fe7f9aef2a63..000000000000 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" -HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration" - -LICENSE="GPL-3+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/purpose-${KFMIN}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" - ) - - ecm_src_configure -} diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.11.ebuild index 15e44d6aa3de..2a7c4161f1e7 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.24.4-r1.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.27.11.ebuild @@ -1,26 +1,25 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" HOMEPAGE+=" https://community.kde.org/Plasma/Browser_Integration" LICENSE="GPL-3+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" -DEPEND=" +RDEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kcrash-${KFMIN}:5 @@ -30,11 +29,14 @@ DEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/purpose-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 >=kde-plasma/plasma-workspace-${PVCUT}:5 " -RDEPEND="${DEPEND}" +DEPEND="${RDEPEND} + >=kde-frameworks/krunner-${KFMIN}:5 +" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.0.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.0.5.ebuild new file mode 100644 index 000000000000..4ba4cb854551 --- /dev/null +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.0.5.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 07428c4cd1aa..d12ab0a8da32 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,3 +1,4 @@ -DIST plasma-desktop-5.24.4.tar.xz 6239980 BLAKE2B 0b8af5d596e277d202a9c088aa561ce3f0c3602ca781c807b4082f37da4269176429946edf0665ebd9bc6046cd6b0a97baf5a67ec3c0194c23d6fe237a56c18d SHA512 9d6a8c50a85d7f59b89a13753d9a7072df5e8bd1e726bf1037c4cf8d4d43046c2076c8993dffc1f5cec7f7a113832dd14f836e9b47b879f6352f3c30f4b5c408 -DIST plasma-desktop-5.24.5.tar.xz 6241532 BLAKE2B 20bec56fbd0c3f68b3eaf75cb18a01888c63a8d49e2761c83858125ef82dfe225137e9ba704eaddc43405fe6f9818f879f0105eff03d06aa74d93800e4891693 SHA512 3bb770023b47dcc3c51dbdacfe9cb93adc2f514d8d19f54fed10023d9440bed956ec3beb18d9979cb408ab2e6e960ca383d215fd072ba2df34e4e0b5f6c55270 -DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20 +DIST plasma-desktop-5.27.11.tar.xz 14729900 BLAKE2B 3c023febf5c6dc72fdd3ca3696d5c5c84c5c099e8d66497e9fccde601a23ec19fc001d6b48f9b1160946ab46e0436e54dc20a91c56dafae455e8455fa558bfc4 SHA512 644bfe2235dcfc591ae66fc7090ca1e67fc8dfe80033c1b0bedc32cd76299a3f47e6c74eadee7ce80241efb31d20b561d9c06af457aa36b6528548b4eaee3eb9 +DIST plasma-desktop-6.0.5.tar.xz 15632868 BLAKE2B 9ece4d16440ecd9f38bad29dc5039439662abf9c872103d9faa58c742b1b93d7825ad4bf6716778c5a3881b877c30d58dcecbaef117fb9ade2ef7d804acece3c SHA512 59ab3e024a5a947603556d596f52bbcedbe94a997f67955583534ad4fce9c95c03e98e977f6df47be13d6014c55266c3f0fee88fdde682fe5d1036c170577499 +DIST plasma-desktop-override-include-dirs-3.tar.xz 8288 BLAKE2B f05ece81d1b744d45a21a5963750011c1e815156bcaac6075fa67451ba8ab1ea0fcc5ca59c8109c6fe65f9d4db6ac003bb7e26bf011e124c5f9b7f9e1b3afef5 SHA512 fbfc08a4c057dab3ef96e3c56d5e6087916e952ff32280c6e23c0822e18739441082894ea36412be04eda0893a4e10b9a0fbf0a10e0e44f046b6e872840c4dbb +DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch deleted file mode 100644 index fce29f49536a..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.24.4-folderview-icons-per-resolution.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 8f85c4658adfdf7a01c591afd79baa9eed8b79dd Mon Sep 17 00:00:00 2001 -From: Bharadwaj Raju <bharadwaj.raju777@protonmail.com> -Date: Tue, 12 Apr 2022 15:01:15 +0000 -Subject: [PATCH] Folder View: save desktop containment icon positions on a - per-resolution basis - -BUG: 360478 -BUG: 354802 -FIXED-IN: 5.24.5 -(cherry picked from commit 2dca17060c06f85abc365bab9484ee4446d78772) ---- - .../package/contents/ui/FolderView.qml | 15 +-------- - .../package/contents/ui/FolderViewLayer.qml | 32 +++++++++++++++++-- - .../desktop/plugins/folder/positioner.cpp | 1 + - 3 files changed, 31 insertions(+), 17 deletions(-) - -diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml -index 218a3da77..72ae4903a 100644 ---- a/containments/desktop/package/contents/ui/FolderView.qml -+++ b/containments/desktop/package/contents/ui/FolderView.qml -@@ -30,6 +30,7 @@ FocusScope { - property alias currentIndex: gridView.currentIndex - property alias url: dir.url - property alias status: dir.status -+ property alias perStripe: positioner.perStripe - property alias positions: positioner.positions - property alias errorString: dir.errorString - property alias dragging: dir.dragging -@@ -828,20 +829,6 @@ FocusScope { - } - } - -- onFlowChanged: { -- // FIXME TODO: Preserve positions. -- if (positioner.enabled) { -- positioner.reset(); -- } -- } -- -- onLayoutDirectionChanged: { -- // FIXME TODO: Preserve positions. -- if (positioner.enabled) { -- positioner.reset(); -- } -- } -- - onCurrentIndexChanged: { - positionViewAtIndex(currentIndex, GridView.Contain); - } -diff --git a/containments/desktop/package/contents/ui/FolderViewLayer.qml b/containments/desktop/package/contents/ui/FolderViewLayer.qml -index 3f9b29937..f2044e1b0 100644 ---- a/containments/desktop/package/contents/ui/FolderViewLayer.qml -+++ b/containments/desktop/package/contents/ui/FolderViewLayer.qml -@@ -29,6 +29,8 @@ FocusScope { - property alias overflowing: folderView.overflowing - property alias flow: folderView.flow - -+ property string resolution: Math.round(plasmoid.screenGeometry.width) + "x" + Math.round(plasmoid.screenGeometry.height) -+ - readonly property bool lockedByKiosk: !KAuthorized.authorize("editable_desktop_icons") - - focus: true -@@ -178,6 +180,26 @@ FocusScope { - } - } - -+ function getPositions() { -+ try { -+ var allPositions = JSON.parse(plasmoid.configuration.positions); -+ } catch (err) { -+ var allPositions = {}; -+ allPositions[resolution] = plasmoid.configuration.positions; -+ } -+ return allPositions[resolution] || ""; -+ } -+ -+ function savePositions(positions) { -+ try { -+ var allPositions = JSON.parse(plasmoid.configuration.positions); -+ } catch (err) { -+ var allPositions = {}; -+ } -+ allPositions[resolution] = positions; -+ plasmoid.configuration.positions = JSON.stringify(allPositions, Object.keys(allPositions).sort()); -+ } -+ - Connections { - target: plasmoid.configuration - -@@ -211,7 +233,7 @@ FocusScope { - } - - function onPositionsChanged() { -- folderView.positions = plasmoid.configuration.positions; -+ folderView.positions = getPositions(); - } - } - -@@ -241,12 +263,16 @@ FocusScope { - } - - onPositionsChanged: { -- plasmoid.configuration.positions = folderView.positions; -+ savePositions(folderView.positions); -+ } -+ -+ onPerStripeChanged: { -+ folderView.positions = getPositions(); - } - - Component.onCompleted: { - folderView.sortMode = plasmoid.configuration.sortMode; -- folderView.positions = plasmoid.configuration.positions; -+ folderView.positions = getPositions(); - } - } - -diff --git a/containments/desktop/plugins/folder/positioner.cpp b/containments/desktop/plugins/folder/positioner.cpp -index 859c16754..3b2df8c5a 100644 ---- a/containments/desktop/plugins/folder/positioner.cpp -+++ b/containments/desktop/plugins/folder/positioner.cpp -@@ -854,6 +854,7 @@ void Positioner::applyPositions() - } - - if (pos > m_perStripe) { -+ qDebug() << "Some items did not fit, rearranging"; - name = positions.at(offset); - - if (!sourceIndices.contains(name)) { --- -GitLab - diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch new file mode 100644 index 000000000000..e88c78b49be4 --- /dev/null +++ b/kde-plasma/plasma-desktop/files/plasma-desktop-6.0.5-unused-dep.patch @@ -0,0 +1,85 @@ +From 96d62f21f52e543dfb1f114988d4912ef321772f Mon Sep 17 00:00:00 2001 +From: Jakob Petsovits <jpetso@petsovits.com> +Date: Thu, 4 Apr 2024 19:03:49 -0400 +Subject: [PATCH 1/2] kcms/mouse: Remove unused xorg-evdev dependency + +It's not necessary to access it directly anymore, now that we only +expose settings for libinput. + +(cherry picked from commit b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770) +--- + kcms/mouse/CMakeLists.txt | 3 --- + kcms/mouse/backends/x11.cmake | 1 - + kcms/mouse/inputbackend.h | 1 - + 3 files changed, 5 deletions(-) + +diff --git a/kcms/mouse/CMakeLists.txt b/kcms/mouse/CMakeLists.txt +index 639981380..909ed815d 100644 +--- a/kcms/mouse/CMakeLists.txt ++++ b/kcms/mouse/CMakeLists.txt +@@ -32,9 +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() +diff --git a/kcms/mouse/backends/x11.cmake b/kcms/mouse/backends/x11.cmake +index 3b1601285..c402612de 100644 +--- a/kcms/mouse/backends/x11.cmake ++++ b/kcms/mouse/backends/x11.cmake +@@ -11,7 +11,6 @@ set(backend_SRCS + set(backend_LIBS + ${backend_LIBS} + PkgConfig::XORGLIBINPUT +- PkgConfig::EVDEV + X11::X11 + X11::Xi + X11::Xcursor +diff --git a/kcms/mouse/inputbackend.h b/kcms/mouse/inputbackend.h +index 579634d27..0a6e6ac6a 100644 +--- a/kcms/mouse/inputbackend.h ++++ b/kcms/mouse/inputbackend.h +@@ -20,7 +20,6 @@ enum class InputBackendMode { + #endif + #if BUILD_KCM_MOUSE_X11 + XLibinput = 1, +- XEvdev = 2, + #endif + }; + +-- +2.45.1 + + +From fcc965d6a90822b2c6600bf2426dfb0c2b46021a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 20 May 2024 18:41:57 +0200 +Subject: [PATCH 2/2] Cleanup remaining pkg_check_modules(EVDEV) call + +Amends 181b6c85ea6d46652b136462d5b6e0c9b56fc5c2 and b4fe3e9115856cdd8a67f11d1ab9b5246e2c4770 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +(cherry picked from commit 2242b7852f1ab746e4f6929e2fcd51b24b2ec37e) +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b475d3c5b..a515367a8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,7 +226,6 @@ 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) + + ecm_find_qmlmodule(org.kde.pipewire 0.1) +-- +2.45.1 + diff --git a/kde-plasma/plasma-desktop/metadata.xml b/kde-plasma/plasma-desktop/metadata.xml index 3ea9270f30ec..3e49f87352a5 100644 --- a/kde-plasma/plasma-desktop/metadata.xml +++ b/kde-plasma/plasma-desktop/metadata.xml @@ -9,7 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="emoji">Build emojipicker applet using <pkg>app-i18n/ibus</pkg> and <pkg>media-fonts/noto-emoji</pkg></flag> <flag name="ibus">Use ibus input method via <pkg>app-i18n/ibus</pkg></flag> <flag name="kaccounts">Build the OpenDesktop integration plugin</flag> <flag name="scim">Enable applets that use <pkg>app-i18n/scim</pkg></flag> diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild deleted file mode 100644 index 302d9b8d656b..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.5.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-1" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry" - -COMMON_DEPEND=" - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kdelibs4support-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - x11-libs/libX11 - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb[xkb] - x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - kaccounts? ( - kde-apps/kaccounts-integration:5 - net-libs/accounts-qt - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - !kde-plasma/user-manager - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=kde-plasma/oxygen-${PVCUT}:5 - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) -" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch -) - -src_prepare() { - ecm_src_prepare - - if ! use ibus; then - sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \ - -i applets/kimpanel/backend/ibus/CMakeLists.txt || die - fi - - use emoji || cmake_run_in applets/kimpanel/backend/ibus \ - cmake_comment_add_subdirectory emojier - - # TODO: try to get a build switch upstreamed - if ! use scim; then - sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged - -DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include - $(cmake_use_find_package kaccounts AccountsQt5) - $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) - fi - - ecm_src_configure -} - -src_test() { - # parallel tests fail, foldermodeltest,positionertest hang, bug #646890 - # test_kio_fonts needs D-Bus, bug #634166 - # lookandfeel-kcmTest is unreliable for a long time, bug #607918 - local myctestargs=( - -j1 - -E "(foldermodeltest|positionertest|test_kio_fonts|lookandfeel-kcmTest)" - ) - - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "screen reader support" app-accessibility/orca - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild index 5fedd708f1d5..f64ee0ee6e80 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.24.4-r1.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.11.ebuild @@ -1,26 +1,27 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature +QTMIN=5.15.9 +inherit ecm plasma.kde.org optfeature DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-1" +XORGHDRS="${PN}-override-include-dirs-3" SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="emoji ibus +kaccounts scim +semantic-desktop telemetry" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="ibus kaccounts scim screencast +semantic-desktop" +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras COMMON_DEPEND=" + dev-libs/wayland >=dev-qt/qtconcurrent-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 @@ -29,12 +30,11 @@ COMMON_DEPEND=" >=dev-qt/qtprintsupport-${QTMIN}:5 >=dev-qt/qtsql-${QTMIN}:5 >=dev-qt/qtsvg-${QTMIN}:5 + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/attica-${KFMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 @@ -60,30 +60,30 @@ COMMON_DEPEND=" >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-frameworks/sonnet-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 - >=kde-plasma/plasma-workspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 + >=kde-plasma/plasma-workspace-${PVCUT}:5[screencast?] + >=media-libs/phonon-4.11.0[qt5(+)] x11-libs/libX11 + x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi - x11-libs/libxcb[xkb] + x11-libs/libxcb + x11-libs/libxkbcommon x11-libs/libxkbfile - emoji? ( - app-i18n/ibus[emoji] - dev-libs/glib:2 - media-fonts/noto-emoji - ) ibus? ( app-i18n/ibus dev-libs/glib:2 @@ -93,34 +93,41 @@ COMMON_DEPEND=" ) kaccounts? ( kde-apps/kaccounts-integration:5 - net-libs/accounts-qt + net-libs/accounts-qt[qt5(+)] ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) " DEPEND="${COMMON_DEPEND} + >=dev-libs/wayland-protocols-1.25 dev-libs/boost x11-base/xorg-proto " RDEPEND="${COMMON_DEPEND} - !kde-plasma/user-manager + !<kde-plasma/kdeplasma-addons-5.25.50 >=dev-qt/qtgraphicaleffects-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=dev-qt/qtwaylandscanner-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* >=kde-plasma/oxygen-${PVCUT}:5 + media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) + kaccounts? ( net-libs/signon-oauth2[qt5(+)] ) + screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 ) +" +BDEPEND=" + dev-util/intltool + dev-util/wayland-scanner + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" PATCHES=( - "${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch - "${FILESDIR}/${P}-folderview-icons-per-resolution.patch" # KDE-bug 354802, 360478 + "${WORKDIR}/${XORGHDRS}/${PN}-5.27.9-override-include-dirs.patch" # downstream patch ) src_prepare() { @@ -131,9 +138,6 @@ src_prepare() { -i applets/kimpanel/backend/ibus/CMakeLists.txt || die fi - use emoji || cmake_run_in applets/kimpanel/backend/ibus \ - cmake_comment_add_subdirectory emojier - # TODO: try to get a build switch upstreamed if ! use scim; then sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die @@ -147,14 +151,11 @@ src_configure() { -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include -DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + $(cmake_use_find_package ibus GLIB2) $(cmake_use_find_package kaccounts AccountsQt5) $(cmake_use_find_package kaccounts KAccounts) $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) ) - if ! use emoji && ! use ibus; then - mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON ) - fi ecm_src_configure } diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild new file mode 100644 index 000000000000..f928f890a09a --- /dev/null +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.0.5.ebuild @@ -0,0 +1,179 @@ +# 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-4" +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" + +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/libxcb + x11-libs/libXcursor + x11-libs/libXi + 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}-6.0.5-unused-dep.patch" # backport from 6.1/git master + "${WORKDIR}/${XORGHDRS}/${PN}-6.0.5-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=( + -DBUILD_KCM_MOUSE_X11=ON + -DBUILD_KCM_TOUCHPAD_X11=ON + -DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include + -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) + ) + + 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 997aa524492c..3f2a9c5cf62d 100644 --- a/kde-plasma/plasma-disks/Manifest +++ b/kde-plasma/plasma-disks/Manifest @@ -1,2 +1,2 @@ -DIST plasma-disks-5.24.4.tar.xz 88244 BLAKE2B 71035d47373eb97cff2355a6fc22faac149874d922d6f857ab6f669af2f36ceb750194d9d4679c8218e85b2e5f7b3e293b48c0fb2838d3ca15029ca66f3ec789 SHA512 735d28c6c50515ae7af7a3df4f2ba586d7273d11e8ba96e6546685f6dbf29917001854ba9fa8f298b15f50ec8b26d51d04771874074eeb808f29f5112d07758f -DIST plasma-disks-5.24.5.tar.xz 88304 BLAKE2B 649bb10a09333cc49f34731188a66cea6017702e5d5d5f7dc1aa100c6cf7b274153a5570ce20aa3c05737a9f5c8041dd73e0707b91b1198ff3d4e456081497b9 SHA512 fc13922a8961a0581eb5c67f23a00c7898e0700604785573c677ceae3391d784fd44944acbfae501a620ce9e86c21694a03b4613a60284488c1cf5450c5de6fe +DIST plasma-disks-5.27.11.tar.xz 93892 BLAKE2B 7da072a23214297ceabaf256cf30ab2d0ed304f76351953ffae973a54ed0ad25a839549bb0c61b2793546b38c7857ec927d0ebb03885d3a43b2580aa9a60fd13 SHA512 102323ee220e0c2e823fe0a20f96a47646d5000555baa3f81e89168f62093690ed347f776cd78e290c7972114f9a76ba7e62f47c17db56312d5b58774f68100f +DIST plasma-disks-6.0.5.tar.xz 99692 BLAKE2B 2e364c6b5f82df3c2f84d3aede4c54b695b18a1c4d9a0ba7e8b3179d8abb3557c2ac99aa721260244a3a6d07ab55408536a5bf60c2438b0043f2cd83441271c7 SHA512 6f8a705719a3febf3fcc3a36a9765937965a9f7feb002b455b63aabc981ae84a1ee1afed5e4e19540d6c50c25c3d5b0c6b194c1689bd36e531654f7a59bbed41 diff --git a/kde-plasma/plasma-disks/metadata.xml b/kde-plasma/plasma-disks/metadata.xml index d925f2439758..9ac314a3e317 100644 --- a/kde-plasma/plasma-disks/metadata.xml +++ b/kde-plasma/plasma-disks/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-disks</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild deleted file mode 100644 index 857b4e21996c..000000000000 --- a/kde-plasma/plasma-disks/plasma-disks-5.24.4.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="true" -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Monitors S.M.A.R.T. capable devices for imminent failure" -HOMEPAGE="https://invent.kde.org/plasma/plasma-disks" - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - sys-apps/smartmontools -" -RDEPEND="${DEPEND} - kde-plasma/kinfocenter:5 -" diff --git a/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-5.27.11.ebuild index e6d4c37ca87b..669889c70f68 100644 --- a/kde-plasma/plasma-disks/plasma-disks-5.24.5.ebuild +++ b/kde-plasma/plasma-disks/plasma-disks-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="true" -KFMIN=5.90.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 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" diff --git a/kde-plasma/plasma-disks/plasma-disks-6.0.5.ebuild b/kde-plasma/plasma-disks/plasma-disks-6.0.5.ebuild new file mode 100644 index 000000000000..e73bdf433e50 --- /dev/null +++ b/kde-plasma/plasma-disks/plasma-disks-6.0.5.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 cacaf8a16971..f90eb9caa467 100644 --- a/kde-plasma/plasma-firewall/Manifest +++ b/kde-plasma/plasma-firewall/Manifest @@ -1,2 +1,2 @@ -DIST plasma-firewall-5.24.4.tar.xz 346676 BLAKE2B bbd7e460910b6437c29871814c11c08bb2cb36976a92c70cb7afafbf865d99db73d6ef2c0f0502d990df6c4c72c789f5153ceecd732b2dcb994db330035448d5 SHA512 320066a2339eae7113a3a8b50a01d8ef11c4ba2e9bed48a4f919cae0d1964246ad0beef02f3bc26c8e7ea63214037683552c1004d8b98cfcece52e2ee131b3cc -DIST plasma-firewall-5.24.5.tar.xz 346660 BLAKE2B 767cd4722325e8035735b744afdccfe4114e68756919f3904fcbd2aa25879b09b7bb4fcaffcaf0a2687f5744e1177fb177658b6af0ed3fef7838498c99f583a3 SHA512 4c774b10c32929399a8b01007e3c34ab702803a0aa80ea812bbcc4d4ead02d0e64136f575454fdc2f0e938740afbf6d48025c654831aa5485b86253418bf13d1 +DIST plasma-firewall-5.27.11.tar.xz 362988 BLAKE2B 484e853f4a8c61823e2a235fe5d5e40b6861c04044ca5058b8e866d9a9d9cb072b8a64c2c1b8a950f1604acc85dd27c38314735db2b6e4f59e8fb9085eda0ea8 SHA512 9c6a41448ef83a1c464e1e10441ae811bc898afc451b821fbd46141df4ffe1ad395692c420ce02dd5618197a307fa2729dbe8f0f703c1a64b14068f6c018ba7b +DIST plasma-firewall-6.0.5.tar.xz 368708 BLAKE2B 302bddcb69a14a5d9bbc2d09357e5b2baedc488d69e98d8707968a1cb41984d2c6f36cce15d7e4774f333097d66f08ae7e97d16b2dccac834fb9b524bea8446f SHA512 fdcdfc8ae2a137a5ab1758bb92a36b5bc2518d887df02e5fd2c83e31790e596ac3c2d946288cf14049f4b9bf4a28b7c08ecaa916a297bd8c9a1bb82792e15edc diff --git a/kde-plasma/plasma-firewall/metadata.xml b/kde-plasma/plasma-firewall/metadata.xml index 173d8fdb463d..b4a87d9ec623 100644 --- a/kde-plasma/plasma-firewall/metadata.xml +++ b/kde-plasma/plasma-firewall/metadata.xml @@ -7,6 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">network/plasma-firewall</remote-id> </upstream> <use> <flag name="firewalld">Build <pkg>net-firewall/firewalld</pkg> backend</flag> diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-5.27.11.ebuild index 5093bf4f5120..c93d394f02d8 100644 --- a/kde-plasma/plasma-firewall/plasma-firewall-5.24.4.ebuild +++ b/kde-plasma/plasma-firewall/plasma-firewall-5.27.11.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org python-single-r1 +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{10..12} ) +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org python-single-r1 DESCRIPTION="Plasma frontend for Firewalld or UFW" HOMEPAGE="https://invent.kde.org/network/plasma-firewall" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="firewalld +ufw" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )" @@ -31,13 +32,13 @@ DEPEND=" >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 " RDEPEND="${DEPEND} ${PYTHON_DEPS} firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_prepare() { ecm_src_prepare diff --git a/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild b/kde-plasma/plasma-firewall/plasma-firewall-6.0.5.ebuild index 5ac26b7e39d1..b32a35aa7769 100644 --- a/kde-plasma/plasma-firewall/plasma-firewall-5.24.5.ebuild +++ b/kde-plasma/plasma-firewall/plasma-firewall-6.0.5.ebuild @@ -1,43 +1,39 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org python-single-r1 +ECM_TEST="forceoptional" +PYTHON_COMPAT=( python3_{10..12} ) +KFMIN=6.0 +QTMIN=6.6.2 +inherit ecm plasma.kde.org python-single-r1 DESCRIPTION="Plasma frontend for Firewalld or UFW" HOMEPAGE="https://invent.kde.org/network/plasma-firewall" LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="firewalld +ufw" REQUIRED_USE="${PYTHON_REQUIRED_USE} || ( firewalld ufw )" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kauth-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 " RDEPEND="${DEPEND} ${PYTHON_DEPS} firewalld? ( net-firewall/firewalld ) ufw? ( net-firewall/ufw ) " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" src_prepare() { ecm_src_prepare diff --git a/kde-plasma/plasma-integration/Manifest b/kde-plasma/plasma-integration/Manifest index f2cdbe17c054..1176bc3449ed 100644 --- a/kde-plasma/plasma-integration/Manifest +++ b/kde-plasma/plasma-integration/Manifest @@ -1,2 +1,2 @@ -DIST plasma-integration-5.24.4.tar.xz 83744 BLAKE2B 4784ccde0eb5f9075cc47c1b9c718971a36b025f9e7a2c404af96dad07d71300ca1b7a0bfdf9a2c30391526f8fb2a2156d4a96e9cf098d09a649f94e665366d7 SHA512 a4262cca85bac798c5afd29543cae7a670b346347f00f29a693d3263cde669931fdf981fa64c8632bb0ab447b758a24795c343b99b5b7acc166da14db66543a1 -DIST plasma-integration-5.24.5.tar.xz 83772 BLAKE2B a399ee55271799855195ad77ec96f25f37d9b2d49f88f0e54d536067a8aef728be3de35ca4d9da105f51382a57ff30733dea79fe2b4d91174d90989e9b9b4cc1 SHA512 6c60eff349d6b60fd8f781e162768d7cfb45d042687c1206f3f2c9e7af0c5719ff70555eff181782607ac53755844b0968ee7b9a75c87d6bd65b489a3a9dc348 +DIST plasma-integration-5.27.11.tar.xz 89460 BLAKE2B b6e0f487332c7280d394c9e84c44f18cd0694812307fdb1109a27d7f04ac5e0b2c6934adfed10fcbb65b5ec358e4ece728c8761edbc2872f33b40d3cff54495f SHA512 34e040425a11089bdda444132c224af8b4fca5d3fd30e875d4a385ad26bb215409c076c19ee3a2bbe3736121a7988bbc6ca564814f4e28b8e20acb5ebc194347 +DIST plasma-integration-6.0.5.tar.xz 92464 BLAKE2B 7bf1ae70de4e0eeb9402eeeb37e2a29735b97476d673974e30f90d50ca06612d341184e811b1ff86c4d6f12b99e4b5c341f74b92f96264b5f16cc36927ead3f1 SHA512 54c1dd96610cfa479cf4edf2b937ef1543a42ec3edec29c515ed3db49093b7ea2e5ec425d70142e47e9bcf95c28747fb1e28cd0e5dba28ba4a7515a146c0ff0c diff --git a/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild deleted file mode 100644 index 3e4edfe68b7a..000000000000 --- a/kde-plasma/plasma-integration/plasma-integration-5.24.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -# requires running kde environment -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[dbus] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - x11-libs/libXcursor - x11-libs/libxcb -" -RDEPEND="${DEPEND} - media-fonts/hack - media-fonts/noto -" diff --git a/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild b/kde-plasma/plasma-integration/plasma-integration-5.27.11.ebuild index d598ad5a2941..056b3049e30b 100644 --- a/kde-plasma/plasma-integration/plasma-integration-5.24.4.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-5.27.11.ebuild @@ -1,28 +1,29 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" LICENSE="LGPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" # requires running kde environment RESTRICT="test" -DEPEND=" +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 @@ -34,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 @@ -42,7 +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 " +BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" diff --git a/kde-plasma/plasma-integration/plasma-integration-6.0.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.0.5.ebuild new file mode 100644 index 000000000000..1f740140256d --- /dev/null +++ b/kde-plasma/plasma-integration/plasma-integration-6.0.5.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KF5MIN=5.115.0 +KFMIN=6.0 +PVCUT=$(ver_cut 1-3) +QT5MIN=5.15.12 +QTMIN=6.6.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Qt Platform Theme integration plugins for the Plasma workspaces" + +LICENSE="LGPL-2+" +SLOT="6" +KEYWORDS="~amd64" +IUSE="qt5" + +# requires running kde environment +RESTRICT="test" + +# slot ops: qdbus*_p.h and Qt6::GuiPrivate for qtx11extras_p.h +COMMON_DEPEND=" + dev-libs/wayland + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtwayland-${QTMIN}:6 + >=kde-frameworks/kcolorscheme-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kguiaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + x11-libs/libXcursor + x11-libs/libxcb + qt5? ( + >=dev-qt/qtdbus-${QT5MIN}:5 + >=dev-qt/qtgui-${QT5MIN}:5=[dbus] + >=dev-qt/qtquickcontrols2-${QT5MIN}:5 + >=dev-qt/qtwayland-${QT5MIN}:5 + >=dev-qt/qtwidgets-${QT5MIN}:5 + >=dev-qt/qtx11extras-${QT5MIN}:5 + >=kde-frameworks/kcompletion-${KF5MIN}:5 + >=kde-frameworks/kconfig-${KF5MIN}:5 + >=kde-frameworks/kconfigwidgets-${KF5MIN}:5 + >=kde-frameworks/kcoreaddons-${KF5MIN}:5 + >=kde-frameworks/kguiaddons-${KF5MIN}:5 + >=kde-frameworks/ki18n-${KF5MIN}:5 + >=kde-frameworks/kiconthemes-${KF5MIN}:5 + >=kde-frameworks/kio-${KF5MIN}:5 + >=kde-frameworks/kjobwidgets-${KF5MIN}:5 + >=kde-frameworks/knotifications-${KF5MIN}:5 + >=kde-frameworks/kwindowsystem-${KF5MIN}:5 + >=kde-frameworks/kxmlgui-${KF5MIN}:5 + ) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/plasma-wayland-protocols-1.11.1 +" +RDEPEND="${COMMON_DEPEND} + media-fonts/hack + media-fonts/noto + media-fonts/noto-emoji +" +PDEPEND=" + >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6 +" +BDEPEND=" + >=dev-qt/qtwayland-${QTMIN}:6 + qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 ) +" + +src_configure() { + local mycmakeargs=( + -DBUILD_QT6=ON + -DBUILD_QT5=$(usex qt5) + ) + ecm_src_configure +} diff --git a/kde-plasma/plasma-meta/metadata.xml b/kde-plasma/plasma-meta/metadata.xml index 929b376cb8ad..d99c868979a6 100644 --- a/kde-plasma/plasma-meta/metadata.xml +++ b/kde-plasma/plasma-meta/metadata.xml @@ -17,16 +17,23 @@ <flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag> <flag name="display-manager">Pull in a graphical display manager</flag> <flag name="firewall">Pull in <pkg>kde-plasma/plasma-firewall</pkg> for system firewall administration</flag> + <flag name="flatpak">Pull in <pkg>kde-plasma/flatpak-kcm</pkg> for flatpak permissions administration</flag> <flag name="grub">Pull in Breeze theme for <pkg>sys-boot/grub</pkg></flag> <flag name="gtk">Enable Breeze widget style and system settings module for GTK+</flag> <flag name="kwallet">Enable support for KWallet auto-unlocking via <pkg>kde-plasma/kwallet-pam</pkg></flag> <flag name="legacy-systray">Add support for legacy applications using <pkg>kde-plasma/xembed-sni-proxy</pkg></flag> + <flag name="oxygen-theme">Pull in Oxygen icons, sound theme and visual style for KDE Plasma</flag> <flag name="plymouth">Pull in Breeze theme for <pkg>sys-boot/plymouth</pkg></flag> <flag name="pulseaudio">Install Plasma applet for PulseAudio volume management</flag> + <flag name="qt5">Pull in required packages for seamless integration of KF5/Qt5-based applications</flag> <flag name="sddm">Pull in the <pkg>x11-misc/sddm</pkg> display manager and system settings module</flag> <flag name="sdk">Pull in <pkg>kde-plasma/plasma-sdk</pkg> for Plasma development</flag> <flag name="smart">Pull in <pkg>kde-plasma/plasma-disks</pkg> for disk health monitoring</flag> <flag name="thunderbolt">Pull in <pkg>kde-plasma/plasma-thunderbolt</pkg> control center module</flag> + <flag name="unsupported">Allow packages that are known to ruin runtime experience ** DO NOT FILE BUGS WITH THIS ENABLED **</flag> + <flag name="wacom">Pull in <pkg>kde-plasma/wacomtablet</pkg> control center module</flag> <flag name="wallpapers">Install wallpapers for the Plasma Workspace</flag> + <flag name="webengine">Use <pkg>kde-apps/khelpcenter</pkg> to access the locally installed KDE Help System Handbook</flag> + <flag name="xwayland">Enable Wayland windows screensharing to XWayland applications via <pkg>gui-apps/xwaylandvideobridge</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild b/kde-plasma/plasma-meta/plasma-meta-5.27.11.ebuild index 28ee1d06a038..12b463bf6356 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.24.4.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-5.27.11.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -8,11 +8,11 @@ HOMEPAGE="https://kde.org/plasma-desktop/" LICENSE="metapackage" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt -+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook -+kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart -systemd thunderbolt +wallpapers" +cups +desktop-portal discover +display-manager +elogind +firewall flatpak grub +gtk +handbook +kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm +sdk +smart systemd thunderbolt +wallpapers" REQUIRED_USE="^^ ( elogind systemd )" @@ -31,19 +31,20 @@ RDEPEND=" >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksystemstats-${PV}:${SLOT} >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwayland-server-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} + >=kde-plasma/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?] @@ -54,6 +55,7 @@ RDEPEND=" colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) + cups? ( kde-plasma/print-manager:${SLOT} ) desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) display-manager? ( @@ -64,6 +66,7 @@ RDEPEND=" !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) + flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} ) grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} ) gtk? ( >=kde-plasma/breeze-gtk-${PV}:${SLOT} diff --git a/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.0.5.ebuild index 9a3d27c702c5..e38e671c9a36 100644 --- a/kde-plasma/plasma-meta/plasma-meta-5.24.5.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-6.0.5.ebuild @@ -1,51 +1,59 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -DESCRIPTION="Merge this to pull in all Plasma 5 packages" +DESCRIPTION="Merge this to pull in all Plasma 6 packages" HOMEPAGE="https://kde.org/plasma-desktop/" LICENSE="metapackage" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="accessibility bluetooth +browser-integration colord +crash-handler crypt -+desktop-portal discover +display-manager +elogind +firewall grub gtk +handbook -+kwallet +legacy-systray +networkmanager plymouth pulseaudio +sddm sdk +smart -systemd thunderbolt +wallpapers" +cups discover +display-manager +elogind +firewall flatpak grub gtk +kwallet ++networkmanager oxygen-theme plymouth pulseaudio qt5 +sddm sdk +smart systemd +thunderbolt unsupported wacom +wallpapers webengine +xwayland" REQUIRED_USE="^^ ( elogind systemd )" RDEPEND=" - >=kde-plasma/breeze-${PV}:${SLOT} + !${CATEGORY}/${PN}:5 + >=kde-plasma/breeze-${PV}:${SLOT}[qt5?] >=kde-plasma/kactivitymanagerd-${PV}:${SLOT} >=kde-plasma/kde-cli-tools-${PV}:${SLOT} >=kde-plasma/kdecoration-${PV}:${SLOT} >=kde-plasma/kdeplasma-addons-${PV}:${SLOT} >=kde-plasma/kgamma-${PV}:${SLOT} - >=kde-plasma/khotkeys-${PV}:${SLOT} + >=kde-plasma/kglobalacceld-${PV}:${SLOT} >=kde-plasma/kinfocenter-${PV}:${SLOT} >=kde-plasma/kmenuedit-${PV}:${SLOT} + >=kde-plasma/kpipewire-${PV}:${SLOT} >=kde-plasma/kscreen-${PV}:${SLOT} >=kde-plasma/kscreenlocker-${PV}:${SLOT} >=kde-plasma/ksshaskpass-${PV}:${SLOT} >=kde-plasma/ksystemstats-${PV}:${SLOT} - >=kde-plasma/kwayland-integration-${PV}:${SLOT} - >=kde-plasma/kwayland-server-${PV}:${SLOT} - >=kde-plasma/kwin-${PV}:${SLOT} + >=kde-plasma/kwayland-${PV}:${SLOT} + >=kde-plasma/kwin-${PV}:${SLOT}[lock] >=kde-plasma/kwrited-${PV}:${SLOT} >=kde-plasma/layer-shell-qt-${PV}:${SLOT} >=kde-plasma/libkscreen-${PV}:${SLOT} >=kde-plasma/libksysguard-${PV}:${SLOT} + >=kde-plasma/libplasma-${PV}:${SLOT} >=kde-plasma/milou-${PV}:${SLOT} - >=kde-plasma/oxygen-${PV}:${SLOT} + >=kde-plasma/ocean-sound-theme-${PV}:${SLOT} + >=kde-plasma/plasma-activities-${PV}:${SLOT} + >=kde-plasma/plasma-activities-stats-${PV}:${SLOT} >=kde-plasma/plasma-desktop-${PV}:${SLOT} - >=kde-plasma/plasma-integration-${PV}:${SLOT} + >=kde-plasma/plasma-integration-${PV}:${SLOT}[qt5?] >=kde-plasma/plasma-systemmonitor-${PV}:${SLOT} + >=kde-plasma/plasma-welcome-${PV}:${SLOT} >=kde-plasma/plasma-workspace-${PV}:${SLOT} - >=kde-plasma/polkit-kde-agent-${PV}:${SLOT} + >=kde-plasma/plasma5support-${PV}:${SLOT} + >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} + >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} + >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] sys-auth/polkit[systemd?] sys-fs/udisks:2[elogind?,systemd?] @@ -54,7 +62,7 @@ RDEPEND=" colord? ( x11-misc/colord ) crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} ) crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} ) - desktop-portal? ( >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} ) + cups? ( >=kde-plasma/print-manager-${PV}:${SLOT} ) discover? ( >=kde-plasma/discover-${PV}:${SLOT} ) display-manager? ( sddm? ( @@ -64,24 +72,29 @@ RDEPEND=" !sddm? ( x11-misc/lightdm ) ) elogind? ( sys-auth/elogind[pam] ) + flatpak? ( >=kde-plasma/flatpak-kcm-${PV}:${SLOT} ) grub? ( >=kde-plasma/breeze-grub-${PV}:${SLOT} ) gtk? ( >=kde-plasma/breeze-gtk-${PV}:${SLOT} >=kde-plasma/kde-gtk-config-${PV}:${SLOT} x11-misc/appmenu-gtk-module ) - handbook? ( kde-apps/khelpcenter:5 ) kwallet? ( >=kde-plasma/kwallet-pam-${PV}:${SLOT} ) - legacy-systray? ( >=kde-plasma/xembed-sni-proxy-${PV}:${SLOT} ) networkmanager? ( >=kde-plasma/plasma-nm-${PV}:${SLOT} net-misc/networkmanager[elogind?,systemd?] ) + oxygen-theme? ( + >=kde-frameworks/oxygen-icons-6.0.0:* + >=kde-plasma/oxygen-${PV}:${SLOT}[qt5?] + >=kde-plasma/oxygen-sounds-${PV}:${SLOT} + ) plymouth? ( >=kde-plasma/breeze-plymouth-${PV}:${SLOT} >=kde-plasma/plymouth-kcm-${PV}:${SLOT} ) pulseaudio? ( >=kde-plasma/plasma-pa-${PV}:${SLOT} ) + qt5? ( >=kde-plasma/kwayland-integration-${PV}:5 ) sdk? ( >=kde-plasma/plasma-sdk-${PV}:${SLOT} ) smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} ) systemd? ( @@ -89,7 +102,14 @@ RDEPEND=" firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} ) ) thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} ) + !unsupported? ( + !gui-apps/qt6ct + !sys-apps/xdg-desktop-portal-gnome + ) + wacom? ( >=kde-plasma/wacomtablet-${PV}:${SLOT} ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} ) + webengine? ( kde-apps/khelpcenter:6 ) + xwayland? ( >=gui-apps/xwaylandvideobridge-0.4.0 ) " # Optional runtime deps: kde-plasma/plasma-desktop RDEPEND="${RDEPEND} @@ -97,11 +117,12 @@ RDEPEND="${RDEPEND} " pkg_postinst() { - has_version sys-auth/consolekit || return - ewarn "An existing installation of sys-auth/consolekit was detected even though" - ewarn "${PN} was configured with USE $(usex elogind elogind systemd)." - ewarn "There can only be one session manager at runtime, otherwise random issues" - ewarn "may occur. Please make sure USE consolekit is nowhere enabled in make.conf" - ewarn "or package.use and remove sys-auth/consolekit before raising bugs." - ewarn "For more information, visit https://wiki.gentoo.org/wiki/KDE" + if ! use qt5 && has_version dev-qt/qtgui; then + ewarn "KF5- and Qt5-based applications will exhibit various integration bugs" + ewarn "and generally look out of place in Plasma 6 without the dependencies" + ewarn "enforced by kde-plasma/plasma-meta[qt5]." + ewarn + ewarn "This warning message is being displayed because dev-qt/qtgui:5 is" + ewarn "currently installed which indicates the use of such applications." + fi } diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index 7d492c21ed58..0c050ab524db 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,2 +1,2 @@ -DIST plasma-nm-5.24.4.tar.xz 926080 BLAKE2B 4ae2ae273572b60e6c4d88658f2247843921cb59060d1489c00388d4b224e66f6278f47009ba2a866ca7d725bba6c567839a4610c8a8123191511c048998ee42 SHA512 2a28f7879a3e90111ab43d6c30d7f191dfbd58dbcac1e2415387f054674cebc28e2aaeb5beffe448c1bc4f698bb1212b757746dc1e4f5d78a1c2e094895eae85 -DIST plasma-nm-5.24.5.tar.xz 926128 BLAKE2B 43abf81b433291432cc8d5a576ac7579c7a68f196afab106b832a8851846eebdf1562654f7186efae65f3e0942b88aa12f778eb9e5a3972cbafc62f165d07b02 SHA512 0b64b2f231d7e97f901251e274bebd53b22c19ddcfa67cc66947f48adebe61c6bde21f339896f267af22f4112b9a392d331345999000c43cb5b1e51680668ec8 +DIST plasma-nm-5.27.11.tar.xz 1150816 BLAKE2B 9c48416a45caf9ac4836f793bd082906b2f3548dc1000c013c9403d609e3d0eee6036da4c6bb9b24be31a278487f777bd6fc3b258ce75adec35759c94ee35994 SHA512 79148728ab0e365c686ad4f24e8304f4be37112794c6356495b6108629ba68348588cf56f2fee60d2392ebaa5f4ab33cc43c30bdbae053ead5c5783cc1ced8ad +DIST plasma-nm-6.0.5.tar.xz 1172040 BLAKE2B 02d6c0524d3448a7c2c5f625fcfdffac10d08d658218c6756b7b022df9b351b2523665422636340adfd7af76bed727151497a200bdc827c1b55fa8f1d1bedd6e SHA512 ea5f96d1d12aa66b082fd78ec0c6896b5e345ecd39328ece917ca732c9eaa1944dc4fbc22cb4ab9a1fd2d50559ad3d113dd0f5ece6bfa20f66d97905f2108c1d diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml index 4cc596c40725..357da291c490 100644 --- a/kde-plasma/plasma-nm/metadata.xml +++ b/kde-plasma/plasma-nm/metadata.xml @@ -9,7 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="modemmanager">Enable support for mobile broadband devices</flag> <flag name="openconnect">Build support for the OpenConnect VPN client</flag> <flag name="teamd">Enable Teamd control support</flag> </use> diff --git a/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild deleted file mode 100644 index 2069ad424702..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.24.5.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="modemmanager openconnect teamd" - -DEPEND=" - >=app-crypt/qca-2.3.0:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - net-misc/networkmanager[teamd=] - modemmanager? ( - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 - net-misc/mobile-broadband-provider-info - ) - openconnect? ( - >=dev-qt/qtxml-${QTMIN}:5 - net-vpn/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" -BDEPEND="virtual/pkgconfig" - -src_prepare() { - ecm_src_prepare - - # TODO: try to get a build switch upstreamed - if ! use openconnect; then - sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - ) - - ecm_src_configure -} - -pkg_postinst() { - ecm_pkg_postinst - - if ! has_version "kde-plasma/plasma-workspace:5"; then - elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5." - elog "However, the networkmanagement KCM can be called from either systemsettings" - elog "or manually: $ kcmshell5 kcm_networkmanagement" - fi -} diff --git a/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild index 65f17f90aad8..1c2ec2adf0cb 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.24.4.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.27.11.ebuild @@ -1,34 +1,34 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="modemmanager openconnect teamd" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" +IUSE="openconnect teamd" DEPEND=" - >=app-crypt/qca-2.3.0:2 + >=app-crypt/qca-2.3.0:2[qt5(+)] >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtnetwork-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 + >=dev-qt/qtxml-${QTMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 @@ -38,17 +38,13 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-frameworks/modemmanager-qt-${KFMIN}:5 >=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=] - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + net-misc/mobile-broadband-provider-info net-misc/networkmanager[teamd=] - modemmanager? ( - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/modemmanager-qt-${KFMIN}:5 - net-misc/mobile-broadband-provider-info - ) openconnect? ( - >=dev-qt/qtxml-${QTMIN}:5 net-vpn/networkmanager-openconnect net-vpn/openconnect:= ) @@ -56,10 +52,15 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* +" +BDEPEND=" + >=kde-frameworks/kcmutils-${KFMIN}:5 + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" src_prepare() { ecm_src_prepare @@ -70,15 +71,6 @@ src_prepare() { fi } -src_configure() { - local mycmakeargs=( - -DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager) - $(cmake_use_find_package modemmanager KF5ModemManagerQt) - ) - - ecm_src_configure -} - pkg_postinst() { ecm_pkg_postinst diff --git a/kde-plasma/plasma-nm/plasma-nm-6.0.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.0.5.ebuild new file mode 100644 index 000000000000..ebef5ede78f0 --- /dev/null +++ b/kde-plasma/plasma-nm/plasma-nm-6.0.5.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 b72d48e53e1a..ccf66234bf11 100644 --- a/kde-plasma/plasma-pa/Manifest +++ b/kde-plasma/plasma-pa/Manifest @@ -1,2 +1,2 @@ -DIST plasma-pa-5.24.4.tar.xz 132860 BLAKE2B 034716472ac2b2d0c35005b95457b75f6517d5a51cb94df57bec5b34a5f9785f1784f819b74f1ca330af4be58f3b665d3b26942976b9cd18ba4621873be86931 SHA512 37662d46928e5e086ea6e9d681903d70a2c673207c0c5b692dac01d583d38e14a79f185088a8f7db88e655ef16d62432771acc1cec9c923d22299f7b1da0749d -DIST plasma-pa-5.24.5.tar.xz 132952 BLAKE2B f877a23a07420c27cc55760a870bf45d887b0787c0e25dea2e37b79d04b56db8d4ebace9505934fb370cda4adf0d992033b3ed72fda4b73497acdbacb551fc10 SHA512 fdf18b0baa1fb43a8d576d454ba6625bf7d376eb30fcbe8e09df388441a04d1b373b6d53a56b4f14552fc06cbdddea193248044d0cc5e3b71fb90651708afaa1 +DIST plasma-pa-5.27.11.tar.xz 164028 BLAKE2B b657d0d82f4c0faa2e08d054c3f9e4f7fc439dbf5a2c3d6671b06b91d21f22da44ad3b0b6c848f6be63709cd6b7666bcef4f1992228c24574ade99c79824d6de SHA512 660e5e32476e8426dced4cf2fc1b198145f1e25237a1da392bbe9c889ffad92bc2a94dbf0daf13e03737f0fa5913e50bff264637178105815b4f32336b611857 +DIST plasma-pa-6.0.5.tar.xz 170904 BLAKE2B 269b714e0c06a712bc9b89b7e9c3612dd75c00ce8559533fc3143039ae4ff5dfd22dc2cae309996bacb7ba6f8d0f2dddf133d7fe2ce2abc2525d515c9e93f405 SHA512 4c7c881cac64c54114efd202ad7011ebd16ccc14dddf8c2a17b7427950eacdfa5b3fd27a6f3932ed9798760d04f39fe14fa1bc04c86587198ed34707073628ed diff --git a/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild deleted file mode 100644 index 3a401af81cad..000000000000 --- a/kde-plasma/plasma-pa/plasma-pa-5.24.5.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -DEPEND=" - dev-libs/glib:2 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - media-libs/libcanberra - media-sound/pulseaudio -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - || ( - media-video/pipewire - media-sound/pulseaudio-daemon - media-sound/pulseaudio[daemon(+)] - ) - x11-themes/sound-theme-freedesktop -" diff --git a/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.27.11.ebuild index f61ca444d701..2939a17453ca 100644 --- a/kde-plasma/plasma-pa/plasma-pa-5.24.4.ebuild +++ b/kde-plasma/plasma-pa/plasma-pa-5.27.11.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plasma applet for audio volume management using PulseAudio" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -20,21 +20,20 @@ DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 media-libs/libcanberra - media-sound/pulseaudio + media-libs/libpulse " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 - || ( - media-video/pipewire - media-sound/pulseaudio-daemon - media-sound/pulseaudio[daemon(+)] - ) x11-themes/sound-theme-freedesktop " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/plasma-pa/plasma-pa-6.0.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.0.5.ebuild new file mode 100644 index 000000000000..63fc040f502b --- /dev/null +++ b/kde-plasma/plasma-pa/plasma-pa-6.0.5.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 305320851330..25534a49004d 100644 --- a/kde-plasma/plasma-sdk/Manifest +++ b/kde-plasma/plasma-sdk/Manifest @@ -1,2 +1,2 @@ -DIST plasma-sdk-5.24.4.tar.xz 261172 BLAKE2B c195814d62cfa8d22df67e726a11004e7a3530b0eec358a7b90270b09d525ef8817602a0dfac974e097c8b62f417af688a0b0173ca95868443585d267fefce2b SHA512 c531f4df314b25f7e34495a4c26189a5c83065523935a20ff482ddd22df7b922dd06784a218d41817bd49edef3bb1b41c09bfdd26aa806914a40781210d25690 -DIST plasma-sdk-5.24.5.tar.xz 261552 BLAKE2B 6a52464135d73119b53b3a5ce73e5a58f8797e6e8357010809e623bca5797199fb76aac5c3c0f18269d5584303b207e9ac21b03415e80d041f73154aa8b31aaa SHA512 9dff5a3088fb92296e4bb53d8839dade53dc71595c62e85bf5431ce85b686fec9197adf09177f1aa6ab488d0ededc063121f074f1c77b8b281950eb5cea0caf8 +DIST plasma-sdk-5.27.11.1.tar.xz 322312 BLAKE2B 36f63e5dd301b93a6c36e87d8fc8b48f9c1819d7d74ce5da1b69ea7f450af0fbb36c7f4155b3c6c6b8e4b0ac9484fda5288feb1a4d643ae0753d4f4a4a957c48 SHA512 000f69a9197c978bc105a11d1b9f127c3e8f788686ad9654fdb595ed4a4e6cd156cc01654b804d5e2d719e386939a1ed27ae96c35e1612f0ac0db72fdd267d97 +DIST plasma-sdk-6.0.5.tar.xz 327928 BLAKE2B c26aa96ba00598e1a229f170b3b88d48dffd1fe15a73c3f0e7fc3b1a48950fd390a537c9897dd6f0b49a0886ea0c8ae9b77d11e05dbfb77c0354260a9d0f6698 SHA512 4c28df3ffdeafc40e14626eb2c29ef102ac6d8a47ff0d8b3da78a764876326907de521aa5cbd441b491457b78aa57a17c9520534758cfe6a3a71edb2f6ec1235 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild deleted file mode 100644 index 7aeb98067ec4..000000000000 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.24.5.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="optional" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 -" diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.27.11.1.ebuild index 305df908068b..8bd539f2e20e 100644 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.24.4.ebuild +++ b/kde-plasma/plasma-sdk/plasma-sdk-5.27.11.1.ebuild @@ -1,20 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="optional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Useful applications for Plasma development" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -37,7 +36,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/ktexteditor-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols-${QTMIN}:5 diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.0.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.0.5.ebuild new file mode 100644 index 000000000000..85077df74840 --- /dev/null +++ b/kde-plasma/plasma-sdk/plasma-sdk-6.0.5.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 91042abfec56..fb41eca39732 100644 --- a/kde-plasma/plasma-systemmonitor/Manifest +++ b/kde-plasma/plasma-systemmonitor/Manifest @@ -1,2 +1,2 @@ -DIST plasma-systemmonitor-5.24.4.tar.xz 151840 BLAKE2B d0c8f3ab7881650b9bf38218cfeff78fbba0194a6fee80d79649f8ec12136082d86ec6153aa91815d2916416a9d641fa1ab7533d0f75c372336bbe3ef5b62df1 SHA512 13d489865df36bbe9a1465d7efd5603442144492781d0a5102e395f80f50b31d0519953962a0c3b2b9ff199c05daf20e9d7828ae42ce2335714c31bb6ff9f2c1 -DIST plasma-systemmonitor-5.24.5.tar.xz 151824 BLAKE2B dfc6bc0dfe6815879eaed6686f52f108ce3e9a84f76899afffac255c97e36dd8afb4521d2dd8abad157306b1e0e02c874935e40e88aa2c187ce22f668c05b760 SHA512 b8c4a959eb587b25d8d503b3b2d05e6c8ced3b0cb146e08f0351f424962d059b70c8dd323d55b31ef903157b71bad6f20f969840a860ed25ebdafeb3db18489d +DIST plasma-systemmonitor-5.27.11.tar.xz 173356 BLAKE2B 358a4f021813564c608d12c9483c076c746a201b2072bab3cb48625bc62a9666b4afd10267839a9836b4544b2cc0a2f88f53052a615606fe89db08f4f5100f2b SHA512 bbd7036d2666b39910f5e1d87e336f3531c55bbc35b29510be33619aa1afdfca26f4c437cdc68758c28ef3afe35ec0e618135c6cba68d967abcb0c03e045d06c +DIST plasma-systemmonitor-6.0.5.tar.xz 182032 BLAKE2B 7e2894fe748fe5b6a7c2e805292f584a00f8f6446f8d989e0498bf847db3f6b9fc8583a29213c5715146d47730b9cb5b58f33e869a08ecc4326f92731472056d SHA512 8e1e06e56bc5d8aa5d21a576f6e3b23bc7f47ff5014260350e0a28368f6af358dcc06989c258230b76e7f144668f1e9c613e728f8d3da7488494a30e81c280a2 diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild deleted file mode 100644 index ed93a083cd93..000000000000 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.4.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PVCUT=$(ver_cut 1-3) -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Monitor system sensors, process information and other system resources" -HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/" - -LICENSE="|| ( GPL-3 GPL-2 )" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/ksystemstats-${PVCUT}:5 -" diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.11.ebuild index d39879f4df9c..a661ce1a6006 100644 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.24.5.ebuild +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -KFMIN=5.90.0 -QTMIN=5.15.2 -inherit ecm kde.org +KFMIN=5.106.0 +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Monitor system sensors, process information and other system resources" HOMEPAGE="https://apps.kde.org/plasma-systemmonitor/" LICENSE="|| ( GPL-3 GPL-2 )" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -31,6 +31,7 @@ DEPEND=" >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-plasma/libksysguard-${PVCUT}:5 " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.0.5.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.0.5.ebuild new file mode 100644 index 000000000000..6b88e5f0912d --- /dev/null +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.0.5.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 499a16783202..c355f16ee279 100644 --- a/kde-plasma/plasma-thunderbolt/Manifest +++ b/kde-plasma/plasma-thunderbolt/Manifest @@ -1,2 +1,2 @@ -DIST plasma-thunderbolt-5.24.4.tar.xz 66724 BLAKE2B 339a4fd20ddd8032736d84e2247b0ed52f9a9231bd36c2f4c91defd09b8f3997d5c13642319fdfaa3e96921fbadbff94da6450d417f6e31f6fe675f72e63686d SHA512 eb5af8c87852fdd0089cc48675c572887ff1d0d63b2a68d7e2d28e22890f93a4697575f56b76fc3a135a81cd721ffef0fab6d274d862d431fd6daafc79d621be -DIST plasma-thunderbolt-5.24.5.tar.xz 66752 BLAKE2B 38fe4132da08afe71a26751307d9ecd77cf0462323b4dc452ae2355cedf25f41c1de4e6f6dfe50b24fd2f1650383434aea4ec775e194b219d27a09387a8453e4 SHA512 b1096fac09800e33b87e79a2e774eaf19afa063263e71f772ec0081fda714c63dd07a0000489c36c3f7deead3ee563880bc12f336b8ea599b396613d28cc08f5 +DIST plasma-thunderbolt-5.27.11.tar.xz 72824 BLAKE2B c6c7fb62b255388672116a0e0cd9d36637a8ace2e2b559e39ebb5a64867c1c3057f832875885990fec3cd0a478bb177f8e10f5cb05c486e33b097836f7f3dd4a SHA512 8ba96ca33d32b3185e7026c75f8b6158df4cee88e4f2a5e42a1a86faf22391fe62112e441cc1d41a36e7a7b74cef3d61ac2426399e0e71a862d88807c404c6f8 +DIST plasma-thunderbolt-6.0.5.tar.xz 75488 BLAKE2B da71d0f9ffae02437b9da1cfc580659d3e1f20be051e4cbe5b7f7d86f5b8eef2c32da1ecc66bd4086871f4699bf9d26b69ff7a76cc01034c32daeb906da98995 SHA512 e22f61f99f8259c2c48dfd7c1bbbb75f2c9be7fa78b1187154235ace44e48277670bd89cddfe2f970564e880db4056062ed7155c78b07ae3377fc24a4516ad1f diff --git a/kde-plasma/plasma-thunderbolt/metadata.xml b/kde-plasma/plasma-thunderbolt/metadata.xml index d925f2439758..507f645eef1a 100644 --- a/kde-plasma/plasma-thunderbolt/metadata.xml +++ b/kde-plasma/plasma-thunderbolt/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-thunderbolt</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild deleted file mode 100644 index f68c386c4db9..000000000000 --- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -# tests require DBus -RESTRICT="test" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - sys-apps/bolt -" diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.11.ebuild index 346585e6911a..98e1bee10aa6 100644 --- a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.24.4.ebuild +++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Plasma integration for controlling Thunderbolt devices" HOMEPAGE="https://invent.kde.org/plasma/plasma-thunderbolt" LICENSE="|| ( GPL-2 GPL-3+ )" SLOT="5" -KEYWORDS="amd64 ~riscv x86" +KEYWORDS="amd64 ~loong ~riscv x86" IUSE="" # tests require DBus @@ -36,3 +36,4 @@ RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:5 sys-apps/bolt " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.0.5.ebuild b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.0.5.ebuild new file mode 100644 index 000000000000..88642424e300 --- /dev/null +++ b/kde-plasma/plasma-thunderbolt/plasma-thunderbolt-6.0.5.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 48a76a4f10a0..5a7af2e6191a 100644 --- a/kde-plasma/plasma-vault/Manifest +++ b/kde-plasma/plasma-vault/Manifest @@ -1,2 +1,2 @@ -DIST plasma-vault-5.24.4.tar.xz 178000 BLAKE2B 736fbad8567c21fcd259c2334674e88a1ce041c9e3136712444fcf4b69785f5bd86eff6edfcbf73cca54e6c6ff75f742c97064b6b63cb46ff13850bce5fd01fb SHA512 21bf4f215583bf055f15d3c05e0a8b8d637662619eced04008051e25c1bac7ca6fb9b83d0c8661daf91c4790405d422d272176042f3420f9d27497fc2fc84a4c -DIST plasma-vault-5.24.5.tar.xz 178032 BLAKE2B a9e93f71a627c0426e881b1e48e3a6cb32c3744db7986a09c33c36cf04be275dffd22c45369bfdcf1ca0f05b31d0d30129e7af54f6d425bb28e96f586a5453c3 SHA512 6495f94f060f139e91a25cbecf432d5bf9ee5ae949438278966c11cd7e725feb63aee6955dce5b46b816b0c57f5253b2cf215ad70efd592bf6e579ad6acb4cd2 +DIST plasma-vault-5.27.11.tar.xz 187204 BLAKE2B 7dcfdf2f2407a1138c80e8a28513643f3a4803643062c3bf1407fdd1066688b336b1287f3c4b4890dc7ce25069badaec78a9f1f7822cd28d928b7224f8847c4c SHA512 8e7a6a2acf28810ab8c12cf3d38583a563fb7f741c509395bf1b21a37070390eef2e2b6e0f7aa8dfaf8de8e12679be84aa25fb73790c5a431922eb531e944305 +DIST plasma-vault-6.0.5.tar.xz 192848 BLAKE2B 9794fd73b4a8cb77da91d65c3f44470cd5a662f50fee684e863899b21279385d243755b208f0442b5b772cded25da1d45758adf9ca720913113c123a175744eb SHA512 2ac2544f1a6e47f069e8cd58517f41bf195335dc4f8389e2bfeab3e268b1e3e86ea1ef130ea58c7341b21e71e06ce46ef48b200cbd907cf6376ab003b5cf7d27 diff --git a/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild deleted file mode 100644 index e1ff81661e57..000000000000 --- a/kde-plasma/plasma-vault/plasma-vault-5.24.5.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv ~x86" -IUSE="networkmanager" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) -" - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package networkmanager KF5NetworkManagerQt) - ) - - ecm_src_configure -} diff --git a/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.27.11.ebuild index 9cce0daf50a1..018fbaf45b59 100644 --- a/kde-plasma/plasma-vault/plasma-vault-5.24.4.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm flag-o-matic plasma.kde.org DESCRIPTION="Plasma applet and services for creating encrypted vaults" HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/" LICENSE="LGPL-3" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="networkmanager" DEPEND=" @@ -21,7 +21,6 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kcodecs-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -29,9 +28,11 @@ DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-plasma/libksysguard-${PVCUT}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) " RDEPEND="${DEPEND} @@ -40,6 +41,9 @@ RDEPEND="${DEPEND} " src_configure() { + # ODR violations (bug #909446, kde#471836) + filter-lto + local mycmakeargs=( $(cmake_use_find_package networkmanager KF5NetworkManagerQt) ) diff --git a/kde-plasma/plasma-vault/plasma-vault-6.0.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.0.5.ebuild new file mode 100644 index 000000000000..a5e5dd80e4e4 --- /dev/null +++ b/kde-plasma/plasma-vault/plasma-vault-6.0.5.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..34ffad98b3b9 --- /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.5.tar.xz 909304 BLAKE2B 793beaa01040d5d17e6d839b3b9b176f9958c7a4e8b33fabc710b835dfea418a3d521e728bdc7db42c85869e8e04001da654c46f4f9b7ebb59d7828ad4049d99 SHA512 e9a234a0ac876938faeddb14d01dc4c5f9915678b7d6280c74083859ce16b8e8c09fad436977483cf0dbcfa574cbd204a599bfca5f69a766c9931fee56345111 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.5.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.0.5.ebuild new file mode 100644 index 000000000000..04c90c6f1796 --- /dev/null +++ b/kde-plasma/plasma-welcome/plasma-welcome-6.0.5.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 7cf57f020e86..807621099078 100644 --- a/kde-plasma/plasma-workspace-wallpapers/Manifest +++ b/kde-plasma/plasma-workspace-wallpapers/Manifest @@ -1,2 +1,2 @@ -DIST plasma-workspace-wallpapers-5.24.4.tar.xz 72711976 BLAKE2B f8b06a88543e2ad6a225fc2d463045047df66b9582307cbc10a068aad0af6ee9ea2500c773edfa042498af8726d4ef3593893b70356189f21cf164a8ffc137f1 SHA512 8bfdd82e3e88d9723fcbd530660ef0fa8060a0b1504157057ea7a057aa1dd2a7309ca5b86830c4ed6c8e80fc8a31a01ce7b78e0675babafc95c41ba41607ae55 -DIST plasma-workspace-wallpapers-5.24.5.tar.xz 72711796 BLAKE2B 0740e3ac16db5274505358a096997e36f72bd2e58fe60cc7fec914a7a9cfe8a5480fc3e5317cef9a6e4a75d05b58ecb9918b433a61e522a5c605b503cdf785d1 SHA512 8b22bb8a2c093f3f7b7da8b0db55c688fa6d602326429db3e32960d7596c0f79e79d1a724bdb914d55caeffa36f422eea6678afdd62e2bb89f3afa479d056873 +DIST plasma-workspace-wallpapers-5.27.11.tar.xz 94029756 BLAKE2B 570645ce99c8f9992a328d8e61a25f36aa43f8fc7c4742b31869b2df6b234f39e991755867b873158db7ba74accaef5bd627a355cf0cb5b183ce4f5236d0b074 SHA512 796f5c652d449fc5d02a3702cf3037126d26cb1d46f5d698e154a80585931c0a4f6a658ad58ebb611be29bbff8a27a71091fd988a9533e0bcf86d4d597658b2c +DIST plasma-workspace-wallpapers-6.0.5.tar.xz 110084540 BLAKE2B a587fe74f9a43ed30e00a7de8fd46fb17bcf7bcdd815e4fb578ceb3a8370a5264895a449fdd3b4dfd186a093580a0b999fb70b7b8c37a68864f2dd5455862b4f SHA512 877c8285e50bad720246716a023ca4f8e654d4a3744c0c0a57268c4c77095cd54e0685b197352ee841413f3f5d036ac395dcbbbbd6c7f6c620ee3386ede0d67c diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.11.ebuild index bceff041c2fa..36c00c8005b0 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.5.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +inherit cmake plasma.kde.org DESCRIPTION="Wallpapers for the Plasma workspace" LICENSE="GPL-2" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" BDEPEND=" dev-qt/qtcore:5 - kde-frameworks/extra-cmake-modules:5 + kde-frameworks/extra-cmake-modules:0 " diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.0.5.ebuild index 862f306fb000..a4488992a794 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.24.4.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.0.5.ebuild @@ -1,19 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PVCUT=$(ver_cut 1-3) -inherit cmake kde.org +QTMIN=6.6.2 +inherit cmake plasma.kde.org DESCRIPTION="Wallpapers for the Plasma workspace" LICENSE="GPL-2" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +SLOT="6" +KEYWORDS="~amd64" IUSE="" BDEPEND=" - dev-qt/qtcore:5 - kde-frameworks/extra-cmake-modules:5 + >=dev-qt/qtbase-${QTMIN}:6 + kde-frameworks/extra-cmake-modules:0 " diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index be5c47e6ef60..b7fbdb3d67f7 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1,2 @@ -DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 -DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 +DIST plasma-workspace-6.0.5.tar.xz 19962836 BLAKE2B f59634fb5215e67357a7917a060c27740a5c9e3940c0ceec32f50b9cfec770ba5ff73de88ca8dcfc079ee13f871cc9230ad5f1664e5e93f0aa349f371321d187 SHA512 e6ad1ee600ae95cbbb4e565178f6b03f81f7139188d48ccb846337034227c8520cc2aaad70cfe6161204b16fe791f6578587493b242feb5f14f70602930140ed diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch deleted file mode 100644 index c96c0ba623d6..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.21.5-split-libkworkspace.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Mon, 22 Oct 2018 10:35:10 +0200 -Subject: [PATCH] libkworkspace: Allow standalone build - ---- - CMakeLists.txt | 6 +++- - 1 file changed, 5 insertions(+), 1 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 67f82cfb7..88a8c09b4 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -73,6 +73,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching" - - find_package(KF5TextEditor) - find_package(KWinDBusInterface CONFIG REQUIRED) -+find_package(LibKWorkspace 5.21.5) - - find_package(KF5Screen CONFIG REQUIRED) - find_package(KScreenLocker 5.13.80 REQUIRED) -@@ -214,7 +215,10 @@ query_qmake(QtBinariesDir QT_INSTALL_BINS) - option(PLASMA_WAYLAND_DEFAULT_SESSION "Use Wayland session by default for Plasma" FALSE) - - add_subdirectory(doc) --add_subdirectory(libkworkspace) -+if(NOT LibKWorkspace_FOUND) -+ message(STATUS "System LibKWorkspace not found, using bundled.") -+ add_subdirectory(libkworkspace) -+endif() - add_subdirectory(libdbusmenuqt) - add_subdirectory(appmenu) - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch deleted file mode 100644 index d61877300d27..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-appmenu-fix-top-level-menu-text-coloration.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001 -From: Nate Graham <nate@kde.org> -Date: Wed, 4 May 2022 10:45:52 -0600 -Subject: [PATCH 2/8] applets/appmenu: fix top-level menu text coloration - -28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but -neglected to respect the Plasma color scheme, if any. This causes -problems with Plasma themes that have their own colors and don't -respect the systemwide color scheme, such as Breeze Twilight. - -Fix it by using the appropriate colors from the PlasmaCore color scheme -object, not the systemwide object provided by Qt. - -BUG: 453348 -FIXED-IN: 5.24.6 - - -(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e) ---- - applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml -index 441e99016..afb37589a 100644 ---- a/applets/appmenu/package/contents/ui/MenuDelegate.qml -+++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml -@@ -66,9 +66,6 @@ AbstractButton { - - contentItem: PC3.Label { - text: controlRoot.Kirigami.MnemonicData.richTextLabel -- // Kirigami.Theme.highlightedTextColor returns different colors -- // depending on window focus, which does not apply to this applet -- // instead, we use palette.highlightedText here, which returns consistent result -- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText -+ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor - } - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch deleted file mode 100644 index 8cffd8d372ed..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-kicker-refresh-RootModel-on-session-backend.patch +++ /dev/null @@ -1,92 +0,0 @@ -From d0340868619c26de5892f8bd095456dc5a32d0ce Mon Sep 17 00:00:00 2001 -From: Amy Rose <amy@fluff.tech> -Date: Tue, 17 May 2022 07:38:03 +0000 -Subject: [PATCH 8/8] applets/kicker: refresh RootModel on session backend - state change - -BUG: 427530 - -Hunting this one down since mid-March... - -In "native" Plasma containments like the panel, desktop, and plasmawindowed, the `LogindSessionBackend` in `libkworkspace` enters the "Ready" state nearly instantly, before any signals can even be attached. In other containments like Latte Dock and plasmoidviewer, however, the initialization takes some time to complete (unsure why). RootModel was not watching or waiting to check what the session backend's state was, resulting in validity checks being done too soon and never checked again. - - -(cherry picked from commit 2cc819f39bcce9ca83ab3767c42beb1e500e55b1) ---- - applets/kicker/plugin/rootmodel.cpp | 1 + - applets/kicker/plugin/systementry.cpp | 1 + - applets/kicker/plugin/systementry.h | 1 + - applets/kicker/plugin/systemmodel.cpp | 2 ++ - applets/kicker/plugin/systemmodel.h | 3 +++ - 5 files changed, 8 insertions(+) - -diff --git a/applets/kicker/plugin/rootmodel.cpp b/applets/kicker/plugin/rootmodel.cpp -index 4ec323683..837108744 100644 ---- a/applets/kicker/plugin/rootmodel.cpp -+++ b/applets/kicker/plugin/rootmodel.cpp -@@ -449,6 +449,7 @@ void RootModel::refresh() - } - - m_systemModel = new SystemModel(this); -+ QObject::connect(m_systemModel, &SystemModel::sessionManagementStateChanged, this, &RootModel::refresh); - - if (m_showPowerSession) { - m_entryList << new GroupEntry(this, i18n("Power / Session"), QStringLiteral("system-log-out"), m_systemModel); -diff --git a/applets/kicker/plugin/systementry.cpp b/applets/kicker/plugin/systementry.cpp -index fdd86ece3..939e2119e 100644 ---- a/applets/kicker/plugin/systementry.cpp -+++ b/applets/kicker/plugin/systementry.cpp -@@ -79,6 +79,7 @@ void SystemEntry::refresh() - { - if (!s_sessionManagement) { - s_sessionManagement = new SessionManagement(); -+ QObject::connect(s_sessionManagement, &SessionManagement::stateChanged, this, &SystemEntry::sessionManagementStateChanged); - } - - bool valid = false; -diff --git a/applets/kicker/plugin/systementry.h b/applets/kicker/plugin/systementry.h -index a0a258024..981a3a5f5 100644 ---- a/applets/kicker/plugin/systementry.h -+++ b/applets/kicker/plugin/systementry.h -@@ -54,6 +54,7 @@ public: - - Q_SIGNALS: - void isValidChanged() const; -+ void sessionManagementStateChanged(); - - private Q_SLOTS: - void refresh(); -diff --git a/applets/kicker/plugin/systemmodel.cpp b/applets/kicker/plugin/systemmodel.cpp -index 656bbdc4e..844f80d09 100644 ---- a/applets/kicker/plugin/systemmodel.cpp -+++ b/applets/kicker/plugin/systemmodel.cpp -@@ -92,10 +92,12 @@ void SystemModel::populate() - - auto addIfValid = [=](const SystemEntry::Action action) { - SystemEntry *entry = new SystemEntry(this, action); -+ QObject::connect(entry, &SystemEntry::sessionManagementStateChanged, this, &SystemModel::sessionManagementStateChanged); - - if (entry->isValid()) { - m_entries << entry; - } -+ - QObject::connect(entry, &SystemEntry::isValidChanged, this, &AbstractModel::refresh, Qt::UniqueConnection); - }; - -diff --git a/applets/kicker/plugin/systemmodel.h b/applets/kicker/plugin/systemmodel.h -index cd9048de1..29ae9e428 100644 ---- a/applets/kicker/plugin/systemmodel.h -+++ b/applets/kicker/plugin/systemmodel.h -@@ -25,6 +25,9 @@ public: - - Q_INVOKABLE bool trigger(int row, const QString &actionId, const QVariant &argument) override; - -+Q_SIGNALS: -+ void sessionManagementStateChanged(); -+ - protected Q_SLOTS: - void refresh() override; - --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch deleted file mode 100644 index 0ac8ed788ade..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-applets-systemtray-prefer-IconName-over-IconPixmap.patch +++ /dev/null @@ -1,137 +0,0 @@ -From ea2833e4dd7114f8bf22a322a26c6c05ebf767f2 Mon Sep 17 00:00:00 2001 -From: Vlad Zahorodnii <vlad.zahorodnii@kde.org> -Date: Mon, 25 Apr 2022 21:58:58 +0300 -Subject: [PATCH 3/8] applets/systemtray: Prefer IconName over IconPixmap - -In case both IconName and IconPixmap are provided, the system tray -applet is going to prefer the pixmap. - -That can create a dark icon on dark background bug because plasma can't -recolor pixmaps. - -The SNI spec recommends visualizations to prefer icons over pixmaps: - -> An icon can either be identified by its Freedesktop-compliant icon -> name, carried by this property of by the icon data itself, carried by -> the property IconPixmap. Visualizations are encouraged to prefer icon -> names over icon pixmaps if both are available (FIXME: still not very -> defined: could e the pixmap used as fallback if an icon name is not found?) - -BUG: 418996 - -- Unset iconName when icon can't be loaded -- no code duplication -(cherry picked from commit 7363d0e0f3c1a447e6264e92762735bd33da2682) ---- - .../systemtray/statusnotifieritemsource.cpp | 82 ++++++++----------- - 1 file changed, 33 insertions(+), 49 deletions(-) - -diff --git a/applets/systemtray/statusnotifieritemsource.cpp b/applets/systemtray/statusnotifieritemsource.cpp -index f67845e42..731aecadc 100644 ---- a/applets/systemtray/statusnotifieritemsource.cpp -+++ b/applets/systemtray/statusnotifieritemsource.cpp -@@ -286,68 +286,52 @@ void StatusNotifierItemSource::refreshCallback(QDBusPendingCallWatcher *call) - QIcon overlay; - QStringList overlayNames; - -- // Icon -+ // Overlay icon - { -- KDbusImageVector image; -- QIcon icon; -- QString iconName; -- -- properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image; -- if (image.isEmpty()) { -- QString iconName = properties[QStringLiteral("OverlayIconName")].toString(); -- m_overlayIconName = iconName; -- if (!iconName.isEmpty()) { -+ m_overlayIconName = QString(); -+ -+ const QString iconName = properties[QStringLiteral("OverlayIconName")].toString(); -+ if (!iconName.isEmpty()) { -+ overlay = QIcon(new KIconEngine(iconName, iconLoader())); -+ if (!overlay.isNull()) { -+ m_overlayIconName = iconName; - overlayNames << iconName; -- overlay = QIcon(new KIconEngine(iconName, iconLoader())); - } -- } else { -- overlay = imageVectorToPixmap(image); - } -+ if (overlay.isNull()) { -+ KDbusImageVector image; -+ properties[QStringLiteral("OverlayIconPixmap")].value<QDBusArgument>() >> image; -+ if (!image.isEmpty()) { -+ overlay = imageVectorToPixmap(image); -+ } -+ } -+ } - -- properties[QStringLiteral("IconPixmap")].value<QDBusArgument>() >> image; -- if (image.isEmpty()) { -- iconName = properties[QStringLiteral("IconName")].toString(); -- if (!iconName.isEmpty()) { -- icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames)); -- -- if (overlayNames.isEmpty() && !overlay.isNull()) { -+ auto loadIcon = [this, &properties, &overlay, &overlayNames](const QString &iconKey, const QString &pixmapKey) -> std::tuple<QIcon, QString> { -+ const QString iconName = properties[iconKey].toString(); -+ if (!iconName.isEmpty()) { -+ QIcon icon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames)); -+ if (!icon.isNull()) { -+ if (!overlay.isNull() && overlayNames.isEmpty()) { - overlayIcon(&icon, &overlay); - } -+ return {icon, iconName}; - } -- } else { -- icon = imageVectorToPixmap(image); -+ } -+ KDbusImageVector image; -+ properties[pixmapKey].value<QDBusArgument>() >> image; -+ if (!image.isEmpty()) { -+ QIcon icon = imageVectorToPixmap(image); - if (!icon.isNull() && !overlay.isNull()) { - overlayIcon(&icon, &overlay); - } -+ return {icon, QString()}; - } -- m_icon = icon; -- m_iconName = iconName; -- } -+ return {}; -+ }; - -- // Attention icon -- { -- KDbusImageVector image; -- QIcon attentionIcon; -- -- properties[QStringLiteral("AttentionIconPixmap")].value<QDBusArgument>() >> image; -- if (image.isEmpty()) { -- QString iconName = properties[QStringLiteral("AttentionIconName")].toString(); -- m_attentionIconName = iconName; -- if (!iconName.isEmpty()) { -- attentionIcon = QIcon(new KIconEngine(iconName, iconLoader(), overlayNames)); -- -- if (overlayNames.isEmpty() && !overlay.isNull()) { -- overlayIcon(&attentionIcon, &overlay); -- } -- } -- } else { -- attentionIcon = imageVectorToPixmap(image); -- if (!attentionIcon.isNull() && !overlay.isNull()) { -- overlayIcon(&attentionIcon, &overlay); -- } -- } -- m_attentionIcon = attentionIcon; -- } -+ std::tie(m_icon, m_iconName) = loadIcon(QStringLiteral("IconName"), QStringLiteral("IconPixmap")); -+ std::tie(m_attentionIcon, m_attentionIconName) = loadIcon(QStringLiteral("AttentionIconName"), QStringLiteral("AttentionIconPixmap")); - - // ToolTip - { --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch deleted file mode 100644 index 609ab0f011cd..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-fix-plasmashell-crash-on-panel-w-systray-remove.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7795e5fb4f7e2a79e15a9e5711149f71144e73c9 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Fri, 13 May 2022 14:43:44 +0800 -Subject: [PATCH 5/8] applets/systemtray: disconnect KConfigLoader signal when - instance is about to be deleted - -When an applet is about to be deleted, it will save its config -automatically, but in this case the system tray doesn't need to load the -config again. - -BUG: 453726 - - -(cherry picked from commit 6da91d053b4f142277d60db4a1a17eded9249d11) ---- - applets/systemtray/systemtray.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/applets/systemtray/systemtray.cpp b/applets/systemtray/systemtray.cpp -index 3b7f688a6..0d889b3f0 100644 ---- a/applets/systemtray/systemtray.cpp -+++ b/applets/systemtray/systemtray.cpp -@@ -40,6 +40,8 @@ SystemTray::SystemTray(QObject *parent, const KPluginMetaData &data, const QVari - - SystemTray::~SystemTray() - { -+ // When the applet is about to be deleted, delete now to avoid calling loadConfig() -+ delete m_settings; - } - - void SystemTray::init() --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch deleted file mode 100644 index 57477173acbb..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-1.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 1a966d3fb979cf0f0080c805aed248ee77978800 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Mon, 16 May 2022 16:18:00 +0800 -Subject: [PATCH 6/8] kcms/desktoptheme: find metadata.json when loading - ThemesModel - -Before this commit ThemesModel only finds metadata.desktop, but after -KF5.94, the default theme metadata files have been ported to json format. - -BUG: 453830 - - -(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e) ---- - kcms/desktoptheme/themesmodel.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp -index 6f0ecf4e3..296951742 100644 ---- a/kcms/desktoptheme/themesmodel.cpp -+++ b/kcms/desktoptheme/themesmodel.cpp -@@ -155,7 +155,15 @@ void ThemesModel::load() - const QDir cd(ppath); - const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot); - for (const QString &pack : entries) { -- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop"); -+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator()); -+ -+ QString _metadata = QStringLiteral("%1json").arg(prefix); -+ if (QFile::exists(_metadata)) { -+ themes << _metadata; -+ continue; -+ } -+ -+ _metadata = QStringLiteral("%1desktop").arg(prefix); - if (QFile::exists(_metadata)) { - themes << _metadata; - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch deleted file mode 100644 index 2a379c707efe..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-kcms-desktoptheme-detect-installed-styles-2.patch +++ /dev/null @@ -1,72 +0,0 @@ -From c602c52578da1331d2466ff9803c7e0b9287c24c Mon Sep 17 00:00:00 2001 -From: Alexander Lohnau <alexander.lohnau@gmx.de> -Date: Mon, 16 May 2022 14:49:46 +0200 -Subject: [PATCH 7/8] kcms/desktoptheme: Fix reading of metadata in ThemesModel - -We can not use KConfig to read the desktop file. - -CCBUG: 453830 - - -(cherry picked from commit 43ae993da35bb408b4fabb5c4514feff97628e0d) ---- - kcms/desktoptheme/themesmodel.cpp | 27 +++++++++++++++++++-------- - 1 file changed, 19 insertions(+), 8 deletions(-) - -diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp -index 296951742..ce3cac14b 100644 ---- a/kcms/desktoptheme/themesmodel.cpp -+++ b/kcms/desktoptheme/themesmodel.cpp -@@ -16,6 +16,7 @@ - - #include <KColorScheme> - #include <KDesktopFile> -+#include <KPluginMetaData> - - #include <KConfigGroup> - #include <KSharedConfig> -@@ -176,15 +177,25 @@ void ThemesModel::load() - int themeNameSepIndex = themeRoot.lastIndexOf(QLatin1Char('/'), -1); - const QString packageName = themeRoot.right(themeRoot.length() - themeNameSepIndex - 1); - -- KDesktopFile df(theme); -+ QString name; -+ QString comment; - -- if (df.noDisplay()) { -- continue; -- } -+ if (theme.endsWith(QLatin1String(".json"))) { -+ KPluginMetaData data = KPluginMetaData::fromJsonFile(theme); -+ name = data.name(); -+ comment = data.description(); -+ } else { -+ KDesktopFile df(theme); - -- QString name = df.readName(); -- if (name.isEmpty()) { -- name = packageName; -+ if (df.noDisplay()) { -+ continue; -+ } -+ -+ name = df.readName(); -+ if (name.isEmpty()) { -+ name = packageName; -+ } -+ comment = df.readComment(); - } - const bool isLocal = QFileInfo(theme).isWritable(); - bool hasPluginName = std::any_of(m_data.begin(), m_data.end(), [&](const ThemesModelData &item) { -@@ -205,7 +216,7 @@ void ThemesModel::load() - type = LightTheme; - } - } -- ThemesModelData item{name, packageName, df.readComment(), type, isLocal, false}; -+ ThemesModelData item{name, packageName, comment, type, isLocal, false}; - m_data.append(item); - } - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch deleted file mode 100644 index 594efe7df172..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-sddm-theme-KeyboardButton-fix-layout-name.patch +++ /dev/null @@ -1,39 +0,0 @@ -From e2b631d43528c3e41d53c8a359b6129c616bc271 Mon Sep 17 00:00:00 2001 -From: ivan tkachenko <me@ratijas.tk> -Date: Sat, 30 Apr 2022 03:20:11 +0300 -Subject: [PATCH 1/8] [sddm-theme] KeyboardButton: Fix layout name not being - shown - -It used to cause an error like this: - - [03:21:31.246] (WW) GREETER: file:///usr/share/sddm/themes/breeze/KeyboardButton.qml:19: TypeError: Cannot read property 'shortName' of null - -(cherry picked from commit 2e9020ca6c1d55842a4b014623f0d88697972000) ---- - sddm-theme/KeyboardButton.qml | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/sddm-theme/KeyboardButton.qml b/sddm-theme/KeyboardButton.qml -index d5d5a446c..712096d87 100644 ---- a/sddm-theme/KeyboardButton.qml -+++ b/sddm-theme/KeyboardButton.qml -@@ -10,7 +10,7 @@ PlasmaComponents.ToolButton { - - property int currentIndex: -1 - -- text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", instantiator.objectAt(currentIndex).shortName) -+ text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Keyboard Layout: %1", keyboard.layouts[currentIndex].shortName) - implicitWidth: minimumWidth - - visible: menu.items.length > 1 -@@ -27,7 +27,6 @@ PlasmaComponents.ToolButton { - onObjectRemoved: keyboardMenu.removeItem( object ) - delegate: QQC.MenuItem { - text: modelData.longName -- property string shortName: modelData.shortName - onTriggered: { - keyboard.currentLayout = model.index - } --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch deleted file mode 100644 index d09b60ce6ce4..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.24.5-wallpapers-image-fix-missing-folder-action-buttons.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd8f1b5e302717c84f6a05af36c621122ead6d99 Mon Sep 17 00:00:00 2001 -From: Fushan Wen <qydwhotmail@gmail.com> -Date: Fri, 6 May 2022 21:36:09 +0800 -Subject: [PATCH 4/8] wallpapers/image: Fix missing folder action buttons - -The width of the action area needs to be substracted in contentItem's -width. - -Also use `Kirigami.Units.gridUnit * 4` because `overlayWidth` was -introduced in Frameworks 5.94, and people using Plasma 5.24 may have an -older Frameworks version. ---- - wallpapers/image/imagepackage/contents/ui/config.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/wallpapers/image/imagepackage/contents/ui/config.qml b/wallpapers/image/imagepackage/contents/ui/config.qml -index 97f9f81a5..7bb675f23 100644 ---- a/wallpapers/image/imagepackage/contents/ui/config.qml -+++ b/wallpapers/image/imagepackage/contents/ui/config.qml -@@ -331,6 +331,7 @@ ColumnLayout { - // Don't need a highlight or hover effects - hoverEnabled: false - contentItem: Kirigami.BasicListItem { -+ width: slidePathsView.width - (parent.hasOwnProperty("overlayWidth") ? overlayWidth : Kirigami.Units.gridUnit * 4) - // Don't need a highlight or hover effects - hoverEnabled: false - separatorVisible: false --- -2.35.1 - diff --git a/kde-plasma/plasma-workspace/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 79fb12a10ab1..427c617b6684 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -11,8 +11,9 @@ <use> <flag name="appstream">Enable AppStream software metadata support</flag> <flag name="geolocation">Enables dataengine providing location information</flag> - <flag name="policykit">Build the Users KCM using <pkg>sys-apps/accountsservice</pkg> and <pkg>sys-auth/polkit</pkg></flag> - <flag name="screencast">Enable screencast portal using <pkg>media-video/pipewire</pkg></flag> + <flag name="policykit">Enable locale generation and Users KCM using <pkg>sys-auth/polkit</pkg> and <pkg>sys-apps/accountsservice</pkg></flag> + <flag name="screencast">Enable screencast portal using <pkg>kde-plasma/kpipewire</pkg></flag> <flag name="telemetry">Enable User Feedback control module for <pkg>kde-plasma/systemsettings</pkg></flag> + <flag name="wallpaper-metadata">Show metadata for image wallpaper plugin using <pkg>kde-apps/libkexiv2</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild deleted file mode 100644 index 9fa47cdd5c54..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.5-r1.ebuild +++ /dev/null @@ -1,226 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org - -DESCRIPTION="KDE Plasma workspace" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop telemetry" - -REQUIRED_USE="gps? ( geolocation )" -RESTRICT="test" - -# slot op: various private QtWaylandClient headers -COMMON_DEPEND=" - >=dev-libs/wayland-1.15 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5=[jpeg,libinput] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwayland-${QTMIN}:5= - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kded-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kpeople-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/ktexteditor-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kunitconversion-${KFMIN}:5 - >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 - >=kde-frameworks/prison-${KFMIN}:5[qml] - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/breeze-${PVCUT}:5 - >=kde-plasma/kscreenlocker-${PVCUT}:5 - >=kde-plasma/kwin-${PVCUT}:5 - >=kde-plasma/layer-shell-qt-${PVCUT}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 - >=kde-plasma/libksysguard-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 - sci-libs/libqalculate:= - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) - fontconfig? ( - >=dev-qt/qtprintsupport-${QTMIN}:5 - media-libs/fontconfig - x11-libs/libXft - x11-libs/xcb-util-image - ) - geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) - gps? ( sci-geosciences/gpsd ) - policykit? ( virtual/libcrypt:= ) - screencast? ( - >=dev-qt/qtgui-${QTMIN}:5=[egl] - media-libs/libglvnd - >=media-video/pipewire-0.3:= - x11-libs/libdrm - ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.6.0 - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-util/wayland-scanner-1.19.0 - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) -" -RDEPEND="${COMMON_DEPEND} - app-text/iso-codes - >=dev-qt/qdbus-${QTMIN}:* - >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpaths-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - kde-apps/kio-extras:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kquickcharts-${KFMIN}:5 - >=kde-plasma/milou-${PVCUT}:5 - >=kde-plasma/plasma-integration-${PVCUT}:5 - sys-apps/dbus - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - !<kde-plasma/breeze-5.22.90:5 - !<kde-plasma/plasma-desktop-5.23.90:5 - policykit? ( sys-apps/accountsservice ) -" -BDEPEND=" - >=dev-qt/qtwaylandscanner-${QTMIN}:5 - virtual/pkgconfig -" -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" - -PATCHES=( - "${FILESDIR}"/${PN}-5.21.5-split-libkworkspace.patch # downstream - "${FILESDIR}"/${PN}-5.22.5-krunner-cwd-at-home.patch # TODO upstream: KDE-bug 432975, bug 767478 - "${FILESDIR}"/${P}-sddm-theme-KeyboardButton-fix-layout-name.patch - "${FILESDIR}"/${P}-applets-appmenu-fix-top-level-menu-text-coloration.patch # KDE-bug 453348 - "${FILESDIR}"/${P}-applets-systemtray-prefer-IconName-over-IconPixmap.patch # KDE-bug 418996 - "${FILESDIR}"/${P}-wallpapers-image-fix-missing-folder-action-buttons.patch - "${FILESDIR}"/${P}-fix-plasmashell-crash-on-panel-w-systray-remove.patch # KDE-bug 453726 - "${FILESDIR}"/${P}-kcms-desktoptheme-detect-installed-styles-{1,2}.patch # KDE-bug 453830 - "${FILESDIR}"/${P}-applets-kicker-refresh-RootModel-on-session-backend.patch # KDE-bug 427530 -) - -src_prepare() { - ecm_src_prepare - - cmake_comment_add_subdirectory libkworkspace - # delete colliding libkworkspace translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -name "libkworkspace*" -delete || die - fi - - # TODO: try to get a build switch upstreamed - if ! use screencast; then - sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die - fi - - # TODO: try to get a build switch upstreamed - if use geolocation; then - use gps || sed -e "s/^pkg_check_modules.*LIBGPS/#&/" \ - -i dataengines/geolocation/CMakeLists.txt || die - fi - - if ! use policykit; then - cmake_run_in kcms cmake_comment_add_subdirectory users - fi - - ecm_punt_kf_module Su -} - -src_configure() { - local mycmakeargs=( - -DBUILD_xembed-sni-proxy=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON - $(cmake_use_find_package appstream AppStreamQt) - $(cmake_use_find_package calendar KF5Holidays) - $(cmake_use_find_package fontconfig Fontconfig) - $(cmake_use_find_package geolocation KF5NetworkManagerQt) - $(cmake_use_find_package semantic-desktop KF5Baloo) - $(cmake_use_find_package telemetry KUserFeedback) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - - # default startup and shutdown scripts - insinto /etc/xdg/plasma-workspace/env - doins "${FILESDIR}"/10-agent-startup.sh - - insinto /etc/xdg/plasma-workspace/shutdown - doins "${FILESDIR}"/10-agent-shutdown.sh - fperms +x /etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh -} - -pkg_postinst () { - ecm_pkg_postinst - - elog "To enable gpg-agent and/or ssh-agent in Plasma sessions," - elog "edit ${EPREFIX}/etc/xdg/plasma-workspace/env/10-agent-startup.sh" - elog "and ${EPREFIX}/etc/xdg/plasma-workspace/shutdown/10-agent-shutdown.sh" -} diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.ebuild index 8c06edc3b7e3..19bf008b5923 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.24.4.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.11.ebuild @@ -1,29 +1,30 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -ECM_HANDBOOK="forceoptional" +ECM_HANDBOOK="optional" ECM_TEST="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma workspace" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="appstream +calendar +fontconfig geolocation gps +policykit -screencast +semantic-desktop telemetry" +screencast +semantic-desktop telemetry +wallpaper-metadata" REQUIRED_USE="gps? ( geolocation )" RESTRICT="test" +# kde-frameworks/kwindowsystem[X]: Uses KX11Extras # slot op: various private QtWaylandClient headers COMMON_DEPEND=" + dev-libs/icu:= >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] @@ -35,11 +36,10 @@ COMMON_DEPEND=" >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/karchive-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kbookmarks-${KFMIN}:5 + >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kconfigwidgets-${KFMIN}:5 @@ -53,7 +53,6 @@ COMMON_DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kinit-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5 >=kde-frameworks/kitemviews-${KFMIN}:5 @@ -62,6 +61,7 @@ COMMON_DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 >=kde-frameworks/kpeople-${KFMIN}:5 >=kde-frameworks/krunner-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 @@ -69,21 +69,23 @@ COMMON_DEPEND=" >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kunitconversion-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 >=kde-frameworks/prison-${KFMIN}:5[qml] >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libksysguard-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 - >=media-libs/phonon-4.11.0 + >=kde-plasma/libplasma-${KFMIN}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 + >=kde-plasma/plasma-activities-stats-${KFMIN}:5 + >=media-libs/phonon-4.11.0[qt5(+)] sci-libs/libqalculate:= sys-libs/zlib x11-libs/libICE @@ -96,8 +98,7 @@ COMMON_DEPEND=" x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) + appstream? ( <dev-libs/appstream-1[qt5] ) calendar? ( >=kde-frameworks/kholidays-${KFMIN}:5 ) fontconfig? ( >=dev-qt/qtprintsupport-${QTMIN}:5 @@ -107,33 +108,43 @@ COMMON_DEPEND=" ) geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:5 ) gps? ( sci-geosciences/gpsd ) - policykit? ( virtual/libcrypt:= ) + policykit? ( + sys-auth/polkit-qt[qt5(+)] + virtual/libcrypt:= + ) screencast? ( >=dev-qt/qtgui-${QTMIN}:5=[egl] + >=kde-plasma/kpipewire-${PVCUT}:5 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm ) semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) - telemetry? ( dev-libs/kuserfeedback:5 ) + telemetry? ( kde-frameworks/kuserfeedback:5 ) + wallpaper-metadata? ( kde-apps/libkexiv2:5 ) " DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.6.0 + >=dev-libs/wayland-protocols-1.31 >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-util/wayland-scanner-1.19.0 x11-base/xorg-proto fontconfig? ( x11-libs/libXrender ) " RDEPEND="${COMMON_DEPEND} + !<kde-plasma/breeze-5.22.90:5 + !<kde-plasma/plasma-desktop-5.27.0:5 app-text/iso-codes >=dev-qt/qdbus-${QTMIN}:* >=dev-qt/qtgraphicaleffects-${QTMIN}:5 - >=dev-qt/qtpaths-${QTMIN}:5 >=dev-qt/qtquickcontrols-${QTMIN}:5[widgets] >=dev-qt/qtquickcontrols2-${QTMIN}:5 - kde-apps/kio-extras:5 + || ( + kde-apps/kio-extras-kf5:5 + kde-apps/kio-extras:5 + ) >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kquickcharts-${KFMIN}:5 + >=kde-plasma/kactivitymanagerd-${PVCUT}:5 >=kde-plasma/milou-${PVCUT}:5 >=kde-plasma/plasma-integration-${PVCUT}:5 sys-apps/dbus @@ -141,18 +152,18 @@ RDEPEND="${COMMON_DEPEND} x11-apps/xprop x11-apps/xrdb x11-apps/xsetroot - !<kde-plasma/breeze-5.22.90:5 - !<kde-plasma/plasma-desktop-5.23.90:5 policykit? ( sys-apps/accountsservice ) " BDEPEND=" >=dev-qt/qtwaylandscanner-${QTMIN}:5 + >=dev-util/wayland-scanner-1.19.0 + >=kde-frameworks/kcmutils-${KFMIN}:5 virtual/pkgconfig " -PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:5" +PDEPEND=">=kde-plasma/kde-cli-tools-${PVCUT}:*" PATCHES=( - "${FILESDIR}/${PN}-5.21.5-split-libkworkspace.patch" # downstream + "${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 ) @@ -161,12 +172,11 @@ src_prepare() { cmake_comment_add_subdirectory libkworkspace # delete colliding libkworkspace translations - if [[ ${KDE_BUILD_TYPE} = release ]]; then - find po -type f -name "*po" -and -name "libkworkspace*" -delete || die - fi + find po -type f -name "*po" -and -name "libkworkspace*" -delete || die # TODO: try to get a build switch upstreamed if ! use screencast; then + ecm_punt_bogus_dep KPipeWire sed -e "s/^pkg_check_modules.*PipeWire/#&/" -i CMakeLists.txt || die fi @@ -180,19 +190,23 @@ src_prepare() { cmake_run_in kcms cmake_comment_add_subdirectory users fi - ecm_punt_kf_module Su + if ! use fontconfig; then + ecm_punt_bogus_dep XCB IMAGE + sed -e "s/check_X11_lib(Xft)/#&/" -i CMakeLists.txt || die + fi } src_configure() { local mycmakeargs=( -DBUILD_xembed-sni-proxy=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON + -DGLIBC_LOCALE_GEN=$(usex policykit) $(cmake_use_find_package appstream AppStreamQt) $(cmake_use_find_package calendar KF5Holidays) $(cmake_use_find_package fontconfig Fontconfig) $(cmake_use_find_package geolocation KF5NetworkManagerQt) $(cmake_use_find_package semantic-desktop KF5Baloo) $(cmake_use_find_package telemetry KUserFeedback) + $(cmake_use_find_package wallpaper-metadata KF5KExiv2) ) ecm_src_configure diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.0.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.0.5.ebuild new file mode 100644 index 000000000000..c34a58c45cb2 --- /dev/null +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.0.5.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..d113614cd05a --- /dev/null +++ b/kde-plasma/plasma5support/Manifest @@ -0,0 +1 @@ +DIST plasma5support-6.0.5.tar.xz 55568 BLAKE2B 4c6f74e991a0197c65b9c48ae4becf386ac9d4454a06bd48dff5ded626b9f2fb843d739c7c8bb058b14c94a9b8f60a505048d67567bc0116038ddedbeacca798 SHA512 5279517c2d1e61f1914338dc5d933a7590ce09029e34f4bb4f7e87f3c4e72515f32fae3d8e3bd3641aa6619a1ec4782e46f4e4fddaf0b2b0fec875f066ecd9e8 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.5.ebuild b/kde-plasma/plasma5support/plasma5support-6.0.5.ebuild new file mode 100644 index 000000000000..c32801cdf76c --- /dev/null +++ b/kde-plasma/plasma5support/plasma5support-6.0.5.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 ea366b3531e1..3f5156e66202 100644 --- a/kde-plasma/plymouth-kcm/Manifest +++ b/kde-plasma/plymouth-kcm/Manifest @@ -1,2 +1,2 @@ -DIST plymouth-kcm-5.24.4.tar.xz 39920 BLAKE2B e1edda971f8d055defe35da2710c1da7de336bde9dedc378b7217b1884da2bbdf066be58e17159b029487772f0ff3e2072986c6b7da1cf005e4dbab5ab3dd5ca SHA512 532f83b73fdbdfb1457a86d8d06d0f947eb64729d75b33646c7ca276845407c5ad924f2d3bfa34a926a26f0c580696ed076bb927b99d13edc1049f0109c8b4af -DIST plymouth-kcm-5.24.5.tar.xz 39964 BLAKE2B ba1e54afb9a19b4e3858caa31c8c729feb338412368c8b91a197ee87351397f6c54f62753862982f6f2a3bbcbb74c39946bfcc9e90085ec22179676672ebb229 SHA512 7bc78c3b3d2639de00f428bda606b4f822c99f4c3dc0c2f1fe3f422208e05273701a1871fc573c36b8e14cc1a8bc02e07e4389a40b3fee3a6b79c44a561c2cf8 +DIST plymouth-kcm-5.27.11.tar.xz 45828 BLAKE2B 28c06e6f1cd8cbd1d82786b00c28f652dc7ac123677ba0e00d2df494fa4ddd57883842051e984b144d6b6a8f87ba3d05d3a07fb9e8eb250013ca7044c232f0e7 SHA512 3b7174d52141db79330cb56ee3426dfc44f5d5edb5ebce5354fca098dd741c2414a0faaf5bc8a10a4c1ca21a72141a0c5f36558ede681400537d0686f4a2b0b5 +DIST plymouth-kcm-6.0.5.tar.xz 46468 BLAKE2B eb4bd5b981de0e1c6e71fc7761a7554f95107e1d55be63bf782f70b23727d4012c0cce140af46744a52149f822f7aecc3cd001f99120ca09a404f63446f0c4f4 SHA512 abc3ffa1bdf6d9d86dda293d8dafdb7b8f29e01539fd9f1f6b5db7814741e4b3df8cfcf53896db0d0d9dc2340716533ae72fd9390a280a9d76501dab49e446e4 diff --git a/kde-plasma/plymouth-kcm/metadata.xml b/kde-plasma/plymouth-kcm/metadata.xml index d925f2439758..485b99be0e32 100644 --- a/kde-plasma/plymouth-kcm/metadata.xml +++ b/kde-plasma/plymouth-kcm/metadata.xml @@ -6,6 +6,7 @@ <name>Gentoo KDE Project</name> </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_plymouth</bugs-to> + <remote-id type="kde-invent">plasma/plymouth-kcm</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild deleted file mode 100644 index d6268b4f5766..000000000000 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.4.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="KDE Plasma control module for Plymouth" -HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm" - -LICENSE="GPL-2+" -SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtquickcontrols-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - sys-boot/plymouth -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 -" diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.11.ebuild index 8800e665bf19..7c9c3c65222a 100644 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-5.24.5.ebuild +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma control module for Plymouth" HOMEPAGE="https://invent.kde.org/plasma/plymouth-kcm" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 x86" IUSE="" DEPEND=" @@ -33,5 +33,8 @@ DEPEND=" sys-boot/plymouth " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=dev-qt/qtquickcontrols2-${QTMIN}:5 + >=kde-frameworks/kirigami-${KFMIN}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.0.5.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.0.5.ebuild new file mode 100644 index 000000000000..3a1ab63851de --- /dev/null +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.0.5.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 bc252a236a22..30a437aee46d 100644 --- a/kde-plasma/polkit-kde-agent/Manifest +++ b/kde-plasma/polkit-kde-agent/Manifest @@ -1,2 +1,2 @@ -DIST polkit-kde-agent-1-5.24.4.tar.xz 48424 BLAKE2B f7981148478e674961aaac29359748e1703a5ae41d1cadde0b94da5c37c4bc9afd1a508e3ea6e6e083dae21174fa1e2377e3679ad6ae8709d50918579b9df069 SHA512 49e18d1c3e858eba2157064fef94b8023f7ac56cbc3bd43f1b454f19381a3d9567a68ec0f846097e992f4cec78f51ed011cc36afd9e3b335ffe6bf05001c6664 -DIST polkit-kde-agent-1-5.24.5.tar.xz 48444 BLAKE2B 4e39fe9e23d474e79a0e2611669065e05180f9e2e514cd0aba23b950c19357ac8d56d1a3fbaa85516b3eff86ebe2fbfb8e96d1dcda2cca9333ce0d9b7e7f7f8e SHA512 8182271a4463e28001c5806156afffa8436c9fce0ead257c60b413bf54565d8271e8356f5670e8eb2aea5c3d2a308e31f14f6eff4c6903e1936e6395d8502a93 +DIST polkit-kde-agent-1-5.27.11.tar.xz 53144 BLAKE2B bfffb3ed163b0d1581a23f663120c367d32afaefe843f19b5e5b0b099fd3f7f6b0f396a8543797e6dc9771acb137125f0a7a2ebd2520edc15acec560ef532987 SHA512 c5687704986bca51fde5d0b8d054ee6bdd957d0742c0e6a6f33100c77874ea75b7cb973393d4c7711964e390aa31fe30128d157a757ae13fc0c4d2eae1fc7bed +DIST polkit-kde-agent-1-6.0.5.tar.xz 56484 BLAKE2B 4999cd7e73151a7563fc0c5abb266c11be0c1f300d4468716b2f84e44cf6a1fbda02d5a5d4444b877e39858cbee1744c606c641b286dcb7da289b71f3b9dc27d SHA512 09039518784b13da7f1873172e6814a51b968be45a341b87eb17c25cb7f04810c12f3a4c62b3ac312710b45b8827675abbd05bb7a5e370824c383a7a5ff49d54 diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild deleted file mode 100644 index 1a4ad3aed2e5..000000000000 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.5.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="${PN}-1" -KFMIN=5.90.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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=sys-auth/polkit-qt-0.113.0 -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.11.ebuild index 6d8dd7374950..9a3e74aae971 100644 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.24.4.ebuild +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="${PN}-1" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="PolKit agent module for KDE Plasma" HOMEPAGE="https://kde.org/" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -27,7 +27,7 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=sys-auth/polkit-qt-0.113.0 + >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] + >=sys-auth/polkit-qt-0.113.0[qt5(+)] " RDEPEND="${DEPEND}" diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.0.5.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.0.5.ebuild new file mode 100644 index 000000000000..a303cb987fa3 --- /dev/null +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.0.5.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 8f9ae48efa00..72094e03e0bb 100644 --- a/kde-plasma/powerdevil/Manifest +++ b/kde-plasma/powerdevil/Manifest @@ -1,2 +1,2 @@ -DIST powerdevil-5.24.4.tar.xz 632736 BLAKE2B ab348f7f193627bd7833890cc64ff07b614ff899f2fc2c148d38f6a42f627ae7f2ed7978aecd08795ab4ebdaa4a36b68c483f8fabe7714954e4527c6b743e1cf SHA512 195724a72593248bcf7001a59fbc3b1b1aa3672c3b040eff935993fff26e16c2d85ec37ccc3d2d25e9e3758dd5ed135f203d22855982141fca2e3600566589ee -DIST powerdevil-5.24.5.tar.xz 632800 BLAKE2B 657e68359664bdf4d6ac782a53148400b430ae786d5551763b45d28690d1a3481d913e47618aea015c1753389c779f7e028c03f21a328d08edc6fa5bb3ab21d1 SHA512 2f3e6888be7039bf7beb754ef117d09e79ceb4e5ef73d74f982d37785adbd7a489fc86641c9df9ea4a34fabd2ccac737f5e7ee08958d2dd03b5a676f22aa4c15 +DIST powerdevil-5.27.11.tar.xz 791244 BLAKE2B 423bca5c6c1731f241e1db5aba3a75c7f5801fb99957fb6de6df682053ee5810aeec412a599b83862f4b27c7392cd8781f5b5e952a11bcdb2910a406bf9990c6 SHA512 7ea5640d42c3aa4bc21091a56452202f798ed3df3cfab6b0f38895cdd558fe877e463bf2c801914ded2511777b353d6e252f9dcee2856b1995b6f08c84cc3b84 +DIST powerdevil-6.0.5.tar.xz 799760 BLAKE2B 1ea81103f32fe7e960de1cd40d7b50cecab556097512be7f1721329c6e890dbcb1e43240c0434841c632fa4434e385a91326c8a3d33403004e7b015c1775e051 SHA512 36be20bfc0c074b451e0f9eca6317f2894dc71a943353e8ce52c3f68e0181e054e4a035a85888b9281aa684b50912e87ec3db8d6260fdd371dd6d4c7e86e3709 diff --git a/kde-plasma/powerdevil/metadata.xml b/kde-plasma/powerdevil/metadata.xml index 4b6478b5df5d..a24d6661f302 100644 --- a/kde-plasma/powerdevil/metadata.xml +++ b/kde-plasma/powerdevil/metadata.xml @@ -7,9 +7,11 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/powerdevil</remote-id> </upstream> <use> <flag name="brightness-control">Enable screen brightness control using <pkg>app-misc/ddcutil</pkg></flag> + <flag name="caps">Capabilities support for scheduled wakeup which can wake from suspend (CAP_WAKE_ALARM)</flag> <flag name="wireless">Enable wireless energy saving actions via <pkg>kde-frameworks/bluez-qt</pkg> and <pkg>kde-frameworks/networkmanager-qt</pkg></flag> </use> </pkgmetadata> diff --git a/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild b/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild deleted file mode 100644 index 94703d516236..000000000000 --- a/kde-plasma/powerdevil/powerdevil-5.24.5.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv ~x86" -IUSE="brightness-control caps +wireless" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5[policykit] - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kglobalaccel-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kidletime-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 - >=kde-plasma/libkscreen-${PVCUT}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 - virtual/libudev:= - x11-libs/libxcb - brightness-control? ( app-misc/ddcutil:= ) - caps? ( sys-libs/libcap ) - wireless? ( - >=kde-frameworks/bluez-qt-${KFMIN}:5 - >=kde-frameworks/networkmanager-qt-${KFMIN}:5 - ) -" -RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - >=sys-power/upower-0.9.23 -" - -src_configure() { - local mycmakeargs=( - -DHAVE_DDCUTIL=$(usex brightness-control) - $(cmake_use_find_package caps Libcap) - $(cmake_use_find_package wireless KF5BluezQt) - $(cmake_use_find_package wireless KF5NetworkManagerQt) - ) - - ecm_src_configure -} diff --git a/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild b/kde-plasma/powerdevil/powerdevil-5.27.11.ebuild index f06590672c3f..3adfa345818f 100644 --- a/kde-plasma/powerdevil/powerdevil-5.24.4.ebuild +++ b/kde-plasma/powerdevil/powerdevil-5.27.11.ebuild @@ -1,20 +1,20 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="Power management for KDE Plasma Shell" HOMEPAGE="https://invent.kde.org/plasma/powerdevil" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="brightness-control caps +wireless" DEPEND=" @@ -22,7 +22,6 @@ DEPEND=" >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5[policykit] >=kde-frameworks/kcompletion-${KFMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 @@ -38,12 +37,12 @@ DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/libkscreen-${PVCUT}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) @@ -54,9 +53,11 @@ DEPEND=" ) " RDEPEND="${DEPEND} - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* + sys-power/power-profiles-daemon >=sys-power/upower-0.9.23 " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" src_configure() { local mycmakeargs=( diff --git a/kde-plasma/powerdevil/powerdevil-6.0.5.ebuild b/kde-plasma/powerdevil/powerdevil-6.0.5.ebuild new file mode 100644 index 000000000000..587311940d33 --- /dev/null +++ b/kde-plasma/powerdevil/powerdevil-6.0.5.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..810227f86534 --- /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.5.tar.xz 339988 BLAKE2B e4a0163d43126625080f2de6c0f4def3d17e0d83a1cd09cdb8301d7d08404ec8941bb1f561a5bcffd5bf1e893b12ee240716542a0a875f4763076613035eae26 SHA512 87c8e553a8a288bde40a16cfe191c27d625ef4323e42e0b3f418ca34eddd4a2b9abe77951daa67a4b5a9eb73cdcf7d3abe66f1987d9606d72976b189c5aed6c6 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.5.ebuild b/kde-plasma/print-manager/print-manager-6.0.5.ebuild new file mode 100644 index 000000000000..aa99a2858e98 --- /dev/null +++ b/kde-plasma/print-manager/print-manager-6.0.5.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..dcae02f9e808 --- /dev/null +++ b/kde-plasma/qqc2-breeze-style/Manifest @@ -0,0 +1 @@ +DIST qqc2-breeze-style-6.0.5.tar.xz 66152 BLAKE2B 46e3a990080bbf0b0da3fa36d9b728751b1a9b10fedbf3de62b0bfa2b3389a880cc8bce86aa6ffe48bb1902029be7f348d0b39ab330d5629ca76a8233043ea26 SHA512 8248fb3c64494c851971279b7b039aa0564632c4289d07a28796ee0bf3e4566ef23f844206e14f4d2fa46ccff28df08e4bbb4fc6fa9bd32e8734208f935297c0 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.5.ebuild b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.0.5.ebuild new file mode 100644 index 000000000000..b672cf26596d --- /dev/null +++ b/kde-plasma/qqc2-breeze-style/qqc2-breeze-style-6.0.5.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 a1ad758667dc..cac45b75517b 100644 --- a/kde-plasma/sddm-kcm/Manifest +++ b/kde-plasma/sddm-kcm/Manifest @@ -1,2 +1,2 @@ -DIST sddm-kcm-5.24.4.tar.xz 81212 BLAKE2B 4e1b4a7762c330a89af10fe729373548bd2167c27dd5dbda53d08fa63c4ab0f399969b92a0fc67cd72bdb66bbccf360c057d09c81e4041ec6fed4f9ca1f7301f SHA512 ecff5e710148dc42daffdbebb5ea63c36afe01cf1c3219e615efc8c34d1191748e69ff79017beb3ccd1e48c0e967d258066b004c25b9aa2252972645e95a1192 -DIST sddm-kcm-5.24.5.tar.xz 81280 BLAKE2B d944d898b84dd9da0849c5a81586365d0cae06a1c116587807329e8b029cf26f3faa31e0dcce5382d42d7416b601f10e4110850d643f5f7b0a83a5f4d7f906b3 SHA512 1fbc050e70dde74bcaa0a97ac982f017146ca65f180ea07e57190bd13ea653789fb369b83bc0b2583b73d37e4cd3db087eebe2cdaa3346b81c1d7d11730fad15 +DIST sddm-kcm-5.27.11.tar.xz 94340 BLAKE2B 10592e30e288f85f565d1070542b19a2a03d58a7d0befc69807049ad4ccb8a1491b93e94bd50fcc0f59e0b483d41a7758ead475def217e57c3600298340b049e SHA512 512eb0acfc0e3925d2c020103b94dc4ae7df4e82a4492e686f38e9ff6554e0f1ace42fa63bae3c4b8d8956a6413fc78cf65779ce3024213cfaaf5aa3fb2a74ff +DIST sddm-kcm-6.0.5.tar.xz 97608 BLAKE2B ba8156fd69b73300ac5d123154176d380143dd2e3dda9603b69b09a4a250cdbbc734fadfc7a83cef08c0870e0019842efe3e99ed823aa9ea8f5b4e3c3e1cf422 SHA512 5cae2c11c5a9de14fd77378de3796ced0deffb830b9109f51fbf3903648845ea40736c20e0386f9c2630570aaa74956a5548acfc5bd8cf246a2fe818072e5e03 diff --git a/kde-plasma/sddm-kcm/metadata.xml b/kde-plasma/sddm-kcm/metadata.xml index d925f2439758..ef73ee478dde 100644 --- a/kde-plasma/sddm-kcm/metadata.xml +++ b/kde-plasma/sddm-kcm/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/sddm-kcm</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild deleted file mode 100644 index 7da8175afc35..000000000000 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.24.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -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 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-plasma/kde-cli-tools-${PVCUT}:5 - x11-misc/sddm -" - -DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-5.27.11.ebuild index 362db6a8c3c2..d430bade52bb 100644 --- a/kde-plasma/sddm-kcm/sddm-kcm-5.24.4.ebuild +++ b/kde-plasma/sddm-kcm/sddm-kcm-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.0 +KFMIN=5.106.0 PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org +QTMIN=5.15.9 +inherit ecm plasma.kde.org DESCRIPTION="KDE Plasma control module for SDDM" HOMEPAGE="https://invent.kde.org/plasma/sddm-kcm" LICENSE="GPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -30,14 +30,16 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/kitemmodels-${KFMIN}:5[qml] - >=kde-plasma/kde-cli-tools-${PVCUT}:5 + >=kde-plasma/kde-cli-tools-${PVCUT}:* x11-misc/sddm " +BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:5" DOCS=( CONTRIBUTORS ) diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.0.5.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.0.5.ebuild new file mode 100644 index 000000000000..9601866d0043 --- /dev/null +++ b/kde-plasma/sddm-kcm/sddm-kcm-6.0.5.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 10653b9ec2fd..f8a4f4077b85 100644 --- a/kde-plasma/systemsettings/Manifest +++ b/kde-plasma/systemsettings/Manifest @@ -1,2 +1,2 @@ -DIST systemsettings-5.24.4.tar.xz 205488 BLAKE2B 0bef1c8f3c1c63820b273e8182db3a506b71f379bbe952b485c73485b9fecfea418dea19c1fdfa53fb0fc5436ece192f1b30e60ebb9e3e65151a21f62b9a50bb SHA512 4de5b7c8224f0fb376dfa5481c4185d44632485569e3dd1a7f36582751ca15de2382cd8293d684bdb1d771983ad09b53fa36fe7ae776f447ca09f609a6ec13c0 -DIST systemsettings-5.24.5.tar.xz 205532 BLAKE2B ddde588074ab761fc41e6fb0715fa1af45904d223c060234170062a25b86d58d807b8fed003543785f50e9227161b167f4889bd817fe87c8b711da9f07bf361d SHA512 7dd2aa3d2b0ad821569eaa6e17d064a2216d35a525baf82621a1fb31867a340372ec0349488cc6bf344156f9d9052b589be5d01ed82a1c18fcedaa64fb4986b1 +DIST systemsettings-5.27.11.tar.xz 230736 BLAKE2B 0645be30d2f673683b020d62ce2a8168d4c656fcc23a863a6ca15bacc57be85cc13ef11ff5006ae377526ec55251120ed110afcc502d737d372255f5555ac824 SHA512 5e48b9f7099d2e6efb681094e24da50727bf8819e90bfbd55dbddb546449c1976f2e6763c13e00270f5bd845b3342764a745de40cf0d0278c7285bc1e6943991 +DIST systemsettings-6.0.5.tar.xz 219620 BLAKE2B e91e4e24d8cbd5f27b7a46cdb80a354c6398339a53a9751bb28548349bc3057b2a23cbf40c33ac58cff08535e1409b2cded2117ed59712b60b4a7caf91718ad0 SHA512 3912fc9f00c67c163bd71639dd8186df5eae83f5d560adddcb4bd95532d078a3b18488c66378c0686f0d4be2c01acdc70c3b6726030ef3dbf113262561897204 diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch deleted file mode 100644 index c52f043133b7..000000000000 --- a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-activating-running-instance-on-wayland.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c48ecf5efb941cb3056da8f2c074005cb87417aa Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 12 May 2022 16:49:55 +0200 -Subject: [PATCH] Fix activating running instance on Wayland - -(cherry picked from commit 16c1ee0c517164867d004c561d403e3aebebc7e3) ---- - app/main.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/app/main.cpp b/app/main.cpp -index 13a803cd..e3f7b004 100644 ---- a/app/main.cpp -+++ b/app/main.cpp -@@ -172,7 +172,8 @@ int main(int argc, char *argv[]) - mainWindow->reloadStartupModule(); - } - -- KWindowSystem::forceActiveWindow(mainWindow->winId()); -+ KWindowSystem::updateStartupId(mainWindow->windowHandle()); -+ KWindowSystem::activateWindow(mainWindow->windowHandle()); - }); - - if (!startupModule.isEmpty()) { --- -GitLab - diff --git a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch b/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch deleted file mode 100644 index 9f8d494ded69..000000000000 --- a/kde-plasma/systemsettings/files/systemsettings-5.24.5-fix-kcm-highlighting.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 684004217fd28ba45f7ce61df5b3600398ee1108 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Thu, 12 May 2022 01:22:14 +0200 -Subject: [PATCH] Fix current index in subcategory list - -We bind currentIndex to activeSubCategoryRow, but when clicking on an item this binding is broken - -Manually set the current index when the backend index changes - -BUG: 453543 - -Fixed-In: 5.24.6 -(cherry picked from commit 40b71c085f8ceddc9b3f44fa65d8bb48dad42b4a) ---- - sidebar/package/contents/ui/SubCategoryPage.qml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sidebar/package/contents/ui/SubCategoryPage.qml b/sidebar/package/contents/ui/SubCategoryPage.qml -index 756b2763..19b33142 100644 ---- a/sidebar/package/contents/ui/SubCategoryPage.qml -+++ b/sidebar/package/contents/ui/SubCategoryPage.qml -@@ -140,6 +140,7 @@ Kirigami.ScrollablePage { - Connections { - target: systemsettings - function onActiveSubCategoryRowChanged() { -+ subCategoryView.currentIndex = systemsettings.activeSubCategoryRow - if (systemsettings.activeSubCategoryRow >= 0) { - if (subCategoryView.count > 1) { - root.pageStack.push(subCategoryColumn); --- -GitLab - diff --git a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild b/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild deleted file mode 100644 index ab73d76a6c65..000000000000 --- a/kde-plasma/systemsettings/systemsettings-5.24.5-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org optfeature - -DESCRIPTION="Control Center to configure KDE Plasma desktop" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 - >=kde-frameworks/kauth-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/krunner-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-plasma/libkworkspace-${PVCUT}:5 -" -RDEPEND="${DEPEND} - >=dev-qt/qtquickcontrols2-${QTMIN}:5 -" - -PATCHES=( - "${FILESDIR}/${P}-fix-kcm-highlighting.patch" # KDE-bug 453543 - "${FILESDIR}/${P}-fix-activating-running-instance-on-wayland.patch" -) - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - optfeature "Configure looks for GTK+" kde-plasma/kde-gtk-config - fi - ecm_pkg_postinst -} diff --git a/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild b/kde-plasma/systemsettings/systemsettings-5.27.11.ebuild index 3b2ece11ba78..4dd8d8440f8c 100644 --- a/kde-plasma/systemsettings/systemsettings-5.24.4.ebuild +++ b/kde-plasma/systemsettings/systemsettings-5.27.11.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_HANDBOOK="optional" -KFMIN=5.90.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="Control Center to configure KDE Plasma desktop" LICENSE="GPL-2" # TODO: CHECK SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" DEPEND=" @@ -21,8 +21,6 @@ DEPEND=" >=dev-qt/qtdeclarative-${QTMIN}:5[widgets] >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kactivities-${KFMIN}:5 - >=kde-frameworks/kactivities-stats-${KFMIN}:5 >=kde-frameworks/kauth-${KFMIN}:5 >=kde-frameworks/kcmutils-${KFMIN}:5 >=kde-frameworks/kcompletion-${KFMIN}:5 @@ -31,7 +29,6 @@ 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 @@ -47,6 +44,7 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-plasma/libkworkspace-${PVCUT}:5 + >=kde-plasma/plasma-activities-${KFMIN}:5 " RDEPEND="${DEPEND} >=dev-qt/qtquickcontrols2-${QTMIN}:5 diff --git a/kde-plasma/systemsettings/systemsettings-6.0.5.ebuild b/kde-plasma/systemsettings/systemsettings-6.0.5.ebuild new file mode 100644 index 000000000000..fc4732969291 --- /dev/null +++ b/kde-plasma/systemsettings/systemsettings-6.0.5.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..11a4baca0b8d --- /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.5.tar.xz 825656 BLAKE2B 59e0d2d9a0884a5b33e6abc6114016ef956c4c887f6ee7ec0aa2d322e8de441754f85bbbbb867519b2c73ebf65b1f69672128284517fb156658e37b306268466 SHA512 cc9c53e9a18f9b74af14b466aede365b190e6573a2da8387148c57008f72df583e5f4dfa8b9221614df781cbd672d67d05977f524fe7625fa07485d0ca990735 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.5.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.0.5.ebuild new file mode 100644 index 000000000000..9132cd45f468 --- /dev/null +++ b/kde-plasma/wacomtablet/wacomtablet-6.0.5.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 a3f73b00da72..c77a8ce5e591 100644 --- a/kde-plasma/xdg-desktop-portal-kde/Manifest +++ b/kde-plasma/xdg-desktop-portal-kde/Manifest @@ -1,2 +1,2 @@ -DIST xdg-desktop-portal-kde-5.24.4.tar.xz 88540 BLAKE2B 6a6522bbfe99919a98ee697fc6331fe6b833f376307dbfec303dddb2020c97d355dcd0b251d0feb1e270f2b9a7633f8e770f5e58d9a0ade618dd376fc3890eed SHA512 6efd6452aff8e139921d884e272d26421ed3b1b83c36ca1bdee8bb54633cf85866be87e5f169ececd5364d901d78d9f4b0dd520450b890540a5bd514b0e2e54c -DIST xdg-desktop-portal-kde-5.24.5.tar.xz 88904 BLAKE2B b7ab407132ce8dfdae58854dc29af270c411e1d2c7c8631c6209ff0fb44c80b8287dbe13a6ed60d2e8926f4b23ed3209242bd2836906a44ee06a936d56a91131 SHA512 6314fa4f679700224c6de44726f1fbf513249cebcb9c0fae212bde3de98cb0cc040f671e2435d8e53f379ad907bde4022a6ecfe5f95424a9414ce7471c0fe401 +DIST xdg-desktop-portal-kde-5.27.11.tar.xz 143652 BLAKE2B e7086d30d677385a1d1a2bed22661b935b67ae3cd15102bf47f0b75ecc8e0d3189530e54913a11d0a9eb9db9427af18bd77bfc37d856a3e4bef46cc90bfd0bc1 SHA512 39e1c4cf284558e013c24523ef1993f48e237d13fc2fb3ccfbffcea1925f18bcd623229ef933aaf301c83f460ee849656ba3344ca74fd068e416ea2eb3467621 +DIST xdg-desktop-portal-kde-6.0.5.tar.xz 164208 BLAKE2B c1c4844b1651b4b788b87c60a6636eb3ed12433a8e1304046099ea6d97ed5f9ae668b2cfeb80f5732d2a1ad3371a77e41b747d0cfc244e154bc1899370f3f3f9 SHA512 f83af71b1441926d7688c97da9253bc49896b56927edb39bf1839a07461f7d3a507f69f79bce2bfe63b9eb5f7553e43e74ae78203ef9f3db56f806b191c21745 diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch deleted file mode 100644 index 6b771bfede1e..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.24.5-show-screenshare-notifier-more-prominently.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bbff465e6a005c737ee2e53eb5e072da006d9b4b Mon Sep 17 00:00:00 2001 -From: Aleix Pol <aleixpol@kde.org> -Date: Fri, 13 May 2022 16:47:36 +0200 -Subject: [PATCH] screenshare: Show the screen sharing notifier more - prominently - -Sets it as active, otherwise it got buried in the extended view of the -system tray. - -BUG: 452980 - - -(cherry picked from commit 3d61dae1fa334a9f3dadc505a038f75aa5846588) ---- - src/waylandintegration.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/waylandintegration.cpp b/src/waylandintegration.cpp -index e125578..b1b2d4d 100644 ---- a/src/waylandintegration.cpp -+++ b/src/waylandintegration.cpp -@@ -292,6 +292,7 @@ bool WaylandIntegration::WaylandIntegrationPrivate::startStreaming(Screencasting - } - item->setOverlayIconByName("media-record"); - item->setToolTip(item->iconName(), item->title(), i18n("Press to cancel")); -+ item->setStatus(KStatusNotifierItem::Active); - connect(item, &KStatusNotifierItem::activateRequested, stream, [=] { - stopStreaming(nodeid); - stream->deleteLater(); --- -GitLab - diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild deleted file mode 100644 index 302a1ac2c35e..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.5-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit ecm kde.org - -DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" - -LICENSE="LGPL-2+" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" -IUSE="" - -COMMON_DEPEND=" - >=dev-libs/wayland-1.15 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5[cups] - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kdeclarative-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kirigami-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 - >=dev-qt/qtconcurrent-${QTMIN}:5 -" -RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal -" -BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" - -PATCHES=( - "${FILESDIR}"/${P}-show-screenshare-notifier-more-prominently.patch # KDE-bug 452980 -) diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.ebuild index dce949206335..d7ba7d0d90b5 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.24.4-r1.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.11.ebuild @@ -1,44 +1,60 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=5.90.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 DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" LICENSE="LGPL-2+" SLOT="5" -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" IUSE="" +# dev-qt/qtgui: QtXkbCommonSupport is provided by either IUSE libinput or X COMMON_DEPEND=" >=dev-libs/wayland-1.15 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 + || ( + >=dev-qt/qtgui-${QTMIN}:5[libinput] + >=dev-qt/qtgui-${QTMIN}:5[X] + ) >=dev-qt/qtprintsupport-${QTMIN}:5[cups] + >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5[dbus] >=kde-frameworks/kconfig-${KFMIN}:5 >=kde-frameworks/kdeclarative-${KFMIN}:5 + >=kde-frameworks/kglobalaccel-${KFMIN}:5 + >=kde-frameworks/kguiaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 - >=kde-frameworks/plasma-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 + >=kde-plasma/libplasma-${KFMIN}:5 + x11-libs/libxkbcommon " DEPEND="${COMMON_DEPEND} - >=dev-libs/plasma-wayland-protocols-1.1.1 + >=dev-libs/plasma-wayland-protocols-1.7.0 + >=dev-libs/wayland-protocols-1.25 >=dev-qt/qtconcurrent-${QTMIN}:5 " RDEPEND="${COMMON_DEPEND} + kde-misc/kio-fuse:5 sys-apps/xdg-desktop-portal " -BDEPEND=">=dev-qt/qtwaylandscanner-${QTMIN}:5" +BDEPEND=" + >=dev-qt/qtwaylandscanner-${QTMIN}:5 + virtual/pkgconfig +" diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.0.5.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.0.5.ebuild new file mode 100644 index 000000000000..540f85ca6d26 --- /dev/null +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.0.5.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 be5c47e6ef60..156526552da7 100644 --- a/kde-plasma/xembed-sni-proxy/Manifest +++ b/kde-plasma/xembed-sni-proxy/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.24.4.tar.xz 18488324 BLAKE2B 140540a95360bc1c9ce1940ca03267bfe8c5d59a378b09a5c2abfed9ad8f8af89558c616465363f27a42a730025c081092f00dd0eb776cb7ee53a0aeff1b3881 SHA512 6c917d3ea307bca85e6ca12294357410c3442a9115a4864311df87af29919c20d8dab768f470379bbc4e0510367319a6cf8ce045ab7254db06e8c29477370d89 -DIST plasma-workspace-5.24.5.tar.xz 18490588 BLAKE2B 5a9681620f40604f631cd7ef0c9d6256cc490436dc5e29ef9434d0f129324c2d405c5647da12778c208976c0cb0b4da698a90a22b70c1cb2723cbc58f69bda1d SHA512 ae40fe545b03e42e9f8fe2e8885d3853f4b52d4fd2ed3ecf7d24fa59b4924b8f8b389e8713ec6a3a875bc66df3952de9157d4a5631b283105a9329a1a1825996 +DIST plasma-workspace-5.27.11.tar.xz 19486864 BLAKE2B 41da7e904b08e6c6dc7600c601183a9b600e68f122e1f9aae3dfec468adc1eff377566aadc52084648840be227106e7e0aa8cf48ffc7301a6853dc1c0ad92d4b SHA512 d49b717bf4b074cd201a6807329d73d0defebc814c2d3dc2eb473e00bf030d1334fe9eb8cc8b3f3e019b54faf67dcc992c5a7bef1c85d7d2fb8ee70a6c6b3443 diff --git a/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.20.80-standalone.patch b/kde-plasma/xembed-sni-proxy/files/xembed-sni-proxy-5.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 d925f2439758..7a4a42fc5fa8 100644 --- a/kde-plasma/xembed-sni-proxy/metadata.xml +++ b/kde-plasma/xembed-sni-proxy/metadata.xml @@ -7,5 +7,6 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> + <remote-id type="kde-invent">plasma/plasma-workspace</remote-id> </upstream> </pkgmetadata> diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild deleted file mode 100644 index b73f5cac8f27..000000000000 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.2 -inherit cmake kde.org - -DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays" -HOMEPAGE="https://invent.kde.org/plasma/plasma-workspace/-/blob/master/xembed-sni-proxy/Readme.md" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" - -DEPEND=" - >=dev-qt/qtcore-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] - x11-libs/libxcb - x11-libs/libXtst - x11-libs/xcb-util-image -" -RDEPEND="${DEPEND} - !kde-plasma/xembed-sni-proxy:0 -" - -S="${S}/${PN}" - -PATCHES=( "${FILESDIR}/${PN}-5.20.80-standalone.patch" ) - -src_prepare() { - cmake_src_prepare - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -} diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.11.ebuild index 4930f2576348..18465c657337 100644 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.24.4.ebuild +++ b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.27.11.ebuild @@ -1,27 +1,26 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_NAME="plasma-workspace" -KFMIN=5.90.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 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86" DEPEND=" >=dev-qt/qtcore-${QTMIN}:5 >=dev-qt/qtdbus-${QTMIN}:5 >=dev-qt/qtgui-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 - >=kde-frameworks/extra-cmake-modules-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] x11-libs/libxcb x11-libs/libXtst @@ -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" } |