Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2022-01-11 21:16:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Tue Jan 11 21:16:59 2022 rev:105 rq:945100 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2021-12-13 20:45:23.720492421 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new.1892/solid.changes 2022-01-11 21:20:14.773000042 +0100 @@ -1,0 +2,13 @@ +Mon Jan 3 12:48:08 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * udisks backend: don't assume /etc/mtab is not present + * Remove trailing \x00 from string returned by Q6File::decodeName() + * Change the build system to enable building with Qt6 + * devicenotifier.h: Fix typo + +------------------------------------------------------------------- Old: ---- solid-5.89.0.tar.xz solid-5.89.0.tar.xz.sig New: ---- solid-5.90.0.tar.xz solid-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.SdbTFJ/_old 2022-01-11 21:20:15.401000484 +0100 +++ /var/tmp/diff_new_pack.SdbTFJ/_new 2022-01-11 21:20:15.405000487 +0100 @@ -17,17 +17,17 @@ %define lname libKF5Solid5 -%define _tar_path 5.89 -%bcond_without lang +%define _tar_path 5.90 +%bcond_without released Name: solid -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif @@ -51,7 +51,7 @@ BuildRequires: pkgconfig(libplist) %endif BuildRequires: pkgconfig(libudev) -%if %{with lang} +%if %{with released} BuildRequires: cmake(Qt5LinguistTools) >= 5.15.0 %endif @@ -62,7 +62,6 @@ %package -n %{lname} Summary: KDE Desktop hardware abstraction Group: System/GUI/KDE -Recommends: %{lname}-lang = %{version} Recommends: %{name}-imports = %{version} Recommends: %{name}-tools = %{version} Recommends: media-player-info @@ -116,14 +115,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 --with-qt --without-mo %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ solid-5.89.0.tar.xz -> solid-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/CMakeLists.txt new/solid-5.90.0/CMakeLists.txt --- old/solid-5.89.0/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(Solid VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -18,15 +18,15 @@ include(ECMQtDeclareLoggingCategory) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml Gui) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Xml Gui) # 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) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) endif() if(WIN32) - find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network) + find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network) endif() @@ -171,7 +171,7 @@ install(EXPORT KF5SolidTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5SolidTargets.cmake NAMESPACE KF5:: ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/KF5SolidConfig.cmake.in new/solid-5.90.0/KF5SolidConfig.cmake.in --- old/solid-5.89.0/KF5SolidConfig.cmake.in 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/KF5SolidConfig.cmake.in 2022-01-01 13:39:27.000000000 +0100 @@ -17,14 +17,14 @@ set(SOLID_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) if (NOT @BUILD_SHARED_LIBS@) - find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) - find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) + find_dependency(Qt@QT_MAJOR_VERSION@Xml @REQUIRED_QT_VERSION@) + find_dependency(Qt@QT_MAJOR_VERSION@Gui @REQUIRED_QT_VERSION@) - if (@Qt5DBus_FOUND@) - find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + if ("@Qt5DBus_FOUND@" OR "@Qt6DBus_FOUND@") + find_dependency(Qt@QT_MAJOR_VERSION@DBus @REQUIRED_QT_VERSION@) endif() if (@HAVE_LIBMOUNT@) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/autotests/CMakeLists.txt new/solid-5.90.0/autotests/CMakeLists.txt --- old/solid-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -1,11 +1,11 @@ include(ECMAddTests) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent Test) +find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Concurrent Test) ########### fakehardwaretest ############### if (BUILD_DEVICE_BACKEND_fakehw) - ecm_add_test(fakehardwaretest.cpp LINK_LIBRARIES KF5Solid_static Qt5::Xml Qt5::Test) + ecm_add_test(fakehardwaretest.cpp LINK_LIBRARIES KF5Solid_static Qt${QT_MAJOR_VERSION}::Xml Qt${QT_MAJOR_VERSION}::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() @@ -13,30 +13,30 @@ ########### solidhwtest ############### if (BUILD_DEVICE_BACKEND_fakehw) - ecm_add_test(solidhwtest.cpp LINK_LIBRARIES Qt5::Xml Qt5::Test ${LIBS} KF5Solid_static) + ecm_add_test(solidhwtest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Xml Qt${QT_MAJOR_VERSION}::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::Xml Qt5::Test ${LIBS} KF5Solid_static Qt5::Concurrent) +ecm_add_test(solidmttest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Xml Qt${QT_MAJOR_VERSION}::Test ${LIBS} KF5Solid_static Qt${QT_MAJOR_VERSION}::Concurrent) target_compile_definitions(solidmttest PRIVATE SOLID_STATIC_DEFINE=1) ########### solidmttest ############### if (WITH_NEW_SOLID_JOB) - ecm_add_test(solidjobtest.cpp LINK_LIBRARIES Qt5::Test ${LIBS} KF5Solid_static) + ecm_add_test(solidjobtest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test ${LIBS} KF5Solid_static) endif() ########### solidpowertest ############### if (WITH_NEW_SOLID_JOB AND WITH_NEW_POWER_ASYNC_API) - ecm_add_test(solidpowertest.cpp LINK_LIBRARIES Qt5::Test ${LIBS} KF5Solid_static) + ecm_add_test(solidpowertest.cpp LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test ${LIBS} KF5Solid_static) endif() ########### solidpowertest ############### if(WITH_NEW_POWER_ASYNC_API AND WITH_NEW_POWER_ASYNC_FREEDESKTOP) set(solidFreedesktopTest_SRCS solidfreedesktoptest.cpp fakeUpower.cpp fakelogind.cpp) - ecm_add_test(${solidFreedesktopTest_SRCS} TEST_NAME "solidfreedesktopbackend" LINK_LIBRARIES Qt5::Test Qt5::DBus ${LIBS} KF5Solid_static) + ecm_add_test(${solidFreedesktopTest_SRCS} TEST_NAME "solidfreedesktopbackend" LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::DBus ${LIBS} KF5Solid_static) endif() ########### logindinhibitionargument ########### @@ -45,5 +45,5 @@ logindinhibitionargumenttest.cpp ../src/solid/power/backends/freedesktop/logindinhibitionargument.cpp ) -ecm_add_test(${solidLogindInhibitionArgument_SRCS} TEST_NAME "logindinhibitionargument" LINK_LIBRARIES Qt5::Test KF5Solid_static) +ecm_add_test(${solidLogindInhibitionArgument_SRCS} TEST_NAME "logindinhibitionargument" LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5Solid_static) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/po/ar/solid5_qt.po new/solid-5.90.0/po/ar/solid5_qt.po --- old/solid-5.89.0/po/ar/solid5_qt.po 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/po/ar/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 @@ -5,7 +5,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-28 15:38+0300\n" -"PO-Revision-Date: 2021-11-16 20:36+0400\n" +"PO-Revision-Date: 2021-12-19 19:59+0400\n" "Last-Translator: Zayed Al-Saidi <[email protected]>\n" "Language-Team: ar\n" "Language: ar\n" @@ -465,12 +465,9 @@ msgstr "?????????? %1 ?????????? ??????????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:582 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" -#| msgid "%1 Removable Media" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "?????????? %1 ?????????? ??????????????" +msgstr "?????????? ?????????? ??????????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -479,9 +476,6 @@ msgstr "?????????? %1" #: solid/devices/backends/udisks2/udisksdevice.cpp:588 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Manager|" -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" msgstr "?????????? ??????????????" @@ -808,7 +802,7 @@ #: tools/solid-hardware/solid-hardware.cpp:314 msgctxt "solid-hardware|" msgid "Show non portable information" -msgstr "" +msgstr "???????? ?????????????????? ?????? ????????????????" #: tools/solid-hardware/solid-hardware.cpp:327 msgctxt "solid-hardware|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/po/ko/solid5_qt.po new/solid-5.90.0/po/ko/solid5_qt.po --- old/solid-5.89.0/po/ko/solid5_qt.po 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/po/ko/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2021-06-24 00:30+0200\n" +"PO-Revision-Date: 2021-12-08 00:18+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" "Language: ko\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" -"X-Generator: Lokalize 20.12.3\n" +"X-Generator: Lokalize 21.08.1\n" #: solid/devices/backends/fstab/fstabdevice.cpp:60 #, qt-format @@ -466,12 +466,9 @@ msgstr "%1 ????????? ?????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:582 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" -#| msgid "%1 Removable Media" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "%1 ????????? ?????????" +msgstr "????????? ?????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -480,12 +477,9 @@ msgstr "%1 ?????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:588 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Manager|" -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" -msgstr "????????? ??????" +msgstr "????????? ?????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:732 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/po/ru/solid5_qt.po new/solid-5.90.0/po/ru/solid5_qt.po --- old/solid-5.89.0/po/ru/solid5_qt.po 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/po/ru/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 @@ -10,14 +10,14 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-01-24 18:50+0000\n" -"PO-Revision-Date: 2021-08-20 21:36+0300\n" +"PO-Revision-Date: 2021-12-28 15:52+0300\n" "Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 21.08.0\n" +"X-Generator: Lokalize 21.12.0\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Environment: kde\n" @@ -479,12 +479,9 @@ msgstr "?????????????? ???????????????? (%1)" #: solid/devices/backends/udisks2/udisksdevice.cpp:582 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|%1 is the size" -#| msgid "%1 Removable Media" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Removable Media" -msgstr "?????????????? ???????????????? (%1)" +msgstr "?????????????? ????????????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:586 #, qt-format @@ -493,12 +490,9 @@ msgstr "???????????????? ???????????????????? (%1)" #: solid/devices/backends/udisks2/udisksdevice.cpp:588 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Manager|" -#| msgid "Storage devices" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Storage Media" -msgstr "???????????????????? ???????????????? ????????????" +msgstr "???????????????? ????????????????????" #: solid/devices/backends/udisks2/udisksdevice.cpp:732 msgctxt "Solid::Backends::UDisks2::Device|" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/po/zh_CN/solid5_qt.po new/solid-5.90.0/po/zh_CN/solid5_qt.po --- old/solid-5.89.0/po/zh_CN/solid5_qt.po 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/po/zh_CN/solid5_qt.po 2022-01-01 13:39:27.000000000 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-11-30 15:22\n" +"PO-Revision-Date: 2021-12-22 14:06\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.89.0/src/imports/CMakeLists.txt new/solid-5.90.0/src/imports/CMakeLists.txt --- old/solid-5.89.0/src/imports/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/imports/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -1,14 +1,14 @@ -find_package(Qt5Qml ${REQUIRED_QT_VERSION} CONFIG QUIET) +find_package(Qt${QT_MAJOR_VERSION}Qml ${REQUIRED_QT_VERSION} CONFIG QUIET) -set_package_properties(Qt5Qml PROPERTIES URL "git://gitorious.org/qt/qtdeclarative.git" +set_package_properties(Qt${QT_MAJOR_VERSION}Qml PROPERTIES URL "git://gitorious.org/qt/qtdeclarative.git" DESCRIPTION "QML support for Solid" TYPE OPTIONAL PURPOSE "Allows to use Solid in QML code" ) -if(NOT Qt5Qml_FOUND) - message(STATUS "Qt5Qml not found, qml imports will not be built.") +if(NOT TARGET Qt${QT_MAJOR_VERSION}::Qml) + message(STATUS "Qt${QT_MAJOR_VERSION}Qml not found, qml imports will not be built.") return() endif() @@ -23,8 +23,8 @@ target_link_libraries( solidextensionplugin KF5::Solid - Qt5::Core - Qt5::Qml + Qt${QT_MAJOR_VERSION}::Core + Qt${QT_MAJOR_VERSION}::Qml ) install(TARGETS solidextensionplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/solid) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/src/solid/CMakeLists.txt new/solid-5.90.0/src/solid/CMakeLists.txt --- old/solid-5.89.0/src/solid/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/solid/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -26,15 +26,15 @@ add_library(KF5::Solid ALIAS KF5Solid) # Apps must include <Solid/File> or <solid/file.h> -target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Solid>") +target_include_directories(KF5Solid INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/Solid>") -target_link_libraries(KF5Solid PUBLIC Qt5::Core - PRIVATE Qt5::Xml - Qt5::Gui +target_link_libraries(KF5Solid PUBLIC Qt${QT_MAJOR_VERSION}::Core + PRIVATE Qt${QT_MAJOR_VERSION}::Xml + Qt${QT_MAJOR_VERSION}::Gui ${solid_OPTIONAL_LIBS} ) -if (TARGET Qt5::DBus) - target_link_libraries(KF5Solid PRIVATE Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(KF5Solid PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() set_target_properties(KF5Solid PROPERTIES VERSION ${SOLID_VERSION} @@ -94,7 +94,7 @@ ) endif() -install(FILES ${Solid_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid/Solid COMPONENT Devel) +install(FILES ${Solid_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Solid/Solid COMPONENT Devel) install(TARGETS KF5Solid EXPORT KF5SolidTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) @@ -104,10 +104,10 @@ add_library(KF5Solid_static STATIC ${solid_LIB_SRCS}) 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::Xml Qt5::Gui ${solid_OPTIONAL_LIBS}) - if (TARGET Qt5::DBus) - target_link_libraries(KF5Solid_static PRIVATE Qt5::DBus) + target_link_libraries(KF5Solid_static PUBLIC Qt${QT_MAJOR_VERSION}::Core) + target_link_libraries(KF5Solid_static PRIVATE Qt${QT_MAJOR_VERSION}::Xml Qt${QT_MAJOR_VERSION}::Gui ${solid_OPTIONAL_LIBS}) + if (TARGET Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(KF5Solid_static PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() target_include_directories(KF5Solid_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") endif() @@ -117,7 +117,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/solid_export.h ${Solid_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid/solid COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/Solid/solid COMPONENT Devel ) if(BUILD_QCH) @@ -147,5 +147,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME Solid LIB_NAME KF5Solid DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Solid) +ecm_generate_pri_file(BASE_NAME Solid LIB_NAME KF5Solid DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/Solid) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp new/solid-5.90.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp --- old/solid-5.89.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp 2022-01-01 13:39:27.000000000 +0100 @@ -83,8 +83,8 @@ // UDisks "MountPoints" property contains multiple paths, this happens with // devices with bind mounts; try finding the "base" mount point if (struct libmnt_table *table = mnt_new_table()) { - // This parses "/proc/self/mountinfo" by default - if (mnt_table_parse_mtab(table, nullptr) == 0) { + // This parses "/etc/mtab" if present or "/proc/self/mountinfo" by default + if (mnt_table_parse_mtab(table, "/proc/self/mountinfo") == 0) { // BACKWARD because the fs's we're interested in, /dev/sdXY, are typically at the end struct libmnt_iter *itr = mnt_new_iter(MNT_ITER_BACKWARD); struct libmnt_fs *fs; @@ -133,7 +133,12 @@ return {}; } - const QString potentialMountPoint = QFile::decodeName(mntPoints.first()); + QByteArray first = mntPoints.first(); + if (first.endsWith('\x00')) { + first.chop(1); + } + const QString potentialMountPoint = QFile::decodeName(first); + if (mntPoints.size() == 1) { return potentialMountPoint; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/src/solid/devices/backends/win/CMakeLists.txt new/solid-5.90.0/src/solid/devices/backends/win/CMakeLists.txt --- old/solid-5.89.0/src/solid/devices/backends/win/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/solid/devices/backends/win/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -13,4 +13,4 @@ winstoragevolume.cpp winbattery.cpp ) -set(backend_libs Qt5::Network setupapi) +set(backend_libs Qt${QT_MAJOR_VERSION}::Network setupapi) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/src/solid/devices/frontend/devicenotifier.h new/solid-5.90.0/src/solid/devices/frontend/devicenotifier.h --- old/solid-5.89.0/src/solid/devices/frontend/devicenotifier.h 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/solid/devices/frontend/devicenotifier.h 2022-01-01 13:39:27.000000000 +0100 @@ -32,14 +32,14 @@ Q_SIGNALS: /** - * This signal is emitted when a new device appear in the underlying system. + * This signal is emitted when a new device appears in the underlying system. * * @param udi the new device UDI */ void deviceAdded(const QString &udi); /** - * This signal is emitted when a device disappear from the underlying system. + * This signal is emitted when a device disappears from the underlying system. * * @param udi the old device UDI */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/src/tools/solid-hardware/CMakeLists.txt new/solid-5.90.0/src/tools/solid-hardware/CMakeLists.txt --- old/solid-5.89.0/src/tools/solid-hardware/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/tools/solid-hardware/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -1,7 +1,7 @@ add_executable(solid-hardware5 solid-hardware.cpp) ecm_mark_nongui_executable(solid-hardware5) target_link_libraries(solid-hardware5 PUBLIC KF5::Solid) -if (TARGET Qt5::DBus) - target_link_libraries(solid-hardware5 PRIVATE Qt5::DBus) +if (TARGET Qt${QT_MAJOR_VERSION}::DBus) + target_link_libraries(solid-hardware5 PRIVATE Qt${QT_MAJOR_VERSION}::DBus) endif() install(TARGETS solid-hardware5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.89.0/src/tools/solid-power/CMakeLists.txt new/solid-5.90.0/src/tools/solid-power/CMakeLists.txt --- old/solid-5.89.0/src/tools/solid-power/CMakeLists.txt 2021-12-04 19:55:16.000000000 +0100 +++ new/solid-5.90.0/src/tools/solid-power/CMakeLists.txt 2022-01-01 13:39:27.000000000 +0100 @@ -2,5 +2,5 @@ ecm_mark_nongui_executable(solid-power) -target_link_libraries(solid-power Qt5::Core KF5::Solid) +target_link_libraries(solid-power Qt${QT_MAJOR_VERSION}::Core KF5::Solid) install(TARGETS solid-power ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
