From a8fc77cbba98499017b18bdfdad811ebc7a9224c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 25 Sep 2025 21:15:02 +0200 Subject: [PATCH] kde-plasma/plasma-desktop: drop 6.3.6 Signed-off-by: Andreas Sturmlechner --- kde-plasma/plasma-desktop/Manifest | 1 - ...6.3.5-keep-sorting-when-adding-files.patch | 61 ------ .../plasma-desktop-6.3.6.ebuild | 187 ------------------ 3 files changed, 249 deletions(-) delete mode 100644 kde-plasma/plasma-desktop/files/plasma-desktop-6.3.5-keep-sorting-when-adding-files.patch delete mode 100644 kde-plasma/plasma-desktop/plasma-desktop-6.3.6.ebuild diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest index 13bce34fdeb76..7f1c6ff7d8ccd 100644 --- a/kde-plasma/plasma-desktop/Manifest +++ b/kde-plasma/plasma-desktop/Manifest @@ -1,3 +1,2 @@ -DIST plasma-desktop-6.3.6.tar.xz 16861312 BLAKE2B 5a688cf774e4294ce26411638edd58a37a3a99cc5ce5ee56b349b57d8ff65e1d4046bc62dd070b440105df4713ffb51b4d79040493fd639b6ae36025d10686bb SHA512 440128226069b6c772595c337ea121bfebad2366262545107d154d9644edc9f285879fb85cffc59247e83a1441da88c3c04093e2eff2d9a7c3d83fad254e2a88 DIST plasma-desktop-6.4.5.tar.xz 16758604 BLAKE2B 41b81bffe4793b744c861d701d654865874cccc1207bda49c27d5d1bebb2df8f5e31edf0b8f339b9491103e7c72b1ac4c27888b014ea3c1e437b2b54d76ee4b2 SHA512 8bbce62c722886061225463e84b35f2faecc0daea3f89006ec049efc76942abe11397d3f621278bf82934346f2920d4323322482cc20ef323c4ea5a0b4f19099 DIST plasma-desktop-override-include-dirs-4.tar.xz 6360 BLAKE2B 8d4340f7b520ec2a4d47d7679028d5d75ceb141877248f7c411a082197ca9c0735ff2d21bd30333236c50dcae8bbdabd41164daa392b803504d2707ffd013960 SHA512 5273df12260d90e7aacc90b9ed7f6f1868c8996e2609229c59a771b3fb541b720f53fe2c2198d9d91870b05d06797bc4b2cec5afcf97d8b2b754f0da197584a1 diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-6.3.5-keep-sorting-when-adding-files.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-6.3.5-keep-sorting-when-adding-files.patch deleted file mode 100644 index 6683e4176c011..0000000000000 --- a/kde-plasma/plasma-desktop/files/plasma-desktop-6.3.5-keep-sorting-when-adding-files.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f1a9052dff63938fd96890c7f88c6aa508e5f9a6 Mon Sep 17 00:00:00 2001 -From: Akseli Lahtinen -Date: Fri, 9 May 2025 12:03:52 +0300 -Subject: [PATCH] FolderModel: When adding files, keep the current sorting - -The sort mode got changed to unsorted if any file was added. -This was probably due to the infinite while loop that would happen -later when we're looking for a new blank spot from an index -that does not exist: This would return an empty QVariant that is -false by default. - -We need to check if the index is valid. If it's not, we know -it's a new index and can create one, so it is a blank spot. - -BUG: 482470 -FIXED-IN: 6.3.6 - - -(cherry picked from commit 03ef2343212bbc4be274b1b37788186df03a8cb3) - -10260acb FolderModel: When adding files, keep the current sorting -e64705c8 Fix comment, combine ifs - -Co-authored-by: Akseli Lahtinen ---- - containments/desktop/plugins/folder/foldermodel.cpp | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/containments/desktop/plugins/folder/foldermodel.cpp b/containments/desktop/plugins/folder/foldermodel.cpp -index 1c79a3de3c..ce170e00bb 100644 ---- a/containments/desktop/plugins/folder/foldermodel.cpp -+++ b/containments/desktop/plugins/folder/foldermodel.cpp -@@ -199,13 +199,6 @@ FolderModel::FolderModel(QObject *parent) - m_dirModel->setDropsAllowed(KDirModel::DropOnDirectory | KDirModel::DropOnLocalExecutable); - m_dirModel->dirLister()->setAutoUpdate(true); - -- // If we have dropped items queued for moving, go unsorted now. -- connect(this, &QAbstractItemModel::rowsAboutToBeInserted, this, [this]() { -- if (!m_dropTargetPositions.isEmpty()) { -- setSortMode(-1); -- } -- }); -- - /* - * Dropped files may not actually show up as new files, e.g. when we overwrite - * an existing file. Or files that fail to be listed by the dirLister, or... -@@ -1405,7 +1398,10 @@ void FolderModel::changeSelection(const QItemSelection &selected, const QItemSel - - bool FolderModel::isBlank(int row) const - { -- if (row < 0) { -+ // Invalid indexes are blank, since they're not created yet -+ // and will be created when needed. -+ const auto idx = index(row, 0); -+ if (row < 0 || !idx.isValid()) { - return true; - } - --- -GitLab - diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.3.6.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.3.6.ebuild deleted file mode 100644 index 906b456bfbe7c..0000000000000 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.3.6.ebuild +++ /dev/null @@ -1,187 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" -ECM_TEST="true" -KFMIN=6.10.0 -QTMIN=6.8.1 -inherit ecm plasma.kde.org optfeature xdg - -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 arm64 ~loong ~ppc64 ~riscv ~x86" -IUSE="ibus input_devices_wacom scim screencast sdl +semantic-desktop webengine" - -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-qt/qt5compat-${QTMIN}:6[qml] - >=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,gui,network,sql,wayland,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtsvg-${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-${KDE_CATV}:6 - >=kde-plasma/libksysguard-${KDE_CATV}:6 - >=kde-plasma/libplasma-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-${KDE_CATV}:6 - >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 - >=kde-plasma/plasma-workspace-${KDE_CATV}:6[screencast?] - >=kde-plasma/plasma5support-${KDE_CATV}: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 - ) - input_devices_wacom? ( - dev-libs/wayland - dev-libs/libwacom:= - ) - scim? ( app-i18n/scim ) - sdl? ( media-libs/libsdl2[joystick] ) - semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:6 ) - webengine? ( - kde-apps/kaccounts-integration:6 - >=net-libs/accounts-qt-1.17[qt6(+)] - ) -" -DEPEND="${COMMON_DEPEND} - dev-libs/boost - x11-base/xorg-proto - input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 ) - test? ( - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 - ) -" -RDEPEND="${COMMON_DEPEND} - !=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/oxygen-${KDE_CATV}:6 - >=kde-plasma/plasma-mimeapps-list-3 - media-fonts/noto-emoji - sys-apps/util-linux - x11-apps/setxkbmap - x11-misc/xdg-user-dirs - screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) - webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] ) -" -RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland]