Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dolphin rebuld

Browse Source
This commit is contained in:
Rmys
2024-04-17 20:47:17 +03:00
parent 262f088ad8
commit d63571b0ce
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde6/applications/dolphin-kf6/files/a07f2422.patch
+37
View File
@@ -0,0 +1,37 @@
From a07f24228a94aab2bdeb3caaf7a4d694c0180ed7 Mon Sep 17 00:00:00 2001
From: Felix Ernst <felixernst@kde.org>
Date: Wed, 17 Apr 2024 07:32:27 +0000
Subject: [PATCH] Fix crash while entering selection mode with Qt6.7
`deleteLater()` on a non-existing object seems to cause a crash with
Qt6.7. This makes some sense but wasn't the case previously.
I didn't test this yet but it is a harmless change so if anyone can confirm we can IMO merge directly.
This was brought up in https://invent.kde.org/system/dolphin/-/merge_requests/764#note_920935, reported in the bug linked below, and the sentry crash reporting page also has a few dozen reports (https://crash-reports.kde.org/organizations/kde/issues/13589/?project=4&query=is%3Aunresolved&referrer=issue-stream&stream_index=1).
Dolphin 24.02 is also affected but we are already past the last bug fix release for it.
BUG: 485599
---
src/selectionmode/bottombarcontentscontainer.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/selectionmode/bottombarcontentscontainer.cpp b/src/selectionmode/bottombarcontentscontainer.cpp
index d571b0302a..0e3087a9c5 100644
--- a/src/selectionmode/bottombarcontentscontainer.cpp
+++ b/src/selectionmode/bottombarcontentscontainer.cpp
@@ -483,7 +483,9 @@ std::vector<QAction *> BottomBarContentsContainer::contextActionsFor(const KFile
if (selectedItems.isEmpty()) {
// There are no contextual actions to show for these items.
// We might even want to hide this bar in this case. To make this clear, we reset m_internalContextMenu.
- m_internalContextMenu.release()->deleteLater();
+ if (m_internalContextMenu) {
+ m_internalContextMenu.release()->deleteLater();
+ }
return std::vector<QAction *>{};
}
--
GitLab
desktop/kde6/applications/dolphin-kf6/pspec.xml
+8 -6
View File
@@ -28,7 +28,6 @@
<Dependency>kdoctools-kf6-devel</Dependency>
<Dependency>ki18n-kf6-devel</Dependency>
<Dependency>kiconthemes-kf6-devel</Dependency>
<Dependency>kio-kf6-devel</Dependency>
<Dependency>knewstuff-kf6-devel</Dependency>
<Dependency>knotifications-kf6-devel</Dependency>
@@ -37,7 +36,6 @@
<Dependency>solid-kf6-devel</Dependency>
<Dependency versionFrom="5.8.0">qt6-base-devel</Dependency>
<Dependency>qt6-phonon-devel</Dependency>
<Dependency versionFrom="24.02.2">kio-extras-kf6-devel</Dependency>
<Dependency>libxml2-devel</Dependency>
<Dependency>docbook-xsl</Dependency>
@@ -45,7 +43,7 @@
<Dependency>packagekit-qt6-devel</Dependency>
</BuildDependencies>
<Patches>
<!-- <Patch level="1">find-kactivities.patch</Patch> -->
<Patch level="1">a07f2422.patch</Patch>
</Patches>
</Source>
@@ -104,15 +102,12 @@
<Dependency>kio-kf6-devel</Dependency>
<Dependency>kcmutils-kf6-devel</Dependency>
<Dependency>knewstuff-kf6-devel</Dependency>
<Dependency>plasma-activities-kf6-devel</Dependency>
<Dependency>baloo-kf6-devel</Dependency>
<Dependency versionFrom="24.02.2">baloo-widgets-kf6-devel</Dependency>
<Dependency>kfilemetadata-kf6-devel</Dependency>
<Dependency>kparts-kf6-devel</Dependency>
<Dependency>ktexteditor-kf6-devel</Dependency>
<Dependency>kitemmodels-kf6-devel</Dependency>
<Dependency>kunitconversion-kf6-devel</Dependency>
</RuntimeDependencies>
@@ -122,6 +117,13 @@
</Package>
<History>
<Update release="6">
<Date>2024-04-17</Date>
<Version>24.02.2</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="5">
<Date>2024-04-13</Date>
<Version>24.02.2</Version>