From: Andreas Sturmlechner Date: Sat, 21 Sep 2019 08:06:06 +0000 (+0200) Subject: kde-plasma: Drop KDE Plasma 5.15.5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2d67b7d0699d02a4025aa99e293642bb75f4709;p=gentoo.git kde-plasma: Drop KDE Plasma 5.15.5 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner --- diff --git a/kde-plasma/bluedevil/Manifest b/kde-plasma/bluedevil/Manifest index cf3ae2642dcb..381fb5e5483f 100644 --- a/kde-plasma/bluedevil/Manifest +++ b/kde-plasma/bluedevil/Manifest @@ -1,2 +1 @@ -DIST bluedevil-5.15.5.tar.xz 158216 BLAKE2B 0f7fdf6cf700e09a7b3468163e65bbc314960531f6e6d73f599bae98f52f19287a25fc71bf4349dd27791de35a992235ae2a884950217640253e15ab6c92609b SHA512 fdcf1a203ca78f6f36e22fc8bbabb2ea8c3f3fd63d4ba6c37453ea6b32a41311347685be68454c25e4e238926dcc1b6cbdbeefaad3ed384b488054a6a4e0d54e DIST bluedevil-5.16.5.tar.xz 160136 BLAKE2B 19b39ce147a7678d8740a9c209e5af5c80d1affebb349f03b49e48f170fa1323410399c32b56b844b522e75056680e926bb1a432b69567cbede256dfc977b6f9 SHA512 de3c767413ede046ef39bc249c728c50f22db04ce1062956f9462214cf0d9dda0468ea3e463330663da720226a97b3bf935c5c138d282d066181faf0b6e55828 diff --git a/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild b/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild deleted file mode 100644 index 0712de35aeb2..000000000000 --- a/kde-plasma/bluedevil/bluedevil-5.15.5.ebuild +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Bluetooth stack for KDE Plasma" -HOMEPAGE="https://cgit.kde.org/bluedevil.git" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep bluez-qt) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND} - $(add_plasma_dep kde-cli-tools) -" diff --git a/kde-plasma/breeze-grub/Manifest b/kde-plasma/breeze-grub/Manifest index 31f666d17379..0c47b90153d7 100644 --- a/kde-plasma/breeze-grub/Manifest +++ b/kde-plasma/breeze-grub/Manifest @@ -1,2 +1 @@ -DIST breeze-grub-5.15.5.tar.xz 3127888 BLAKE2B 0ee6733509a8e82e272e17ea6247dc3d32420e243c4989a04271a17b30e614d5b35f19a14aebc676fdffbcfe66130352ddde4b5c31acbb890e5a6aa8868d1db7 SHA512 fa95f67ab63382c12f9d5448fe114145c485b73ebc7eeefb4b3199c582707f88fdbc68dbd9c996a46d44004f0a0f759fe44b49d03391a399f8113b4494b64420 DIST breeze-grub-5.16.5.tar.xz 3136380 BLAKE2B 922e97a8f921ee43f163c861a2424f3f4cb290d669dc5fe372eac654cd9ddf2bcbc0f26cf831c4452c463f2f5c768d7f3aef945873e1edea818c6ba332b78318 SHA512 3fb6c8dfde319a62234a7f1dbb6306b159a42c5d7c910fc09ef202f3e3e89500a0bf70664f013059c0e113d2e1ebcf46698acc9909d7b6398fcf3bacba000746 diff --git a/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild b/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild deleted file mode 100644 index 931934c8b2c3..000000000000 --- a/kde-plasma/breeze-grub/breeze-grub-5.15.5.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_AUTODEPS="false" -KDE_DEBUG="false" -inherit kde5 - -DESCRIPTION="Breeze theme for GRUB" -LICENSE="GPL-3+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -src_prepare() { default; } -src_configure() { :; } -src_compile() { :; } - -src_install() { - insinto /usr/share/grub/themes - doins -r breeze -} diff --git a/kde-plasma/breeze-gtk/Manifest b/kde-plasma/breeze-gtk/Manifest index 748462e24d0e..995c0615af2b 100644 --- a/kde-plasma/breeze-gtk/Manifest +++ b/kde-plasma/breeze-gtk/Manifest @@ -1,2 +1 @@ -DIST breeze-gtk-5.15.5.tar.xz 47504 BLAKE2B 3a6d4c656e652004e1c3268978e31f476c08a78fcf27de178edd94c1b1f568fcef26b971e52b89037922eb7be86ff5eb6189e8816a6ce6dab5a50c7d951da84a SHA512 61416aa88b50cca55df03b6eb95f6d5f6f7700fb64730668d777155c5ec0a892d00b9dd659f8a4ab86ba0c857d7bb52954563cdb8df2498f8fdfbea95c1cdd59 DIST breeze-gtk-5.16.5.tar.xz 47412 BLAKE2B d995d6b542c517785b33b4c1178d513ac5faa391b1de9f8605b1ad55f392e9eb8b9d2951cdde173854f25fd9d27ea3099f4505b5701a054eb3c350187d1f294a SHA512 deb172423d0e22d20305d1229b0f7c679c8707f56c0fd1e4589a068d295b5a17eeb3342ab174e94d0399fc357f091c9229f126b58bd1e9f4d45deefd0f6c41aa diff --git a/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild deleted file mode 100644 index 0587632ef9b1..000000000000 --- a/kde-plasma/breeze-gtk/breeze-gtk-5.15.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7} ) -inherit kde5 python-any-r1 - -DESCRIPTION="Official GTK+ port of Plasma's Breeze widget style" -HOMEPAGE="https://cgit.kde.org/breeze-gtk.git" -LICENSE="LGPL-2.1+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -BDEPEND="${PYTHON_DEPS} - $(add_plasma_dep breeze) - $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - dev-lang/sassc -" - -python_check_deps() { - has_version "dev-python/pycairo[${PYTHON_USEDEP}]" -} - -pkg_setup() { - python-any-r1_pkg_setup - kde5_pkg_setup -} diff --git a/kde-plasma/breeze-plymouth/Manifest b/kde-plasma/breeze-plymouth/Manifest index 3034b0c881bc..15d4d9bbb21e 100644 --- a/kde-plasma/breeze-plymouth/Manifest +++ b/kde-plasma/breeze-plymouth/Manifest @@ -1,2 +1 @@ -DIST breeze-plymouth-5.15.5.tar.xz 105724 BLAKE2B 2ba7c8daf2997bf8f422e687ff5636398eb5d84867814177c73a2d004baacbc2a25131585757efd615069dabaadd23641d646806d884228b2ac95805576198db SHA512 74df266881cebf5f1378975f6768e43e73a3ca4f6d8f1d73a4026eb1d046b9386887d40e8e8ad59fb9c96c45a6f63aa9b6c41a8d1740eaab4db515ab4c5a5310 DIST breeze-plymouth-5.16.5.tar.xz 105440 BLAKE2B 9a9e86347d4b683253266831a10b21162c01155e03de3195dd1ece75c97bf6e698c8bfd9876e5a8ccc1c5a6d525fe3d7ae95e689ad2c5d4235f348e2a19cd895 SHA512 2934d43c44b5683964fd14b3a5498c41989c5fb69182b29cef9bc588470c299f16662028e8c2101228a3c3299789ffdc21e33ed49d90965a2add2d9bd79a4ee6 diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild deleted file mode 100644 index 3ebe007bd070..000000000000 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-5.15.5.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_KDEINSTALLDIRS="false" -KDE_AUTODEPS="false" -inherit kde5 - -DESCRIPTION="Breeze theme for Plymouth" -LICENSE="GPL-2+ GPL-3+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -BDEPEND="$(add_frameworks_dep extra-cmake-modules)" -DEPEND="sys-boot/plymouth" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DDISTRO_NAME="Gentoo Linux" - -DDISTRO_VERSION= - ) - - kde5_src_configure -} diff --git a/kde-plasma/breeze/Manifest b/kde-plasma/breeze/Manifest index 52de5805fc61..0cd429f808e6 100644 --- a/kde-plasma/breeze/Manifest +++ b/kde-plasma/breeze/Manifest @@ -1,2 +1 @@ -DIST breeze-5.15.5.tar.xz 25144812 BLAKE2B 00a477883384924cf9d77d659e9df4e31d442b94bbb2ad7b502e4cfd4aa5f40a01918654a738ef92db6ada834a10a7197d56ecb2994218a24d2ec0b0830f887c SHA512 a83ab125ed55f5da6b4e74ceecea5bbf5dc0f2b589b88764b2c0e501bfdc514e7b911e8a93b6e491f9ff0a22055fe8fa6611203f50b75fd624d7427e6c532391 DIST breeze-5.16.5.tar.xz 16588516 BLAKE2B 25956c6d3293d4a8aab96ab2fc8e0ca6c73c5ac5329693ff8e728638ca42f3e07194a4b78d9f39c791ab1e5b0ccf8f2d8c350718d4649480aafccc9fac823d93 SHA512 28c1236078da8a9de21469ff1a01391512afb84bbd8beafb2dbc6dcb1dd955caa758a6dc6869fd11396fd5eed203e9f62b0b6e9e093e47e54d399cd61d52c8d6 diff --git a/kde-plasma/breeze/breeze-5.15.5.ebuild b/kde-plasma/breeze/breeze-5.15.5.ebuild deleted file mode 100644 index 2504dba5e701..000000000000 --- a/kde-plasma/breeze/breeze-5.15.5.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Breeze visual style for the Plasma desktop" -HOMEPAGE="https://cgit.kde.org/breeze.git" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="wayland X" - -RDEPEND=" - $(add_frameworks_dep frameworkintegration) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_plasma_dep kdecoration) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - sci-libs/fftw:3.0= - wayland? ( $(add_frameworks_dep kwayland) ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libxcb - ) -" -DEPEND="${RDEPEND} - $(add_frameworks_dep kpackage) -" -PDEPEND=" - $(add_frameworks_dep breeze-icons) - $(add_plasma_dep kde-cli-tools) -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package wayland KF5Wayland) - $(cmake-utils_use_find_package X XCB) - ) - kde5_src_configure -} diff --git a/kde-plasma/discover/Manifest b/kde-plasma/discover/Manifest index db2769ccc4e4..5ce73b461b8c 100644 --- a/kde-plasma/discover/Manifest +++ b/kde-plasma/discover/Manifest @@ -1,2 +1 @@ -DIST discover-5.15.5.tar.xz 10447644 BLAKE2B 456acc6bbbea216cde7a535fa591ef76316ee07f5ba57e6b3c6c20536b21877eb210f381cba8cc7c114110f3f7ffc4244163174bf8ae95cd022ca05a4be16bed SHA512 fc94bf3d93423d6327951c8ba76c2a08c7bd19aafbca7333e159af7500d1a78b464f7b5824b9168c522f052ca6cd322e9b5a26abd74657b99c734bbc7b864a3d DIST discover-5.16.5.tar.xz 10453308 BLAKE2B 03d497f9dd1685a356081bf43228c5859d80c40f3b45616e9919f6b3a50e193ca608a14e3175168c77d9b5e234e34ab4eb97c2294a366e47328044bdea98b231 SHA512 69fcfc9f8576dc5933f4e0c36ac25c518e2cd41158c5c171f760a4cd883018a6dd01ffa8984c80e5002830d6b9d706abbb7cedf3d2144317e482404bb821055e diff --git a/kde-plasma/discover/discover-5.15.5.ebuild b/kde-plasma/discover/discover-5.15.5.ebuild deleted file mode 100644 index 2623796609c7..000000000000 --- a/kde-plasma/discover/discover-5.15.5.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE Plasma resources management GUI" -HOMEPAGE="https://userbase.kde.org/Discover" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="+firmware" - -# libmarkdown (app-text/discount) only used in PackageKitBackend -DEPEND=" - $(add_frameworks_dep attica) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kirigami) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - firmware? ( sys-apps/fwupd ) -" -RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) -" - -PATCHES=( "${FILESDIR}/${PN}-5.15.5-tests.patch" ) - -RESTRICT+=" test" - -src_prepare() { - kde5_src_prepare - # we don't need it with PackageKitBackend off - punt_bogus_dep KF5 Archive -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_packagekitqt5=ON - -DCMAKE_DISABLE_FIND_PACKAGE_AppStreamQt=ON - -DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON - -DBUILD_FlatpakBackend=OFF - -DBUILD_FwupdBackend=$(usex firmware) - ) - - kde5_src_configure -} diff --git a/kde-plasma/drkonqi/Manifest b/kde-plasma/drkonqi/Manifest index 5b5f900742cc..c3f4511da351 100644 --- a/kde-plasma/drkonqi/Manifest +++ b/kde-plasma/drkonqi/Manifest @@ -1,2 +1 @@ -DIST drkonqi-5.15.5.tar.xz 738752 BLAKE2B e0a48064a1881079f44c727a1bc08b9e8906b2c3e83a3def8b5fd406b6aa4d2982ebb885f3038692568293da2d933d521735724b34b40fbbcc96b139c1595740 SHA512 812206194f095a4862023a085ac2975c107e2774010598a6bf1b9b88b8dfa1e78819ac4012854d607a61bcba6dc954554ac178ccb3fd304ed27adddefa1fe8c9 DIST drkonqi-5.16.5.tar.xz 743220 BLAKE2B d878bcde06693b309be7ed9b8f6a9de952f41c00701fe4a4b84df7a557e8b0e996a9f37402c1d8f10363822220deccf71416412895336abee4acc77fef6c5610 SHA512 4d42e69301e4af88c292d6072055384ebf79b91240504c23f393abba9f7def5b15da9f252efa76232535ce6bdfe77238131c88b98f89afdc38a7a107e7dc8c40 diff --git a/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild b/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild deleted file mode 100644 index 310e0085fc93..000000000000 --- a/kde-plasma/drkonqi/drkonqi-5.15.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Plasma crash handler, gives the user feedback if a program crashed" - -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="X" - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kxmlrpcclient) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - X? ( $(add_qt_dep qtx11extras) ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) -" -RDEPEND="${COMMON_DEPEND} - !> CMakeLists.txt <<- _EOF_ || die - ki18n_install(po) - _EOF_ - fi - - sed -e "/set/s/GENTOO_PV/$(ver_cut 1-3)/" \ - -i CMakeLists.txt || die "Failed to prepare CMakeLists.txt" -} diff --git a/kde-plasma/milou/Manifest b/kde-plasma/milou/Manifest index 158f194f5ac6..c88c75cb96b5 100644 --- a/kde-plasma/milou/Manifest +++ b/kde-plasma/milou/Manifest @@ -1,2 +1 @@ -DIST milou-5.15.5.tar.xz 57296 BLAKE2B 7dd8fa3da98836354072bd4eb67a92173d839ac0432da5bbedbbb3c68c3d1022cb572864e3c0b0335a36efd364676416d07b7258b0e5d17db6306884e8bacd82 SHA512 4b0a7a3edc1d50c64a226ae49e3660635838bd899939004d42a33492ba9f2255ef0c3575e2155f1ff7713c8396a95afcd8659bb61c48dee639962359a562565a DIST milou-5.16.5.tar.xz 57700 BLAKE2B b813af1c1e0082c1a077464eb9db51fc4e526a63915a86d4b6c8b351c23590012ba12d6cbcf38e6c580346aa1b1eca7e6ab29a203035a2568833705cd28ee84d SHA512 70f8ab1c7dc1d3724e385cc959f3ad4b80efbd200c0dd9028cb123a07304b0c866c3a8a474cb5dcd0d2358a6b0ed888c85f0f6b8f43d8e057b16152406ea8ead diff --git a/kde-plasma/milou/milou-5.15.5.ebuild b/kde-plasma/milou/milou-5.15.5.ebuild deleted file mode 100644 index aab591c79a3d..000000000000 --- a/kde-plasma/milou/milou-5.15.5.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_TEST="forceoptional-recursive" -inherit kde5 - -DESCRIPTION="Dedicated search application built on top of Baloo" -HOMEPAGE="https://cgit.kde.org/milou.git" - -LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" diff --git a/kde-plasma/oxygen/Manifest b/kde-plasma/oxygen/Manifest index ec68db994a23..ff4f4cb94285 100644 --- a/kde-plasma/oxygen/Manifest +++ b/kde-plasma/oxygen/Manifest @@ -1,2 +1 @@ -DIST oxygen-5.15.5.tar.xz 4473020 BLAKE2B 1c7fbaac142e80ba14b7fa99645590299b3b0dbc973ff12aa23114d50a4cf61fffc274c066ad90925e7796e3475a00752926b417f18705fe5712a5bb120b0c67 SHA512 fed946bf50e7f58ee247bd63dab2a5c371bf6d2c75cc64924e3de8e9b00faa003e2949dc78cc1babb352a043389d7f285d96731cedf0200b660d99131db0ecd0 DIST oxygen-5.16.5.tar.xz 4466432 BLAKE2B 99ffbf358ebe687402d2ad08b01f0043c4c2510762a4eed9556d97727000d9a6144c712775c206cc4b98f4c247ed6d4fa96aceda0af6e82c2e75b69250ce8490 SHA512 6ed14b6fc454e22e837525efa7298245d62cd7c86a0f8b608960141f8820722fa9996214848309cb89d4212d9a8ad1384ce82e7917b62114aea8d65247b68951 diff --git a/kde-plasma/oxygen/oxygen-5.15.5.ebuild b/kde-plasma/oxygen/oxygen-5.15.5.ebuild deleted file mode 100644 index 203ea9251d30..000000000000 --- a/kde-plasma/oxygen/oxygen-5.15.5.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Oxygen visual style for the Plasma desktop" -HOMEPAGE="https://cgit.kde.org/oxygen.git" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="wayland" - -RDEPEND=" - $(add_frameworks_dep frameworkintegration) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_plasma_dep kdecoration) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - x11-libs/libxcb - wayland? ( $(add_frameworks_dep kwayland) ) -" -DEPEND="${RDEPEND} - $(add_frameworks_dep kservice) -" -PDEPEND=" - $(add_plasma_dep kde-cli-tools) -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package wayland KF5Wayland) - ) - kde5_src_configure -} diff --git a/kde-plasma/plasma-browser-integration/Manifest b/kde-plasma/plasma-browser-integration/Manifest index 868da51e4953..53728e917fde 100644 --- a/kde-plasma/plasma-browser-integration/Manifest +++ b/kde-plasma/plasma-browser-integration/Manifest @@ -1,2 +1 @@ -DIST plasma-browser-integration-5.15.5.tar.xz 118136 BLAKE2B fc5ead642b561ef383307fca9c06424ea17278fc951bb46f6555d31e7d9d7762a2e211054ba61a6ac83fcb817017745f9773402fdfb1a286fde5be301aadcb44 SHA512 c3f1ec7ebcb06ee6dc807e639cffb373cfe2d2eb549b18f7028e13991154107f474d923fcceea809399836bc3af6299993f91e7bfa85ce80e85c212640b1750c DIST plasma-browser-integration-5.16.5.tar.xz 123784 BLAKE2B dedcc770ea524e5a10ae7c231ea800ae69ffe707dec135aabec3acad36c6270e0dd45ec82e8c0e4f0ca7bea758fbc63b0f380b718077b52dba9eec042fa5803a SHA512 667c5ef2dd0529e6c567e9d3e34e8e6df73e0101605ccc4a6712e7f47b6824407495102ddc9b800e411f53a1fdf0132caebf6d955c39e7a80b7ab6569d02d1b4 diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild deleted file mode 100644 index 25870b49649f..000000000000 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-5.15.5.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Integrate Chrome/Firefox better into Plasma through browser extensions" - -LICENSE="GPL-3+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -DMOZILLA_DIR="${EPREFIX}/usr/$(get_libdir)/mozilla" - ) - - kde5_src_configure -} diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index f53fe3e4a20a..2a4312d0f833 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,2 +1 @@ -DIST plasma-desktop-5.15.5.tar.xz 9285792 BLAKE2B 27e44bf35b6c317e8e7d3074c089d1cf5106066e52d5be5fbec36096e1df86d5004fc84bc9693d8d396711f7a94ce5d709ee8c9a5b867ccdfaa5dd016ad14964 SHA512 ed7578d92a908bebc3bc42cd7900704253a7066f667deeed35d5efb291711a364a7026bf9d12510a8113f9d52d6e9297f500c5b04bd8f9522f071da0f240432c DIST plasma-desktop-5.16.5.tar.xz 9556104 BLAKE2B 8e825692dc09897daa9eb6977991ae9d559284b066a662b4bd40faae575068866c6f82a7fab899e5b06312ae3910aea7ccd50ce895ea0371b2346f2fd69c4786 SHA512 7a4678928ccfd511746ceea53a4c31d15dfddafdeef3d9b169088a186ea1f5787eb3589ad5dbd3892b4669a7a833311da41795562fc94a58ac7aa2f02a741192 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild deleted file mode 100644 index effd643ed428..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="true" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="KDE Plasma desktop" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad" - -COMMON_DEPEND=" - $(add_frameworks_dep attica) - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep karchive) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kemoticons) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kparts) - $(add_frameworks_dep kpeople) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_frameworks_dep sonnet) - $(add_plasma_dep kwin) - $(add_plasma_dep plasma-workspace) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsql) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbfile - appstream? ( >=dev-libs/appstream-0.12.2[qt5] ) - fontconfig? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - x11-libs/xcb-util-image - ) - ibus? ( - $(add_qt_dep qtx11extras) - app-i18n/ibus - dev-libs/glib:2 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) - touchpad? ( x11-drivers/xf86-input-synaptics ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto - fontconfig? ( x11-libs/libXrender ) - mouse? ( - x11-drivers/xf86-input-evdev - x11-drivers/xf86-input-libinput - ) -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kirigami) - $(add_frameworks_dep qqc2-desktop-style) - $(add_plasma_dep breeze) - $(add_plasma_dep kde-cli-tools) - $(add_plasma_dep oxygen) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtquickcontrols2) - sys-apps/util-linux - x11-apps/setxkbmap - !kde-apps/kcontrol - ! -Date: Sun, 31 Mar 2019 16:19:55 +0200 -Subject: [PATCH] Port from GConf to GSettings - -Summary: -CCBUG: 386665 - -As discussed in bug 386665 GConf is deprecated and needs to be replaced by GSettings to keep features enabled. - -Question: Do we need GConf as a fallback for PA versions without module-gsettings? - -Test Plan: -Checkboxes in Advanced tab are enabled again. -Changed settings are shown in dconf-editor and vice versa. -Combine output checkbox shows/hides combined sink in applet - -Reviewers: drosca, davidedmundson - -Reviewed By: drosca - -Subscribers: pino, lbeltrame, evpokp, rikmills, broulik, asturmlechner, plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D14147 ---- - CMakeLists.txt | 15 ++-- - cmake/FindGIO.cmake | 72 +++++++++++++++++++ - config.h.cmake | 3 +- - src/CMakeLists.txt | 18 ++++- - src/gsettingsitem.cpp | 91 ++++++++++++++++++++++++ - src/gsettingsitem.h | 59 +++++++++++++++ - src/kcm/package/contents/ui/Advanced.qml | 8 +-- - src/modulemanager.cpp | 79 +++++++++++++------- - src/modulemanager.h | 14 ++-- - 9 files changed, 315 insertions(+), 44 deletions(-) - create mode 100644 cmake/FindGIO.cmake - create mode 100644 src/gsettingsitem.cpp - create mode 100644 src/gsettingsitem.h - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9973ef7..d33dc1d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,11 +20,6 @@ include(KDECompilerSettings NO_POLICY_SCOPE) - include(ECMOptionalAddSubdirectory) - - include(FindPkgConfig) --pkg_check_modules(GCONF gconf-2.0) --pkg_check_modules(GOBJECT gobject-2.0) --if (GCONF_FOUND AND GOBJECT_FOUND) -- set(HAVE_GCONF TRUE) --endif() - - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS - Core -@@ -45,6 +40,16 @@ find_package(PulseAudio 5.0.0 REQUIRED) - find_package(Canberra REQUIRED) - find_package(GLIB2 REQUIRED) - -+option(USE_GCONF "Use legacy GConf instead of GSettings") -+ -+pkg_check_modules(GOBJECT gobject-2.0 REQUIRED) -+if(USE_GCONF) -+ pkg_check_modules(GCONF gconf-2.0 REQUIRED) -+else() -+ find_package(GIO REQUIRED) -+ set(USE_GSETTINGS True) -+endif() -+ - find_package(CanberraPulse) - set_package_properties(CanberraPulse PROPERTIES - DESCRIPTION "Pulseaudio backend for libcanberra" -diff --git a/cmake/FindGIO.cmake b/cmake/FindGIO.cmake -new file mode 100644 -index 0000000..827c243 ---- /dev/null -+++ b/cmake/FindGIO.cmake -@@ -0,0 +1,72 @@ -+# - Try to find the GIO libraries -+# Once done this will define -+# -+# GIO_FOUND - system has GIO -+# GIO_INCLUDE_DIR - the GIO include directory -+# GIO_LIBRARIES - GIO library -+# -+# Copyright (c) 2010 Dario Freddi -+# -+# Redistribution and use is allowed according to the terms of the BSD license. -+# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -+ -+if(GIO_INCLUDE_DIR AND GIO_LIBRARIES) -+ # Already in cache, be silent -+ set(GIO_FIND_QUIETLY TRUE) -+endif(GIO_INCLUDE_DIR AND GIO_LIBRARIES) -+ -+if (NOT WIN32) -+ include(UsePkgConfig) -+ pkgconfig(gio-2.0 _LibGIOIncDir _LibGIOLinkDir _LibGIOLinkFlags _LibGIOCflags) -+endif(NOT WIN32) -+ -+MESSAGE(STATUS "gio include dir: ${_LibGIOIncDir}") -+ -+# first try without default paths to respect PKG_CONFIG_PATH -+ -+find_path(GIO_MAIN_INCLUDE_DIR glib.h -+ PATH_SUFFIXES glib-2.0 -+ PATHS ${_LibGIOIncDir} -+ NO_DEFAULT_PATH) -+ -+find_path(GIO_MAIN_INCLUDE_DIR glib.h -+ PATH_SUFFIXES glib-2.0 -+ PATHS ${_LibGIOIncDir} ) -+ -+MESSAGE(STATUS "found gio main include dir: ${GIO_MAIN_INCLUDE_DIR}") -+ -+# search the glibconfig.h include dir under the same root where the library is found -+find_library(GIO_LIBRARIES -+ NAMES gio-2.0 -+ PATHS ${_LibGIOLinkDir} -+ NO_DEFAULT_PATH) -+ -+find_library(GIO_LIBRARIES -+ NAMES gio-2.0 -+ PATHS ${_LibGIOLinkDir}) -+ -+ -+get_filename_component(GIOLibDir "${GIO_LIBRARIES}" PATH) -+ -+find_path(GIO_INTERNAL_INCLUDE_DIR glibconfig.h -+ PATH_SUFFIXES glib-2.0/include -+ PATHS ${_LibGIOIncDir} "${GIOLibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH} -+ NO_DEFAULT_PATH) -+ -+find_path(GIO_INTERNAL_INCLUDE_DIR glibconfig.h -+ PATH_SUFFIXES glib-2.0/include -+ PATHS ${_LibGIOIncDir} "${GIOLibDir}" ${CMAKE_SYSTEM_LIBRARY_PATH}) -+ -+set(GIO_INCLUDE_DIR "${GIO_MAIN_INCLUDE_DIR}") -+ -+# not sure if this include dir is optional or required -+# for now it is optional -+if(GIO_INTERNAL_INCLUDE_DIR) -+ set(GIO_INCLUDE_DIR ${GIO_INCLUDE_DIR} "${GIO_INTERNAL_INCLUDE_DIR}") -+endif(GIO_INTERNAL_INCLUDE_DIR) -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(GIO DEFAULT_MSG GIO_LIBRARIES GIO_MAIN_INCLUDE_DIR) -+ -+mark_as_advanced(GIO_INCLUDE_DIR GIO_LIBRARIES) -+ -diff --git a/config.h.cmake b/config.h.cmake -index 1643e50..7d801c3 100644 ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -1,3 +1,4 @@ - /* config.h. Generated by cmake from config.h.cmake */ - --#cmakedefine01 HAVE_GCONF -+#cmakedefine01 USE_GSETTINGS -+#cmakedefine01 USE_GCONF -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 8684251..d4a6c4b 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -37,11 +37,16 @@ set(qml_SRCS - set_property(SOURCE qml/dbus/osdService.xml APPEND PROPERTY CLASSNAME OsdServiceInterface) - qt5_add_dbus_interface(dbus_SRCS qml/dbus/osdService.xml osdservice) - --if (HAVE_GCONF) -+if (USE_GCONF) - include_directories(${GCONF_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS}) - set(cpp_SRCS ${cpp_SRCS} gconfitem.cpp) - endif() - -+if (USE_GSETTINGS) -+ include_directories(${GIO_INCLUDE_DIRS} ${GOBJECT_INCLUDE_DIRS}) -+ set(cpp_SRCS ${cpp_SRCS} gsettingsitem.cpp) -+endif() -+ - add_library(plasma-volume-declarative SHARED ${dbus_SRCS} ${cpp_SRCS} ${qml_SRCS}) - target_link_libraries(plasma-volume-declarative - Qt5::Core -@@ -52,12 +57,19 @@ target_link_libraries(plasma-volume-declarative - ${PULSEAUDIO_LIBRARY} - ${PULSEAUDIO_MAINLOOP_LIBRARY} - ${CANBERRA_LIBRARIES} -+ ${GOBJECT_LIBRARIES} - ) - --if (HAVE_GCONF) -+if (USE_GCONF) - target_link_libraries(plasma-volume-declarative - ${GCONF_LDFLAGS} -- ${GOBJECT_LDFLAGS} -+ ) -+endif() -+ -+if (USE_GSETTINGS) -+ target_link_libraries(plasma-volume-declarative -+ ${GIO_LIBRARIES} -+ GLIB2::GLIB2 - ) - endif() - -diff --git a/src/gsettingsitem.cpp b/src/gsettingsitem.cpp -new file mode 100644 -index 0000000..b3a9353 ---- /dev/null -+++ b/src/gsettingsitem.cpp -@@ -0,0 +1,91 @@ -+/* -+ * Copyright (C) 2018 Nicolas Fella -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License -+ * version 2.1 as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ * -+ */ -+ -+#include -+#include -+ -+#include -+ -+#include "gsettingsitem.h" -+#include "debug.h" -+ -+QVariant GSettingsItem::value(const QString &key) const -+{ -+ GVariant *gvalue = g_settings_get_value(m_settings, key.toLatin1().data()); -+ -+ QVariant toReturn; -+ -+ switch (g_variant_classify(gvalue)) { -+ case G_VARIANT_CLASS_BOOLEAN: -+ toReturn = QVariant((bool)g_variant_get_boolean(gvalue)); -+ break; -+ case G_VARIANT_CLASS_STRING: -+ toReturn = QVariant(QString::fromUtf8(g_variant_get_string(gvalue, nullptr))); -+ break; -+ default: -+ qCWarning(PLASMAPA()) << "Unhandled variant type in value()"; -+ } -+ -+ g_variant_unref(gvalue); -+ -+ return toReturn; -+} -+ -+void GSettingsItem::set(const QString &key, const QVariant &val) -+{ -+ // It might be hard to detect the right GVariant type from -+ // complext QVariant types such as string lists or more detailed -+ // types such as integers (GVariant has different sizes), -+ // therefore we get the current value for the key and convert -+ // to QVariant using the GVariant type -+ GVariant *oldValue = g_settings_get_value(m_settings, key.toLatin1().data()); -+ GVariant *newValue = nullptr; -+ -+ switch (g_variant_type_peek_string(g_variant_get_type(oldValue))[0]) { -+ case G_VARIANT_CLASS_BOOLEAN: -+ newValue = g_variant_new_boolean(val.toBool()); -+ break; -+ case G_VARIANT_CLASS_STRING: -+ newValue = g_variant_new_string(val.toString().toUtf8().constData()); -+ break; -+ default: -+ qCWarning(PLASMAPA()) << "Unhandled variant type in set()"; -+ } -+ -+ if (newValue) { -+ g_settings_set_value(m_settings, key.toLatin1().data(), newValue); -+ } -+ -+ g_variant_unref(oldValue); -+} -+ -+GSettingsItem::GSettingsItem(const QString &key, QObject *parent) -+ : QObject (parent) -+{ -+ m_settings = g_settings_new_with_path("org.freedesktop.pulseaudio.module-group", key.toLatin1().data()); -+ -+ g_signal_connect(m_settings, "changed", G_CALLBACK(GSettingsItem::settingChanged), this); -+} -+ -+GSettingsItem::~GSettingsItem() -+{ -+ g_settings_sync(); -+ if (m_settings) -+ g_object_unref(m_settings); -+} -diff --git a/src/gsettingsitem.h b/src/gsettingsitem.h -new file mode 100644 -index 0000000..9afcfc2 ---- /dev/null -+++ b/src/gsettingsitem.h -@@ -0,0 +1,59 @@ -+/* -+ * Copyright (C) 2018 Nicolas Fella -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public License -+ * version 2.1 as published by the Free Software Foundation. -+ * -+ * This library is distributed in the hope that it will be useful, but -+ * WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ * -+ */ -+ -+#ifndef GSETTINGSITEM_H -+#define GSETTINGSITEM_H -+ -+#include -+#include -+#include -+ -+#include -+ -+class GSettingsItem : public QObject -+{ -+ Q_OBJECT -+ -+ public: -+ -+ explicit GSettingsItem(const QString &key, QObject *parent = nullptr); -+ virtual ~GSettingsItem() override; -+ -+ QVariant value(const QString &key) const; -+ void set(const QString &key, const QVariant &val); -+ -+ -+Q_SIGNALS: -+ void subtreeChanged(); -+ -+private: -+ GSettings *m_settings; -+ -+static void settingChanged(GSettings *settings, const gchar *key, gpointer data) -+{ -+ Q_UNUSED(settings) -+ Q_UNUSED(key) -+ -+ GSettingsItem *self = static_cast(data); -+ Q_EMIT self->subtreeChanged(); -+} -+ -+}; -+ -+#endif // GCONFITEM_H -diff --git a/src/kcm/package/contents/ui/Advanced.qml b/src/kcm/package/contents/ui/Advanced.qml -index 536ae3e..48512e7 100644 ---- a/src/kcm/package/contents/ui/Advanced.qml -+++ b/src/kcm/package/contents/ui/Advanced.qml -@@ -73,7 +73,7 @@ ScrollView { - text: i18nd("kcm_pulseaudio", "Add virtual output device for simultaneous output on all local sound cards") - checked: moduleManager.combineSinks - onCheckedChanged: moduleManager.combineSinks = checked; -- enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1 -+ enabled: moduleManager.configModuleLoaded - visible: moduleManager.settingsSupported - } - -@@ -84,7 +84,7 @@ ScrollView { - text: i18nd("kcm_pulseaudio", "Automatically switch all running streams when a new output becomes available") - checked: moduleManager.switchOnConnect - onCheckedChanged: moduleManager.switchOnConnect = checked; -- enabled: moduleManager.loadedModules.indexOf("module-gconf") != -1 -+ enabled: moduleManager.configModuleLoaded - visible: moduleManager.settingsSupported - } - -@@ -92,8 +92,8 @@ ScrollView { - Layout.alignment: Qt.AlignHCenter - enabled: false - font.italic: true -- text: i18nd("kcm_pulseaudio", "Requires 'module-gconf' PulseAudio module") -- visible: moduleManager.settingsSupported && moduleManager.loadedModules.indexOf("module-gconf") == -1 -+ text: i18nd("kcm_pulseaudio", "Requires %1 PulseAudio module", moduleManager.configModuleName) -+ visible: moduleManager.settingsSupported && !moduleManager.configModuleLoaded - } - - Header { -diff --git a/src/modulemanager.cpp b/src/modulemanager.cpp -index 5245ac5..a43182e 100644 ---- a/src/modulemanager.cpp -+++ b/src/modulemanager.cpp -@@ -23,10 +23,15 @@ - #include "module.h" - #include "../config.h" - --#if HAVE_GCONF -+#if USE_GSETTINGS -+#include "gsettingsitem.h" -+ -+#define PA_SETTINGS_PATH_MODULES "/org/freedesktop/pulseaudio/module-groups" -+#endif -+ -+#if USE_GCONF - #include "gconfitem.h" --#define PA_GCONF_ROOT "/system/pulseaudio" --#define PA_GCONF_PATH_MODULES PA_GCONF_ROOT"/modules" -+#define PA_SETTINGS_PATH_MODULES "/system/pulseaudio/modules" - #endif - - #include -@@ -34,29 +39,38 @@ - namespace QPulseAudio - { - --#if HAVE_GCONF --class GConfModule : public GConfItem -+#if USE_GCONF || USE_GSETTINGS -+ -+#if USE_GSETTINGS -+class ConfigModule : public GSettingsItem -+#elif USE_GCONF -+class ConfigModule : public GConfItem -+#endif - { - public: -- GConfModule(const QString &configName, const QString &moduleName, QObject *parent); -+ ConfigModule(const QString &configName, const QString &moduleName, QObject *parent); - bool isEnabled() const; - void setEnabled(bool enabled, const QVariant &args=QVariant()); - private: - QString m_moduleName; - }; - --GConfModule::GConfModule(const QString &configName, const QString &moduleName, QObject *parent) : -- GConfItem(QStringLiteral(PA_GCONF_PATH_MODULES"/") + configName, parent), -+ConfigModule::ConfigModule(const QString &configName, const QString &moduleName, QObject *parent) : -+#if USE_GSETTINGS -+ GSettingsItem(QStringLiteral(PA_SETTINGS_PATH_MODULES"/") + configName + QStringLiteral("/"), parent), -+#elif USE_GCONF -+ GConfItem(QStringLiteral(PA_SETTINGS_PATH_MODULES"/") + configName, parent), -+#endif - m_moduleName(moduleName) - { - } - --bool GConfModule::isEnabled() const -+bool ConfigModule::isEnabled() const - { - return value(QStringLiteral("enabled")).toBool(); - } - --void GConfModule::setEnabled(bool enabled, const QVariant &args) -+void ConfigModule::setEnabled(bool enabled, const QVariant &args) - { - set(QStringLiteral("locked"), true); - -@@ -69,20 +83,20 @@ void GConfModule::setEnabled(bool enabled, const QVariant &args) - } - set(QStringLiteral("locked"), false); - } --#endif - -+#endif - - ModuleManager::ModuleManager(QObject *parent) : - QObject(parent) - { --#if HAVE_GCONF -- m_combineSinks = new GConfModule(QStringLiteral("combine"), QStringLiteral("module-combine"), this); -- m_switchOnConnect = new GConfModule(QStringLiteral("switch-on-connect"), QStringLiteral("module-switch-on-connect"), this); -- m_deviceManager = new GConfModule(QStringLiteral("device-manager"), QStringLiteral("module-device-manager"), this); -- -- connect(m_combineSinks, &GConfItem::subtreeChanged, this, &ModuleManager::combineSinksChanged); -- connect(m_switchOnConnect, &GConfItem::subtreeChanged, this, &ModuleManager::switchOnConnectChanged); -- connect(m_deviceManager, &GConfItem::subtreeChanged, this, &ModuleManager::switchOnConnectChanged); -+#if USE_GCONF || USE_GSETTINGS -+ m_combineSinks = new ConfigModule(QStringLiteral("combine"), QStringLiteral("module-combine"), this); -+ m_switchOnConnect = new ConfigModule(QStringLiteral("switch-on-connect"), QStringLiteral("module-switch-on-connect"), this); -+ m_deviceManager = new ConfigModule(QStringLiteral("device-manager"), QStringLiteral("module-device-manager"), this); -+ -+ connect(m_combineSinks, &ConfigModule::subtreeChanged, this, &ModuleManager::combineSinksChanged); -+ connect(m_switchOnConnect, &ConfigModule::subtreeChanged, this, &ModuleManager::switchOnConnectChanged); -+ connect(m_deviceManager, &ConfigModule::subtreeChanged, this, &ModuleManager::switchOnConnectChanged); - #endif - - QTimer *updateModulesTimer = new QTimer(this); -@@ -100,7 +114,7 @@ ModuleManager::~ModuleManager() - - bool ModuleManager::settingsSupported() const - { --#if HAVE_GCONF -+#if USE_GCONF || USE_GSETTINGS - return true; - #else - return false; -@@ -109,7 +123,7 @@ bool ModuleManager::settingsSupported() const - - bool ModuleManager::combineSinks() const - { --#if HAVE_GCONF -+#if USE_GCONF || USE_GSETTINGS - return m_combineSinks->isEnabled(); - #else - return false; -@@ -118,21 +132,21 @@ bool ModuleManager::combineSinks() const - - void ModuleManager::setCombineSinks(bool combineSinks) - { --#if HAVE_GCONF -+#if USE_GCONF || USE_GSETTINGS - m_combineSinks->setEnabled(combineSinks); - #else -- Q_UNUSED(combineSinks) -+ Q_UNUSED(combineSinks() - #endif - } - - bool ModuleManager::switchOnConnect() const - { -+#if USE_GCONF || USE_GSETTINGS - //switch on connect and device-manager do the same task. Only one should be enabled - - //Note on the first run m_deviceManager will appear to be disabled even though it's actually running - //because there is no gconf entry, however m_switchOnConnect will only exist if set by Plasma PA - //hence only check this entry --#if HAVE_GCONF - return m_switchOnConnect->isEnabled() ; - #else - return false; -@@ -141,7 +155,7 @@ bool ModuleManager::switchOnConnect() const - - void ModuleManager::setSwitchOnConnect(bool switchOnConnect) - { --#if HAVE_GCONF -+#if USE_GCONF || USE_GSETTINGS - m_deviceManager->setEnabled(!switchOnConnect); - m_switchOnConnect->setEnabled(switchOnConnect); - #else -@@ -164,4 +178,19 @@ void ModuleManager::updateLoadedModules() - Q_EMIT loadedModulesChanged(); - } - -+bool ModuleManager::configModuleLoaded() const -+{ -+ return m_loadedModules.contains(configModuleName()); -+} -+ -+QString ModuleManager::configModuleName() const -+{ -+#if USE_GCONF -+ return QStringLiteral("module-gconf"); -+#elif USE_GSETTINGS -+ return QStringLiteral("module-gsettings"); -+#else -+ return QString(); -+#endif -+} - } -diff --git a/src/modulemanager.h b/src/modulemanager.h -index 17efd6d..291936e 100644 ---- a/src/modulemanager.h -+++ b/src/modulemanager.h -@@ -29,11 +29,9 @@ - // Properties need fully qualified classes even with pointers. - #include "client.h" - --class GConfItem; -- - namespace QPulseAudio - { --class GConfModule; -+class ConfigModule; - - class ModuleManager : public QObject - { -@@ -41,6 +39,8 @@ class ModuleManager : public QObject - Q_PROPERTY(bool settingsSupported READ settingsSupported CONSTANT) - Q_PROPERTY(bool combineSinks READ combineSinks WRITE setCombineSinks NOTIFY combineSinksChanged) - Q_PROPERTY(bool switchOnConnect READ switchOnConnect WRITE setSwitchOnConnect NOTIFY switchOnConnectChanged) -+ Q_PROPERTY(bool configModuleLoaded READ configModuleLoaded NOTIFY loadedModulesChanged) -+ Q_PROPERTY(QString configModuleName READ configModuleName CONSTANT) - Q_PROPERTY(QStringList loadedModules READ loadedModules NOTIFY loadedModulesChanged) - public: - explicit ModuleManager(QObject *parent = nullptr); -@@ -52,6 +52,8 @@ public: - bool switchOnConnect() const; - void setSwitchOnConnect(bool switchOnConnect); - QStringList loadedModules() const; -+ bool configModuleLoaded() const; -+ QString configModuleName() const; - - Q_SIGNALS: - void combineSinksChanged(); -@@ -61,9 +63,9 @@ Q_SIGNALS: - private: - void updateLoadedModules(); - -- GConfModule *m_combineSinks; -- GConfModule *m_switchOnConnect; -- GConfModule *m_deviceManager; -+ ConfigModule *m_combineSinks; -+ ConfigModule *m_switchOnConnect; -+ ConfigModule *m_deviceManager; - QStringList m_loadedModules; - }; - --- -2.21.0 diff --git a/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild b/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild deleted file mode 100644 index 0dad9b387626..000000000000 --- a/kde-plasma/plasma-pa/plasma-pa-5.15.5.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_REMOVE_MODULES_LIST=( FindGLIB2 ) -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Plasma applet for audio volume management using PulseAudio" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - dev-libs/glib:2 - media-libs/libcanberra - media-sound/pulseaudio -" -RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) - $(add_qt_dep qtquickcontrols) - media-libs/libcanberra - x11-themes/sound-theme-freedesktop -" - -PATCHES=( "${FILESDIR}/${PN}-5.15.4-gsettings.patch" ) diff --git a/kde-plasma/plasma-sdk/Manifest b/kde-plasma/plasma-sdk/Manifest index 13c620afdaf2..7b4b5893255e 100644 --- a/kde-plasma/plasma-sdk/Manifest +++ b/kde-plasma/plasma-sdk/Manifest @@ -1,2 +1 @@ -DIST plasma-sdk-5.15.5.tar.xz 249732 BLAKE2B 305794c1c6098c2f5750dfd3b10506b5494e84256c6c1198b78668fa9d304d9af314e23ec026d4e5774f4c277a65911a109424839bd4b6c39f8a5fcfeb41eb3e SHA512 aff109eeb879b66b6e076ec333703f4e9202ea73f4c97fb05538755f1c0d96d41d2b01a2ff48c050632dbbd848cac4e528aa90be374fd4f2503140490a16753d DIST plasma-sdk-5.16.5.tar.xz 250148 BLAKE2B 29fad7533515756df87865cfd55b1531ba30de77eb52115475fe352ee9df12b144dff2e9bebe44b76f742e903f75edd7e91ee2b7a53ce1154f1b8143748a855f SHA512 95ed00eebe787ec36d68f47e01f717cb5929c7c15c89b33be5b8edac7c9c4d700af6b81c6353e1b5bc783360f542b8284b78706f4c4de398d10db1bcaf23e4fe diff --git a/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild deleted file mode 100644 index 60a91ed842b9..000000000000 --- a/kde-plasma/plasma-sdk/plasma-sdk-5.15.5.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_TEST="optional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Useful applications for Plasma development" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep plasma) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) -" -RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) -" diff --git a/kde-plasma/plasma-vault/Manifest b/kde-plasma/plasma-vault/Manifest index 3c2d5f3bbc8d..fc78a487b4a9 100644 --- a/kde-plasma/plasma-vault/Manifest +++ b/kde-plasma/plasma-vault/Manifest @@ -1,2 +1 @@ -DIST plasma-vault-5.15.5.tar.xz 123880 BLAKE2B d844b31bb0d40a61cc3df1a493730495a73adc2f7e9582279a4ca6d87aac15f45128340093c06b8e1c841abec7a0806acaa6a99525a1793202f3644359699ca2 SHA512 815f45163225ba692fb2b1745c7f99e1ae06509850e82f46807b17664728c2f3667844c42035000d04da6a360913a217edf6f6768bb50a910d316eb7770d929b DIST plasma-vault-5.16.5.tar.xz 127376 BLAKE2B 94f6360ab8bbff5210a516d020250f4fffe1c61bcaa579d4f9d4fad1caa15a2dcaf749e04919a0e36fa08acb28fcb614820408008bee8249397410e81cae847e SHA512 bb5d06af090b9659cf9d253b8469e3b7264d7a820c6bbdce7db414d3a8e5aef5dc1122d11285194afa0b2d1aff2a0a2dd8a74036674541abd7938d38521afbd5 diff --git a/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild deleted file mode 100644 index f70c37f54ade..000000000000 --- a/kde-plasma/plasma-vault/plasma-vault-5.15.5.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Plasma applet and services for creating encrypted vaults" -HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/" - -LICENSE="LGPL-3" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="networkmanager" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep plasma) - $(add_frameworks_dep kwidgetsaddons) - $(add_plasma_dep libksysguard) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - networkmanager? ( $(add_frameworks_dep networkmanager-qt) ) -" -RDEPEND="${DEPEND} - || ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 ) -" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt) - ) - - kde5_src_configure -} diff --git a/kde-plasma/plasma-workspace-wallpapers/Manifest b/kde-plasma/plasma-workspace-wallpapers/Manifest index e53bd6a62954..57887fa38d44 100644 --- a/kde-plasma/plasma-workspace-wallpapers/Manifest +++ b/kde-plasma/plasma-workspace-wallpapers/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-wallpapers-5.15.5.tar.xz 24354892 BLAKE2B b3beb39f377d0fc8265ac2c2f18c07806b548b44cc0df6e3b69727d876235dd434019e2e4721168942454e08612f271e555bf76355f121edc1def03a1c4fa32c SHA512 088e22bea249be02c72c1fda974be1f9de3bfcfe009003de5bdddd256834679fe644ae4ff4e9090a99fd75d4c8b8681113e29f13b015bfdafe568a1871a43704 DIST plasma-workspace-wallpapers-5.16.5.tar.xz 34172180 BLAKE2B 8fe56bba584ed4c64035a81d6431d4c71a869f97fbd1b9ca9df0b53481653af475bab6d093e68c1b7ce6e4e6b5e40825caf6f1b0e2558497774aa7cb7bbc9be8 SHA512 88cda8d89371d0b8e689432656047fba1a83a15356b6007999bcbacfc4f12ad4f5d4323c89026ae50cd71298fd4d52ac52ac7c39a27d5f1109f51cf07b6f2648 diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild deleted file mode 100644 index 9ccd512332fa..000000000000 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-5.15.5.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_AUTODEPS="false" -KDE_DEBUG="false" -inherit kde5 - -DESCRIPTION="Additional wallpapers for the Plasma workspace" -KEYWORDS="amd64 ~arm arm64 ~ppc64 x86" -IUSE="" - -BDEPEND=" - $(add_frameworks_dep extra-cmake-modules) - $(add_qt_dep qtcore) -" diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest index 6805969de40a..f2ef4b26463d 100644 --- a/kde-plasma/plasma-workspace/Manifest +++ b/kde-plasma/plasma-workspace/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369 diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch deleted file mode 100644 index e26b27e8c3be..000000000000 --- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt -index 8a90cb59..597b3f7e 100644 ---- a/dataengines/notifications/CMakeLists.txt -+++ b/dataengines/notifications/CMakeLists.txt -@@ -46,7 +46,8 @@ ecm_qt_declare_logging_category(notifications_test_SRCS HEADER debug.h - IDENTIFIER NOTIFICATIONS - CATEGORY_NAME kde.dataengine.notifications` - DEFAULT_SEVERITY Info) -- --add_executable(notification_test ${notifications_test_SRCS}) --target_link_libraries(notification_test Qt5::Test Qt5::Core) --ecm_mark_as_test(notification_test) -+if(BUILD_TESTING) -+ add_executable(notification_test ${notifications_test_SRCS}) -+ target_link_libraries(notification_test Qt5::Test Qt5::Core) -+ ecm_mark_as_test(notification_test) -+endif() diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml index cc387a9b356f..38d3c0357337 100644 --- a/kde-plasma/plasma-workspace/metadata.xml +++ b/kde-plasma/plasma-workspace/metadata.xml @@ -8,7 +8,6 @@ Enable AppStream software metadata support Enables dataengine providing location information - Enable support for barcodes/QRcodes Enable Qalculate runner using sci-libs/libqalculate Enable support for creating QR codes from clipboard data using kde-frameworks/prison diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild deleted file mode 100644 index e2c969156c11..000000000000 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 qmake-utils - -DESCRIPTION="KDE Plasma workspace" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd" - -REQUIRED_USE="gps? ( geolocation )" - -COMMON_DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kded) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep kglobalaccel) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kidletime) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep kjs) - $(add_frameworks_dep kjsembed) - $(add_frameworks_dep knewstuff) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep krunner) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktexteditor) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwayland) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_plasma_dep kscreenlocker) - $(add_plasma_dep kwin) - $(add_plasma_dep libksysguard) - $(add_plasma_dep libkworkspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui 'jpeg') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtsql) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - media-libs/phonon[qt5(+)] - sys-libs/zlib - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - x11-libs/xcb-util - x11-libs/xcb-util-image - appstream? ( dev-libs/appstream[qt5] ) - calendar? ( $(add_frameworks_dep kholidays) ) - geolocation? ( $(add_frameworks_dep networkmanager-qt) ) - gps? ( sci-geosciences/gpsd ) - prison? ( $(add_frameworks_dep prison) ) - qalculate? ( sci-libs/libqalculate:= ) - semantic-desktop? ( $(add_frameworks_dep baloo) ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kdesu) - $(add_frameworks_dep kirigami) - $(add_kdeapps_dep kio-extras) - $(add_plasma_dep ksysguard) - $(add_plasma_dep milou) - $(add_plasma_dep plasma-integration) - $(add_qt_dep qdbus) - $(add_qt_dep qtgraphicaleffects) - $(add_qt_dep qtpaths) - $(add_qt_dep qtquickcontrols 'widgets') - $(add_qt_dep qtquickcontrols2) - app-text/iso-codes - x11-apps/xmessage - x11-apps/xprop - x11-apps/xrdb - x11-apps/xsetroot - systemd? ( sys-apps/dbus[user-session] ) - !systemd? ( sys-apps/dbus ) - !kde@gentoo.org Gentoo KDE Project - - Enable classic mode plugin, requires kde-frameworks/khtml - diff --git a/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild b/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild deleted file mode 100644 index 1e6f0ee33644..000000000000 --- a/kde-plasma/systemsettings/systemsettings-5.15.5.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="System settings utility" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="classic gtk" - -DEPEND=" - $(add_frameworks_dep kactivities) - $(add_frameworks_dep kactivities-stats) - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kpackage) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_plasma_dep libkworkspace) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative 'widgets') - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - classic? ( $(add_frameworks_dep khtml) ) -" -RDEPEND="${DEPEND} - $(add_frameworks_dep kirigami) - gtk? ( $(add_plasma_dep kde-gtk-config) ) -" - -src_prepare() { - kde5_src_prepare - - # FIXME: hangs in chroot; similar to bug #640432 - sed -e "s/^ecm_find_qmlmodule.*org\.kde\.kcm/#&/" \ - -i CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package classic KF5KHtml) - ) - - kde5_src_configure -} diff --git a/kde-plasma/user-manager/Manifest b/kde-plasma/user-manager/Manifest index 6f937cd0da45..27821b00d793 100644 --- a/kde-plasma/user-manager/Manifest +++ b/kde-plasma/user-manager/Manifest @@ -1,2 +1 @@ -DIST user-manager-5.15.5.tar.xz 546156 BLAKE2B 9b37eee3f88ce182aef023efedf288aed43edd7fa3212ba6549c2cc659e891f45cf20ebc8b573286c5b52cdee42d5367835c06c74d31fdb2d6eb7f20fe9a81f0 SHA512 7a8cc2e37fdfc0f99c317db4f4433559e662f0ae03faae9844d4c51b298fcc8906efd457c17898193687c088664008e41c1e158e64fd0af0c581bbb1f98a924d DIST user-manager-5.16.5.tar.xz 547036 BLAKE2B a7fa24996e5e2f30c85f70301238359736ad1b98db00dccc96c669afd61512805ea81f0a015e47d1292dc053fd0ec0b8928a65f09cf646bd330521e9cc1868a2 SHA512 4a99446165ec06606752a388979caac367addc2e5f5e899a1d91665c632db04d073d91d353317bf5fcb5684966e65ca614f4e9582b11b7641e774dd6d49c57d1 diff --git a/kde-plasma/user-manager/user-manager-5.15.5.ebuild b/kde-plasma/user-manager/user-manager-5.15.5.ebuild deleted file mode 100644 index bd567cc39876..000000000000 --- a/kde-plasma/user-manager/user-manager-5.15.5.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit kde5 - -DESCRIPTION="Simple system settings module to manage the users of your system" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -DEPEND=" - $(add_frameworks_dep kauth) - $(add_frameworks_dep kcmutils) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - >=dev-libs/libpwquality-1.3.0 -" -RDEPEND="${DEPEND} - sys-apps/accountsservice -" diff --git a/kde-plasma/xdg-desktop-portal-kde/Manifest b/kde-plasma/xdg-desktop-portal-kde/Manifest index e57884c0d7d1..c416a6ce2a6f 100644 --- a/kde-plasma/xdg-desktop-portal-kde/Manifest +++ b/kde-plasma/xdg-desktop-portal-kde/Manifest @@ -1,2 +1 @@ -DIST xdg-desktop-portal-kde-5.15.5.tar.xz 60292 BLAKE2B 5e0f07ec5e57d978c444fc65e1aa70b04dea458d34d9c091da5699501995499fb877e90ae0272634fc7dd62fa192a99d7f800bf7627612e2eafb6763e3f732ca SHA512 f575c9a5273cef3ab34a7eb4be520cdec3344fd6729f79d4475f200a177fba40b265815136c4af18ce6e48c9736bb835af4d972c5563171ead2e4390e938fcbf DIST xdg-desktop-portal-kde-5.16.5.tar.xz 61576 BLAKE2B b9d186e3269aae6c079bae8abf01e790300da5ba255ecaa37ca2b139bb5c017f0cc118adbaca8d4f846cfbf5d563d574cddca4703e9d917f7001468b27734db6 SHA512 381298cc001795902343512f8bb08c363acfb6e3ef398e0f170f305572ca9a5caaf458e85b6f48ac84bcd963a34e535c666b0ddc1bb910a894a8b8de8801467e diff --git a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.15.5-appchooser.patch b/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.15.5-appchooser.patch deleted file mode 100644 index 3a95c0272e81..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/files/xdg-desktop-portal-kde-5.15.5-appchooser.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 83773f6682154723d2a68e731c0e87c1f1a06893 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Thu, 16 May 2019 13:05:19 +0200 -Subject: AppChooser: put list of applications into a scrollarea - -BUG:407559 -FIXED-IN: 5.15.6 ---- - src/appchooserdialog.cpp | 18 ++++++++++++++++-- - src/appchooserdialogitem.cpp | 1 + - 2 files changed, 17 insertions(+), 2 deletions(-) - -diff --git a/src/appchooserdialog.cpp b/src/appchooserdialog.cpp -index 8fc888f..b14a5f9 100644 ---- a/src/appchooserdialog.cpp -+++ b/src/appchooserdialog.cpp -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - - #include -@@ -42,6 +43,7 @@ AppChooserDialog::AppChooserDialog(const QStringList &choices, const QString &de - , m_defaultApp(defaultApp) - { - setMinimumWidth(640); -+ setMaximumHeight(480); - - QVBoxLayout *vboxLayout = new QVBoxLayout(this); - vboxLayout->setSpacing(20); -@@ -60,11 +62,23 @@ AppChooserDialog::AppChooserDialog(const QStringList &choices, const QString &de - - vboxLayout->addWidget(label); - -- m_gridLayout = new QGridLayout(); -+ QWidget *appsWidget = new QWidget(this); -+ QScrollArea *scrollArea = new QScrollArea(this); -+ scrollArea->setFrameShape(QFrame::NoFrame); -+ scrollArea->setWidget(appsWidget); -+ scrollArea->setWidgetResizable(true); -+ -+ // FIXME: workaround scrollarea sizing, set minimum height to make sure at least two rows are visible -+ if (choices.count() > 3) { -+ scrollArea->setMinimumHeight(200); -+ } -+ -+ m_gridLayout = new QGridLayout; -+ appsWidget->setLayout(m_gridLayout); - - QTimer::singleShot(0, this, &AppChooserDialog::addDialogItems); - -- vboxLayout->addLayout(m_gridLayout); -+ vboxLayout->addWidget(scrollArea); - - setLayout(vboxLayout); - setWindowTitle(i18n("Open with")); -diff --git a/src/appchooserdialogitem.cpp b/src/appchooserdialogitem.cpp -index d01327f..1ce3249 100644 ---- a/src/appchooserdialogitem.cpp -+++ b/src/appchooserdialogitem.cpp -@@ -36,6 +36,7 @@ AppChooserDialogItem::AppChooserDialogItem(const QString &applicationName, const - setIcon(QIcon::fromTheme(icon)); - setIconSize(QSize(64, 64)); - setCheckable(true); -+ setFixedHeight(100); - setFixedWidth(150); - setToolButtonStyle(Qt::ToolButtonTextUnderIcon); - --- -cgit v1.1 - diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild deleted file mode 100644 index 733e0fca1f66..000000000000 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.15.5-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Backend implementation for xdg-desktop-portal that is using Qt/KDE Frameworks" -LICENSE="LGPL-2+" -KEYWORDS="amd64 ~arm arm64 x86" -IUSE="" - -# TODO: Needed for screencast portal -# dev-libs/glib:2 -# media-libs/libepoxy -# media-libs/mesa[gbm] -# not packaged: PipeWire -COMMON_DEPEND=" - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport 'cups') - $(add_qt_dep qtwidgets) -" -DEPEND="${COMMON_DEPEND} - $(add_frameworks_dep kwayland) - $(add_qt_dep qtconcurrent) -" -RDEPEND="${COMMON_DEPEND} - sys-apps/xdg-desktop-portal -" - -PATCHES=( "${FILESDIR}/${P}-appchooser.patch" ) diff --git a/kde-plasma/xembed-sni-proxy/Manifest b/kde-plasma/xembed-sni-proxy/Manifest index 6805969de40a..f2ef4b26463d 100644 --- a/kde-plasma/xembed-sni-proxy/Manifest +++ b/kde-plasma/xembed-sni-proxy/Manifest @@ -1,2 +1 @@ -DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369 diff --git a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild b/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild deleted file mode 100644 index 4faf2de2b993..000000000000 --- a/kde-plasma/xembed-sni-proxy/xembed-sni-proxy-5.15.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_AUTODEPS="false" -KMNAME="plasma-workspace" -inherit kde5 - -DESCRIPTION="Legacy xembed tray icons support for SNI-only system trays" -HOMEPAGE="https://cgit.kde.org/plasma-workspace.git/tree/xembed-sni-proxy/Readme.md" - -LICENSE="GPL-2" -KEYWORDS="amd64 ~arm arm64 x86" - -DEPEND=" - $(add_frameworks_dep extra-cmake-modules) - $(add_frameworks_dep kwindowsystem) - $(add_qt_dep qtcore) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtx11extras) - x11-libs/libxcb - x11-libs/libXtst - x11-libs/xcb-util-image -" -RDEPEND="${DEPEND} - !