Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2021-05-10 15:35:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new.2988 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Mon May 10 15:35:45 2021 rev:76 rq:891773 version:5.82.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2021-04-12 12:36:43.889325109 +0200 +++ /work/SRC/openSUSE:Factory/.kpeople5.new.2988/kpeople5.changes 2021-05-10 15:37:26.854024457 +0200 @@ -1,0 +2,10 @@ +Sat May 1 16:41:08 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.82.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.82.0 +- Changes since 5.81.0: + * Make DBus dependency on Windows and Mac optional + +------------------------------------------------------------------- Old: ---- kpeople-5.81.0.tar.xz kpeople-5.81.0.tar.xz.sig New: ---- kpeople-5.82.0.tar.xz kpeople-5.82.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.P3aKMk/_old 2021-05-10 15:37:27.346022551 +0200 +++ /var/tmp/diff_new_pack.P3aKMk/_new 2021-05-10 15:37:27.350022537 +0200 @@ -17,14 +17,14 @@ %define rname kpeople -%define _tar_path 5.81 +%define _tar_path 5.82 # 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: kpeople5 -Version: 5.81.0 +Version: 5.82.0 Release: 0 Summary: Library for access to contacts and identity holders License: LGPL-2.1-or-later @@ -42,12 +42,12 @@ BuildRequires: cmake(KF5I18n) >= %{_kf5_version} BuildRequires: cmake(KF5ItemViews) >= %{_kf5_version} BuildRequires: cmake(KF5WidgetsAddons) >= %{_kf5_version} -BuildRequires: cmake(Qt5DBus) >= 5.14.0 -BuildRequires: cmake(Qt5Gui) >= 5.14.0 -BuildRequires: cmake(Qt5Qml) >= 5.14.0 -BuildRequires: cmake(Qt5Sql) >= 5.14.0 -BuildRequires: cmake(Qt5Test) >= 5.14.0 -BuildRequires: cmake(Qt5Widgets) >= 5.14.0 +BuildRequires: cmake(Qt5DBus) >= 5.15.0 +BuildRequires: cmake(Qt5Gui) >= 5.15.0 +BuildRequires: cmake(Qt5Qml) >= 5.15.0 +BuildRequires: cmake(Qt5Sql) >= 5.15.0 +BuildRequires: cmake(Qt5Test) >= 5.15.0 +BuildRequires: cmake(Qt5Widgets) >= 5.15.0 %if %{with lang} Recommends: %{name}-lang %endif @@ -59,7 +59,7 @@ Summary: Library for access to contacts and identity holders Group: Development/Libraries/KDE Requires: %{name} = %{version} -Requires: cmake(Qt5Core) >= 5.14.0 +Requires: cmake(Qt5Core) >= 5.15.0 %description devel A library that provides access to all contacts and the people who hold them. @@ -68,14 +68,14 @@ %lang_package %prep -%setup -q -n kpeople-%{version} +%autosetup -p1 -n kpeople-%{version} %build - %cmake_kf5 -d build -- -DENABLE_EXAMPLES=OFF - %cmake_build +%cmake_kf5 -d build -- -DENABLE_EXAMPLES=OFF +%cmake_build %install - %kf5_makeinstall -C build +%kf5_makeinstall -C build %if %{with lang} %find_lang kpeople5 %{name}.lang ++++++ kpeople-5.81.0.tar.xz -> kpeople-5.82.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.81.0/.gitignore new/kpeople-5.82.0/.gitignore --- old/kpeople-5.81.0/.gitignore 2021-04-04 13:46:27.000000000 +0200 +++ new/kpeople-5.82.0/.gitignore 2021-05-01 14:38:28.000000000 +0200 @@ -22,3 +22,6 @@ .cmake/ /.clang-format /compile_commands.json +.clangd +.idea +/cmake-build* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.81.0/CMakeLists.txt new/kpeople-5.82.0/CMakeLists.txt --- old/kpeople-5.81.0/CMakeLists.txt 2021-04-04 13:46:27.000000000 +0200 +++ new/kpeople-5.82.0/CMakeLists.txt 2021-05-01 14:38:28.000000000 +0200 @@ -1,22 +1,25 @@ cmake_minimum_required(VERSION 3.5) -set(KF_VERSION "5.81.0") # handled by release scripts -set(KF_DEP_VERSION "5.81.0") # handled by release scripts +set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_DEP_VERSION "5.82.0") # handled by release scripts project (KPeople VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.81.0 NO_MODULE) +find_package(ECM 5.82.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) -set(REQUIRED_QT_VERSION 5.14.0) +set(REQUIRED_QT_VERSION 5.15.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql Widgets Qml) -if(NOT ANDROID) +# On UNIX DBus integration is required, on Android it does not exist and on other platforms it is optional +if(UNIX) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) +elseif(NOT ANDROID) + find_package(Qt5 ${REQUIRED_QT_VERSION} OPTIONAL_COMPONENTS DBus) endif() find_package(KF5CoreAddons ${KF_DEP_VERSION} CONFIG REQUIRED) @@ -57,8 +60,8 @@ ki18n_install(po) endif () add_definitions(-DQT_NO_FOREACH) -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055000) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) add_definitions(-DKSERVICE_DISABLE_DEPRECATED_BEFORE_AND_AT=0x04ff00) # TODO: PersonDetailsView(QWidget *) constructor still calls KPluginInfo::fromServices() (deprecated at 5.0) # investigate if needed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.81.0/po/zh_CN/kpeople5.po new/kpeople-5.82.0/po/zh_CN/kpeople5.po --- old/kpeople-5.81.0/po/zh_CN/kpeople5.po 2021-04-04 13:46:27.000000000 +0200 +++ new/kpeople-5.82.0/po/zh_CN/kpeople5.po 2021-05-01 14:38:28.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-03-14 19:34+0000\n" -"PO-Revision-Date: 2021-03-27 17:29\n" +"PO-Revision-Date: 2021-04-24 15:42\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.81.0/src/CMakeLists.txt new/kpeople-5.82.0/src/CMakeLists.txt --- old/kpeople-5.81.0/src/CMakeLists.txt 2021-04-04 13:46:27.000000000 +0200 +++ new/kpeople-5.82.0/src/CMakeLists.txt 2021-05-01 14:38:28.000000000 +0200 @@ -43,7 +43,7 @@ KF5::PeopleBackend ) -if(NOT ANDROID) +if(Qt5DBus_FOUND) target_link_libraries(KF5People PRIVATE Qt5::DBus) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.81.0/src/personmanager.cpp new/kpeople-5.82.0/src/personmanager.cpp --- old/kpeople-5.81.0/src/personmanager.cpp 2021-04-04 13:46:27.000000000 +0200 +++ new/kpeople-5.82.0/src/personmanager.cpp 2021-05-01 14:38:28.000000000 +0200 @@ -14,7 +14,7 @@ #include <QStandardPaths> #include <QVariant> -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB #include <QDBusConnection> #include <QDBusMessage> #endif @@ -64,7 +64,7 @@ m_db.exec(QStringLiteral("CREATE INDEX IF NOT EXISTS contactIdIndex ON persons (contactId)")); m_db.exec(QStringLiteral("CREATE INDEX IF NOT EXISTS personIdIndex ON persons (personId)")); -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB QDBusConnection::sessionBus().connect(QString(), QStringLiteral("/KPeople"), QStringLiteral("org.kde.KPeople"), @@ -140,7 +140,7 @@ bool rc = true; -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB QList<QDBusMessage> pendingMessages; #endif @@ -194,7 +194,7 @@ rc = false; } -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KPeople"), QStringLiteral("org.kde.KPeople"), QStringLiteral("ContactRemovedFromPerson")); @@ -220,7 +220,7 @@ rc = false; } -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB // FUTURE OPTIMIZATION - this would be best as one signal, but arguments become complex QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KPeople"), QStringLiteral("org.kde.KPeople"), QStringLiteral("ContactAddedToPerson")); @@ -234,7 +234,7 @@ // if success send all messages to other clients // otherwise roll back our database changes and return an empty string if (rc) { -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB for (const QDBusMessage &message : qAsConst(pendingMessages)) { QDBusConnection::sessionBus().send(message); } @@ -258,7 +258,7 @@ query.bindValue(0, id.mid(strlen("kpeople://"))); query.exec(); -#ifndef Q_OS_ANDROID +#ifdef QT_DBUS_LIB for (const QString &contactUri : contactUris) { // FUTURE OPTIMIZATION - this would be best as one signal, but arguments become complex QDBusMessage message = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.81.0/src/personsmodel.cpp new/kpeople-5.82.0/src/personsmodel.cpp --- old/kpeople-5.81.0/src/personsmodel.cpp 2021-04-04 13:46:27.000000000 +0200 +++ new/kpeople-5.82.0/src/personsmodel.cpp 2021-05-01 14:38:28.000000000 +0200 @@ -249,7 +249,7 @@ // fetch all already loaded contacts from plugins for (const AllContactsMonitorPtr &contactWatcher : qAsConst(m_sourceMonitors)) { - addresseeMap.unite(contactWatcher->contacts()); + addresseeMap.insert(contactWatcher->contacts()); } // add metacontacts
