Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2019-03-21 09:49:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Thu Mar 21 09:49:59 2019 rev:69 rq:686783 version:5.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2019-02-28 21:33:29.409732907 +0100 +++ /work/SRC/openSUSE:Factory/.solid.new.28833/solid.changes 2019-03-21 09:49:59.762842468 +0100 @@ -1,0 +2,12 @@ +Sun Mar 10 20:15:38 UTC 2019 - lbeltr...@kde.org + +- Update to 5.56.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.56.0.php +- Changes since 5.55.0: + * Hopefully fix compilation on Windows after commit c9a135579431 + * It compile fine against qt5.13 without deprecated method + * Bring FindUDev.cmake up to ECM standards + +------------------------------------------------------------------- Old: ---- solid-5.55.0.tar.xz New: ---- solid-5.56.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.VJfeU4/_old 2019-03-21 09:50:00.506842266 +0100 +++ /var/tmp/diff_new_pack.VJfeU4/_new 2019-03-21 09:50:00.506842266 +0100 @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.55 +%define _tar_path 5.56 %bcond_without lang Name: solid -Version: 5.55.0 +Version: 5.56.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later ++++++ solid-5.55.0.tar.xz -> solid-5.56.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.55.0/CMakeLists.txt new/solid-5.56.0/CMakeLists.txt --- old/solid-5.55.0/CMakeLists.txt 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/CMakeLists.txt 2019-03-02 14:52:13.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.55.0") # handled by release scripts +set(KF5_VERSION "5.56.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.55.0 NO_MODULE) +find_package(ECM 5.56.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) @@ -53,10 +53,11 @@ if (CMAKE_SYSTEM_NAME MATCHES Linux) find_package( UDev ) + if (UDev_FOUND) + set(UDEV_FOUND TRUE) # for config-solid.h + endif() - set_package_properties(UDev PROPERTIES URL "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"; - DESCRIPTION "UDev support for Solid" - TYPE REQUIRED + set_package_properties(UDev PROPERTIES TYPE REQUIRED PURPOSE "Allows Solid to use UDev to provide information about devices on Linux" ) endif() @@ -76,7 +77,7 @@ # TODO: Remove these remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) - +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ecm_install_po_files_as_qm(po) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.55.0/KF5SolidConfig.cmake.in new/solid-5.56.0/KF5SolidConfig.cmake.in --- old/solid-5.55.0/KF5SolidConfig.cmake.in 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/KF5SolidConfig.cmake.in 2019-03-02 14:52:13.000000000 +0100 @@ -25,5 +25,5 @@ # "public" variables: -set(Solid_HAVE_UDev @UDEV_FOUND@ ) +set(Solid_HAVE_UDev @UDev_FOUND@ ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.55.0/cmake/FindUDev.cmake new/solid-5.56.0/cmake/FindUDev.cmake --- old/solid-5.55.0/cmake/FindUDev.cmake 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/cmake/FindUDev.cmake 2019-03-02 14:52:13.000000000 +0100 @@ -1,11 +1,30 @@ -# - Try to find the UDev library -# Once done this will define +#.rst: +# FindUDev +# -------- # -# UDEV_FOUND - system has UDev -# UDEV_INCLUDE_DIR - the libudev include directory -# UDEV_LIBS - The libudev libraries +# Try to find the UDev library, once done this will define: +# +# ``UDev_FOUND`` +# System has UDev. +# +# ``UDev_INCLUDE_DIRS`` +# The libudev include directory. +# +# ``UDev_LIBRARIES`` +# The libudev libraries. +# +# ``UDev_VERSION`` +# The libudev version. +# +# If ``UDev_FOUND`` is TRUE, the following imported target +# will be available: +# +# ``UDev::UDev`` +# The UDev library +#============================================================================= # Copyright (c) 2010, Rafael Fernández López, <eresli...@kde.org> +# Copyright (c) 2019, Volker Krause, <vkra...@kde.org> # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -30,21 +49,36 @@ # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. +#============================================================================= -find_path(UDEV_INCLUDE_DIR libudev.h) -find_library(UDEV_LIBS udev) - -if(UDEV_INCLUDE_DIR AND UDEV_LIBS) - include(CheckFunctionExists) - include(CMakePushCheckState) - cmake_push_check_state() - set(CMAKE_REQUIRED_LIBRARIES ${UDEV_LIBS} ) +find_package(PkgConfig QUIET) +pkg_check_modules(PC_UDEV QUIET libudev) - cmake_pop_check_state() +find_path(UDev_INCLUDE_DIRS NAMES libudev.h HINTS ${PC_UDEV_INCLUDE_DIRS}) +find_library(UDev_LIBRARIES NAMES udev HINTS ${PC_UDEV_LIBRARY_DIRS}) -endif() +set(UDev_VERSION ${PC_UDEV_VERSION}) include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(UDev DEFAULT_MSG UDEV_INCLUDE_DIR UDEV_LIBS) +find_package_handle_standard_args(UDev + FOUND_VAR UDev_FOUND + REQUIRED_VARS UDev_INCLUDE_DIRS UDev_LIBRARIES + VERSION_VAR UDev_VERSION +) + +mark_as_advanced(UDev_INCLUDE_DIRS UDev_LIBRARIES) + +if(UDev_FOUND AND NOT TARGET UDev::UDev) + add_library(UDev::UDev UNKNOWN IMPORTED) + set_target_properties(UDev::UDev PROPERTIES + IMPORTED_LOCATION "${UDev_LIBRARIES}" + INTERFACE_INCLUDE_DIRECTORIES "${UDev_INCLUDE_DIRS}" + INTERFACE_COMPILE_DEFINITIONS "${PC_UDEV_CFLAGS_OTHER}" + ) +endif() -mark_as_advanced(UDEV_INCLUDE_DIR UDEV_LIBS) +include(FeatureSummary) +set_package_properties(UDev PROPERTIES + DESCRIPTION "API for enumerating and introspecting local devices (part of systemd)" + URL "https://freedesktop.org/wiki/Software/systemd/"; +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.55.0/po/id/solid5_qt.po new/solid-5.56.0/po/id/solid5_qt.po --- old/solid-5.55.0/po/id/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/po/id/solid5_qt.po 2019-03-02 14:52:13.000000000 +0100 @@ -9,7 +9,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 18.12.0\n" "X-Qt-Contexts: true\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.55.0/po/zh_CN/solid5_qt.po new/solid-5.56.0/po/zh_CN/solid5_qt.po --- old/solid-5.55.0/po/zh_CN/solid5_qt.po 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/po/zh_CN/solid5_qt.po 2019-03-02 14:52:13.000000000 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-01-27 22:57\n" +"PO-Revision-Date: 2019-02-20 23:16\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.55.0/src/solid/devices/CMakeLists.txt new/solid-5.56.0/src/solid/devices/CMakeLists.txt --- old/solid-5.55.0/src/solid/devices/CMakeLists.txt 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/src/solid/devices/CMakeLists.txt 2019-03-02 14:52:13.000000000 +0100 @@ -102,7 +102,7 @@ set(EXPERIMENTAL_BSDISKS FALSE) endif() - if ( UDEV_FOUND ) + if ( UDev_FOUND ) message(STATUS "Building Solid UDev backend." ) include(devices/backends/udev/CMakeLists.txt) endif() @@ -111,7 +111,7 @@ include(devices/backends/upower/CMakeLists.txt) # FIXME: this should work on more Unix systems - if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND) OR EXPERIMENTAL_BSDISKS) + if ((CMAKE_SYSTEM_NAME MATCHES Linux AND UDev_FOUND) OR EXPERIMENTAL_BSDISKS) message(STATUS "Building Solid UDisks2 backend." ) include(devices/backends/udisks2/CMakeLists.txt) endif () @@ -175,6 +175,6 @@ set(solid_OPTIONAL_LIBS ${IOKIT_LIBRARY} "-framework DiskArbitration") endif() -if ( UDEV_FOUND ) - set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${UDEV_LIBS}) +if ( UDev_FOUND ) + set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} UDev::UDev) endif () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.55.0/src/solid/devices/backends/win/windevicemanager.cpp new/solid-5.56.0/src/solid/devices/backends/win/windevicemanager.cpp --- old/solid-5.55.0/src/solid/devices/backends/win/windevicemanager.cpp 2019-02-03 01:06:12.000000000 +0100 +++ new/solid-5.56.0/src/solid/devices/backends/win/windevicemanager.cpp 2019-03-02 14:52:13.000000000 +0100 @@ -214,9 +214,8 @@ QSet<QString> tmp = udi - m_devices;//don't report devices that are already known(cd drive) m_devices += tmp; m_devicesList = m_devices.toList(); - qSort(m_devicesList); + std::sort(m_devicesList.begin(), m_devicesList.end()); foreach (const QString &s, tmp) { - emit deviceAdded(s); } } @@ -225,7 +224,7 @@ { m_devices -= udi; m_devicesList = m_devices.toList(); - qSort(m_devicesList); + std::sort(m_devicesList.begin(), m_devicesList.end()); foreach (const QString &s, udi) { emit deviceRemoved(s); } @@ -239,7 +238,7 @@ m_devices = devices; m_devicesList = m_devices.toList(); - qSort(m_devicesList); + std::sort(m_devicesList.begin(), m_devicesList.end()); }
