Hello community, here is the log from the commit of package solid for openSUSE:Factory checked in at 2019-11-12 11:52:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/solid (Old) and /work/SRC/openSUSE:Factory/.solid.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "solid" Tue Nov 12 11:52:26 2019 rev:77 rq:747154 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/solid/solid.changes 2019-10-14 13:40:40.769526100 +0200 +++ /work/SRC/openSUSE:Factory/.solid.new.2990/solid.changes 2019-11-12 11:52:29.267160478 +0100 @@ -1,0 +2,11 @@ +Sun Nov 3 15:47:23 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.64.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.64.0.php +- Changes since 5.63.0: + * Use ECMGenerateExportHeader to manage deprecated API better + * Don't build static library when BUILD_TESTING=OFF + +------------------------------------------------------------------- Old: ---- solid-5.63.0.tar.xz solid-5.63.0.tar.xz.sig New: ---- solid-5.64.0.tar.xz solid-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ solid.spec ++++++ --- /var/tmp/diff_new_pack.WiELr9/_old 2019-11-12 11:52:29.779161001 +0100 +++ /var/tmp/diff_new_pack.WiELr9/_new 2019-11-12 11:52:29.779161001 +0100 @@ -17,10 +17,10 @@ %define lname libKF5Solid5 -%define _tar_path 5.63 +%define _tar_path 5.64 %bcond_without lang Name: solid -Version: 5.63.0 +Version: 5.64.0 Release: 0 Summary: KDE Desktop hardware abstraction License: LGPL-2.1-or-later ++++++ solid-5.63.0.tar.xz -> solid-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.63.0/CMakeLists.txt new/solid-5.64.0/CMakeLists.txt --- old/solid-5.63.0/CMakeLists.txt 2019-10-06 11:52:17.000000000 +0200 +++ new/solid-5.64.0/CMakeLists.txt 2019-11-02 14:02:53.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.63.0") # handled by release scripts +set(KF5_VERSION "5.64.0") # handled by release scripts project(Solid VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.63.0 NO_MODULE) +find_package(ECM 5.64.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) @@ -27,7 +27,7 @@ endif() -include(GenerateExportHeader) +include(ECMGenerateExportHeader) include(CMakePackageConfigHelpers) include(ECMSetupVersion) include(ECMGenerateHeaders) @@ -53,6 +53,7 @@ include(ECMPoQmTools) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -66,6 +67,7 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII) remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) 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.63.0/docs/Doxyfile.local new/solid-5.64.0/docs/Doxyfile.local --- old/solid-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/solid-5.64.0/docs/Doxyfile.local 2019-11-02 14:02:53.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "SOLID_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "SOLID_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "SOLID_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.63.0/po/et/solid5_qt.po new/solid-5.64.0/po/et/solid5_qt.po --- old/solid-5.63.0/po/et/solid5_qt.po 2019-10-06 11:52:17.000000000 +0200 +++ new/solid-5.64.0/po/et/solid5_qt.po 2019-11-02 14:02:53.000000000 +0100 @@ -2,20 +2,20 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # -# Marek Laane <b...@smail.ee>, 2009, 2010, 2012, 2016. +# Marek Laane <b...@smail.ee>, 2009, 2010, 2012, 2016, 2019. msgid "" msgstr "" "Project-Id-Version: solid_qt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-04-01 01:49+0000\n" -"PO-Revision-Date: 2016-09-10 00:22+0300\n" +"PO-Revision-Date: 2019-11-01 01:28+0200\n" "Last-Translator: Marek Laane <qiila...@gmail.com>\n" -"Language-Team: Estonian <kde-i18n-...@kde.org>\n" +"Language-Team: Estonian <kde...@lists.linux.ee>\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 19.08.1\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Qt-Contexts: true\n" @@ -23,26 +23,23 @@ #, qt-format msgctxt "%1 is sharename, %2 is servername" msgid "%1 on %2" -msgstr "" +msgstr "%1 serveris %2" #: solid/devices/backends/fstab/fstabdevice.cpp:86 #, qt-format msgctxt "%1 is mountpoint, %2 is fs type" msgid "%1 (%2)" -msgstr "" +msgstr "%1 (%2)" #: solid/devices/backends/fstab/fstabmanager.cpp:96 msgctxt "Solid::Backends::Fstab::FstabManager|" msgid "Filesystem Volumes" -msgstr "" +msgstr "Failisüsteemi kettad" #: solid/devices/backends/fstab/fstabmanager.cpp:97 -#, fuzzy -#| msgctxt "Solid::Backends::UDev::UDevManager|" -#| msgid "Devices declared in your system" msgctxt "Solid::Backends::Fstab::FstabManager|" msgid "Mountable filesystems declared in your system" -msgstr "Süsteemis deklareeritud seadmed" +msgstr "Süsteemis deklareeritud haagitavad failisüsteemid" #: solid/devices/backends/hal/haldevice.cpp:63 #, qt-format @@ -829,12 +826,9 @@ msgstr "Krüptitud seade" #: solid/devices/backends/udisks2/udisksdevice.cpp:593 -#, fuzzy -#| msgctxt "Solid::Backends::UDisks2::Device|" -#| msgid "Floppy Drive" msgctxt "Solid::Backends::UDisks2::Device|" msgid "Floppy Disk" -msgstr "Disketiseade" +msgstr "Diskett" #: solid/devices/backends/udisks2/udisksdevice.cpp:596 #, qt-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.63.0/po/id/solid5_qt.po new/solid-5.64.0/po/id/solid5_qt.po --- old/solid-5.63.0/po/id/solid5_qt.po 2019-10-06 11:52:17.000000000 +0200 +++ new/solid-5.64.0/po/id/solid5_qt.po 2019-11-02 14:02:53.000000000 +0100 @@ -10,7 +10,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.04.3\n" "X-Qt-Contexts: true\n" #: solid/devices/backends/fstab/fstabdevice.cpp:83 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.63.0/po/zh_CN/solid5_qt.po new/solid-5.64.0/po/zh_CN/solid5_qt.po --- old/solid-5.63.0/po/zh_CN/solid5_qt.po 2019-10-06 11:52:17.000000000 +0200 +++ new/solid-5.64.0/po/zh_CN/solid5_qt.po 2019-11-02 14:02:53.000000000 +0100 @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-09-05 09:24\n" +"PO-Revision-Date: 2019-10-09 09:45\n" "Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.63.0/src/solid/CMakeLists.txt new/solid-5.64.0/src/solid/CMakeLists.txt --- old/solid-5.63.0/src/solid/CMakeLists.txt 2019-10-06 11:52:17.000000000 +0200 +++ new/solid-5.64.0/src/solid/CMakeLists.txt 2019-11-02 14:02:53.000000000 +0100 @@ -15,7 +15,14 @@ ${CMAKE_CURRENT_BINARY_DIR}/.. ) target_include_directories(KF5Solid PUBLIC "$<BUILD_INTERFACE:${solid_BUILD_INCLUDE_DIRS}>") -generate_export_header(KF5Solid BASE_NAME Solid) +ecm_generate_export_header(KF5Solid + BASE_NAME Solid + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 5.0 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) add_library(KF5::Solid ALIAS KF5Solid) # Apps must include <Solid/File> or <solid/file.h> @@ -93,15 +100,17 @@ ########### static lib for tests ############### -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::Widgets ${solid_OPTIONAL_LIBS}) -if (TARGET Qt5::DBus) - target_link_libraries(KF5Solid_static PRIVATE Qt5::DBus) +if (BUILD_TESTING) + 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::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}/..>") endif() -target_include_directories(KF5Solid_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/..;${CMAKE_CURRENT_BINARY_DIR}/..>") ########### install files ############### @@ -130,6 +139,7 @@ SOLID_EXPORT SOLID_DEPRECATED SOLID_DEPRECATED_EXPORT + "SOLID_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/solid-5.63.0/src/solid/devices/frontend/battery.h new/solid-5.64.0/src/solid/devices/frontend/battery.h --- old/solid-5.63.0/src/solid/devices/frontend/battery.h 2019-10-06 11:52:17.000000000 +0200 +++ new/solid-5.64.0/src/solid/devices/frontend/battery.h 2019-11-02 14:02:53.000000000 +0100 @@ -152,12 +152,15 @@ */ bool isPresent() const; +#if SOLID_ENABLE_DEPRECATED_SINCE(5, 0) /** * Indicates if this battery is currently present in its bay. * * @deprecated since Solid 5.0. Use isPresent instead. */ - SOLID_DEPRECATED bool isPlugged() const { return isPresent(); } + SOLID_DEPRECATED_VERSION(5, 0, "Use Battery::isPresent()") + bool isPlugged() const { return isPresent(); } +#endif /** * Retrieves the type of device holding this battery.
