commit kf6-kpeople for openSUSE:Factory

9 Jun 2024

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package kf6-kpeople for openSUSE:Factory checked in at 2024-06-09 20:20:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kf6-kpeople (Old)
 and      /work/SRC/openSUSE:Factory/.kf6-kpeople.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kf6-kpeople"

Sun Jun  9 20:20:41 2024 rev:4 rq:1179295 version:6.3.0

Changes:
--------

--- /work/SRC/openSUSE:Factory/kf6-kpeople/kf6-kpeople.changes	2024-05-11 18:24:52.590251275 +0200
+++ /work/SRC/openSUSE:Factory/.kf6-kpeople.new.19518/kf6-kpeople.changes	2024-06-09 20:23:56.465549547 +0200
@@ -1,0 +2,12 @@
+Wed Jun  5 10:11:51 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 6.3.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/frameworks/6/6.3.0/
+- Changes since 6.2.0:
+  * Fix tier information
+  * Remove explicit maintainer from metainfo
+  * Port to ecm_add_qml_module and declarative type registration
+
+-------------------------------------------------------------------

Old:
----
  kpeople-6.2.0.tar.xz
  kpeople-6.2.0.tar.xz.sig

New:
----
  kpeople-6.3.0.tar.xz
  kpeople-6.3.0.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kf6-kpeople.spec ++++++
--- /var/tmp/diff_new_pack.VpH02a/_old	2024-06-09 20:23:56.945566869 +0200
+++ /var/tmp/diff_new_pack.VpH02a/_new	2024-06-09 20:23:56.945566869 +0200
@@ -19,13 +19,13 @@
 %define qt6_version 6.6.0
 
 %define rname kpeople
-# Full KF6 version (e.g. 6.2.0)
+# Full KF6 version (e.g. 6.3.0)
 %{!?_kf6_version: %global _kf6_version %{version}}
 # Last major and minor KF6 version (e.g. 6.0)
 %{!?_kf6_bugfix_version: %define _kf6_bugfix_version %(echo %{_kf6_version} | awk -F. '{print $1"."$2}')}
 %bcond_without released
 Name:           kf6-kpeople
-Version:        6.2.0
+Version:        6.3.0
 Release:        0
 Summary:        Library for access to contacts and identity holders
 License:        LGPL-2.1-or-later


++++++ kpeople-6.2.0.tar.xz -> kpeople-6.3.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/CMakeLists.txt new/kpeople-6.3.0/CMakeLists.txt
--- old/kpeople-6.2.0/CMakeLists.txt	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/CMakeLists.txt	2024-05-31 15:27:53.000000000 +0200
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 3.16)
 
-set(KF_VERSION "6.2.0") # handled by release scripts
-set(KF_DEP_VERSION "6.2.0") # handled by release scripts
+set(KF_VERSION "6.3.0") # handled by release scripts
+set(KF_DEP_VERSION "6.3.0") # handled by release scripts
 project (KPeople VERSION ${KF_VERSION})
 
 include(FeatureSummary)
-find_package(ECM 6.2.0  NO_MODULE)
+find_package(ECM 6.3.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)
 
@@ -25,6 +25,7 @@
 include(ECMGenerateExportHeader)
 include(ECMQtDeclareLoggingCategory)
 include(ECMDeprecationSettings)
+include(ECMQmlModule)
 
 set(REQUIRED_QT_VERSION 6.5.0)
 find_package(Qt6 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql Widgets Qml Quick)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/metainfo.yaml new/kpeople-6.3.0/metainfo.yaml
--- old/kpeople-6.2.0/metainfo.yaml	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/metainfo.yaml	2024-05-31 15:27:53.000000000 +0200
@@ -1,6 +1,5 @@
-maintainer: apol
 description: Provides access to all contacts and the people who hold them
-tier: 2
+tier: 3
 type: functional
 platforms:
     - name: Linux
@@ -17,4 +16,4 @@
 
 public_lib: true
 group: Frameworks
-subgroup: Tier 2
+subgroup: Tier 3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/po/en_GB/kpeople6.po new/kpeople-6.3.0/po/en_GB/kpeople6.po
--- old/kpeople-6.2.0/po/en_GB/kpeople6.po	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/po/en_GB/kpeople6.po	2024-05-31 15:27:53.000000000 +0200
@@ -1,27 +1,27 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# , 2015.
+# SPDX-FileCopyrightText: 2024 Steve Allewell <steve.allewell@gmail.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-12-26 01:32+0000\n"
-"PO-Revision-Date: 2015-03-14 14:49+0000\n"
-"Last-Translator: \n"
-"Language-Team: British English <kde-l10n-en_gb@kde.org>\n"
+"PO-Revision-Date: 2024-05-20 19:18+0100\n"
+"Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
+"Language-Team: British English\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 24.02.2\n"
 
 #: backends/vcard/kpeoplevcard.cpp:69
 #, kde-format
 msgctxt "given-name family-name"
 msgid "%1 %2"
-msgstr ""
+msgstr "%1 %2"
 
 #: match.cpp:46
 #, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/po/eo/kpeople6.po new/kpeople-6.3.0/po/eo/kpeople6.po
--- old/kpeople-6.2.0/po/eo/kpeople6.po	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/po/eo/kpeople6.po	2024-05-31 15:27:53.000000000 +0200
@@ -1,7 +1,7 @@
 # translation of kpeople6.pot to Esperanto
 # Copyright (C) 2017 Free Software Foundation, Inc.
 # This file is distributed under the same license as the kpeople package.
-# Oliver Kellogg <okellogg@users.sourceforge.net>, 2023.
+# Oliver Kellogg <olivermkellogg@gmail.com>, 2023.
 #
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
 "POT-Creation-Date: 2023-12-26 01:32+0000\n"
 "PO-Revision-Date: 2023-12-27 09:20+0100\n"
-"Last-Translator: Oliver Kellogg <okellogg@users.sourceforge.net>\n"
+"Last-Translator: Oliver Kellogg <olivermkellogg@gmail.com>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/po/pl/kpeople6.po new/kpeople-6.3.0/po/pl/kpeople6.po
--- old/kpeople-6.2.0/po/pl/kpeople6.po	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/po/pl/kpeople6.po	2024-05-31 15:27:53.000000000 +0200
@@ -16,7 +16,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 23.08.3\n"
 
 #: backends/vcard/kpeoplevcard.cpp:69
 #, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/CMakeLists.txt new/kpeople-6.3.0/src/CMakeLists.txt
--- old/kpeople-6.2.0/src/CMakeLists.txt	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/CMakeLists.txt	2024-05-31 15:27:53.000000000 +0200
@@ -15,6 +15,8 @@
     EXPORT_NAME People
 )
 
+qt_extract_metatypes(KF6People)
+
 ecm_generate_export_header(KF6People
     EXPORT_FILE_NAME ${CMAKE_CURRENT_BINARY_DIR}/kpeople/kpeople_export.h
     BASE_NAME KPeople
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/declarative/CMakeLists.txt new/kpeople-6.3.0/src/declarative/CMakeLists.txt
--- old/kpeople-6.2.0/src/declarative/CMakeLists.txt	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/declarative/CMakeLists.txt	2024-05-31 15:27:53.000000000 +0200
@@ -1,4 +1,4 @@
-add_library(KF6PeopleDeclarative SHARED)
+ecm_add_qml_module(KF6PeopleDeclarative URI org.kde.people VERSION 1.0 DEPENDENCIES QtCore)
 
 target_sources(KF6PeopleDeclarative PRIVATE
     declarativepersondata.cpp
@@ -16,11 +16,11 @@
 )
 
 target_link_libraries(KF6PeopleDeclarative
+    PRIVATE
     Qt6::Qml
     Qt6::Quick
     KF6PeopleBackend
     KF6::People
 )
 
-install(TARGETS KF6PeopleDeclarative DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/people)
-install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/people)
+ecm_finalize_qml_module(KF6PeopleDeclarative DESTINATION ${KDE_INSTALL_QMLDIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/declarative/declarativepersondata.h new/kpeople-6.3.0/src/declarative/declarativepersondata.h
--- old/kpeople-6.2.0/src/declarative/declarativepersondata.h	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/declarative/declarativepersondata.h	2024-05-31 15:27:53.000000000 +0200
@@ -9,9 +9,12 @@
 
 #include "persondata.h"
 
+#include <qqmlregistration.h>
+
 class DeclarativePersonData : public QObject
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(PersonData)
 
     Q_PROPERTY(QString personUri READ personUri WRITE setPersonUri NOTIFY personChanged)
     Q_PROPERTY(KPeople::PersonData *person READ person NOTIFY personChanged)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/declarative/peopleqmlplugin.cpp new/kpeople-6.3.0/src/declarative/peopleqmlplugin.cpp
--- old/kpeople-6.2.0/src/declarative/peopleqmlplugin.cpp	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/declarative/peopleqmlplugin.cpp	2024-05-31 15:27:53.000000000 +0200
@@ -9,45 +9,7 @@
 
 #include <QQmlEngine>
 
-#include <actions.h>
-#include <personactionsmodel_p.h>
-#include <persondata.h>
-#include <personpluginmanager.h>
-#include <personsmodel.h>
-#include <personssortfilterproxymodel.h>
-
 #include "avatarimageprovider.h"
-#include "declarativepersondata.h"
-
-class ActionTypeWrapper : public QObject
-{
-    Q_OBJECT
-
-public:
-    enum ActionType {
-        TextChatAction = KPeople::TextChatAction,
-        AudioCallAction = KPeople::AudioCallAction,
-        VideoCallAction = KPeople::VideoCallAction,
-        SendEmailAction = KPeople::SendEmailAction,
-        SendFileAction = KPeople::SendFileAction,
-        OtherAction = KPeople::OtherAction,
-    };
-    Q_ENUM(ActionType)
-};
-
-class DeclarativePersonPluginManager : public QObject
-{
-    Q_OBJECT
-public:
-    Q_SCRIPTABLE bool addContact(const QVariantMap &properties)
-    {
-        return KPeople::PersonPluginManager::addContact(properties);
-    }
-    Q_SCRIPTABLE bool deleteContact(const QString &uri)
-    {
-        return KPeople::PersonPluginManager::deleteContact(uri);
-    }
-};
 
 void PeopleQMLPlugin::initializeEngine(QQmlEngine *engine, const char *uri)
 {
@@ -55,19 +17,8 @@
     engine->addImageProvider(QStringLiteral("kpeople-avatar"), new AvatarImageProvider());
 }
 
-void PeopleQMLPlugin::registerTypes(const char *uri)
+void PeopleQMLPlugin::registerTypes(const char * /*uri*/)
 {
-    qmlRegisterType<KPeople::PersonsModel>(uri, 1, 0, "PersonsModel");
-    qmlRegisterType<KPeople::PersonsSortFilterProxyModel>(uri, 1, 0, "PersonsSortFilterProxyModel");
-    qmlRegisterType<KPeople::PersonActionsModel>(uri, 1, 0, "PersonActions");
-    qmlRegisterType<DeclarativePersonData>(uri, 1, 0, "PersonData");
-    qmlRegisterAnonymousType<KPeople::PersonData>(uri, 1);
-    qmlRegisterUncreatableType<ActionTypeWrapper>(uri, 1, 0, "ActionType", QStringLiteral("You cannot create ActionType"));
-    qmlRegisterSingletonType<DeclarativePersonPluginManager>(uri, 1, 0, "PersonPluginManager", [](QQmlEngine *, QJSEngine *) -> QObject * {
-        return new DeclarativePersonPluginManager;
-    });
-
-    qmlRegisterUncreatableMetaObject(KPeople::staticMetaObject, uri, 1, 0, "KPeople", QStringLiteral("Access to enums & flags only"));
 }
 
 #include "moc_peopleqmlplugin.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/declarative/peopleqmlplugin.h new/kpeople-6.3.0/src/declarative/peopleqmlplugin.h
--- old/kpeople-6.2.0/src/declarative/peopleqmlplugin.h	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/declarative/peopleqmlplugin.h	2024-05-31 15:27:53.000000000 +0200
@@ -8,8 +8,48 @@
 #ifndef PEOPLEQMLPLUGIN_H
 #define PEOPLEQMLPLUGIN_H
 
+#include <QQmlEngine>
 #include <QQmlExtensionPlugin>
 
+#include "personsmodel.h"
+#include <KPeople/PersonPluginManager>
+#include <actions.h>
+#include <personactionsmodel_p.h>
+#include <personssortfilterproxymodel.h>
+
+class DeclarativePersonPluginManager : public QObject
+{
+    Q_OBJECT
+    QML_SINGLETON
+    QML_NAMED_ELEMENT(PersonPluginManager)
+
+public:
+    Q_SCRIPTABLE bool addContact(const QVariantMap &properties)
+    {
+        return KPeople::PersonPluginManager::addContact(properties);
+    }
+    Q_SCRIPTABLE bool deleteContact(const QString &uri)
+    {
+        return KPeople::PersonPluginManager::deleteContact(uri);
+    }
+};
+
+namespace ActionType
+{
+Q_NAMESPACE
+QML_ELEMENT
+
+enum ActionType {
+    TextChatAction = KPeople::TextChatAction,
+    AudioCallAction = KPeople::AudioCallAction,
+    VideoCallAction = KPeople::VideoCallAction,
+    SendEmailAction = KPeople::SendEmailAction,
+    SendFileAction = KPeople::SendFileAction,
+    OtherAction = KPeople::OtherAction,
+};
+Q_ENUM_NS(ActionType)
+};
+
 class PeopleQMLPlugin : public QQmlExtensionPlugin
 {
     Q_OBJECT
@@ -19,4 +59,23 @@
     void registerTypes(const char *uri) override;
 };
 
+struct PersonDataForeign {
+    Q_GADGET
+    QML_FOREIGN(KPeople::PersonData)
+    QML_ANONYMOUS
+};
+
+struct PersonsModelForeign {
+    Q_GADGET
+    QML_FOREIGN(KPeople::PersonsModel)
+    QML_NAMED_ELEMENT(PersonsModel)
+};
+
+class PersonsSortFilterProxyModelForeign
+{
+    Q_GADGET
+    QML_FOREIGN(KPeople::PersonsSortFilterProxyModel)
+    QML_NAMED_ELEMENT(PersonsSortFilterProxyModel)
+};
+
 #endif // PEOPLEQMLPLUGIN_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/declarative/personactionsmodel_p.h new/kpeople-6.3.0/src/declarative/personactionsmodel_p.h
--- old/kpeople-6.2.0/src/declarative/personactionsmodel_p.h	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/declarative/personactionsmodel_p.h	2024-05-31 15:27:53.000000000 +0200
@@ -9,6 +9,8 @@
 
 #include <QAbstractListModel>
 
+#include <qqmlregistration.h>
+
 class QAction;
 
 namespace KPeople
@@ -18,6 +20,7 @@
 class PersonActionsModel : public QAbstractListModel
 {
     Q_OBJECT
+    QML_NAMED_ELEMENT(PersonActions)
     Q_PROPERTY(int count READ rowCount NOTIFY personChanged)
     Q_PROPERTY(QString personUri READ personUri WRITE setPersonUri NOTIFY personChanged)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/declarative/qmldir new/kpeople-6.3.0/src/declarative/qmldir
--- old/kpeople-6.2.0/src/declarative/qmldir	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/declarative/qmldir	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-module org.kde.people
-
-plugin KF6PeopleDeclarative
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-6.2.0/src/persondata.h new/kpeople-6.3.0/src/persondata.h
--- old/kpeople-6.2.0/src/persondata.h	2024-05-03 14:26:22.000000000 +0200
+++ new/kpeople-6.3.0/src/persondata.h	2024-05-31 15:27:53.000000000 +0200
@@ -140,7 +140,7 @@
     void dataChanged();
 
 private Q_SLOTS:
-    KPEOPLE_NO_EXPORT void onContactChanged();
+    void onContactChanged();
 
 private:
     Q_DISABLE_COPY(PersonData)

    

Source-Sync

tags

participants (1)