Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2019-02-14 14:29:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Thu Feb 14 14:29:30 2019 rev:67 rq:674283 version:5.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2019-01-21 10:23:36.357865989 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new.28833/solid.changes 2019-02-14 14:29:53.907747810 +0100 @@ -1,0 +2,11 @@ +Sun Feb 10 22:03:25 UTC 2019 - lbeltr...@kde.org + +- Update to 5.55.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.55.0.php +- Changes since 5.54.0: + * Build without D-Bus on Android + * delete copy constructor and assignment operator of some internal classes + +------------------------------------------------------------------- Old: ---- solid-5.54.0.tar.xz New: ---- solid-5.55.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.OL3kBw/_old 2019-02-14 14:29:54.399747583 +0100 +++ /var/tmp/diff_new_pack.OL3kBw/_new 2019-02-14 14:29:54.399747583 +0100 @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.54 +%define _tar_path 5.55 %bcond_without lang Name: solid -Version: 5.54.0 +Version: 5.55.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later ++++++ solid-5.54.0.tar.xz -> solid-5.55.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/CMakeLists.txt new/solid-5.55.0/CMakeLists.txt --- old/solid-5.54.0/CMakeLists.txt 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/CMakeLists.txt 2019-02-03 01:06:12.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.54.0") # handled by release scripts +set(KF5_VERSION "5.55.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.54.0 NO_MODULE) +find_package(ECM 5.55.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) @@ -17,8 +17,11 @@ include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) -set(REQUIRED_QT_VERSION 5.9.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml DBus Widgets) +set(REQUIRED_QT_VERSION 5.10.0) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml Widgets) +if (NOT ANDROID) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) +endif() if(WIN32) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/po/ca/solid5_qt.po new/solid-5.55.0/po/ca/solid5_qt.po --- old/solid-5.54.0/po/ca/solid5_qt.po 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/po/ca/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: solid5_qt\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-01-24 18:50+0000\n" "PO-Revision-Date: 2017-09-27 22:25+0100\n" "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/po/ca@valencia/solid5_qt.po new/solid-5.55.0/po/ca@valencia/solid5_qt.po --- old/solid-5.54.0/po/ca@valencia/solid5_qt.po 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/po/ca@valencia/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: solid5_qt\n" -"Report-Msgid-Bugs-To: \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2014-01-24 18:50+0000\n" "PO-Revision-Date: 2017-09-27 22:25+0100\n" "Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/po/id/solid5_qt.po new/solid-5.55.0/po/id/solid5_qt.po --- old/solid-5.54.0/po/id/solid5_qt.po 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/po/id/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 @@ -1,8 +1,8 @@ -# Wantoyo <wanto...@gmail.com>, 2018. +# Wantoyo <wanto...@gmail.com>, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: \n" -"PO-Revision-Date: 2018-12-28 22:16+0700\n" +"PO-Revision-Date: 2019-01-27 10:27+0700\n" "Last-Translator: Wantoyo <wanto...@gmail.com>\n" "Language-Team: Indonesian <kde-i18n-...@kde.org>\n" "Language: id\n" @@ -10,7 +10,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.0\n" "X-Qt-Contexts: true\n" #: solid/devices/backends/fstab/fstabdevice.cpp:63 @@ -72,7 +72,7 @@ #: solid/devices/backends/hal/haldevice.cpp:322 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Networking Interface" -msgstr "Antarmuka Jejaring" +msgstr "Antarmuka Jaringan" #: solid/devices/backends/hal/haldevice.cpp:507 msgctxt "Solid::Backends::Hal::HalDevice|First item of %1%2 Drive sentence" @@ -393,18 +393,18 @@ #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 Encrypted Container" -msgstr "%1 Encrypted Container" +msgstr "%1 Wadah Terenkripsi" #: solid/devices/backends/hal/haldevice.cpp:789 msgctxt "Solid::Backends::Hal::HalDevice|" msgid "Encrypted Container" -msgstr "Encrypted Container" +msgstr "Wadah Terenkripsi" #: solid/devices/backends/hal/haldevice.cpp:807 #, qt-format msgctxt "Solid::Backends::Hal::HalDevice|%1 is the size" msgid "%1 Removable Media" -msgstr "%1 Media Dapat Dicopot" +msgstr "%1 Media Dapat Dilepas" #: solid/devices/backends/hal/haldevice.cpp:809 #, qt-format @@ -1233,5 +1233,5 @@ "not\n" msgstr "" " # Tampilkan semua informasi pengelolaan daya dari sistem.\n" -" # - acPlugged: di mana perangkat telah tersambung ke AC atau " +" # - acPlugged: di mana perangkat telah terkoneksi ke AC atau " "tidak\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/po/pl/solid5_qt.po new/solid-5.55.0/po/pl/solid5_qt.po --- old/solid-5.54.0/po/pl/solid5_qt.po 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/po/pl/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 @@ -3,20 +3,20 @@ # # Marta Rybczyńska <kde-i...@rybczynska.net>, 2010, 2013. # Artur Chłond <eugenewo...@o2.pl>, 2010. -# Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>, 2011, 2012, 2014, 2016, 2017. +# Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>, 2011, 2012, 2014, 2016, 2017, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2017-10-01 11:03+0100\n" +"PO-Revision-Date: 2019-01-20 07:38+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilow...@gmail.com>\n" "Language-Team: Polish <kde-i18n-...@kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.03.70\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" "X-Qt-Contexts: true\n" @@ -856,7 +856,7 @@ #: solid/devices/backends/udisks2/udisksdevice.cpp:753 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The requested operation has been canceled" -msgstr "Żądane działanie zostało anulowane" +msgstr "Porzucono żądane działanie" #: solid/devices/backends/udisks2/udisksdevice.cpp:755 msgctxt "Solid::Backends::UDisks2::Device|" @@ -901,7 +901,7 @@ #: solid/devices/backends/udisks2/udisksdevice.cpp:771 msgctxt "Solid::Backends::UDisks2::Device|" msgid "The operation has already been canceled" -msgstr "Operacja już została anulowana" +msgstr "Już porzucono działanie" #: solid/devices/backends/udisks2/udisksdevice.cpp:773 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/po/zh_CN/solid5_qt.po new/solid-5.55.0/po/zh_CN/solid5_qt.po --- old/solid-5.54.0/po/zh_CN/solid5_qt.po 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/po/zh_CN/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-01-05 20:42\n" +"PO-Revision-Date: 2019-01-27 22:57\n" "Last-Translator: guoyunhe <i...@guoyunhe.me>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/CMakeLists.txt new/solid-5.55.0/src/solid/CMakeLists.txt --- old/solid-5.54.0/src/solid/CMakeLists.txt 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/CMakeLists.txt 2019-02-03 01:06:12.000000000 +0100 @@ -17,11 +17,13 @@ target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Solid>") target_link_libraries(KF5Solid PUBLIC Qt5::Core - PRIVATE Qt5::DBus - Qt5::Xml + PRIVATE Qt5::Xml Qt5::Widgets ${solid_OPTIONAL_LIBS} ) +if (TARGET Qt5::DBus) + target_link_libraries(KF5Solid PRIVATE Qt5::DBus) +endif() set_target_properties(KF5Solid PROPERTIES VERSION ${SOLID_VERSION_STRING} SOVERSION ${SOLID_SOVERSION} @@ -90,7 +92,10 @@ set_target_properties(KF5Solid_static PROPERTIES COMPILE_FLAGS -DSOLID_STATIC_DEFINE=1) target_link_libraries(KF5Solid_static PUBLIC Qt5::Core) -target_link_libraries(KF5Solid_static PRIVATE Qt5::DBus Qt5::Xml Qt5::Widgets ${solid_OPTIONAL_LIBS}) +target_link_libraries(KF5Solid_static PRIVATE Qt5::Xml Qt5::Widgets ${solid_OPTIONAL_LIBS}) +if (TARGET Qt5::DBus) + target_link_libraries(KF5Solid_static PRIVATE Qt5::DBus) +endif() target_include_directories(KF5Solid_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") ########### install files ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/devices/backends/fakehw/fakedevice.cpp new/solid-5.55.0/src/solid/devices/backends/fakehw/fakedevice.cpp --- old/solid-5.54.0/src/solid/devices/backends/fakehw/fakedevice.cpp 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/devices/backends/fakehw/fakedevice.cpp 2019-02-03 01:06:12.000000000 +0100 @@ -35,7 +35,9 @@ #include "fakebattery.h" #include <QStringList> +#ifdef QT_DBUS_LIB #include <QDBusConnection> +#endif #include <solid/genericinterface.h> @@ -51,7 +53,9 @@ d->locked = false; d->broken = false; +#ifdef QT_DBUS_LIB QDBusConnection::sessionBus().registerObject(udi, this, QDBusConnection::ExportNonScriptableSlots); +#endif // Force instantiation of all the device interfaces // this way they'll get exported on the bus @@ -79,7 +83,9 @@ FakeDevice::~FakeDevice() { +#ifdef QT_DBUS_LIB QDBusConnection::sessionBus().unregisterObject(d->udi, QDBusConnection::UnregisterTree); +#endif } QString FakeDevice::udi() const @@ -302,10 +308,12 @@ break; } +#ifdef QT_DBUS_LIB if (iface) { QDBusConnection::sessionBus().registerObject(d->udi + '/' + Solid::DeviceInterface::typeToString(type), iface, QDBusConnection::ExportNonScriptableSlots); } +#endif return iface; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/devices/backends/fakehw/fakemanager.cpp new/solid-5.55.0/src/solid/devices/backends/fakehw/fakemanager.cpp --- old/solid-5.54.0/src/solid/devices/backends/fakehw/fakemanager.cpp 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/devices/backends/fakehw/fakemanager.cpp 2019-02-03 01:06:12.000000000 +0100 @@ -29,7 +29,9 @@ #include <QFile> #include <QString> #include <QTimer> +#ifdef QT_DBUS_LIB #include <QDBusConnection> +#endif using namespace Solid::Backends::Fake; @@ -48,7 +50,9 @@ QString machineXmlFile = xmlFile; d->xmlFile = machineXmlFile; +#ifdef QT_DBUS_LIB QDBusConnection::sessionBus().registerObject("/org/kde/solid/fakehw", this, QDBusConnection::ExportNonScriptableSlots); +#endif parseMachineFile(); @@ -68,7 +72,9 @@ FakeManager::~FakeManager() { +#ifdef QT_DBUS_LIB QDBusConnection::sessionBus().unregisterObject("/org/kde/solid/fakehw", QDBusConnection::UnregisterTree); +#endif qDeleteAll(d->loadedDevices); delete d; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/devices/backends/fakehw/fakevolume.cpp new/solid-5.55.0/src/solid/devices/backends/fakehw/fakevolume.cpp --- old/solid-5.54.0/src/solid/devices/backends/fakehw/fakevolume.cpp 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/devices/backends/fakehw/fakevolume.cpp 2019-02-03 01:06:12.000000000 +0100 @@ -20,8 +20,6 @@ #include "fakevolume.h" -#include <QDBusConnection> - using namespace Solid::Backends::Fake; FakeVolume::FakeVolume(FakeDevice *device) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp new/solid-5.55.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp --- old/solid-5.54.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/devices/backends/udisks2/udisksopticaldisc.cpp 2019-02-03 01:06:12.000000000 +0100 @@ -216,6 +216,8 @@ { m_mem->unlock(); } + Unlocker(const Unlocker &) = delete; + Unlocker &operator=(const Unlocker &) = delete; private: QSharedMemory *m_mem; }; @@ -227,6 +229,8 @@ { m_sem->release(); } + Releaser(const Releaser &) = delete; + Releaser &operator=(const Releaser &) = delete; private: QSystemSemaphore *m_sem; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/devices/ifaces/device.cpp new/solid-5.55.0/src/solid/devices/ifaces/device.cpp --- old/solid-5.54.0/src/solid/devices/ifaces/device.cpp 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/devices/ifaces/device.cpp 2019-02-03 01:06:12.000000000 +0100 @@ -20,8 +20,10 @@ #include "ifaces/device.h" +#ifdef QT_DBUS_LIB #include <QDBusConnection> #include <QDBusMessage> +#endif Solid::Ifaces::Device::Device(QObject *parent) : QObject(parent) @@ -44,6 +46,7 @@ const char *requestSlot, const char *doneSlot) const { +#ifdef QT_DBUS_LIB QDBusConnection::sessionBus().connect(QString(), deviceDBusPath(), "org.kde.Solid.Device", actionName + "Requested", dest, requestSlot); @@ -51,21 +54,26 @@ QDBusConnection::sessionBus().connect(QString(), deviceDBusPath(), "org.kde.Solid.Device", actionName + "Done", dest, doneSlot); +#endif } void Solid::Ifaces::Device::broadcastActionDone(const QString &actionName, int error, const QString &errorString) const { +#ifdef QT_DBUS_LIB QDBusMessage signal = QDBusMessage::createSignal(deviceDBusPath(), "org.kde.Solid.Device", actionName + "Done"); signal << error << errorString; QDBusConnection::sessionBus().send(signal); +#endif } void Solid::Ifaces::Device::broadcastActionRequested(const QString &actionName) const { +#ifdef QT_DBUS_LIB QDBusMessage signal = QDBusMessage::createSignal(deviceDBusPath(), "org.kde.Solid.Device", actionName + "Requested"); QDBusConnection::sessionBus().send(signal); +#endif } QString Solid::Ifaces::Device::deviceDBusPath() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.54.0/src/solid/devices/managerbase.cpp new/solid-5.55.0/src/solid/devices/managerbase.cpp --- old/solid-5.54.0/src/solid/devices/managerbase.cpp 2019-01-06 21:29:13.000000000 +0100 +++ new/solid-5.55.0/src/solid/devices/managerbase.cpp 2019-02-03 01:06:12.000000000 +0100 @@ -29,7 +29,7 @@ #if defined (Q_OS_MAC) #include "backends/iokit/iokitmanager.h" -#elif defined (Q_OS_UNIX) +#elif defined (Q_OS_UNIX) && !defined(Q_OS_ANDROID) #include "backends/hal/halmanager.h" #include "backends/udisks2/udisksmanager.h" #include "backends/upower/upowermanager.h"
