Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 03:27:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tribe-partitionmanager

Browse Source 
fix crash on "getSolidDeviceList()" function
This commit is contained in:
AlmAck 2014-01-02 20:47:12 +01:00
parent 08f8e090f5
commit 3f890a5e2e
2 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tribe-partitionmanager/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=tribe-partitionmanager pkgname=tribe-partitionmanager
pkgver=1358163 pkgver=1358163
pkgrel=7 pkgrel=8
pkgdesc="A KDE utility that allows you to manage disks, partitions, and file systems - Patched for Chakra Live ISO" pkgdesc="A KDE utility that allows you to manage disks, partitions, and file systems - Patched for Chakra Live ISO"
arch=('x86_64') arch=('x86_64')
url="https://sourceforge.net/projects/partitionman" url="https://sourceforge.net/projects/partitionman"
@ -19,7 +19,7 @@ conflict=('partitionmanager')
install=partitionmanager.install install=partitionmanager.install
options=(debug) options=(debug)
source=(tribe.patch) # disable-gpt.patch) source=(tribe.patch) # disable-gpt.patch)
md5sums=('b15678e85f2da8bbf6accbcaa5996a68') md5sums=('80be08d987fb3edbb769c4b8eba5f59b')
#_svntrunk=svn://anonsvn.kde.org/home/kde/trunk/extragear/sysadmin/partitionmanager #_svntrunk=svn://anonsvn.kde.org/home/kde/trunk/extragear/sysadmin/partitionmanager
_svnmod=partitionmanager-svn _svnmod=partitionmanager-svn

59
tribe-partitionmanager/tribe.patch
View File

@ -544,7 +544,7 @@ diff -ru partitionmanager-svn/src/util/capacity.h partitionmanager-svn-build/src
diff -ru partitionmanager-svn/src/util/helpers.cpp partitionmanager-svn-build/src/util/helpers.cpp diff -ru partitionmanager-svn/src/util/helpers.cpp partitionmanager-svn-build/src/util/helpers.cpp
--- partitionmanager-svn/src/util/helpers.cpp 2013-01-16 17:10:20.653871970 +0000 --- partitionmanager-svn/src/util/helpers.cpp 2013-01-16 17:10:20.653871970 +0000
+++ partitionmanager-svn-build/src/util/helpers.cpp 2013-01-16 17:11:24.645227940 +0000 +++ partitionmanager-svn-build/src/util/helpers.cpp 2013-01-16 17:11:24.645227940 +0000
@@ -191,14 +191,14 @@ @@ -191,14 +191,14 @@ void showColumnsContextMenu(const QPoint
bool loadBackend() bool loadBackend()
{ {
@ -561,7 +561,7 @@ diff -ru partitionmanager-svn/src/util/helpers.cpp partitionmanager-svn-build/sr
i18nc("@title:window", "Error: Could Not Load Backend Plugin")); i18nc("@title:window", "Error: Could Not Load Backend Plugin"));
Config::setBackend(CoreBackendManager::defaultBackendName()); Config::setBackend(CoreBackendManager::defaultBackendName());
} }
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@ bool loadBackend()
KMessageBox::error(NULL, KMessageBox::error(NULL,
i18nc("@info", "<para>Neither the configured (\"%1\") nor the default (\"%2\") backend " i18nc("@info", "<para>Neither the configured (\"%1\") nor the default (\"%2\") backend "
"plugin could be loaded.</para><para>Please check your installation.</para>", "plugin could be loaded.</para><para>Please check your installation.</para>",
@ -570,3 +570,58 @@ diff -ru partitionmanager-svn/src/util/helpers.cpp partitionmanager-svn-build/sr
i18nc("@title:window", "Error: Could Not Load Backend Plugin")); i18nc("@title:window", "Error: Could Not Load Backend Plugin"));
return false; return false;
} }
@@ -241,30 +241,30 @@ QList<Solid::Device> getSolidDeviceList(
"[ StorageDrive.driveType == 'SdMmc' OR StorageDrive.driveType == 'Xd'] ]";
#endif
- KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
- if (args->count() > 0)
- {
- predicate = " [ " + predicate + " AND ";
-
- qint32 brackets = (args->count() + 1) / 2;
- brackets = args->count() == 1 ? 0 : brackets;
- for (qint32 i = 0; i < brackets; i++)
- predicate += "[ ";
-
- bool right_bracket = false;
- for (qint32 i = 0; i < args->count(); i++, right_bracket =! right_bracket)
- {
- predicate += QString("Block.device == '%1' ").arg(args->arg(i));
-
- if (right_bracket)
- predicate += i == 1 ? "] " : "] ] ";
- if (i < args->count() - 1)
- predicate += "OR ";
- if (right_bracket && i != args->count() - 2 && i != args->count()-1)
- predicate += "[ ";
- }
- predicate += right_bracket && brackets > 0 ? "] ]" : "]";
- }
+// KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+// if (args->count() > 0)
+// {
+// predicate = " [ " + predicate + " AND ";
+//
+// qint32 brackets = (args->count() + 1) / 2;
+// brackets = args->count() == 1 ? 0 : brackets;
+// for (qint32 i = 0; i < brackets; i++)
+// predicate += "[ ";
+//
+// bool right_bracket = false;
+// for (qint32 i = 0; i < args->count(); i++, right_bracket =! right_bracket)
+// {
+// predicate += QString("Block.device == '%1' ").arg(args->arg(i));
+//
+// if (right_bracket)
+// predicate += i == 1 ? "] " : "] ] ";
+// if (i < args->count() - 1)
+// predicate += "OR ";
+// if (right_bracket && i != args->count() - 2 && i != args->count()-1)
+// predicate += "[ ";
+// }
+// predicate += right_bracket && brackets > 0 ? "] ]" : "]";
+// }
return Solid::Device::listFromQuery(predicate);
}