commit kaccounts-integration for openSUSE:Factory

Thu, 31 Aug 2023 04:44:17 -0700 

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package kaccounts-integration for 
openSUSE:Factory checked in at 2023-08-31 13:42:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kaccounts-integration (Old)
 and      /work/SRC/openSUSE:Factory/.kaccounts-integration.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kaccounts-integration"

Thu Aug 31 13:42:57 2023 rev:104 rq:1105635 version:23.08.0

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/kaccounts-integration/kaccounts-integration.changes  
    2023-07-07 15:46:38.667954369 +0200
+++ 
/work/SRC/openSUSE:Factory/.kaccounts-integration.new.1766/kaccounts-integration.changes
    2023-08-31 13:44:02.576631074 +0200
@@ -1,0 +2,30 @@
+Sun Aug 20 13:59:04 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.08.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/23.08.0/
+- No code change since 23.07.90
+
+-------------------------------------------------------------------
+Mon Aug 14 08:02:21 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.07.90
+  * New feature release
+- No code change since 23.07.80
+
+-------------------------------------------------------------------
+Tue Aug  1 10:13:25 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.07.80
+  * New feature release
+- Changes since 23.04.3:
+  * Remove unused QVariantList argument from KQuckConfigModule constructor
+  * Use icon.name. Allow to show module in qt6
+  * install kded in kf<version>
+  * Allow building against KF6
+  * Require libaccounts-qt 1.16
+  * Add libaccounts-qt and signond to third-party deps
+  * cmake: Add external deps as system includes
+
+-------------------------------------------------------------------

Old:
----
  kaccounts-integration-23.04.3.tar.xz
  kaccounts-integration-23.04.3.tar.xz.sig

New:
----
  kaccounts-integration-23.08.0.tar.xz
  kaccounts-integration-23.08.0.tar.xz.sig

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

Other differences:
------------------
++++++ kaccounts-integration.spec ++++++
--- /var/tmp/diff_new_pack.lBxlxp/_old  2023-08-31 13:44:03.876677541 +0200
+++ /var/tmp/diff_new_pack.lBxlxp/_new  2023-08-31 13:44:03.884677827 +0200
@@ -19,7 +19,7 @@
 %define sover 2
 %bcond_without released
 Name:           kaccounts-integration
-Version:        23.04.3
+Version:        23.08.0
 Release:        0
 Summary:        KDE Accounts Providers
 License:        GPL-2.0-or-later


++++++ kaccounts-integration-23.04.3.tar.xz -> 
kaccounts-integration-23.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kaccounts-integration-23.04.3/.kde-ci.yml 
new/kaccounts-integration-23.08.0/.kde-ci.yml
--- old/kaccounts-integration-23.04.3/.kde-ci.yml       2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/.kde-ci.yml       2023-08-16 
22:24:20.000000000 +0200
@@ -12,4 +12,7 @@
     'frameworks/kdeclarative': '@stable'
     'frameworks/kwallet': '@stable'
     'frameworks/kio': '@stable'
+    'frameworks/kpackage': '@stable'
     'third-party/qcoro': '@latest'
+    'third-party/libaccounts-qt': '@latest'
+    'third-party/signond': '@latest'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kaccounts-integration-23.04.3/CMakeLists.txt 
new/kaccounts-integration-23.08.0/CMakeLists.txt
--- old/kaccounts-integration-23.04.3/CMakeLists.txt    2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/CMakeLists.txt    2023-08-16 
22:24:20.000000000 +0200
@@ -1,18 +1,18 @@
 cmake_minimum_required(VERSION 3.16)
 
 set(RELEASE_SERVICE_VERSION_MAJOR "23")
-set(RELEASE_SERVICE_VERSION_MINOR "04")
-set(RELEASE_SERVICE_VERSION_MICRO "3")
+set(RELEASE_SERVICE_VERSION_MINOR "08")
+set(RELEASE_SERVICE_VERSION_MICRO "0")
 set(KACCOUNTS_VERSION 
"${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE_VERSION_MINOR}.${RELEASE_SERVICE_VERSION_MICRO}")
 
 project(KAccounts LANGUAGES CXX VERSION ${KACCOUNTS_VERSION})
 
 set(QT_REQUIRED_VERSION "5.15.2")
-set(KF5_MIN_VERSION "5.97.0")
+set(KF_MIN_VERSION "5.97.0")
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
+find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 
 include(KDEInstallDirs)
@@ -31,12 +31,12 @@
 include(ECMDeprecationSettings)
 
 set(KACCOUNTS_SOVERSION "2")
-set(ACCOUNTSQT_DEP_VERSION "1.13")
+set(ACCOUNTSQT_DEP_VERSION "1.16")
 set(SIGNONQT_DEP_VERSION "8.55")
 set(ACCOUNTSGLIB_DEP_VERSION "1.21")
 
 find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core 
Widgets)
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED KCMUtils I18n CoreAddons 
DBusAddons Declarative Wallet KIO)
+find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED KCMUtils I18n 
CoreAddons DBusAddons Declarative Wallet KIO Package)
 
 find_package(AccountsQt${QT_MAJOR_VERSION} ${ACCOUNTSQT_DEP_VERSION} CONFIG)
 set_package_properties(AccountsQt${QT_MAJOR_VERSION} PROPERTIES DESCRIPTION 
"Accounts management library for Qt applications"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/po/ca/kaccounts-integration.po 
new/kaccounts-integration-23.08.0/po/ca/kaccounts-integration.po
--- old/kaccounts-integration-23.04.3/po/ca/kaccounts-integration.po    
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/po/ca/kaccounts-integration.po    
2023-08-16 22:24:20.000000000 +0200
@@ -207,242 +207,3 @@
 #, kde-format
 msgid "Could not create auth session"
 msgstr "No s'ha pogut crear la sessió d'autorització"
-
-#~ msgid "Can't open wallet"
-#~ msgstr "No s'ha pogut obrir la cartera"
-
-#~ msgctxt "NAME OF TRANSLATORS"
-#~ msgid "Your names"
-#~ msgstr "Antoni Bella"
-
-#~ msgctxt "EMAIL OF TRANSLATORS"
-#~ msgid "Your emails"
-#~ msgstr "[email protected]"
-
-#~ msgid "Accounts"
-#~ msgstr "Comptes"
-
-#~ msgid "Sebastian Kügler"
-#~ msgstr "Sebastian Kügler"
-
-#~ msgid "Dan Leinir Turthra Jensen"
-#~ msgstr "Dan Leinir Turthra Jensen"
-
-#~ msgctxt ""
-#~ "Label for the text field used to enter a new human-readable name for an "
-#~ "account"
-#~ msgid "Enter the new name of the account"
-#~ msgstr "Introduïu el nom nou del compte"
-
-#~ msgid "Configure..."
-#~ msgstr "Configura..."
-
-#~ msgid ""
-#~ "No account providers found.<nl/>Some providers can be found in packages "
-#~ "<application>kaccounts-providers</application> and <application>ktp-"
-#~ "accounts-kcm</application>."
-#~ msgstr ""
-#~ "No s'ha trobat cap compte de proveïdor.<nl/>Es poden trobar diversos "
-#~ "proveïdors als paquets <application>kaccounts-providers</application> i "
-#~ "<application>ktp-accounts-kcm</application>."
-
-#~ msgid "Following missing providers are required by installed services: %1"
-#~ msgstr ""
-#~ "Els serveis instal·lats requereixen els proveïdors següents que 
manquen: "
-#~ "%1"
-
-#~ msgctxt ""
-#~ "Messagebox title; meaning 'Unable to finish the action you started'"
-#~ msgid "Unable to finish"
-#~ msgstr "No s'ha pogut finalitzar"
-
-#~ msgid "Select an account from the left column to configure"
-#~ msgstr "Seleccioneu un compte de la columna esquerra per a configurar-lo"
-
-#~ msgid "Create"
-#~ msgstr "Crea"
-
-#~ msgid "Select what services you want to activate"
-#~ msgstr "Seleccioneu els serveis que voleu activar"
-
-#~ msgctxt ""
-#~ "Error message that shows up right after the KCM opens and detects that "
-#~ "the required variables are empty"
-#~ msgid ""
-#~ "It appears your system is not configured properly, please ensure you have "
-#~ "AG_PROVIDERS and/or AG_SERVICES environment variables set correctly, then "
-#~ "restart this configuration module.\n"
-#~ "\n"
-#~ "Please contact your distribution if you're unsure how to proceed."
-#~ msgstr ""
-#~ "Sembla que aquest sistema no està configurat adequadament. Comproveu que "
-#~ "les variables d'entorn AG_PROVIDERS i/o AG_SERVICES estan configurades "
-#~ "correctament, després reinicieu aquests mòdul de configuració.\n"
-#~ "\n"
-#~ "Contacteu amb la distribució si no esteu segur de com fer-ho."
-
-#~ msgid "ownCloud"
-#~ msgstr "ownCloud"
-
-#~ msgid "Password:"
-#~ msgstr "Contrasenya:"
-
-#~ msgid "Username"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "http://my.owncloudserver.org";
-#~ msgstr "http://my.owncloudserver.org";
-
-#~ msgid "Server"
-#~ msgstr "Servidor"
-
-#~ msgid "JohnDoe"
-#~ msgstr "JoanPruna"
-
-#~ msgid "Unable to authenticate using the provided username and password"
-#~ msgstr ""
-#~ "No s'ha pogut autenticar usant el nom d'usuari i la contrasenya "
-#~ "proporcionats"
-
-#~ msgid "Connecting to:"
-#~ msgstr "S'està connectant a:"
-
-#~ msgid "Contacts"
-#~ msgstr "Contactes"
-
-#~ msgid ""
-#~ "Unable to connect to ownCloud at the given server URL. Please check the "
-#~ "server URL."
-#~ msgstr ""
-#~ "No s'ha pogut connectar amb ownCloud a l'URL del servidor donat. "
-#~ "Verifiqueu l'URL del servidor."
-
-#~ msgid "ownCloud Server"
-#~ msgstr "Servidor ownCloud"
-
-#~ msgid "Everything is Ok"
-#~ msgstr "Tot està bé"
-
-#~ msgid "Information is invalid"
-#~ msgstr "La informació no és vàlida"
-
-#~ msgid "owncloud.org"
-#~ msgstr "owncloud.org"
-
-#~ msgid "JohnDoe (username)"
-#~ msgstr "JoanPruna (nom d'usuari)"
-
-#~ msgid "Username:"
-#~ msgstr "Nom d'usuari:"
-
-#~ msgid "Password"
-#~ msgstr "Contrasenya"
-
-#~ msgid "Host:"
-#~ msgstr "Màquina:"
-
-#~ msgctxt "Action to go to the next page on the wizard"
-#~ msgid "Next"
-#~ msgstr "Següent"
-
-#~ msgctxt "Action to finish the wizard"
-#~ msgid "Finish"
-#~ msgstr "Finalitza"
-
-#~ msgid "Files"
-#~ msgstr "Fitxers"
-
-#~ msgid "Calendar"
-#~ msgstr "Calendari"
-
-#~ msgid "Facebook account Wizard"
-#~ msgstr "Assistent de comptes pel Facebook"
-
-#~ msgid "Credentials"
-#~ msgstr "Credencials"
-
-#~ msgid "The email and password are required"
-#~ msgstr "Es necessita el correu electrònic i la contrasenya"
-
-#~ msgid "The email is required"
-#~ msgstr "Es necessita el correu electrònic"
-
-#~ msgid "This account is already configured as a Web Account"
-#~ msgstr "Aquest compte ja està configurat com un compte web"
-
-#~ msgid "The password is required"
-#~ msgstr "Es necessita la contrasenya"
-
-#~ msgid "Facebook Authentication"
-#~ msgstr "Autenticació pel Facebook"
-
-#~ msgid ""
-#~ "Error authenticating with Facebook, please press back and check your "
-#~ "credentials"
-#~ msgstr ""
-#~ "Error en autenticar amb Facebook. Si us plau, premeu cap enrere i "
-#~ "verifiqueu les vostres credencials"
-
-#~ msgid "Checking username..."
-#~ msgstr "S'està comprant el nom d'usuari..."
-
-#~ msgid "Waiting for authorization..."
-#~ msgstr "S'està esperant autorització..."
-
-#~ msgid "Try again"
-#~ msgstr "Torneu-ho a provar"
-
-#~ msgid "Chat"
-#~ msgstr "Xat"
-
-#~ msgid "Contacts and Events"
-#~ msgstr "Contactes i esdeveniments"
-
-#~ msgid "Calendar / Tasks"
-#~ msgstr "Calendari / Tasques"
-
-#~ msgid "The email seems to be wrong (Invalid format)"
-#~ msgstr "El correu electrònic sembla estar malament (format no vàlid)"
-
-#~ msgid "Email address:"
-#~ msgstr "Adreça de correu electrònic:"
-
-#~ msgid ""
-#~ "Error authenticating with Google, please press back and check your "
-#~ "credentials"
-#~ msgstr ""
-#~ "Error en autenticar amb Google. Si us plau, premeu cap enrere i "
-#~ "verifiqueu les vostres credencials"
-
-#~ msgid "TextLabel"
-#~ msgstr "Etiqueta de text"
-
-#~ msgid "Select services"
-#~ msgstr "Selecciona els serveis"
-
-#~ msgid "EMail"
-#~ msgstr "Correu electrònic"
-
-#~ msgid "Tasks"
-#~ msgstr "Tasques"
-
-#~ msgid "WebAccounts requires to have access to"
-#~ msgstr "WebAccounts requereix tenir accés a"
-
-#~ msgid "Retry"
-#~ msgstr "Torna a intentar-ho"
-
-#~ msgid "Calendar and Contacts"
-#~ msgstr "Calendari i contactes"
-
-#~ msgid "User or password are incorrect"
-#~ msgstr "L'usuari o la contrasenya són incorrectes"
-
-#~ msgid "The username and password are required"
-#~ msgstr "Es necessita el nom d'usuari i la contrasenya"
-
-#~ msgid "The username is required"
-#~ msgstr "Es necessita el nom d'usuari"
-
-#~ msgid "This account is already configured in KAccounts"
-#~ msgstr "Aquest compte ja està configurat en el KAccounts"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/po/zh_CN/kaccounts-integration.po 
new/kaccounts-integration-23.08.0/po/zh_CN/kaccounts-integration.po
--- old/kaccounts-integration-23.04.3/po/zh_CN/kaccounts-integration.po 
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/po/zh_CN/kaccounts-integration.po 
2023-08-16 22:24:20.000000000 +0200
@@ -3,7 +3,7 @@
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2023-01-30 00:57+0000\n"
-"PO-Revision-Date: 2023-07-03 11:41\n"
+"PO-Revision-Date: 2023-08-02 12:44\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/declarative/CMakeLists.txt 
new/kaccounts-integration-23.08.0/src/declarative/CMakeLists.txt
--- old/kaccounts-integration-23.04.3/src/declarative/CMakeLists.txt    
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/declarative/CMakeLists.txt    
2023-08-16 22:24:20.000000000 +0200
@@ -3,7 +3,7 @@
 target_sources(kaccountsdeclarativeplugin PRIVATE 
kaccountsdeclarativeplugin.cpp kaccountsdeclarativeplugin.h)
 
 target_link_libraries(kaccountsdeclarativeplugin Qt::Qml
-                                                 KF5::I18n
+                                                 KF${QT_MAJOR_VERSION}::I18n
                                                  kaccounts
                                                  )
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kaccounts-integration-23.04.3/src/kcm/CMakeLists.txt 
new/kaccounts-integration-23.08.0/src/kcm/CMakeLists.txt
--- old/kaccounts-integration-23.04.3/src/kcm/CMakeLists.txt    2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kcm/CMakeLists.txt    2023-08-16 
22:24:20.000000000 +0200
@@ -2,10 +2,15 @@
 
 target_link_libraries(kcm_kaccounts
     Qt::Core
-    KF5::CoreAddons
-    KF5::I18n
-    KF5::QuickAddons
+    KF${QT_MAJOR_VERSION}::CoreAddons
+    KF${QT_MAJOR_VERSION}::I18n
     )
 
+if(QT_MAJOR_VERSION STREQUAL "5")
+    target_link_libraries(kcm_kaccounts KF5::QuickAddons)
+else()
+    target_link_libraries(kcm_kaccounts KF6::KCMUtils)
+endif()
+
 kpackage_install_package(package kcm_kaccounts kcms)
 kcmutils_generate_desktop_file(kcm_kaccounts)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kaccounts-integration-23.04.3/src/kcm/accounts.cpp 
new/kaccounts-integration-23.08.0/src/kcm/accounts.cpp
--- old/kaccounts-integration-23.04.3/src/kcm/accounts.cpp      2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kcm/accounts.cpp      2023-08-16 
22:24:20.000000000 +0200
@@ -12,9 +12,17 @@
 K_PLUGIN_CLASS_WITH_JSON(AccountsSettings, "kcm_kaccounts.json")
 
 AccountsSettings::AccountsSettings(QObject *parent, const KPluginMetaData 
&data, const QVariantList &args)
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     : KQuickAddons::ConfigModule(parent, data, args)
+#else
+    : KQuickConfigModule(parent, data)
+#endif
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     setButtons(KQuickAddons::ConfigModule::NoAdditionalButton);
+#else
+    setButtons(KQuickConfigModule::NoAdditionalButton);
+#endif
 }
 
 #include "accounts.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kaccounts-integration-23.04.3/src/kcm/accounts.h 
new/kaccounts-integration-23.08.0/src/kcm/accounts.h
--- old/kaccounts-integration-23.04.3/src/kcm/accounts.h        2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kcm/accounts.h        2023-08-16 
22:24:20.000000000 +0200
@@ -7,11 +7,20 @@
 #ifndef ACCOUNTSSETTINGS_H
 #define ACCOUNTSSETTINGS_H
 
-#include <KQuickAddons/ConfigModule>
 #include <QObject>
 #include <QVariant>
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <KQuickAddons/ConfigModule>
+#else
+#include <KQuickConfigModule>
+#endif
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 class AccountsSettings : public KQuickAddons::ConfigModule
+#else
+class AccountsSettings : public KQuickConfigModule
+#endif
 {
     Q_OBJECT
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/kcm/kcm_kaccounts.json 
new/kaccounts-integration-23.08.0/src/kcm/kcm_kaccounts.json
--- old/kaccounts-integration-23.04.3/src/kcm/kcm_kaccounts.json        
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kcm/kcm_kaccounts.json        
2023-08-16 22:24:20.000000000 +0200
@@ -3,6 +3,7 @@
         "BugReportUrl": 
"https://bugs.kde.org/enter_bug.cgi?product=systemsettings&component=kcm_kaccounts";,
         "Description": "Configure your internet accounts such as Google, Live, 
Owncloud",
         "Description[ar]": "اضبط حساباتك على الإنترنت 
كغوغل، لايف وسحابتك \"Owncloud\"",
+        "Description[az]": "Google, Live, Owncloud kimi kimi hesabları 
ayarla",
         "Description[bg]": "Настройване на интернет 
акаунти като Google, Live, Owncloud",
         "Description[ca@valencia]": "Configura els vostres comptes d'Internet 
com Google, Live, Owncloud",
         "Description[ca]": "Configura els vostres comptes d'Internet com 
Google, Live, Owncloud",
@@ -10,6 +11,7 @@
         "Description[de]": "Verwalten Sie Ihre Internet-Zugänge wie Google, 
Live und Owncloud",
         "Description[el]": "Διαμόρφωση διαδικτυακών 
λογαριασμών όπως Google, Live, Owncloud",
         "Description[en_GB]": "Configure your internet accounts such as 
Google, Live, Owncloud",
+        "Description[eo]": "Agordu viajn interretajn kontojn kiel ekz. Google, 
Live, Owncloud",
         "Description[es]": "Configurar sus cuentas de internet, como Google, 
Live, Owncloud",
         "Description[eu]": "Konfiguratu zure interneteko kontuak, Google, 
Live, Owncloud eta halakoak",
         "Description[fi]": "Aseta internettilit kuten Google, Live, Owncloud",
@@ -44,6 +46,7 @@
         "Icon": "preferences-online-accounts",
         "Name": "Online Accounts",
         "Name[ar]": "حسابات الإنترنت",
+        "Name[az]": "Onlayn istifadəçi hesabları",
         "Name[bg]": "Онлайн акаунти",
         "Name[ca@valencia]": "Comptes en línia",
         "Name[ca]": "Comptes en línia",
@@ -51,6 +54,7 @@
         "Name[de]": "Online-Zugänge",
         "Name[el]": "Επιγραμμικοί λογαριασμοί",
         "Name[en_GB]": "Online Accounts",
+        "Name[eo]": "Enretaj kontoj",
         "Name[es]": "Cuentas en línea",
         "Name[eu]": "Lerroko kontuak",
         "Name[fi]": "Verkkotilit",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/kcm/package/contents/ui/main.qml 
new/kaccounts-integration-23.08.0/src/kcm/package/contents/ui/main.qml
--- old/kaccounts-integration-23.04.3/src/kcm/package/contents/ui/main.qml      
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kcm/package/contents/ui/main.qml      
2023-08-16 22:24:20.000000000 +0200
@@ -56,7 +56,7 @@
             actions: [
                 Kirigami.Action {
                     text: i18ndc("kaccounts-integration", "Tooltip for an 
action which will offer the user to remove the mentioned account", "Remove %1", 
accountDelegate.contentItem.text)
-                    iconName: "edit-delete-remove"
+                    icon.name: "edit-delete-remove"
                     onTriggered: {
                         accountRemover.accountId = model.id;
                         accountRemover.displayName = model.displayName;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/kded/CMakeLists.txt 
new/kaccounts-integration-23.08.0/src/kded/CMakeLists.txt
--- old/kaccounts-integration-23.04.3/src/kded/CMakeLists.txt   2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kded/CMakeLists.txt   2023-08-16 
22:24:20.000000000 +0200
@@ -1,11 +1,11 @@
 kcoreaddons_add_plugin(
     kded_accounts
     SOURCES kded_accounts.cpp kded_accounts.h
-    INSTALL_NAMESPACE "kf5/kded"
+    INSTALL_NAMESPACE "kf${QT_MAJOR_VERSION}/kded"
 )
 
 target_link_libraries(kded_accounts
     Qt::Core
-    KF5::DBusAddons
+    KF${QT_MAJOR_VERSION}::DBusAddons
     kaccounts
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/kded/kded_accounts.json 
new/kaccounts-integration-23.08.0/src/kded/kded_accounts.json
--- old/kaccounts-integration-23.04.3/src/kded/kded_accounts.json       
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/kded/kded_accounts.json       
2023-08-16 22:24:20.000000000 +0200
@@ -11,6 +11,7 @@
         "Description[de]": "Zugangsverwaltung",
         "Description[el]": "Διαχείριση λογαριασμών",
         "Description[en_GB]": "Accounts management",
+        "Description[eo]": "Mastrumado de kontoj",
         "Description[es]": "Gestión de cuentas",
         "Description[et]": "Kontohaldus",
         "Description[eu]": "Kontu kudeaketa",
@@ -52,6 +53,7 @@
         "Name[de]": "Zugänge",
         "Name[el]": "Λογαριασμοί",
         "Name[en_GB]": "Accounts",
+        "Name[eo]": "Kontoj",
         "Name[es]": "Cuentas",
         "Name[et]": "Kontod",
         "Name[eu]": "Kontuak",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kaccounts-integration-23.04.3/src/lib/CMakeLists.txt 
new/kaccounts-integration-23.08.0/src/lib/CMakeLists.txt
--- old/kaccounts-integration-23.04.3/src/lib/CMakeLists.txt    2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/lib/CMakeLists.txt    2023-08-16 
22:24:20.000000000 +0200
@@ -64,8 +64,8 @@
 generate_export_header(kaccounts BASE_NAME kaccounts)
 target_link_libraries (kaccounts
     PUBLIC
-        KF5::CoreAddons
-        KF5::I18n
+        KF${QT_MAJOR_VERSION}::CoreAddons
+        KF${QT_MAJOR_VERSION}::I18n
         ${ACCOUNTSQT_LIBRARIES}
         Qt::Xml
         Qt::Gui
@@ -73,7 +73,13 @@
         ${SIGNONQT_LIBRARIES}
 )
 
-target_include_directories(kaccounts INTERFACE 
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KAccounts>" PUBLIC 
"${ACCOUNTSQT_INCLUDE_DIRS}" PRIVATE "${SIGNONQT_INCLUDE_DIRS}")
+target_include_directories(kaccounts
+    INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KAccounts>"
+)
+target_include_directories(kaccounts SYSTEM
+    PUBLIC "${ACCOUNTSQT_INCLUDE_DIRS}"
+    PRIVATE "${SIGNONQT_INCLUDE_DIRS}"
+)
 set_target_properties(kaccounts PROPERTIES VERSION   ${KACCOUNTS_VERSION}
                                            SOVERSION ${KACCOUNTS_SOVERSION}
                                            EXPORT_NAME KAccounts
@@ -95,7 +101,7 @@
 
 install(TARGETS kaccounts EXPORT KAccountsTargets 
${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 
-install(EXPORT KAccountsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE 
KAccountsTargets.cmake ) #NAMESPACE KF5::
+install(EXPORT KAccountsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE 
KAccountsTargets.cmake ) #NAMESPACE KF${QT_MAJOR_VERSION}::
 
 install (FILES
         ${CMAKE_CURRENT_BINARY_DIR}/kaccounts_export.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/lib/KAccountsConfig.cmake.in 
new/kaccounts-integration-23.08.0/src/lib/KAccountsConfig.cmake.in
--- old/kaccounts-integration-23.04.3/src/lib/KAccountsConfig.cmake.in  
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/lib/KAccountsConfig.cmake.in  
2023-08-16 22:24:20.000000000 +0200
@@ -2,10 +2,10 @@
 
 include(CMakeFindDependencyMacro)
 
-find_dependency(Qt5Widgets @QT_REQUIRED_VERSION@)
-find_dependency(KF5CoreAddons @KF5_MIN_VERSION@)
-find_dependency(AccountsQt5 @ACCOUNTSQT_DEP_VERSION@)
-find_dependency(SignOnQt5 @SIGNONQT_DEP_VERSION@)
+find_dependency(Qt@QT_MAJOR_VERSION@Widgets @QT_REQUIRED_VERSION@)
+find_dependency(KF@QT_MAJOR_VERSION@CoreAddons @KF5_MIN_VERSION@)
+find_dependency(AccountsQt@QT_MAJOR_VERSION@ @ACCOUNTSQT_DEP_VERSION@)
+find_dependency(SignOnQt@QT_MAJOR_VERSION@ @SIGNONQT_DEP_VERSION@)
 
 include("${CMAKE_CURRENT_LIST_DIR}/KAccountsTargets.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/KAccountsMacros.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/lib/getcredentialsjob.cpp 
new/kaccounts-integration-23.08.0/src/lib/getcredentialsjob.cpp
--- old/kaccounts-integration-23.04.3/src/lib/getcredentialsjob.cpp     
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/lib/getcredentialsjob.cpp     
2023-08-16 22:24:20.000000000 +0200
@@ -139,7 +139,10 @@
 
 QVariantMap GetCredentialsJob::credentialsData() const
 {
-    return d->sessionData.toMap().unite(d->authData);
+    auto data = d->sessionData.toMap();
+    data.insert(d->authData);
+
+    return data;
 }
 
 #include "moc_getcredentialsjob.cpp"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/lib/providersmodel.cpp 
new/kaccounts-integration-23.08.0/src/lib/providersmodel.cpp
--- old/kaccounts-integration-23.04.3/src/lib/providersmodel.cpp        
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/lib/providersmodel.cpp        
2023-08-16 22:24:20.000000000 +0200
@@ -94,7 +94,7 @@
                         ++i;
                     }
                 }
-                data.setValue<int>(i);
+                data.setValue(i);
                 break;
             }
             default:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/lib/servicesmodel.cpp 
new/kaccounts-integration-23.08.0/src/lib/servicesmodel.cpp
--- old/kaccounts-integration-23.04.3/src/lib/servicesmodel.cpp 2023-07-04 
07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/lib/servicesmodel.cpp 2023-08-16 
22:24:20.000000000 +0200
@@ -80,11 +80,9 @@
                 data.setValue(service.name());
                 break;
             case DescriptionRole:
-#if ACCOUNTSQT5_VERSION_MAJOR == 1 && ACCOUNTSQT5_VERSION_MINOR >= 16
                 // Not all services have descriptions and UIs should be 
designed with that in mind.
                 // Consequently, we can accept not having a fallback for this.
                 data.setValue(service.description());
-#endif
                 break;
             case DisplayNameRole:
                 data.setValue(service.displayName());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/CMakeLists.txt 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/CMakeLists.txt
--- old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/CMakeLists.txt     
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/CMakeLists.txt     
2023-08-16 22:24:20.000000000 +0200
@@ -11,12 +11,12 @@
 target_link_libraries(kaccounts_kio_webdav_plugin
     Qt::Core
     Qt::Widgets
-    KF5::CoreAddons
-    KF5::ConfigCore
-    KF5::Wallet
-    KF5::KIOCore
-    KF5::I18n
-    KF5::DBusAddons
+    KF${QT_MAJOR_VERSION}::CoreAddons
+    KF${QT_MAJOR_VERSION}::ConfigCore
+    KF${QT_MAJOR_VERSION}::Wallet
+    KF${QT_MAJOR_VERSION}::KIOCore
+    KF${QT_MAJOR_VERSION}::I18n
+    KF${QT_MAJOR_VERSION}::DBusAddons
     kaccounts
     ${ACCOUNTSQT_LIBRARIES}
     ${SIGNONQT_LIBRARIES}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/kio-webdav.json 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/kio-webdav.json
--- old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/kio-webdav.json    
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/kio-webdav.json    
2023-08-16 22:24:20.000000000 +0200
@@ -11,6 +11,7 @@
         "Description[de]": "WebDAV-Freigaben mit KIO einhängen",
         "Description[el]": "Προσάρτηση κοινών πόρων 
WebDAV με το KIO",
         "Description[en_GB]": "Mount WebDAV shares with KIO",
+        "Description[eo]": "Munti WebDAV-komunaĵojn per KIO",
         "Description[es]": "Montar recursos compartidos WebDAV con KIO",
         "Description[et]": "WebDAV-i jagatud ressursside ühendamine 
KIO-mooduli abil",
         "Description[eu]": "Muntatu WebDAV partekatzeak KIO erabiliz",
@@ -55,6 +56,7 @@
         "Name[de]": "KIO WebDAV",
         "Name[el]": "KIO WebDAV",
         "Name[en_GB]": "KIO WebDAV",
+        "Name[eo]": "KIO-WebDAV",
         "Name[es]": "KIO WebDAV",
         "Name[et]": "WebDAV-i KIO-moodul",
         "Name[eu]": "KIO WebDAV",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/kioservices.cpp 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/kioservices.cpp
--- old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/kioservices.cpp    
2023-07-04 07:06:04.000000000 +0200
+++ new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/kioservices.cpp    
2023-08-16 22:24:20.000000000 +0200
@@ -21,7 +21,7 @@
 #include <KIO/TransferJob>
 #include <KLocalizedString>
 #include <KPluginFactory>
-#include <KWallet/KWallet>
+#include <KWallet>
 
 #include <Accounts/Manager>
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/tests/CMakeLists.txt 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/tests/CMakeLists.txt
--- 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/tests/CMakeLists.txt   
    2023-07-04 07:06:04.000000000 +0200
+++ 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/tests/CMakeLists.txt   
    2023-08-16 22:24:20.000000000 +0200
@@ -3,8 +3,8 @@
 find_package(Qt5 5.2.0 CONFIG REQUIRED Test)
 
 add_definitions("-DTEST_DATA=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"")
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${ACCOUNTSQT_INCLUDE_DIRS} 
${SIGNONQT_INCLUDE_DIRS})
-set(COMMON_LINK_LIBS Qt5::Test Qt5::Core Qt5::Xml Qt5::DBus KF5::CoreAddons 
${ACCOUNTSQT_LIBRARIES})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} SYSTEM 
${ACCOUNTSQT_INCLUDE_DIRS} ${SIGNONQT_INCLUDE_DIRS})
+set(COMMON_LINK_LIBS Qt5::Test Qt5::Core Qt5::Xml Qt5::DBus 
KF${QT_MAJOR_VERSION}::CoreAddons ${ACCOUNTSQT_LIBRARIES})
 
 set(testname testnetattachjobs)
 add_executable(${testname} ${testname}.cpp
@@ -13,4 +13,4 @@
 )
 add_test(kaccounts-${testname} ${testname})
 ecm_mark_as_test(${testname})
-target_link_libraries(${testname} ${COMMON_LINK_LIBS}  KF5::ConfigCore 
KF5::KIOCore Qt5::Widgets KF5::Wallet)
+target_link_libraries(${testname} ${COMMON_LINK_LIBS}  
KF${QT_MAJOR_VERSION}::ConfigCore KF${QT_MAJOR_VERSION}::KIOCore Qt5::Widgets 
KF${QT_MAJOR_VERSION}::Wallet)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/tests/testnetattachjobs.cpp
 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/tests/testnetattachjobs.cpp
--- 
old/kaccounts-integration-23.04.3/src/plugins/kio-webdav/tests/testnetattachjobs.cpp
        2023-07-04 07:06:04.000000000 +0200
+++ 
new/kaccounts-integration-23.08.0/src/plugins/kio-webdav/tests/testnetattachjobs.cpp
        2023-08-16 22:24:20.000000000 +0200
@@ -12,7 +12,7 @@
 #include <KConfig>
 #include <KConfigGroup>
 #include <KDirNotify>
-#include <KWallet/KWallet>
+#include <KWallet>
 
 #include <QDBusAbstractAdaptor>
 #include <QDBusConnection>

Reply via email to