Merge pull request #16488 from suvari/master
kpmcore patched for partitionmanager
This commit is contained in:
@@ -0,0 +1,31 @@
|
|||||||
|
From 9883830642b943d8b26b7d83f1ac87b0a63b5b48 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Fabio Bas <ctrlaltca@gmail.com>
|
||||||
|
Date: Tue, 22 Apr 2025 14:40:33 +0200
|
||||||
|
Subject: [PATCH] Fix a crash when filesystem==nullptr.
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
(cherry picked from commit 458ef81f2e424f13cdea44d2d89b8260b463e34e)
|
||||||
|
|
||||||
|
Co-authored-by: Andrius Štikonas <andrius@stikonas.eu>
|
||||||
|
---
|
||||||
|
src/plugins/sfdisk/sfdiskbackend.cpp | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp
|
||||||
|
index e47c4e58..447c096b 100644
|
||||||
|
--- a/src/plugins/sfdisk/sfdiskbackend.cpp
|
||||||
|
+++ b/src/plugins/sfdisk/sfdiskbackend.cpp
|
||||||
|
@@ -515,6 +515,8 @@ bool SfdiskBackend::updateDevicePartitionTable(Device &d, const QJsonObject &jso
|
||||||
|
*/
|
||||||
|
void SfdiskBackend::readSectorsUsed(const Device& d, Partition& p, const QString& mountPoint)
|
||||||
|
{
|
||||||
|
+ if (p.isFileSystemNullptr())
|
||||||
|
+ return;
|
||||||
|
if (!mountPoint.isEmpty() && p.fileSystem().type() != FileSystem::Type::LinuxSwap && p.fileSystem().type() != FileSystem::Type::Lvm2_PV) {
|
||||||
|
const QStorageInfo storage = QStorageInfo(mountPoint);
|
||||||
|
if (p.isMounted() && storage.isValid())
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<PISI>
|
<PISI>
|
||||||
<Source>
|
<Source>
|
||||||
<Name>kpmcore</Name>
|
<Name>kpmcore</Name>
|
||||||
<Homepage>https://www.kde.org</Homepage>
|
<Homepage>https://apps.kde.org/partitionmanager/</Homepage>
|
||||||
<Packager>
|
<Packager>
|
||||||
<Name>Pisi Linux Admins</Name>
|
<Name>Pisi Linux Admins</Name>
|
||||||
<Email>admin@pisilinux.org</Email>
|
<Email>admin@pisilinux.org</Email>
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
<License>LGPLv2</License>
|
<License>LGPLv2</License>
|
||||||
<IsA>app:gui</IsA>
|
<IsA>app:gui</IsA>
|
||||||
<Summary>Library for managing partitions.</Summary>
|
<Summary>Library for managing partitions.</Summary>
|
||||||
<Description>Library for managing partitions.</Description>
|
<Description>KPMcore, the KDE Partition Manager core, is a library for examining and modifying partitions, disk devices, and filesystems on a Linux system. It provides a unified programming interface over top of (external) system-manipulation tools.</Description>
|
||||||
<Archive sha1sum="8ebd2635400a6ae08f4afc0460374b629b114f78" type="tarxz">mirrors://kde/stable/release-service/25.04.0/src/kpmcore-25.04.0.tar.xz</Archive>
|
<Archive sha1sum="8ebd2635400a6ae08f4afc0460374b629b114f78" type="tarxz">mirrors://kde/stable/release-service/25.04.0/src/kpmcore-25.04.0.tar.xz</Archive>
|
||||||
<BuildDependencies>
|
<BuildDependencies>
|
||||||
<Dependency>ntfs-3g</Dependency>
|
<Dependency>ntfs-3g</Dependency>
|
||||||
@@ -49,6 +49,9 @@
|
|||||||
<Dependency>nilfs-utils-devel</Dependency>
|
<Dependency>nilfs-utils-devel</Dependency>
|
||||||
<Dependency>e2fsprogs-devel</Dependency>
|
<Dependency>e2fsprogs-devel</Dependency>
|
||||||
</BuildDependencies>
|
</BuildDependencies>
|
||||||
|
<Patches>
|
||||||
|
<Patch>98838306.patch</Patch>
|
||||||
|
</Patches>
|
||||||
</Source>
|
</Source>
|
||||||
|
|
||||||
<Package>
|
<Package>
|
||||||
@@ -86,7 +89,8 @@
|
|||||||
<Files>
|
<Files>
|
||||||
<Path fileType="executable">/usr/bin</Path>
|
<Path fileType="executable">/usr/bin</Path>
|
||||||
<Path fileType="data">/usr/share</Path>
|
<Path fileType="data">/usr/share</Path>
|
||||||
<Path fileType="library">/usr/lib</Path>
|
<Path fileType="library">/usr/lib/libkpmcore.so*</Path>
|
||||||
|
<Path fileType="library">/usr/lib/libexec</Path>
|
||||||
<Path fileType="library">/usr/lib/qt6</Path>
|
<Path fileType="library">/usr/lib/qt6</Path>
|
||||||
<Path fileType="doc">/usr/share/doc</Path>
|
<Path fileType="doc">/usr/share/doc</Path>
|
||||||
</Files>
|
</Files>
|
||||||
@@ -112,6 +116,13 @@
|
|||||||
</Package>
|
</Package>
|
||||||
|
|
||||||
<History>
|
<History>
|
||||||
|
<Update release="53">
|
||||||
|
<Date>2025-04-29</Date>
|
||||||
|
<Version>25.04.0</Version>
|
||||||
|
<Comment>patched for partitionmanager</Comment>
|
||||||
|
<Name>Pisi Linux Community</Name>
|
||||||
|
<Email>admin@pisilinux.org</Email>
|
||||||
|
</Update>
|
||||||
<Update release="52">
|
<Update release="52">
|
||||||
<Date>2025-04-20</Date>
|
<Date>2025-04-20</Date>
|
||||||
<Version>25.04.0</Version>
|
<Version>25.04.0</Version>
|
||||||
|
|||||||
Reference in New Issue
Block a user