Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2016-07-15 12:41:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2016-07-03 12:26:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new/solid.changes 2016-07-15 12:42:00.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 6 15:07:40 UTC 2016 - [email protected] + +- Update to 5.24.0 + * Fix check that CPU is valid + * Handle reading /proc/cpuinfo for Arm processors + * Find CPUs by subsystem rather than driver + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.24.0.php + +------------------------------------------------------------------- Old: ---- solid-5.23.0.tar.xz New: ---- solid-5.24.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.3v1k2Y/_old 2016-07-15 12:42:02.000000000 +0200 +++ /var/tmp/diff_new_pack.3v1k2Y/_new 2016-07-15 12:42:02.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Solid5 -%define _tar_path 5.23 +%define _tar_path 5.24 Name: solid -Version: 5.23.0 +Version: 5.24.0 Release: 0 BuildRequires: bison BuildRequires: cmake >= 2.8.12 ++++++ solid-5.23.0.tar.xz -> solid-5.24.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/CMakeLists.txt new/solid-5.24.0/CMakeLists.txt --- old/solid-5.23.0/CMakeLists.txt 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/CMakeLists.txt 2016-07-03 11:30:18.000000000 +0200 @@ -4,7 +4,7 @@ project(Solid) include(FeatureSummary) -find_package(ECM 5.23.0 NO_MODULE) +find_package(ECM 5.24.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -42,7 +42,7 @@ include(ECMPoQmTools) -set(KF5_VERSION "5.23.0") # handled by release scripts +set(KF5_VERSION "5.24.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX SOLID VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/solid_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/metainfo.yaml new/solid-5.24.0/metainfo.yaml --- old/solid-5.23.0/metainfo.yaml 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/metainfo.yaml 2016-07-03 11:30:18.000000000 +0200 @@ -3,7 +3,9 @@ tier: 1 type: integration platforms: - - name: All + - name: Linux + - name: Windows + - name: MacOSX portingAid: false deprecated: false release: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/po/he/solid5_qt.po new/solid-5.24.0/po/he/solid5_qt.po --- old/solid-5.23.0/po/he/solid5_qt.po 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/po/he/solid5_qt.po 2016-07-03 11:30:18.000000000 +0200 @@ -2,32 +2,29 @@ # This file is distributed under the same license as the PACKAGE package. # # Diego Iastrubni <[email protected]>, 2012. +# Elkana Bardugo <[email protected]>, 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2012-08-10 19:31+0300\n" -"Last-Translator: Diego Iastrubni <[email protected]>\n" +"PO-Revision-Date: 2016-06-29 17:44+0200\n" +"Last-Translator: Elkana Bardugo <[email protected]>\n" "Language-Team: Hebrew <[email protected]>\n" "Language: he\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 2.0\n" "X-Qt-Contexts: true\n" #: solid/devices/backends/fstab/fstabmanager.cpp:88 -#, fuzzy -#| msgid "Network Shares" msgctxt "Solid::Backends::Fstab::FstabManager|" msgid "Network Shares" msgstr "שיתופי רשת" #: solid/devices/backends/fstab/fstabmanager.cpp:89 -#, fuzzy -#| msgid "NFS and SMB shares declared in your system" msgctxt "Solid::Backends::Fstab::FstabManager|" msgid "NFS and SMB shares declared in your system" msgstr "שיתופי NFS ו־SMB (שיתוף קבצים מתאים לחלונות) מוגדרים במערכת שלך" @@ -1137,17 +1134,13 @@ msgstr "מיכל מוצפן" #: solid/devices/backends/udisks2/udisksdevice.cpp:578 -#, fuzzy, qt-format -#| msgctxt "%1 is the size" -#| msgid "%1 Removable Media" +#, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 Removable Media" msgstr "מדיה נשלפת בגודל %1" #: solid/devices/backends/udisks2/udisksdevice.cpp:580 -#, fuzzy, qt-format -#| msgctxt "%1 is the size" -#| msgid "%1 Media" +#, qt-format msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" msgid "%1 Media" msgstr "מדיה %1" @@ -1233,61 +1226,42 @@ msgstr "" #: solid/devices/backends/udisks2/udisksdevice.cpp:736 -#, fuzzy -#| msgid "The requested operation has been canceled." msgctxt "Solid::Backends::UDisks2::Device|" msgid "The operation has already been canceled" msgstr "הפעולה המתבקשת בוטלה." #: solid/devices/backends/udisks2/udisksdevice.cpp:738 -#, fuzzy -#| msgid "An unspecified error has occurred." msgctxt "Solid::Backends::UDisks2::Device|" msgid "An unspecified error has occurred" msgstr "התרחשה שגיאה לא מוכרת" #: solid/devices/backends/udisks2/udisksmanager.cpp:90 -#, fuzzy -#| msgid "Storage" msgctxt "Solid::Backends::UDisks2::Manager|" msgid "Storage" msgstr "אחסון" #: solid/devices/backends/udisks2/udisksmanager.cpp:91 -#, fuzzy -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Manager|" msgid "Storage devices" msgstr "אמצעי אחסון" #: solid/devices/backends/upower/upowerdevice.cpp:106 -#, fuzzy, qt-format -#| msgctxt "%1 is battery technology" -#| msgid "%1 Battery" +#, qt-format msgctxt "Solid::Backends::UPower::UPowerDevice|%1 is battery technology" msgid "%1 Battery" msgstr "סוללה מסוג %1" #: solid/devices/backends/upower/upowerdevice.cpp:121 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Lithium Ion" msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Ion" msgstr "ליתיום יון (Lithium Ion)" #: solid/devices/backends/upower/upowerdevice.cpp:123 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Lithium Polymer" msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Polymer" msgstr "ליתיום פולימר (Lithium Polymer)" #: solid/devices/backends/upower/upowerdevice.cpp:125 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Lithium Ion" msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Lithium Iron Phosphate" msgstr "ליתיום יון (Lithium Ion)" @@ -1298,47 +1272,31 @@ msgstr "" #: solid/devices/backends/upower/upowerdevice.cpp:129 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Nickel Cadmium" msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Nickel Cadmium" msgstr "ניקל קדמיום (Nickel Cadmium)" #: solid/devices/backends/upower/upowerdevice.cpp:131 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Nickel Metal Hydride" msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Nickel Metal Hydride" msgstr "ניקל מטאל הידריד (Nickel Metal Hydride)" #: solid/devices/backends/upower/upowerdevice.cpp:133 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Unknown" msgctxt "Solid::Backends::UPower::UPowerDevice|battery technology" msgid "Unknown" msgstr "לא ידוע" #: solid/devices/backends/upower/upowermanager.cpp:90 -#, fuzzy -#| msgid "Power Management" msgctxt "Solid::Backends::UPower::UPowerManager|" msgid "Power Management" msgstr "ניהול צריכת החשמל" #: solid/devices/backends/upower/upowermanager.cpp:91 -#, fuzzy -#| msgid "Batteries and other sources of power" msgctxt "Solid::Backends::UPower::UPowerManager|" msgid "Batteries and other sources of power" msgstr "סוללות ומקורות חשמל אחרים" #: solid/devices/backends/win/windevice.cpp:169 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Lithium Ion" msgctxt "Solid::Backends::Win::WinDevice|battery technology" msgid "Lithium Ion" msgstr "ליתיום יון (Lithium Ion)" @@ -1349,125 +1307,81 @@ msgstr "" #: solid/devices/backends/win/windevice.cpp:175 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Nickel Cadmium" msgctxt "Solid::Backends::Win::WinDevice|battery technology" msgid "Nickel Cadmium" msgstr "ניקל קדמיום (Nickel Cadmium)" #: solid/devices/backends/win/windevice.cpp:178 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Nickel Metal Hydride" msgctxt "Solid::Backends::Win::WinDevice|battery technology" msgid "Nickel Metal Hydride" msgstr "ניקל מטאל הידריד (Nickel Metal Hydride)" #: solid/devices/backends/win/windevice.cpp:181 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Unknown" msgctxt "Solid::Backends::Win::WinDevice|battery technology" msgid "Unknown" msgstr "לא ידוע" #: solid/devices/frontend/deviceinterface.cpp:66 -#, fuzzy -#| msgctxt "battery technology" -#| msgid "Unknown" msgctxt "Solid::DeviceInterface|Unknown device type" msgid "Unknown" msgstr "לא ידוע" #: solid/devices/frontend/deviceinterface.cpp:68 -#, fuzzy -#| msgctxt "Generic Interface device type" -#| msgid "Generic Interface" msgctxt "Solid::DeviceInterface|Generic Interface device type" msgid "Generic Interface" msgstr "ממשק גנרי" #: solid/devices/frontend/deviceinterface.cpp:70 -#, fuzzy -#| msgid "Processor" msgctxt "Solid::DeviceInterface|Processor device type" msgid "Processor" msgstr "מעבד" #: solid/devices/frontend/deviceinterface.cpp:72 -#, fuzzy -#| msgctxt "Block device type" -#| msgid "Block" msgctxt "Solid::DeviceInterface|Block device type" msgid "Block" msgstr "בלוק" #: solid/devices/frontend/deviceinterface.cpp:74 -#, fuzzy -#| msgctxt "Storage Access device type" -#| msgid "Storage Access" msgctxt "Solid::DeviceInterface|Storage Access device type" msgid "Storage Access" msgstr "גישה לאחסון" #: solid/devices/frontend/deviceinterface.cpp:76 -#, fuzzy -#| msgctxt "Storage Drive device type" -#| msgid "Storage Drive" msgctxt "Solid::DeviceInterface|Storage Drive device type" msgid "Storage Drive" msgstr "כונן אחסון" #: solid/devices/frontend/deviceinterface.cpp:78 -#, fuzzy -#| msgctxt "Optical Drive device type" -#| msgid "Optical Drive" msgctxt "Solid::DeviceInterface|Optical Drive device type" msgid "Optical Drive" msgstr "כונן אופטי" #: solid/devices/frontend/deviceinterface.cpp:80 -#, fuzzy -#| msgid "Storage" msgctxt "Solid::DeviceInterface|Storage Volume device type" msgid "Storage Volume" msgstr "אחסון" #: solid/devices/frontend/deviceinterface.cpp:82 -#, fuzzy -#| msgctxt "Optical Disc device type" -#| msgid "Optical Disc" msgctxt "Solid::DeviceInterface|Optical Disc device type" msgid "Optical Disc" msgstr "דיסק אופטי" #: solid/devices/frontend/deviceinterface.cpp:84 -#, fuzzy -#| msgid "Camera" msgctxt "Solid::DeviceInterface|Camera device type" msgid "Camera" msgstr "מצלמה" #: solid/devices/frontend/deviceinterface.cpp:86 -#, fuzzy -#| msgid "Portable Media Player" msgctxt "Solid::DeviceInterface|Portable Media Player device type" msgid "Portable Media Player" msgstr "נגן נדיה נייד" #: solid/devices/frontend/deviceinterface.cpp:88 -#, fuzzy -#| msgctxt "Battery device type" -#| msgid "Battery" msgctxt "Solid::DeviceInterface|Battery device type" msgid "Battery" msgstr "סוללה" #: solid/devices/frontend/deviceinterface.cpp:90 -#, fuzzy -#| msgctxt "Network Share device type" -#| msgid "Network Share" msgctxt "Solid::DeviceInterface|Network Share device type" msgid "Network Share" msgstr "שיתוף רשת" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/po/it/solid5_qt.po new/solid-5.24.0/po/it/solid5_qt.po --- old/solid-5.23.0/po/it/solid5_qt.po 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/po/it/solid5_qt.po 2016-07-03 11:30:18.000000000 +0200 @@ -15,7 +15,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=n != 1;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Qt-Contexts: true\n" "X-Generator: Lokalize 1.5\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/src/solid/devices/backends/udev/cpuinfo.cpp new/solid-5.24.0/src/solid/devices/backends/udev/cpuinfo.cpp --- old/solid-5.23.0/src/solid/devices/backends/udev/cpuinfo.cpp 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/src/solid/devices/backends/udev/cpuinfo.cpp 2016-07-03 11:30:18.000000000 +0200 @@ -32,19 +32,56 @@ namespace UDev { -QString extractCpuInfoLine(int processorNumber, const QString ®ExpStr) +class CpuInfo { - if (processorNumber == -1) { - return QString(); +public: + CpuInfo(); + QString extractCpuInfoLine(int processorNumber, const QString ®ExpStr); + QString extractInfoLine(const QString ®ExpStr); + +private: + QStringList cpuInfo; +}; + +QString extractCpuVendor(int processorNumber) { + CpuInfo info; + QString vendor = info.extractCpuInfoLine(processorNumber, "vendor_id\\s+:\\s+(\\S.+)"); + + if (vendor.isEmpty()) { + vendor = info.extractInfoLine("Hardware\\s+:\\s+(\\S.+)"); + } + + return vendor; +} + +QString extractCpuModel(int processorNumber) { + CpuInfo info; + QString model = info.extractCpuInfoLine(processorNumber, "model name\\s+:\\s+(\\S.+)"); + + if (model.isEmpty()) { + model = info.extractInfoLine("Processor\\s+:\\s+(\\S.+)"); } + return model; +} + +int extractCurrentCpuSpeed(int processorNumber) { + CpuInfo info; + int speed = info.extractCpuInfoLine(processorNumber, "cpu MHz\\s+:\\s+(\\d+).*").toInt(); + return speed; +} + + +CpuInfo::CpuInfo() { QFile cpuInfoFile("/proc/cpuinfo"); if (!cpuInfoFile.open(QIODevice::ReadOnly)) { - return QString(); + return; } - QStringList cpuInfo = QString(cpuInfoFile.readAll()).split('\n', QString::SkipEmptyParts); - cpuInfoFile.close(); + cpuInfo = QString(cpuInfoFile.readAll()).split('\n', QString::SkipEmptyParts); +} +QString CpuInfo::extractCpuInfoLine(int processorNumber, const QString ®ExpStr) +{ const QRegExp processorRegExp("processor\\s+:\\s+(\\d+)"); const QRegExp regExp(regExpStr); @@ -68,6 +105,19 @@ return QString(); } +QString CpuInfo::extractInfoLine(const QString ®ExpStr) +{ + const QRegExp regExp(regExpStr); + + foreach (const QString &line, cpuInfo) { + if (regExp.exactMatch(line)) { + return regExp.capturedTexts()[1]; + } + } + return QString(); +} + + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/src/solid/devices/backends/udev/cpuinfo.h new/solid-5.24.0/src/solid/devices/backends/udev/cpuinfo.h --- old/solid-5.23.0/src/solid/devices/backends/udev/cpuinfo.h 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/src/solid/devices/backends/udev/cpuinfo.h 2016-07-03 11:30:18.000000000 +0200 @@ -31,12 +31,17 @@ { /** - * Extracts a line from /proc/cpuinfo for a given processor - * - * The regexp should have exactly one capture, which should match the - * value of the field. + * Extracts vendor from /proc/cpuinfo for a given processor */ -QString extractCpuInfoLine(int processorNumber, const QString ®Exp); +QString extractCpuVendor(int processorNumber); +/** + * Extracts model from /proc/cpuinfo for a given processor + */ +QString extractCpuModel(int processorNumber); +/** + * Extracts speed from /proc/cpuinfo for a given processor + */ +int extractCurrentCpuSpeed(int processorNumber); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/src/solid/devices/backends/udev/udevdevice.cpp new/solid-5.24.0/src/solid/devices/backends/udev/udevdevice.cpp --- old/solid-5.23.0/src/solid/devices/backends/udev/udevdevice.cpp 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/src/solid/devices/backends/udev/udevdevice.cpp 2016-07-03 11:30:18.000000000 +0200 @@ -61,7 +61,7 @@ if (vendor.isEmpty()) { if (queryDeviceInterface(Solid::DeviceInterface::Processor)) { // sysfs doesn't have anything useful here - vendor = extractCpuInfoLine(deviceNumber(), "vendor_id\\s+:\\s+(\\S.+)"); + vendor = extractCpuVendor(deviceNumber()); } if (vendor.isEmpty()) { @@ -77,7 +77,7 @@ if (product.isEmpty()) { if (queryDeviceInterface(Solid::DeviceInterface::Processor)) { // sysfs doesn't have anything useful here - product = extractCpuInfoLine(deviceNumber(), "model name\\s+:\\s+(\\S.+)"); + product = extractCpuModel(deviceNumber()); } if (product.isEmpty()) { @@ -144,7 +144,7 @@ return true; case Solid::DeviceInterface::Processor: - return property("DRIVER").toString() == "processor"; + return m_device.subsystem() == QLatin1String("cpu"); case Solid::DeviceInterface::Camera: return property("ID_GPHOTO2").toInt() == 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/src/solid/devices/backends/udev/udevmanager.cpp new/solid-5.24.0/src/solid/devices/backends/udev/udevmanager.cpp --- old/solid-5.23.0/src/solid/devices/backends/udev/udevmanager.cpp 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/src/solid/devices/backends/udev/udevmanager.cpp 2016-07-03 11:30:18.000000000 +0200 @@ -91,10 +91,10 @@ qDebug() << "Subsystem:" << device.subsystem(); qDebug() << ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"; #endif - if (device.driver() == QLatin1String("processor")) { + if (device.subsystem() == QLatin1String("cpu")) { // Linux ACPI reports processor slots, rather than processors. // Empty slots will not have a system device associated with them. - return QFile::exists(device.sysfsPath() + "/sysdev") || QFile::exists(device.sysfsPath() + "/cpufreq"); + return QFile::exists(device.sysfsPath() + "/sysdev") || QFile::exists(device.sysfsPath() + "/cpufreq") || QFile::exists(device.sysfsPath() + "/topology/core_id"); } if (device.subsystem() == QLatin1String("sound") && device.deviceProperty("SOUND_FORM_FACTOR").toString() != "internal") { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.23.0/src/solid/devices/backends/udev/udevprocessor.cpp new/solid-5.24.0/src/solid/devices/backends/udev/udevprocessor.cpp --- old/solid-5.23.0/src/solid/devices/backends/udev/udevprocessor.cpp 2016-06-06 13:53:21.000000000 +0200 +++ new/solid-5.24.0/src/solid/devices/backends/udev/udevprocessor.cpp 2016-07-03 11:30:18.000000000 +0200 @@ -61,7 +61,7 @@ } if (m_maxSpeed <= 0) { // couldn't get the info from /sys, try /proc instead - m_maxSpeed = extractCpuInfoLine(number(), "cpu MHz\\s+:\\s+(\\d+).*").toInt(); + m_maxSpeed = extractCurrentCpuSpeed(number()); } } return m_maxSpeed;
