Hello community, here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2020-03-19 19:42:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcontacts (Old) and /work/SRC/openSUSE:Factory/.kcontacts.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts" Thu Mar 19 19:42:00 2020 rev:54 rq:785307 version:5.68.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2020-02-14 16:32:55.363436879 +0100 +++ /work/SRC/openSUSE:Factory/.kcontacts.new.3160/kcontacts.changes 2020-03-19 19:43:49.563970674 +0100 @@ -1,0 +2,11 @@ +Sun Mar 8 09:17:39 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.68.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.68.0.php +- Changes since 5.67.0: + * Make it compile against qt5.15. SkipEmptyParts is part of Qt::. + * Use ecm_qt_install_logging_categories over manual categories files + +------------------------------------------------------------------- Old: ---- kcontacts-5.67.0.tar.xz kcontacts-5.67.0.tar.xz.sig New: ---- kcontacts-5.68.0.tar.xz kcontacts-5.68.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcontacts.spec ++++++ --- /var/tmp/diff_new_pack.0lkAgp/_old 2020-03-19 19:43:50.043970953 +0100 +++ /var/tmp/diff_new_pack.0lkAgp/_new 2020-03-19 19:43:50.047970955 +0100 @@ -16,14 +16,14 @@ # -%define _tar_path 5.67 +%define _tar_path 5.68 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcontacts -Version: 5.67.0 +Version: 5.68.0 Release: 0 Summary: KDE Frameworks based address book API License: LGPL-2.1-or-later ++++++ kcontacts-5.67.0.tar.xz -> kcontacts-5.68.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.67.0/.gitignore new/kcontacts-5.68.0/.gitignore --- old/kcontacts-5.67.0/.gitignore 2020-02-02 13:45:30.000000000 +0100 +++ new/kcontacts-5.68.0/.gitignore 2020-03-07 10:37:45.000000000 +0100 @@ -19,3 +19,4 @@ /build*/ CMakeLists.txt.user* *.unc-backup* +.cmake/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.67.0/CMakeLists.txt new/kcontacts-5.68.0/CMakeLists.txt --- old/kcontacts-5.67.0/CMakeLists.txt 2020-02-02 13:45:30.000000000 +0100 +++ new/kcontacts-5.68.0/CMakeLists.txt 2020-03-07 10:37:45.000000000 +0100 @@ -1,13 +1,13 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.67.0") # handled by release scripts -set(KF5_DEP_VERSION "5.67.0") # handled by release scripts +set(KF5_VERSION "5.68.0") # handled by release scripts +set(KF5_DEP_VERSION "5.68.0") # handled by release scripts project(KContacts VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.67.0 NO_MODULE) +find_package(ECM 5.68.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) @@ -53,7 +53,7 @@ endif() add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054300) add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) @@ -96,6 +96,4 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install( FILES kcontacts.renamecategories kcontacts.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) - feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.67.0/kcontacts.categories new/kcontacts-5.68.0/kcontacts.categories --- old/kcontacts-5.67.0/kcontacts.categories 2020-02-02 13:45:30.000000000 +0100 +++ new/kcontacts-5.68.0/kcontacts.categories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -org.kde.pim.kcontacts kcontacts (pim lib) IDENTIFIER [KCONTACTS_LOG] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.67.0/kcontacts.renamecategories new/kcontacts-5.68.0/kcontacts.renamecategories --- old/kcontacts-5.67.0/kcontacts.renamecategories 2020-02-02 13:45:30.000000000 +0100 +++ new/kcontacts-5.68.0/kcontacts.renamecategories 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -log_kcontacts org.kde.pim.kcontacts diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.67.0/src/CMakeLists.txt new/kcontacts-5.68.0/src/CMakeLists.txt --- old/kcontacts-5.67.0/src/CMakeLists.txt 2020-02-02 13:45:30.000000000 +0100 +++ new/kcontacts-5.68.0/src/CMakeLists.txt 2020-03-07 10:37:45.000000000 +0100 @@ -46,7 +46,14 @@ converter/ldifconverter.cpp ) -ecm_qt_declare_logging_category(kcontacts_converter_SRCS HEADER kcontacts_debug.h IDENTIFIER KCONTACTS_LOG CATEGORY_NAME org.kde.pim.kcontacts) +ecm_qt_declare_logging_category(kcontacts_converter_SRCS + HEADER kcontacts_debug.h + IDENTIFIER KCONTACTS_LOG + CATEGORY_NAME org.kde.pim.kcontacts + OLD_CATEGORY_NAMES log_kcontacts + DESCRIPTION "kcontacts (pim lib)" + EXPORT KCONTACTS +) add_library(KF5Contacts ${kcontacts_SRCS} ${kcontacts_converter_SRCS}) @@ -131,6 +138,12 @@ COMPONENT Devel ) +ecm_qt_install_logging_categories( + EXPORT KCONTACTS + FILE kcontacts.categories + DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" +) + ecm_generate_pri_file(BASE_NAME KContacts LIB_NAME KF5Contacts DEPS "CoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.67.0/src/vcardtool.cpp new/kcontacts-5.68.0/src/vcardtool.cpp --- old/kcontacts-5.67.0/src/vcardtool.cpp 2020-02-02 13:45:30.000000000 +0100 +++ new/kcontacts-5.68.0/src/vcardtool.cpp 2020-03-07 10:37:45.000000000 +0100 @@ -923,7 +923,11 @@ if (lineStr.startsWith(QLatin1String("geo:"))) { //VCard 4.0 lineStr.remove(QStringLiteral("geo:")); const QStringList geoParts +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) = lineStr.split(QLatin1Char(','), QString::KeepEmptyParts); +#else + = lineStr.split(QLatin1Char(','), Qt::KeepEmptyParts); +#endif if (geoParts.size() >= 2) { geo.setLatitude(geoParts.at(0).toFloat()); geo.setLongitude(geoParts.at(1).toFloat()); @@ -931,7 +935,11 @@ } } else { const QStringList geoParts +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) = lineStr.split(QLatin1Char(';'), QString::KeepEmptyParts); +#else + = lineStr.split(QLatin1Char(';'), Qt::KeepEmptyParts); +#endif if (geoParts.size() >= 2) { geo.setLatitude(geoParts.at(0).toFloat()); geo.setLongitude(geoParts.at(1).toFloat()); @@ -1214,7 +1222,11 @@ if (key.startsWith(QLatin1String("messaging/"))) { QUrl url; url.setScheme(normalizeImppServiceType(key.mid(10, dash - 10))); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) const auto values = (*lineIt).value().toString().split(QChar(0xE000), QString::SkipEmptyParts); +#else + const auto values = (*lineIt).value().toString().split(QChar(0xE000), Qt::SkipEmptyParts); +#endif for (const auto &value : values) { url.setPath(value); Impp impp;
