diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-04-10 23:37:47 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-04-10 23:37:47 +0100 |
commit | 6990d0600970cefe6aa2c17668f9028b08d23441 (patch) | |
tree | b106c69cf74dd70e162c879310bdf2fd49a16f6a /kde-plasma/plasma-desktop | |
parent | c7c8d625ecbe5f95c445995303ed9b0e1f0de507 (diff) |
gentoo auto-resync : 10:04:2023 - 23:37:47
Diffstat (limited to 'kde-plasma/plasma-desktop')
-rw-r--r-- | kde-plasma/plasma-desktop/Manifest | 6 | ||||
-rw-r--r-- | kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch | 77 | ||||
-rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild (renamed from kde-plasma/plasma-desktop/plasma-desktop-5.27.3-r1.ebuild) | 5 | ||||
-rw-r--r-- | kde-plasma/plasma-desktop/plasma-desktop-5.27.4.ebuild | 179 |
4 files changed, 5 insertions, 262 deletions
diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 469f38566224..199222a59e4a 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,11 +1,9 @@ AUX plasma-desktop-5.26.5-missing-kpackage-1.patch 607 BLAKE2B 9259235c168e4139578e55656e5d870e7f9dea8b224913cf27874614c1023c48ed88ee0d196c62c70b4efcd5b75879fac69edac194fe1774575070318c705602 SHA512 1b70359238da9c73a5a25e4399871a37016b14737258cf37dee71c089aca443af4a5b2a8e83a9855517a163a6d57dbc82b665e4e8c1c416c0924c63777a5ccea AUX plasma-desktop-5.26.5-missing-kpackage-2.patch 1123 BLAKE2B 160c72f267016be9a320bd735b1d84e3cba30a28a09665a2f4e4a73eb9834c9b04feb468b1359867d77ee062a84278a65048f727595ac211b492b8490a00e8b3 SHA512 cb75f2a27d4436f5828929fd05d92ec3847c2741a776eeeb7df26fc406da5751ec542f94db9a6e1d71e063e7c292f09c1233e81693409d33d9f65641c558f6ad -AUX plasma-desktop-5.27.3-kicker-hide-separators.patch 3944 BLAKE2B 3de0993f53a60bbfabe88cba2a99556c1313ebe44a63f3641bde22e6ced9021b3e406eebc94aef9f2b135afddaec6cccdaa03b76ba5af0c3bf32960b3ce91025 SHA512 79b0a29d217fbb526fd6f522edd89da8402c1dca84efbd5930e006ce97eb9fa72c19222aab4478245fe71098d724de2c9920803e0765867c1768c6e522ca12e7 DIST plasma-desktop-5.26.5.tar.xz 6352588 BLAKE2B 093d559830719ac011d5aea33beb86c6fb39403a44416da97646c1f890373cfcd570ae6015dfacf0d4cd2448b44e03f814376a3897351178c582bc865e110fce SHA512 6d58bc09c7f0e0218d3ffe4609fe206012c34d8c1ad64003a51ee3228e2ca203b0131b878f797babc43476bd0cf3e7cbe295e8a11ff1ae97843a61b2183ae182 -DIST plasma-desktop-5.27.3.tar.xz 14331384 BLAKE2B 7cc83b1cb86eb72df841313cf8351d9c74d2ab4e825b34c778039cd326c179e3c65d02a0a1fc48843c23fb1b01495ef871034b36d8495a6bf42de021e14acb2d SHA512 ac31bedb13c74f3cacd76d099a25da16bc617a7c0c3c9bc0e605eca1754e5f295519372c1c0a0d32c2248e2550159cc0ba97ca349dea43b3be85f32caf69e968 +DIST plasma-desktop-5.27.4-patchset-1.tar.xz 3344 BLAKE2B 4e8daaa10a1f88fcfbf72346b275d3cf6656460dc05f3c61dae4cdc5b9c9071728cf9cf82a13f69d4b8cb6ca79844c1ca37842540a1acfe2fa799553bd0b6773 SHA512 a75e15053134968d805642daeadcf6b3aa321736470d1a04f19f7dc76b513423d97929b36363632bc8eab4167eead2ae58df727bbb69587ef90fcfc0aa94669e DIST plasma-desktop-5.27.4.tar.xz 14335168 BLAKE2B b45aaa6cc04d3d519e7ccad0cae674f60c6f4c81105deb0a575db7f6c1eeaf19e9ce8e441c4144ac670c722a9413b68e9eb2c111338844e0bed0839e69da69ce SHA512 a9e8dc3244631af50429d05c3ec861396e2b5b58738ebee7dfcc9c912f43ca9865ed8343f585fd665df41a05c401996a97161da10e852970dfc2741e01614162 DIST plasma-desktop-override-include-dirs-2.tar.xz 8324 BLAKE2B 5ddf9340edf6b6fa76e80158a982ac887b0fb464bc40d5bc4dcd3d6b8f5a87c2d6ecdd153e67e168454aa7faff8d84defb90ba16096b64f3af1e7a74570a00c6 SHA512 452923555bd419d3e389e808c4c9ea35e48795d4f0d78c5845aea677e21f594068540538a8968c2d4034aacb11e910a7b69908e10518eba486ebcc0dda39221a EBUILD plasma-desktop-5.26.5-r2.ebuild 5670 BLAKE2B bb1797e33205edb737cecbb075d7632ceae2f1794b9d71c23c6c00d5dcd6b98c2a43f44fc97a454521ae11032ab9765f29351bb663c1f2052cf5416821d4d8fe SHA512 ed1c75f01fd9f080141adc186a47fc102f080b8691f7ec1af2ade8bbbb5dea43eb68155fa4c307f1f0bdb53baab2d86dba4e43669d5251c1ff1bb9c30b210565 -EBUILD plasma-desktop-5.27.3-r1.ebuild 5342 BLAKE2B da19bc1bbb85d74f92357d35fb7065941ee5cfd62d27e35f433452ba51c38d8b0ae68a0f662dd2a2a37ced13a6e5e232eecc8c43615e064e5b90cec3f00c7375 SHA512 d9d773d62ac7e4eaabd391b49537efe0d9a475afcd45de27c473d6d2bca51525a0f872ceeecc616c343d736d726d6603228f8bcfc852eef546083db28cc863e9 -EBUILD plasma-desktop-5.27.4.ebuild 5276 BLAKE2B a89b14d3f258fe2d2807ef82ebdb6a886255b65fdc47ce255cc28e5f492885434060cc4a1433ace401c80aa23a247129a1c6f4e8091ec168a07a50faa95ab4d1 SHA512 5ffe37184eae53e4b9e5811f082bf810ba40e9f83ba2ec5036220bb00b520686f61b6b6121c1d3a577b0b2bde630c9b627d28d5c1d2feb4cdc5225ce84d1ddf6 +EBUILD plasma-desktop-5.27.4-r1.ebuild 5405 BLAKE2B 84bea8fd44afbf4a4056cc614297eda7e7c90e3618b5e1d518b56befcab44b1704bbc71435c275a2ba50f719b5a41f915e3b1819551e98a9d82f8445bf352999 SHA512 24bfaa8314fc8fd457601bd1502b18672a95f31f7fa3bcc65e0049b8f582644db215c51097895dbef32637bc8d4752277ac3f5c7398bd627cc1d0be3436bf6be MISC metadata.xml 682 BLAKE2B fbd378484f259e8b85c9c8776c5ce7eb034432f9a4e547453e0b810b22273bc8c494fdcc5f435c1b660c9660fc68b4860fc40987b0c6b8ee82764cc7fd15e771 SHA512 dff0c23d15a172b901fb0d0b9e383b8cfbc47b2123cf06545c3f9064db492987043695305de4af66fedc8d1900fcfb266b120f4883e2384303c9e4f2a208bee5 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch deleted file mode 100644 index 30f95a901839..000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.27.3-kicker-hide-separators.patch +++ /dev/null @@ -1,77 +0,0 @@ -From d492a691d44a2878eb3c189219dc04260294bb77 Mon Sep 17 00:00:00 2001 -From: Joshua Goins <josh@redstrate.com> -Date: Sat, 18 Mar 2023 10:39:49 -0400 -Subject: [PATCH] applets/kicker: Hide separators when sorted alphabetically - -Users are able to manually add separator items at custom positions in -their menu structures. When they do so, the location of these -separators are inherently custom, and only make sense when the menu -structure is being displayed in its custom order. When using the option -to display everything alphabetically, the separators' custom position -no longer exists and any automatic placement becomes nonsensical. - -Currently, the separators get sorted to the beginning of the list, -which looks quite weird. This commit instead hides the separators when -sorting alphabetically. Only Kicker is affected by this change; the -underlying model providing the items is unchanged. - -BUG: 465865 -FIXED-IN: 5.27.4 -(cherry picked from commit 90ad64ba638649b68cf2ffb7f68e227e86a8b8f1) ---- - applets/kicker/package/contents/ui/ItemListDelegate.qml | 4 +++- - applets/kicker/package/contents/ui/ItemListDialog.qml | 2 ++ - applets/kicker/package/contents/ui/ItemListView.qml | 2 +- - 3 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/applets/kicker/package/contents/ui/ItemListDelegate.qml b/applets/kicker/package/contents/ui/ItemListDelegate.qml -index 0eefe24e9e..ea7a0455c9 100644 ---- a/applets/kicker/package/contents/ui/ItemListDelegate.qml -+++ b/applets/kicker/package/contents/ui/ItemListDelegate.qml -@@ -25,6 +25,7 @@ Item { - - readonly property real fullTextWidth: Math.ceil(icon.width + label.implicitWidth + arrow.width + row.anchors.leftMargin + row.anchors.rightMargin + row.actualSpacing) - property bool isSeparator: (model.isSeparator === true) -+ property bool sorted: (model.sorted === true) - property bool hasChildren: (model.hasChildren === true) - property bool hasActionList: ((model.favoriteId !== null) - || (("hasActionList" in model) && (model.hasActionList === true))) -@@ -251,7 +252,8 @@ Item { - anchors.rightMargin: highlightItemSvg.margins.right - anchors.verticalCenter: parent.verticalCenter - -- active: item.isSeparator -+ // Separator positions don't make sense when sorting everything alphabetically -+ active: item.isSeparator && !item.sorted - - asynchronous: false - sourceComponent: separatorComponent -diff --git a/applets/kicker/package/contents/ui/ItemListDialog.qml b/applets/kicker/package/contents/ui/ItemListDialog.qml -index ffdb2e97c8..d97650cbbe 100644 ---- a/applets/kicker/package/contents/ui/ItemListDialog.qml -+++ b/applets/kicker/package/contents/ui/ItemListDialog.qml -@@ -70,6 +70,8 @@ Kicker.SubMenu { - Kicker.FunnelModel { - id: funnelModel - -+ property bool sorted: sourceModel.hasOwnProperty("sorted") ? sourceModel.sorted : false -+ - Component.onCompleted: { - kicker.reset.connect(funnelModel.reset); - } -diff --git a/applets/kicker/package/contents/ui/ItemListView.qml b/applets/kicker/package/contents/ui/ItemListView.qml -index 29ff51da05..d931b9fcff 100644 ---- a/applets/kicker/package/contents/ui/ItemListView.qml -+++ b/applets/kicker/package/contents/ui/ItemListView.qml -@@ -30,7 +30,7 @@ FocusScope { - property int itemHeight: Math.ceil((Math.max(theme.mSize(theme.defaultFont).height, PlasmaCore.Units.iconSizes.small) - + Math.max(highlightItemSvg.margins.top + highlightItemSvg.margins.bottom, - listItemSvg.margins.top + listItemSvg.margins.bottom)) / 2) * 2 -- property int separatorHeight: lineSvg.horLineHeight + (2 * PlasmaCore.Units.smallSpacing) -+ property int separatorHeight: model.sorted === true ? 0 : lineSvg.horLineHeight + (2 * PlasmaCore.Units.smallSpacing) - - property alias currentIndex: listView.currentIndex - property alias currentItem: listView.currentItem --- -GitLab - diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.3-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild index 4a4ff2f230a9..146db24195e5 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.3-r1.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-5.27.4-r1.ebuild @@ -13,7 +13,8 @@ inherit ecm plasma.kde.org optfeature DESCRIPTION="KDE Plasma desktop" XORGHDRS="${PN}-override-include-dirs-2" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz + https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz" LICENSE="GPL-2" # TODO: CHECK SLOT="5" @@ -127,7 +128,7 @@ BDEPEND=" PATCHES=( "${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-override-include-dirs.patch" # downstream patch - "${FILESDIR}/${P}-kicker-hide-separators.patch" # KDE-bug 465865 + "${WORKDIR}/${P}-patchset-1" # KDE-bugs 452187, 467709, 468313 ) src_prepare() { diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.27.4.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.27.4.ebuild deleted file mode 100644 index cb0f572091a5..000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-5.27.4.ebuild +++ /dev/null @@ -1,179 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=5.102.0 -PVCUT=$(ver_cut 1-3) -QTMIN=5.15.7 -VIRTUALX_REQUIRED="test" -inherit ecm plasma.kde.org optfeature - -DESCRIPTION="KDE Plasma desktop" -XORGHDRS="${PN}-override-include-dirs-2" -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="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 - >=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/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 - >=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/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[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[screencast?] - >=media-libs/phonon-4.11.0 - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXfixes - x11-libs/libXi - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/libxkbfile - ibus? ( - app-i18n/ibus - dev-libs/glib:2 - >=dev-qt/qtx11extras-${QTMIN}:5 - x11-libs/libxcb - x11-libs/xcb-util-keysyms - ) - kaccounts? ( - kde-apps/kaccounts-integration:5 - net-libs/accounts-qt - ) - scim? ( app-i18n/scim ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 ) -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/wayland-protocols-1.25 - dev-libs/boost - x11-base/xorg-proto -" -RDEPEND="${COMMON_DEPEND} - !<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/oxygen-${PVCUT}:5 - media-fonts/noto-emoji - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - kaccounts? ( net-libs/signon-oauth2 ) - screencast? ( >=kde-plasma/kpipewire-${PVCUT}:5 ) -" -BDEPEND=" - >=kde-frameworks/kcmutils-${KFMIN}:5 - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}/${XORGHDRS}/${PN}-5.25.80-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 - - # 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 ibus GLIB2) - $(cmake_use_find_package kaccounts AccountsQt5) - $(cmake_use_find_package kaccounts KAccounts) - $(cmake_use_find_package semantic-desktop KF5Baloo) - ) - - 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 -} |