Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2021-05-10 15:36:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Mon May 10 15:36:03 2021 rev:95 rq:891796 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2021-04-12 12:37:14.505360701 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new.2988/solid.changes 2021-05-10 15:37:57.957903512 +0200 @@ -1,0 +2,11 @@ +Sat May 1 16:41:25 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Allow building some tests without DBus + * Do not search for DBus on Windows & Mac + +------------------------------------------------------------------- Old: ---- solid-5.81.0.tar.xz solid-5.81.0.tar.xz.sig New: ---- solid-5.82.0.tar.xz solid-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.ys3KWz/_old 2021-05-10 15:37:58.565901106 +0200 +++ /var/tmp/diff_new_pack.ys3KWz/_new 2021-05-10 15:37:58.569901091 +0200 @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.81 +%define _tar_path 5.82 %bcond_without lang Name: solid -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later @@ -38,15 +38,15 @@ BuildRequires: flex BuildRequires: kf5-filesystem BuildRequires: pkgconfig -BuildRequires: cmake(Qt5Concurrent) >= 5.14.0 -BuildRequires: cmake(Qt5DBus) >= 5.14.0 -BuildRequires: cmake(Qt5Gui) >= 5.14.0 -BuildRequires: cmake(Qt5Qml) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 -BuildRequires: cmake(Qt5Xml) >= 5.14.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.15.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Gui) >= 5.15.0 +BuildRequires: cmake(Qt5Qml) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 +BuildRequires: cmake(Qt5Xml) >= 5.15.0 BuildRequires: pkgconfig(libudev) %if %{with lang} -BuildRequires: cmake(Qt5LinguistTools) >= 5.14.0 +BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif %description @@ -90,7 +90,7 @@ Group: Development/Libraries/KDE Requires: %{lname} = %{version} Requires: extra-cmake-modules -Requires: cmake(Qt5Core) >= 5.14.0 +Requires: cmake(Qt5Core) >= 5.15.0 %description devel Solid is a device integration framework. It provides a way of querying and @@ -100,15 +100,15 @@ %lang_package -n %{lname} %prep -%setup -q +%autosetup -p1 %build - %cmake_kf5 -d build -- -DWITH_NEW_SOLID_JOB=ON -DWITH_NEW_POWER_ASYNC_API=ON -DWITH_NEW_POWER_ASYNC_FREEDESKTOP=ON -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert - %cmake_build +%cmake_kf5 -d build -- -DWITH_NEW_SOLID_JOB=ON -DWITH_NEW_POWER_ASYNC_API=ON -DWITH_NEW_POWER_ASYNC_FREEDESKTOP=ON -Dlconvert_executable=%{_kf5_libdir}/qt5/bin/lconvert +%cmake_build %install - %kf5_makeinstall -C build - %fdupes %{buildroot} +%kf5_makeinstall -C build +%fdupes %{buildroot} %if %{with lang} %find_lang %{name}5 --with-qt --without-mo ++++++ solid-5.81.0.tar.xz -> solid-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/.gitignore new/solid-5.82.0/.gitignore --- old/solid-5.81.0/.gitignore 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/.gitignore 2021-05-01 14:43:25.000000000 +0200 @@ -22,3 +22,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/CMakeLists.txt new/solid-5.82.0/CMakeLists.txt --- old/solid-5.81.0/CMakeLists.txt 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/CMakeLists.txt 2021-05-01 14:43:25.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts project(Solid VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -17,10 +17,12 @@ include(KDEGitCommitHooks) include(ECMQtDeclareLoggingCategory) -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml Gui) -if (NOT ANDROID) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + +# Android has no DBus, and Windows & Mac have backends that don't use DBus +if(NOT ANDROID AND NOT WIN32 AND NOT APPLE) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() if(WIN32) @@ -81,10 +83,8 @@ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) add_definitions(-DQT_NO_FOREACH) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") - ecm_install_po_files_as_qm(po) -endif() +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +ecm_install_po_files_as_qm(po) option(WITH_NEW_SOLID_JOB "WIP: base Job class" Off) add_feature_info(Solid::Job WITH_NEW_SOLID_JOB "WIP: Base class for Solid Asynchronous apis") @@ -138,7 +138,7 @@ add_device_backends_cmake() add_subdirectory(src) -if (TARGET Qt5::DBus AND BUILD_TESTING) +if (BUILD_TESTING) add_subdirectory(autotests) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/autotests/CMakeLists.txt new/solid-5.82.0/autotests/CMakeLists.txt --- old/solid-5.81.0/autotests/CMakeLists.txt 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/autotests/CMakeLists.txt 2021-05-01 14:43:25.000000000 +0200 @@ -5,7 +5,7 @@ ########### fakehardwaretest ############### if (BUILD_DEVICE_BACKEND_fakehw) - ecm_add_test(fakehardwaretest.cpp LINK_LIBRARIES KF5Solid_static Qt5::DBus Qt5::Xml Qt5::Test) + ecm_add_test(fakehardwaretest.cpp LINK_LIBRARIES KF5Solid_static Qt5::Xml Qt5::Test) # QT5 TODO Port solid to QFINDTESTDATA target_compile_definitions(fakehardwaretest PRIVATE SOLID_STATIC_DEFINE=1 TEST_DATA="${CMAKE_CURRENT_SOURCE_DIR}/../src/solid/devices/backends/fakehw/fakecomputer.xml") endif() @@ -20,14 +20,14 @@ ########### solidhwtest ############### if (BUILD_DEVICE_BACKEND_fakehw) - ecm_add_test(solidhwtest.cpp LINK_LIBRARIES Qt5::DBus Qt5::Xml Qt5::Test ${LIBS} KF5Solid_static) + ecm_add_test(solidhwtest.cpp LINK_LIBRARIES Qt5::Xml Qt5::Test ${LIBS} KF5Solid_static) target_compile_definitions(solidhwtest PRIVATE SOLID_STATIC_DEFINE=1 FAKE_COMPUTER_XML="${CMAKE_CURRENT_SOURCE_DIR}/../src/solid/devices/backends/fakehw/fakecomputer.xml") target_include_directories(solidhwtest PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../src/solid/devices/backends/fakehw) endif() ########### solidmttest ############### -ecm_add_test(solidmttest.cpp LINK_LIBRARIES Qt5::DBus Qt5::Xml Qt5::Test ${LIBS} KF5Solid_static Qt5::Concurrent) +ecm_add_test(solidmttest.cpp LINK_LIBRARIES Qt5::Xml Qt5::Test ${LIBS} KF5Solid_static Qt5::Concurrent) target_compile_definitions(solidmttest PRIVATE SOLID_STATIC_DEFINE=1) ########### solidmttest ############### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/autotests/qtest_dbus.h new/solid-5.82.0/autotests/qtest_dbus.h --- old/solid-5.81.0/autotests/qtest_dbus.h 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/autotests/qtest_dbus.h 2021-05-01 14:43:25.000000000 +0200 @@ -17,7 +17,7 @@ int main(int argc, char *argv[]) \ { \ QProcess dbus; \ - dbus.start("dbus-launch"); \ + dbus.start("dbus-launch", QStringList()); \ dbus.waitForFinished(10000); \ QByteArray session = dbus.readLine(); \ if (session.isEmpty()) { \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/po/ro/solid5_qt.po new/solid-5.82.0/po/ro/solid5_qt.po --- old/solid-5.81.0/po/ro/solid5_qt.po 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/po/ro/solid5_qt.po 2021-05-01 14:43:25.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Sergiu Bivol <[email protected]>, 2009. -# Sergiu Bivol <[email protected]>, 2010, 2012, 2014, 2020. +# Sergiu Bivol <[email protected]>, 2010, 2012, 2014, 2020, 2021. # Cristian One?? <[email protected]>, 2010, 2011, 2013. # msgid "" @@ -9,9 +9,9 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2020-08-31 02:18+0100\n" +"PO-Revision-Date: 2021-04-16 18:10+0100\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" -"Language-Team: Romanian <[email protected]>\n" +"Language-Team: Romanian\n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -429,21 +429,17 @@ #: solid/devices/backends/imobile/imobiledevice.cpp:90 msgctxt "imobiledevice|Company name" msgid "Apple" -msgstr "" +msgstr "Apple" #: solid/devices/backends/imobile/imobilemanager.cpp:60 -#, fuzzy -#| msgctxt "Solid::Backends::UDev::UDevManager|" -#| msgid "Devices" msgctxt "Solid::Backends::IMobile::Manager|" msgid "iDevice" -msgstr "Dispozitive" +msgstr "iDispozitiv" #: solid/devices/backends/imobile/imobilemanager.cpp:61 -#, fuzzy msgctxt "Solid::Backends::IMobile::Manager|" msgid "iOS devices" -msgstr "Dispozitive UPnP" +msgstr "Dispozitive iOS" #: solid/devices/backends/udev/udevdevice.cpp:99 msgctxt "Solid::Backends::UDev::UDevDevice|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/po/zh_CN/solid5_qt.po new/solid-5.82.0/po/zh_CN/solid5_qt.po --- old/solid-5.81.0/po/zh_CN/solid5_qt.po 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/po/zh_CN/solid5_qt.po 2021-05-01 14:43:25.000000000 +0200 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-03-27 17:30\n" +"PO-Revision-Date: 2021-04-24 15:43\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/src/solid/devices/backends/hal/haldevice.cpp new/solid-5.82.0/src/solid/devices/backends/hal/haldevice.cpp --- old/solid-5.81.0/src/solid/devices/backends/hal/haldevice.cpp 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/src/solid/devices/backends/hal/haldevice.cpp 2021-05-01 14:43:25.000000000 +0200 @@ -326,7 +326,7 @@ if (reply.isValid()) { cache = reply; } else { - qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << ", " << reply.error().message() << endl; + qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << ", " << reply.error().message() << Qt::endl; cache = QVariantMap(); } @@ -364,7 +364,7 @@ QDBusReply<bool> reply = d->device.call("QueryCapability", cap); if (!reply.isValid()) { - qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << endl; + qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << Qt::endl; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/src/solid/devices/backends/hal/halmanager.cpp new/solid-5.82.0/src/solid/devices/backends/hal/halmanager.cpp --- old/solid-5.81.0/src/solid/devices/backends/hal/halmanager.cpp 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/src/solid/devices/backends/hal/halmanager.cpp 2021-05-01 14:43:25.000000000 +0200 @@ -78,7 +78,7 @@ QDBusReply<QStringList> reply = d->manager.call("GetAllDevices"); if (!reply.isValid()) { - qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << endl; + qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << Qt::endl; return QStringList(); } @@ -99,7 +99,7 @@ QDBusReply<bool> reply = d->manager.call("DeviceExists", udi); if (!reply.isValid()) { - qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << endl; + qWarning() << Q_FUNC_INFO << " error: " << reply.error().name() << Qt::endl; return false; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/src/solid/devices/backends/win/winopticaldrive.cpp new/solid-5.82.0/src/solid/devices/backends/win/winopticaldrive.cpp --- old/solid-5.81.0/src/solid/devices/backends/win/winopticaldrive.cpp 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/src/solid/devices/backends/win/winopticaldrive.cpp 2021-05-01 14:43:25.000000000 +0200 @@ -117,7 +117,7 @@ #define AddProfile(profile, type) profiles.insert(profile, MediaProfiles(profile, type, #profile)) static QMap<ulong, MediaProfiles> profiles; if (profiles.isEmpty()) { - AddProfile(ProfileCdrom, 0); + AddProfile(ProfileCdrom, Solid::OpticalDrive::UnknownMediumType); AddProfile(ProfileCdRecordable, Solid::OpticalDrive::Cdr); AddProfile(ProfileCdRewritable, Solid::OpticalDrive::Cdrw); AddProfile(ProfileDvdRom, Solid::OpticalDrive::Dvd); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/src/tools/solid-power/main.cpp new/solid-5.82.0/src/tools/solid-power/main.cpp --- old/solid-5.81.0/src/tools/solid-power/main.cpp 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/src/tools/solid-power/main.cpp 2021-05-01 14:43:25.000000000 +0200 @@ -29,13 +29,13 @@ parser.process(app); if (parser.isSet(commands)) { - sOut << endl << QCoreApplication::translate("solid-hardware", "Syntax:") << endl << endl; + sOut << Qt::endl << QCoreApplication::translate("solid-hardware", "Syntax:") << Qt::endl << Qt::endl; - sOut << " solid-power show" << endl; + sOut << " solid-power show" << Qt::endl; sOut << QCoreApplication::translate("solid-power", " # Show all the power management information from the system.\n" " # - acPlugged: whether the device is connected to the AC or not\n") - << endl; + << Qt::endl; return 1; } @@ -54,10 +54,10 @@ if (command == QLatin1String("show")) { power.show(); } else if (command == QLatin1String("listen")) { - sOut << "Listening to events:" << endl; + sOut << "Listening to events:" << Qt::endl; power.listen(); app.exec(); } else { - sOut << "Not recognized command" << endl; + sOut << "Not recognized command" << Qt::endl; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.81.0/src/tools/solid-power/solid-power.cpp new/solid-5.82.0/src/tools/solid-power/solid-power.cpp --- old/solid-5.81.0/src/tools/solid-power/solid-power.cpp 2021-04-04 13:51:05.000000000 +0200 +++ new/solid-5.82.0/src/tools/solid-power/solid-power.cpp 2021-05-01 14:43:25.000000000 +0200 @@ -28,7 +28,7 @@ QString status = job->isPlugged() ? "yes" : "no"; - sCout << "is AC plugged:\t" << status << endl; + sCout << "is AC plugged:\t" << status << Qt::endl; } void SolidPower::listen() @@ -38,16 +38,16 @@ connect(power, &Power::acPluggedChanged, [](bool plugged) { QTextStream lOut(stdout); QString status = plugged ? "yes" : "no"; - lOut << "\tAC plugged changed:\t" << status << endl; + lOut << "\tAC plugged changed:\t" << status << Qt::endl; }); connect(power, &Power::aboutToSuspend, []() { QTextStream lOut(stdout); - lOut << "\tAbout to suspend" << endl; + lOut << "\tAbout to suspend" << Qt::endl; }); connect(power, &Power::resumeFromSuspend, []() { QTextStream lOut(stdout); - lOut << "\tResume from suspend" << endl; + lOut << "\tResume from suspend" << Qt::endl; }); }
