Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kcontacts for openSUSE:Factory checked in at 2021-06-16 20:33:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcontacts (Old) and /work/SRC/openSUSE:Factory/.kcontacts.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcontacts" Wed Jun 16 20:33:45 2021 rev:69 rq:899719 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcontacts/kcontacts.changes 2021-05-10 15:36:52.258158426 +0200 +++ /work/SRC/openSUSE:Factory/.kcontacts.new.32437/kcontacts.changes 2021-06-16 20:35:13.663159784 +0200 @@ -1,0 +2,13 @@ +Sat Jun 5 11:58:36 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * Bump required CMake version to 3.16 + * Allow setting email, phonenumber, impp from QML + * [addressee] Add property for photo + * Add properties to Picture + +------------------------------------------------------------------- Old: ---- kcontacts-5.82.0.tar.xz kcontacts-5.82.0.tar.xz.sig New: ---- kcontacts-5.83.0.tar.xz kcontacts-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcontacts.spec ++++++ --- /var/tmp/diff_new_pack.cHK1vI/_old 2021-06-16 20:35:14.115160555 +0200 +++ /var/tmp/diff_new_pack.cHK1vI/_new 2021-06-16 20:35:14.119160562 +0200 @@ -16,14 +16,14 @@ # -%define _tar_path 5.82 +%define _tar_path 5.83 # 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.82.0 +Version: 5.83.0 Release: 0 Summary: KDE Frameworks based address book API License: LGPL-2.1-or-later ++++++ kcontacts-5.82.0.tar.xz -> kcontacts-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/.gitignore new/kcontacts-5.83.0/.gitignore --- old/kcontacts-5.82.0/.gitignore 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/.gitignore 2021-06-05 11:14:36.000000000 +0200 @@ -25,3 +25,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/CMakeLists.txt new/kcontacts-5.83.0/CMakeLists.txt --- old/kcontacts-5.82.0/CMakeLists.txt 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/CMakeLists.txt 2021-06-05 11:14:36.000000000 +0200 @@ -1,13 +1,13 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts -set(KF_DEP_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts +set(KF_DEP_VERSION "5.83.0") # handled by release scripts project(KContacts VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.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) @@ -54,7 +54,6 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) -add_definitions(-DQT_NO_FOREACH) add_subdirectory(src) if(BUILD_TESTING) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/autotests/CMakeLists.txt new/kcontacts-5.83.0/autotests/CMakeLists.txt --- old/kcontacts-5.82.0/autotests/CMakeLists.txt 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/autotests/CMakeLists.txt 2021-06-05 11:14:36.000000000 +0200 @@ -4,9 +4,8 @@ ########### next target ############### -set(testroundtrip_srcs testroundtrip.cpp) -qt5_add_resources(testroundtrip_srcs testroundtrip.qrc) -add_executable(testroundtrip ${testroundtrip_srcs}) +add_executable(testroundtrip) +target_sources(testroundtrip PRIVATE testroundtrip.cpp testroundtrip.qrc) add_test(NAME kcontacts-testroundtrip COMMAND testroundtrip) target_link_libraries(testroundtrip KF5Contacts Qt5::Test) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/po/de/kcontacts5.po new/kcontacts-5.83.0/po/de/kcontacts5.po --- old/kcontacts-5.82.0/po/de/kcontacts5.po 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/po/de/kcontacts5.po 2021-06-05 11:14:36.000000000 +0200 @@ -1,5 +1,5 @@ # Stephan Johach <[email protected]>, 2007. -# Burkhard L??ck <[email protected]>, 2008, 2009. +# Burkhard L??ck <[email protected]>, 2008, 2009, 2021. # Thomas Reitelbach <[email protected]>, 2009. # Frederik Schwarzer <[email protected]>, 2010, 2013, 2016. msgid "" @@ -7,14 +7,14 @@ "Project-Id-Version: kabc\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-18 02:23+0100\n" -"PO-Revision-Date: 2016-01-12 08:17+0100\n" -"Last-Translator: Frederik Schwarzer <[email protected]>\n" +"PO-Revision-Date: 2021-05-14 13:24+0200\n" +"Last-Translator: Burkhard L??ck <[email protected]>\n" "Language-Team: German <[email protected]>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.12.3\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: address.cpp:389 @@ -102,7 +102,7 @@ #, kde-format msgctxt "another type of address" msgid "Other" -msgstr "Weitere" +msgstr "Sonstige" #: addressee.cpp:421 #, kde-format @@ -242,7 +242,7 @@ #: addressee.cpp:918 phonenumber.cpp:217 #, kde-format msgid "Home Fax" -msgstr "Fax privat" +msgstr "Fax (privat)" #: addressee.cpp:923 #, kde-format @@ -547,7 +547,7 @@ #, kde-format msgctxt "another type of phone" msgid "Other" -msgstr "Weitere" +msgstr "Sonstige" #: phonenumber.cpp:212 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/po/zh_CN/kcontacts5.po new/kcontacts-5.83.0/po/zh_CN/kcontacts5.po --- old/kcontacts-5.82.0/po/zh_CN/kcontacts5.po 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/po/zh_CN/kcontacts5.po 2021-06-05 11:14:36.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-18 02:23+0100\n" -"PO-Revision-Date: 2021-04-24 15:42\n" +"PO-Revision-Date: 2021-06-03 16:05\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/src/CMakeLists.txt new/kcontacts-5.83.0/src/CMakeLists.txt --- old/kcontacts-5.82.0/src/CMakeLists.txt 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/src/CMakeLists.txt 2021-06-05 11:14:36.000000000 +0200 @@ -1,10 +1,11 @@ -set(vcardparser_SRCS +add_library(KF5Contacts) +add_library(KF5::Contacts ALIAS KF5Contacts) + +target_sources(KF5Contacts PRIVATE vcardparser/vcard.cpp vcardparser/vcardline.cpp vcardparser/vcardparser.cpp -) -set(kcontacts_SRCS address.cpp addressee.cpp addresseehelper.cpp @@ -36,17 +37,15 @@ note.cpp org.cpp clientpidmap.cpp - ${vcardparser_SRCS} + kcontacts.qrc improtocols/improtocols.qrc -) -set(kcontacts_converter_SRCS converter/vcardconverter.cpp converter/ldifconverter.cpp ) -ecm_qt_declare_logging_category(kcontacts_converter_SRCS +ecm_qt_declare_logging_category(KF5Contacts HEADER kcontacts_debug.h IDENTIFIER KCONTACTS_LOG CATEGORY_NAME kf.contacts @@ -55,12 +54,8 @@ EXPORT KCONTACTS ) -add_library(KF5Contacts ${kcontacts_SRCS} ${kcontacts_converter_SRCS}) - generate_export_header(KF5Contacts BASE_NAME kcontacts) -add_library(KF5::Contacts ALIAS KF5Contacts) - target_include_directories(KF5Contacts INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KContacts>") set(KContacts_BUILD_INCLUDE_DIRS ${KContacts_SOURCE_DIR}/src @@ -72,9 +67,9 @@ target_link_libraries(KF5Contacts PUBLIC Qt5::Core + Qt5::Gui PRIVATE KF5::CoreAddons - Qt5::Gui KF5::ConfigCore KF5::I18n KF5::Codecs # for the vcard parser diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/src/addressee.cpp new/kcontacts-5.83.0/src/addressee.cpp --- old/kcontacts-5.82.0/src/addressee.cpp 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/src/addressee.cpp 2021-06-05 11:14:36.000000000 +0200 @@ -2664,11 +2664,32 @@ return l; } +template<typename T> +static QVector<T> fromVariantList(const QVariantList &v) +{ + QVector<T> l; + l.reserve(v.size()); + std::transform(v.begin(), v.end(), std::back_inserter(l), [](const QVariant &elem) { + return elem.value<T>(); + }); + return l; +} + QVariantList Addressee::emailsVariant() const { return toVariantList(d->mEmails); } +void Addressee::setEmailsVariant(const QVariantList &emails) +{ + setEmailList(fromVariantList<Email>(emails)); +} + +void Addressee::setPhoneNumbersVariant(const QVariantList &emails) +{ + setPhoneNumbers(fromVariantList<PhoneNumber>(emails)); +} + QVariantList Addressee::phoneNumbersVariant() const { return toVariantList(d->mPhoneNumbers); @@ -2689,4 +2710,9 @@ return toVariantList(d->mImpps); } +void Addressee::setImppsVariant(const QVariantList &impps) +{ + setImppList(fromVariantList<Impp>(impps)); +} + #include "moc_addressee.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/src/addressee.h new/kcontacts-5.83.0/src/addressee.h --- old/kcontacts-5.82.0/src/addressee.h 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/src/addressee.h 2021-06-05 11:14:36.000000000 +0200 @@ -108,13 +108,14 @@ Q_PROPERTY(QString office READ office WRITE setOffice) Q_PROPERTY(QString profession READ profession WRITE setProfession) Q_PROPERTY(QString spousesName READ spousesName WRITE setSpousesName) + Q_PROPERTY(KContacts::Picture photo READ photo WRITE setPhoto) // using variants for QML compatibility, can be changed to proper types once QML supports that - Q_PROPERTY(QVariantList emails READ emailsVariant) - Q_PROPERTY(QVariantList phoneNumbers READ phoneNumbersVariant) + Q_PROPERTY(QVariantList emails READ emailsVariant WRITE setEmailsVariant) + Q_PROPERTY(QVariantList phoneNumbers READ phoneNumbersVariant WRITE setPhoneNumbersVariant) Q_PROPERTY(QVariantList addresses READ addressesVariant) Q_PROPERTY(QVariantList urls READ urlsVariant) - Q_PROPERTY(QVariantList impps READ imppsVariant) + Q_PROPERTY(QVariantList impps READ imppsVariant WRITE setImppsVariant) // ### the following properties are still missing: // - logos, photos, sounds @@ -1192,10 +1193,13 @@ private: QVariantList emailsVariant() const; + void setEmailsVariant(const QVariantList &emails); QVariantList phoneNumbersVariant() const; + void setPhoneNumbersVariant(const QVariantList &emails); QVariantList addressesVariant() const; QVariantList urlsVariant() const; QVariantList imppsVariant() const; + void setImppsVariant(const QVariantList &impps); class Private; QSharedDataPointer<Private> d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/src/picture.h new/kcontacts-5.83.0/src/picture.h --- old/kcontacts-5.82.0/src/picture.h 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/src/picture.h 2021-06-05 11:14:36.000000000 +0200 @@ -11,11 +11,10 @@ #include "kcontacts_export.h" #include <QDataStream> +#include <QImage> #include <QSharedDataPointer> #include <QString> -class QImage; - namespace KContacts { class PicturePrivate; @@ -29,6 +28,12 @@ friend KCONTACTS_EXPORT QDataStream &operator<<(QDataStream &, const Picture &); friend KCONTACTS_EXPORT QDataStream &operator>>(QDataStream &, Picture &); + Q_GADGET + Q_PROPERTY(QImage data READ data WRITE setData) + Q_PROPERTY(QString url READ url WRITE setUrl) + Q_PROPERTY(bool isIntern READ isIntern) + Q_PROPERTY(bool isEmpty READ isEmpty) + public: /** * Creates an empty picture. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcontacts-5.82.0/tests/CMakeLists.txt new/kcontacts-5.83.0/tests/CMakeLists.txt --- old/kcontacts-5.82.0/tests/CMakeLists.txt 2021-05-01 14:30:39.000000000 +0200 +++ new/kcontacts-5.83.0/tests/CMakeLists.txt 2021-06-05 11:14:36.000000000 +0200 @@ -4,19 +4,16 @@ ########### next target ############### # FIXME: Build fails -set(testread_SRCS testread.cpp) -add_executable(testread ${testread_SRCS}) +add_executable(testread testread.cpp) target_link_libraries(testread KF5Contacts KF5::I18n Qt5::Gui) ########### next target ############### # FIXME: Build fails -set(testwrite_SRCS testwrite.cpp) -add_executable(testwrite ${testwrite_SRCS}) +add_executable(testwrite testwrite.cpp) target_link_libraries(testwrite KF5Contacts Qt5::Gui KF5::I18n) ########### next target ############### -set(testread2_SRCS testread2.cpp testutils.cpp) -add_executable(testread2 ${testread2_SRCS}) +add_executable(testread2 testread2.cpp testutils.cpp) target_link_libraries(testread2 KF5Contacts Qt5::Gui)
