Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=ad22dcf033f309866abe25a2ebcacc2825c83ba9
commit ad22dcf033f309866abe25a2ebcacc2825c83ba9 Author: Marius Cirsta <[email protected]> Date: Fri Apr 15 04:13:10 2016 +0300 solid-5.21.0-2-x86_64 * fix sorting core numbers, should make crazy happy diff --git a/source/kf5/solid/FrugalBuild b/source/kf5/solid/FrugalBuild index e307eff..11f7d63 100644 --- a/source/kf5/solid/FrugalBuild +++ b/source/kf5/solid/FrugalBuild @@ -3,15 +3,18 @@ pkgname=solid -pkgrel=1 +pkgrel=2 pkgdesc="KDE Desktop hardware abstraction." groups=('kf5') archs=('i686' 'x86_64') _F_kde_project="frameworks" +_F_cmake_type=Debug Finclude kf5 depends=("libqt5qml>=$_F_kde_qtver") # "libqt5dbus>=$_F_kde_qtver") makedepends=("${makedepends[@]}" 'libqt5x11extras' 'qt5-linguist' 'libqt5concurrent') -sha1sums=('44b8ee1836854e0a87453f98a9236936fe8ffc20') +source+=(sort_cores.patch) +sha1sums=('44b8ee1836854e0a87453f98a9236936fe8ffc20' \ + 'e99f86a6d1288f0fb00ca25ff1fd5802eb74d3fe') replaces=('kdebase-runtime-solid-device-automounter' 'kdebase-runtime-soliduiserver' \ 'libsolid' 'kdebase-runtime-solid' 'kdebase-runtime-solid-hardware') diff --git a/source/kf5/solid/sort_cores.patch b/source/kf5/solid/sort_cores.patch new file mode 100644 index 0000000..7a67ee1 --- /dev/null +++ b/source/kf5/solid/sort_cores.patch @@ -0,0 +1,39 @@ +--- solid-5.21.0.old/src/solid/devices/frontend/devicemanager_p.h 2016-04-04 00:08:10.000000000 +0300 ++++ solid-5.21.0.new/src/solid/devices/frontend/devicemanager_p.h 2016-04-15 04:02:42.751456230 +0300 +@@ -29,6 +29,7 @@ + #include <QtCore/QPointer> + #include <QtCore/QSharedData> + #include <QtCore/QThreadStorage> ++#include <QtCore/QRegularExpression> + + namespace Solid + { +--- solid-5.21.0.old/src/solid/devices/frontend/devicemanager.cpp 2016-04-04 00:08:10.000000000 +0300 ++++ solid-5.21.0.new/src/solid/devices/frontend/devicemanager.cpp 2016-04-15 03:51:35.213357947 +0300 +@@ -114,8 +114,24 @@ + + QStringList udis = backend->devicesFromQuery(parentUdi, type); + +- Q_FOREACH (const QString &udi, udis) { +- list.append(Device(udi)); ++ if(type==DeviceInterface::Type::Processor) { ++ QMap<int, QString> coresMap; ++ QRegularExpression re("cpu([0-9]+)"); ++ Q_FOREACH (const QString &udi, udis) { ++ QRegularExpressionMatch match = re.match(udi); ++ if(match.hasMatch()) { ++ QString matched = match.captured(1); ++ coresMap[matched.toUInt()] = udi; ++ } ++ } ++ for(QMap<int, QString>::const_iterator ii=coresMap.constBegin(); ii != coresMap.constEnd(); ii++) { ++ list.append(Device(ii.value())); ++ } ++ } ++ else { ++ Q_FOREACH (const QString &udi, udis) { ++ list.append(Device(udi)); ++ } + } + } + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
