Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mailcommon for openSUSE:Factory checked in at 2022-11-04 17:33:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailcommon (Old) and /work/SRC/openSUSE:Factory/.mailcommon.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailcommon" Fri Nov 4 17:33:37 2022 rev:81 rq:1033391 version:22.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mailcommon/mailcommon.changes 2022-10-15 16:35:47.861914105 +0200 +++ /work/SRC/openSUSE:Factory/.mailcommon.new.2275/mailcommon.changes 2022-11-04 17:35:14.076895006 +0100 @@ -1,0 +2,8 @@ +Tue Nov 1 11:21:39 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.08.3 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/gear/22.08.3/ + +------------------------------------------------------------------- Old: ---- mailcommon-22.08.2.tar.xz mailcommon-22.08.2.tar.xz.sig New: ---- mailcommon-22.08.3.tar.xz mailcommon-22.08.3.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailcommon.spec ++++++ --- /var/tmp/diff_new_pack.Kz8ttL/_old 2022-11-04 17:35:14.724898391 +0100 +++ /var/tmp/diff_new_pack.Kz8ttL/_new 2022-11-04 17:35:14.744898495 +0100 @@ -20,7 +20,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: mailcommon -Version: 22.08.2 +Version: 22.08.3 Release: 0 Summary: Base KDE PIM library for mail-handling applications License: GPL-2.0-only AND LGPL-2.1-or-later ++++++ mailcommon-22.08.2.tar.xz -> mailcommon-22.08.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/CMakeLists.txt new/mailcommon-22.08.3/CMakeLists.txt --- old/mailcommon-22.08.2/CMakeLists.txt 2022-10-05 20:59:20.000000000 +0200 +++ new/mailcommon-22.08.3/CMakeLists.txt 2022-10-23 19:46:53.000000000 +0200 @@ -1,7 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 # SPDX-FileCopyrightText: none cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.21.2") +set(PIM_VERSION "5.21.3") project(mailcommon VERSION ${PIM_VERSION}) @@ -37,17 +37,17 @@ set(QT_REQUIRED_VERSION "5.15.2") set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.21.2") -set(AKONADICONTACT_LIB_VERSION "5.21.2") -set(MESSAGELIB_LIB_VERSION "5.21.2") -set(KMIME_LIB_VERSION "5.21.2") -set(KMAILTRANSPORT_LIB_VERSION "5.21.2") -set(MAILIMPORTER_LIB_VERSION "5.21.2") -set(LIBKDEPIM_LIB_VERSION "5.21.2") -set(PIMCOMMON_LIB_VERSION "5.21.2") +set(AKONADIMIME_LIB_VERSION "5.21.3") +set(AKONADICONTACT_LIB_VERSION "5.21.3") +set(MESSAGELIB_LIB_VERSION "5.21.3") +set(KMIME_LIB_VERSION "5.21.3") +set(KMAILTRANSPORT_LIB_VERSION "5.21.3") +set(MAILIMPORTER_LIB_VERSION "5.21.3") +set(LIBKDEPIM_LIB_VERSION "5.21.3") +set(PIMCOMMON_LIB_VERSION "5.21.3") set(PHONON_LIB_VERSION "4.11.1") -set(AKONADI_VERSION "5.21.2") +set(AKONADI_VERSION "5.21.3") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/po/ca@valencia/libmailcommon.po new/mailcommon-22.08.3/po/ca@valencia/libmailcommon.po --- old/mailcommon-22.08.2/po/ca@valencia/libmailcommon.po 2022-10-11 07:04:22.000000000 +0200 +++ new/mailcommon-22.08.3/po/ca@valencia/libmailcommon.po 2022-11-01 01:16:44.000000000 +0100 @@ -212,11 +212,11 @@ "signing or encryption keys automatically. Identities can be set up in the " "main configuration dialog. (Settings -> Configure KMail)" msgstr "" -"Seleccioneu la identitat del remitent a utilitzar en escriure correus nous o " -"respondre a correus en esta carpeta. A???? vol dir que si vos trobeu en una de " -"les carpetes de treball, podeu fer que KMail empre la corresponent adre??a " -"del remitent del correu, la signatura i les claus de signatura o encriptaci?? " -"autom??ticament. Es poden establir les identitats en el di??leg de " +"Seleccioneu la identitat del remitent que s'utilitzar?? en escriure correus " +"nous o respondre a correus en esta carpeta. A???? vol dir que si vos trobeu en " +"una de les carpetes de treball, podeu fer que KMail empre la corresponent " +"adre??a del remitent del correu, la signatura i les claus de signatura o " +"encriptaci?? autom??ticament. Es poden establir les identitats en el di??leg de " "configuraci?? principal. (Configuraci?? -> Configura KMail)" #: collectionpage/collectiongeneralwidget.cpp:66 @@ -303,8 +303,8 @@ msgid "" "Filter account is missing. Please select account to use with filter \"%1\"" msgstr "" -"Falta el compte del filtre. Seleccioneu un compte a utilitzar amb el filtre " -"??%1??" +"Falta el compte del filtre. Seleccioneu un compte que s'utilitzar?? amb el " +"filtre ??%1??" #: filter/dialog/filteractionmissingfolderdialog.cpp:36 #: folder/folderrequester.cpp:73 @@ -333,7 +333,7 @@ msgid "" "Filter folder is missing. Please select a folder to use with filter \"%1\":" msgstr "" -"Falta la carpeta del filtre. Seleccioneu una carpeta a utilitzar amb el " +"Falta la carpeta del filtre. Seleccioneu una carpeta que s'utilitzar?? amb el " "filtre ??%1??:" #: filter/dialog/filteractionmissingidentitydialog.cpp:27 @@ -348,8 +348,8 @@ "Filter identity is missing. Please select an identity to use with filter " "\"%1\"" msgstr "" -"Falta la identitat del filtre. Seleccioneu una identitat a utilitzar amb el " -"filtre ??%1??" +"Falta la identitat del filtre. Seleccioneu una identitat que s'utilitzar?? " +"amb el filtre ??%1??" #: filter/dialog/filteractionmissingsoundurldialog.cpp:25 #, kde-format @@ -366,7 +366,7 @@ #, kde-format msgid "Sound file is missing. Please select a sound to use with filter \"%1\"" msgstr "" -"Falta el fitxer de so. Seleccioneu un so a utilitzar amb el filtre ??%1??" +"Falta el fitxer de so. Seleccioneu un so que s'utilitzar?? amb el filtre ??%1??" #: filter/dialog/filteractionmissingtagdialog.cpp:31 #, kde-format @@ -383,8 +383,8 @@ #, kde-format msgid "Filter tag is missing. Please select a tag to use with filter \"%1\"" msgstr "" -"Falta l'etiqueta del filtre. Seleccioneu una etiqueta a utilitzar amb el " -"filtre ??%1??" +"Falta l'etiqueta del filtre. Seleccioneu una etiqueta que s'utilitzar?? amb " +"el filtre ??%1??" #: filter/dialog/filteractionmissingtagdialog.cpp:65 #, kde-format @@ -418,8 +418,8 @@ "Filter transport is missing. Please select a transport to use with filter " "\"%1\"" msgstr "" -"Falta el transport del filtre. Seleccioneu un transport a utilitzar amb el " -"filtre ??%1??" +"Falta el transport del filtre. Seleccioneu un transport que s'utilitzar?? amb " +"el filtre ??%1??" #: filter/dialog/selectthunderbirdfilterfilesdialog.cpp:23 #, kde-format @@ -1546,7 +1546,7 @@ #: filter/kmfilterlistbox.cpp:661 #, kde-format msgid "Rename Filter" -msgstr "Canvia el nom el filtre" +msgstr "Canvia el nom del filtre" #: filter/kmfilterlistbox.cpp:662 #, kde-format @@ -1554,7 +1554,7 @@ "Rename filter \"%1\" to:\n" "(leave the field empty for automatic naming)" msgstr "" -"Canvia el nom el filtre ??%1?? a:\n" +"Canvia el nom del filtre ??%1?? a:\n" "(deixeu-ho buit per a anomenar-lo autom??ticament)" #: filter/mailfilter.cpp:131 @@ -2632,7 +2632,7 @@ #: snippets/snippetsmanager.cpp:567 #, kde-format msgid "Rename Group..." -msgstr "Canvia el nom el grup..." +msgstr "Canvia el nom del grup..." #: snippets/snippetsmanager.cpp:569 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/po/tr/libmailcommon.po new/mailcommon-22.08.3/po/tr/libmailcommon.po --- old/mailcommon-22.08.2/po/tr/libmailcommon.po 2022-10-11 07:04:22.000000000 +0200 +++ new/mailcommon-22.08.3/po/tr/libmailcommon.po 2022-11-01 01:16:44.000000000 +0100 @@ -11,7 +11,7 @@ "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-07-04 00:46+0000\n" -"PO-Revision-Date: 2022-07-01 23:00+0300\n" +"PO-Revision-Date: 2022-10-12 01:13+0300\n" "Last-Translator: Emir SARI <emir_s...@icloud.com>\n" "Language-Team: Turkish <kde-l10n...@kde.org>\n" "Language: tr\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 22.04.2\n" +"X-Generator: Lokalize 22.08.1\n" "X-POOTLE-MTIME: 1413111382.000000\n" #: collectionpage/collectionexpirypage.cpp:27 @@ -605,7 +605,7 @@ #: filter/filteractions/filteractionexec.cpp:15 #, kde-format msgid "Execute Command" -msgstr "Komut ??al????t??r" +msgstr "Komutu Y??r??t" #: filter/filteractions/filteractionexec.cpp:36 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/po/zh_CN/libmailcommon.po new/mailcommon-22.08.3/po/zh_CN/libmailcommon.po --- old/mailcommon-22.08.2/po/zh_CN/libmailcommon.po 2022-10-11 07:04:22.000000000 +0200 +++ new/mailcommon-22.08.3/po/zh_CN/libmailcommon.po 2022-11-01 01:16:44.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2022-07-04 00:46+0000\n" -"PO-Revision-Date: 2022-10-02 15:52\n" +"PO-Revision-Date: 2022-10-30 07:51\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -212,13 +212,13 @@ #, kde-format msgctxt "@item:inlistbox Show sender." msgid "Sender" -msgstr "" +msgstr "?????????" #: collectionpage/collectionviewwidget.cpp:38 #, kde-format msgctxt "@item:inlistbox Show receiver." msgid "Receiver" -msgstr "" +msgstr "?????????" #: collectionpage/collectionviewwidget.cpp:39 #, kde-format @@ -2546,6 +2546,9 @@ "then type \\greeting in your email and then press the tab key, and it will " "be replaced with the contents of this snippet." msgstr "" +"??????????????????????????????????????????????????????????????????????????????????????????????????????" +"??????greeting?????????????????????????????????????????????????????? \\greeting ???????????? Tab ?????????" +"??????????????????????????????????????????" #. i18n: ectx: property (text), widget (QLabel, nameLabel) #: snippets/ui/snippetwidget.ui:31 @@ -2564,7 +2567,7 @@ #: snippets/ui/snippetwidget.ui:65 #, kde-format msgid "Attachments:" -msgstr "" +msgstr "?????????" #. i18n: ectx: property (text), widget (QLabel, textLabel) #: snippets/ui/snippetwidget.ui:82 @@ -2576,19 +2579,19 @@ #: snippets/ui/snippetwidget.ui:102 #, kde-format msgid "To:" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (text), widget (QLabel, label_4) #: snippets/ui/snippetwidget.ui:113 #, kde-format msgid "Cc:" -msgstr "" +msgstr "?????????" #. i18n: ectx: property (text), widget (QLabel, label) #: snippets/ui/snippetwidget.ui:120 #, kde-format msgid "Keyword:" -msgstr "" +msgstr "????????????" #. i18n: ectx: property (text), widget (QLabel, keyWidgetLabel) #: snippets/ui/snippetwidget.ui:127 @@ -2600,7 +2603,7 @@ #: snippets/ui/snippetwidget.ui:164 #, kde-format msgid "Bcc:" -msgstr "" +msgstr "?????????" #. i18n: ectx: property (text), widget (QLabel, label_2) #: snippets/ui/snippetwidget.ui:184 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/src/filter/filteractions/filteractioncopy.cpp new/mailcommon-22.08.3/src/filter/filteractions/filteractioncopy.cpp --- old/mailcommon-22.08.2/src/filter/filteractions/filteractioncopy.cpp 2022-10-05 20:59:20.000000000 +0200 +++ new/mailcommon-22.08.3/src/filter/filteractions/filteractioncopy.cpp 2022-10-23 19:46:53.000000000 +0200 @@ -50,7 +50,7 @@ { QString path; if (KernelIf->collectionModel()) { - path = MailCommon::Util::fullCollectionPath(mFolder); + path = MailCommon::Util::fullCollectionRemoveIdPath(mFolder); } else { path = QString::number(mFolder.id()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/src/filter/filteractions/filteractionmove.cpp new/mailcommon-22.08.3/src/filter/filteractions/filteractionmove.cpp --- old/mailcommon-22.08.2/src/filter/filteractions/filteractionmove.cpp 2022-10-05 20:59:20.000000000 +0200 +++ new/mailcommon-22.08.3/src/filter/filteractions/filteractionmove.cpp 2022-10-23 19:46:53.000000000 +0200 @@ -48,7 +48,7 @@ { QString path; if (KernelIf->collectionModel()) { - path = MailCommon::Util::fullCollectionPath(mFolder, false); + path = MailCommon::Util::fullCollectionRemoveIdPath(mFolder, false); } else { path = QString::number(mFolder.id()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/src/util/mailutil.cpp new/mailcommon-22.08.3/src/util/mailutil.cpp --- old/mailcommon-22.08.2/src/util/mailutil.cpp 2022-10-05 20:59:20.000000000 +0200 +++ new/mailcommon-22.08.3/src/util/mailutil.cpp 2022-10-23 19:46:53.000000000 +0200 @@ -100,6 +100,34 @@ return fullPath; } +QString MailCommon::Util::fullCollectionRemoveIdPath(const Akonadi::Collection &collection, bool addAccountName) +{ + QString fullPath; + + QModelIndex idx = Akonadi::EntityTreeModel::modelIndexForCollection(KernelIf->collectionModel(), collection); + if (!idx.isValid()) { + return fullPath; + } + + fullPath = idx.data().toString(); + idx = idx.parent(); + while (idx != QModelIndex()) { + const QString tmp = idx.data(Akonadi::EntityTreeModel::RemoteIdRole).toString() + QLatin1Char('/') + fullPath; + idx = idx.parent(); + if (idx != QModelIndex()) { + fullPath = tmp; + } else { + if (!addAccountName) { + break; + } else { + fullPath = tmp; + break; + } + } + } + return fullPath; +} + bool MailCommon::Util::showJobErrorMessage(KJob *job) { if (job->error()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-22.08.2/src/util/mailutil.h new/mailcommon-22.08.3/src/util/mailutil.h --- old/mailcommon-22.08.2/src/util/mailutil.h 2022-10-05 20:59:20.000000000 +0200 +++ new/mailcommon-22.08.3/src/util/mailutil.h 2022-10-23 19:46:53.000000000 +0200 @@ -36,6 +36,7 @@ Q_REQUIRED_RESULT MAILCOMMON_EXPORT bool isVirtualCollection(const QString &resource); Q_REQUIRED_RESULT MAILCOMMON_EXPORT QString fullCollectionPath(const Akonadi::Collection &collection, bool addAccountName = true); +Q_REQUIRED_RESULT MAILCOMMON_EXPORT QString fullCollectionRemoveIdPath(const Akonadi::Collection &collection, bool addAccountName = true); MAILCOMMON_EXPORT bool showJobErrorMessage(KJob *job);
