Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mailimporter for openSUSE:Factory checked in at 2023-08-31 13:43:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailimporter (Old) and /work/SRC/openSUSE:Factory/.mailimporter.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailimporter" Thu Aug 31 13:43:38 2023 rev:90 rq:1105803 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mailimporter/mailimporter.changes 2023-07-07 15:48:33.256636991 +0200 +++ /work/SRC/openSUSE:Factory/.mailimporter.new.1766/mailimporter.changes 2023-08-31 13:46:03.332947194 +0200 @@ -1,0 +2,32 @@ +Sun Aug 20 14:00:19 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:03:36 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:14:31 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Fix platforms name + * Remove CI 6 job. We will use kf6 branch for kf6 works + * Remove unused files + * not export symbol of private methods + * Fix typo + * Generate version first + * Fix generate QCH + remove compat lib + * PimCommon is only necessary not PimCommonAkonadi + * Use correct INSTALL_TARGETS_DEFAULT_ARGS + +------------------------------------------------------------------- Old: ---- mailimporter-23.04.3.tar.xz mailimporter-23.04.3.tar.xz.sig New: ---- mailimporter-23.08.0.tar.xz mailimporter-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailimporter.spec ++++++ --- /var/tmp/diff_new_pack.IjSrdK/_old 2023-08-31 13:46:04.604992660 +0200 +++ /var/tmp/diff_new_pack.IjSrdK/_new 2023-08-31 13:46:04.608992803 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: mailimporter -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: Mail import functionality for KDE PIM applications License: GPL-2.0-or-later @@ -39,7 +39,7 @@ BuildRequires: cmake(KPim5AkonadiMime) BuildRequires: cmake(KPim5Libkdepim) BuildRequires: cmake(KPim5Mime) -BuildRequires: cmake(KF5PimCommonAkonadi) +BuildRequires: cmake(KPim5PimCommonAkonadi) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) @@ -104,9 +104,7 @@ %dir %{_includedir}/KPim5 %{_includedir}/KPim5/MailImporter/ %{_includedir}/KPim5/MailImporterAkonadi/ -%{_kf5_cmakedir}/KF5MailImporter/ %{_kf5_cmakedir}/KPim5MailImporter/ -%{_kf5_cmakedir}/KF5MailImporterAkonadi/ %{_kf5_cmakedir}/KPim5MailImporterAkonadi/ %{_kf5_libdir}/libKPim5MailImporter.so %{_kf5_libdir}/libKPim5MailImporterAkonadi.so ++++++ mailimporter-23.04.3.tar.xz -> mailimporter-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/.gitignore new/mailimporter-23.08.0/.gitignore --- old/mailimporter-23.04.3/.gitignore 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/.gitignore 2023-08-13 09:04:36.000000000 +0200 @@ -26,3 +26,4 @@ .idea /cmake-build* .cache +Testing/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/.gitlab-ci.yml new/mailimporter-23.08.0/.gitlab-ci.yml --- old/mailimporter-23.04.3/.gitlab-ci.yml 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/.gitlab-ci.yml 2023-08-13 09:04:36.000000000 +0200 @@ -3,8 +3,5 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/.kde-ci.yml new/mailimporter-23.08.0/.kde-ci.yml --- old/mailimporter-23.04.3/.kde-ci.yml 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/.kde-ci.yml 2023-08-13 09:04:36.000000000 +0200 @@ -11,14 +11,5 @@ 'pim/libkdepim' : '@same' 'pim/pimcommon' : '@same' -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] - 'require': - 'frameworks/extra-cmake-modules': '@latest-kf6' - 'pim/akonadi' : '@latest-kf6' - 'pim/akonadi-mime' : '@latest-kf6' - 'pim/kmime' : '@latest-kf6' - 'pim/libkdepim' : '@latest-kf6' - 'pim/pimcommon' : '@latest-kf6' - Options: require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/CMakeLists.txt new/mailimporter-23.08.0/CMakeLists.txt --- old/mailimporter-23.04.3/CMakeLists.txt 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/CMakeLists.txt 2023-08-13 09:04:36.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.23.3") +set(PIM_VERSION "5.24.0") project(MailImporter VERSION ${PIM_VERSION}) -set(KF_MIN_VERSION "5.103.0") +set(KF_MIN_VERSION "5.105.0") find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -35,19 +35,18 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") -set(AKONADIMIME_LIB_VERSION "5.23.3") +set(AKONADIMIME_LIB_VERSION "5.24.0") set(QT_REQUIRED_VERSION "5.15.2") if (QT_MAJOR_VERSION STREQUAL "6") set(QT_REQUIRED_VERSION "6.4.0") set(KF_MIN_VERSION "5.240.0") set(KF_MAJOR_VERSION "6") else() - set(KF_MIN_VERSION "5.100.0") set(KF_MAJOR_VERSION "5") endif() -set(KMIME_LIB_VERSION "5.23.3") -set(AKONADI_VERSION "5.23.3") -set(PIMCOMMON_LIB_VERSION "5.23.3") +set(KMIME_LIB_VERSION "5.24.0") +set(AKONADI_VERSION "5.24.0") +set(PIMCOMMON_LIB_VERSION "5.24.0") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Xml) @@ -60,11 +59,11 @@ find_package(KPim${KF_MAJOR_VERSION}Akonadi ${AKONADI_VERSION} CONFIG REQUIRED) find_package(KPim${KF_MAJOR_VERSION}Mime ${KMIME_LIB_VERSION} CONFIG REQUIRED) find_package(KPim${KF_MAJOR_VERSION}AkonadiMime ${AKONADIMIME_LIB_VERSION} CONFIG REQUIRED) -find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) +find_package(KPim${KF_MAJOR_VERSION}PimCommon ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) ########### Targets ########### -ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.105.0) ########### CMake Config Files ########### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/CMakePresets.json new/mailimporter-23.08.0/CMakePresets.json --- old/mailimporter-23.04.3/CMakePresets.json 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/CMakePresets.json 2023-08-13 09:04:36.000000000 +0200 @@ -41,6 +41,31 @@ ] }, { + "name": "dev-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-qt6-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base-qt6" + ] + }, + + { "name": "dev-qt6", "displayName": "Build against qt6", "binaryDir": "${sourceDir}/build-qt6", @@ -158,11 +183,19 @@ "name": "dev-mold", "configurePreset": "dev-mold" }, + { + "name": "dev-qch", + "configurePreset": "dev-qch" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { + "name": "dev-qt6-qch", + "configurePreset": "dev-qt6-qch" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/metainfo.yaml new/mailimporter-23.08.0/metainfo.yaml --- old/mailimporter-23.04.3/metainfo.yaml 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/metainfo.yaml 2023-08-13 09:04:36.000000000 +0200 @@ -4,7 +4,10 @@ group: kdepim type: functional platforms: - - name: All + - name: Linux + - name: FreeBSD + - name: macOS + - name: Windows public_lib: true libraries: - qmake: MailImporter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/po/eo/libmailimporter.po new/mailimporter-23.08.0/po/eo/libmailimporter.po --- old/mailimporter-23.04.3/po/eo/libmailimporter.po 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/po/eo/libmailimporter.po 2023-08-13 09:04:36.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kmailcvt\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-10 00:19+0000\n" -"PO-Revision-Date: 2023-02-10 21:41+01\n" +"PO-Revision-Date: 2023-04-10 12:21+01\n" "Last-Translator: Oliver Kellogg <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" "Language: eo\n" @@ -176,7 +176,7 @@ msgstr "" "<p><b>Importa filtrilo de Claws-mail</b></p><p>Elektu la bazan dosierujon de " "la poÅtdosierujo de Claws-mail, kiun vi volas importi (kutime: ~/Mail ).</" -"p><p >Äar eblas rekrei la dosierujon, la dosierujoj estos konservitaj sub: " +"p><p>Äar eblas rekrei la dosierujon, la dosierujoj estos konservitaj sub: " "\"ClawsMail-Import\" en via loka dosierujo.</p><p>Tiu Äi filtrilo ankaÅ " "rekreas la staton de mesaÄo, ekz. nova aÅ plusendita.</p>" @@ -263,9 +263,9 @@ msgstr "" "<p><b>Importa filtrilo de Evolution 2.x</b></p><p>Elektu la bazan dosierujon " "de via loka Evolution-poÅtdosierujo (kutime ~/.evolution/mail/local/).</" -"p><b> p><b>Noto:</b> Neniam elektu Dosierujon, kiu <u>ne</u> enhavas mbox-" +"p><p><b>Noto:</b> Neniam elektu Dosierujon, kiu <u>ne</u> enhavas mbox-" "dosierojn (ekzemple maildir): se vi faros, vi ricevos multajn novajn " -"dosierujojn.</p> ><p>Äar eblas rekrei la dosierujon, la dosierujoj estos " +"dosierujojn.</p><p>Äar eblas rekrei la dosierujon, la dosierujoj estos " "konservitaj sub: \"Evolution-Import\".</p>" #: mailimporter/filters/filterevolution_v2.cpp:42 @@ -297,7 +297,7 @@ msgstr "" "<p><b>Importa filtrilo de Evolution 3.x</b></p><p>Elektu la bazan dosierujon " "de via loka Evolution-poÅtdosierujo (kutime ~/.local/share/evolution/mail/" -"local/).< /p><p>Äar eblas rekrei la dosierujon, la dosierujoj estos " +"local/).</p><p>Äar eblas rekrei la dosierujon, la dosierujoj estos " "konservitaj sub: \"Evolution-Import\".</p>" #: mailimporter/filters/filterevolution_v3.cpp:39 @@ -614,7 +614,7 @@ msgstr "" "<p><b>Importfiltrilo de Outlook Express 4/5/6</b></p><p>Vi devos lokalizi la " "dosierujon kie la leterkesto estis konservita serÄante .dbx aÅ .mbx " -"dosierojn sub < ul><li><i>C:\\Windows\\Aplikaj datumoj</i> en Vindozo 9x</" +"dosierojn sub <ul><li><i>C:\\Windows\\Aplikaj datumoj</i> en Vindozo 9x</" "li><li><i>Dokumentoj kaj Agordoj</i> en Vindozo 2000 aÅ poste</li> </ul></" "p><p><b>Noto:</b> Äar eblas rekrei la dosierujon, la dosierujoj de Outlook " "Express 5 kaj 6 estos konservitaj sub: \"OE-Import\" en via loka dosierujo.</" @@ -879,7 +879,7 @@ msgstr "" "<p><b>Thunderbird/Mozilla importfiltrilo</b></p><p>Elektu vian bazan " "Thunderbird/Mozilla poÅtdosierujon (kutime ~/.thunderbird/*.default/Mail/" -"Local Folders/).</p ><p><b>Noto:</b> Neniam elektu Dosierujon, kiu <u>ne</u> " +"Local Folders/).</p><p><b>Noto:</b> Neniam elektu Dosierujon, kiu <u>ne</u> " "enhavas mbox-dosierojn (ekzemple, maildir): se vi faros, vi ricevos multajn " "novajn dosierujojn. </p><p>Äar eblas rekrei la dosierujon, la dosierujoj " "estos konservitaj sub: \"Thunderbird-Import\".</p>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/po/fa/libmailimporter.po new/mailimporter-23.08.0/po/fa/libmailimporter.po --- old/mailimporter-23.04.3/po/fa/libmailimporter.po 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/po/fa/libmailimporter.po 2023-08-13 09:04:36.000000000 +0200 @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.2\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: mailimporter/filters/filterbalsa.cpp:22 #, fuzzy, kde-format @@ -105,10 +105,11 @@ #: mailimporter/filters/filtersylpheed.cpp:148 #: mailimporter/filters/filterthebat.cpp:95 #: mailimporter/filters/filterthunderbird.cpp:212 -#, kde-format +#, fuzzy, kde-format msgid "1 duplicate message not imported" msgid_plural "%1 duplicate messages not imported" msgstr[0] "%1 Ù¾Ûا٠د٠ÙسخÙâØ§Û Ùارد Ùشد" +msgstr[1] "" #: mailimporter/filters/filterbalsa.cpp:116 #: mailimporter/filters/filterevolution_v2.cpp:132 @@ -485,6 +486,7 @@ msgid "1 message was imported." msgid_plural "%1 messages were imported." msgstr[0] "%1 Ù¾Ûا٠د٠ÙسخÙâØ§Û Ùارد Ùشد" +msgstr[1] "" #: mailimporter/filters/filterkmailarchive.cpp:202 #, fuzzy, kde-format @@ -570,10 +572,11 @@ #: mailimporter/filters/filtermailapp.cpp:126 #: mailimporter/filters/filtermailmangzip.cpp:136 #: mailimporter/filters/filtermbox.cpp:135 -#, kde-format +#, fuzzy, kde-format msgid "1 duplicate message not imported to folder %2 in KMail" msgid_plural "%1 duplicate messages not imported to folder %2 in KMail" msgstr[0] "%1 Ù¾Ûا٠د٠ÙسخÙâØ§Û Ø¨Ù Ù¾ÙØ´Ù %2 در KMail Ùارد Ùشد" +msgstr[1] "" #: mailimporter/filters/filtermailmangzip.cpp:19 #, fuzzy, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/po/ka/libmailimporter.po new/mailimporter-23.08.0/po/ka/libmailimporter.po --- old/mailimporter-23.04.3/po/ka/libmailimporter.po 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/po/ka/libmailimporter.po 2023-08-13 09:04:36.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: mailimporter\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-10 00:19+0000\n" -"PO-Revision-Date: 2023-04-03 06:31+0200\n" +"PO-Revision-Date: 2023-08-08 06:35+0200\n" "Last-Translator: Temuri Doghonadze <[email protected]>\n" "Language-Team: Georgian <[email protected]>\n" "Language: ka\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.2.2\n" +"X-Generator: Poedit 3.3.2\n" #: mailimporter/filters/filterbalsa.cpp:22 #, kde-format @@ -470,7 +470,7 @@ #: mailimporter/filters/filtermailapp.cpp:29 #, kde-format msgid "Chris Howells<br /><br />Filter accelerated by Danny Kukawka )" -msgstr "" +msgstr "Chris Howells<br /><br />( á¤ááá¢á á ááá©á¥áá á Danny Kukawka-áá )" #: mailimporter/filters/filtermailapp.cpp:30 #, kde-format @@ -485,8 +485,8 @@ #, kde-format msgid "1 duplicate message not imported to folder %2 in KMail" msgid_plural "%1 duplicate messages not imported to folder %2 in KMail" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1 áá£áááá ááá£áá á¨áá¢á§ááááááá áá á¨áááá¢ááááá KMail-áá¡ á¡áá¥áá¦ááááá¨á %2" +msgstr[1] "%1 áá£áááá ááá£áá á¨áá¢á§ááááááá áá á¨áááá¢ááááá KMail-áá¡ á¡áá¥áá¦ááááá¨á %2" #: mailimporter/filters/filtermailmangzip.cpp:19 #, kde-format @@ -562,7 +562,7 @@ #: mailimporter/filters/filteroe.cpp:66 #, kde-format msgid "No Outlook Express mailboxes found in directory %1." -msgstr "" +msgstr "á¡áá¥áá¦ááááá¨á %1 Outlook Express-áá¡ á¡áá¤áá¡á¢á á§á£áááá áá¦ááá©ááááá áá áá." #: mailimporter/filters/filteroe.cpp:82 #, kde-format @@ -721,7 +721,7 @@ #: mailimporter/filters/filtersylpheed.cpp:28 #, kde-format msgid "Import Sylpheed Maildirs and Folder Structure" -msgstr "" +msgstr "Sylpheed-áá¡ Maildir-áááá¡ áá á¡áá¥áá¦áááááááá¡ á¡á¢á á£á¥á¢á£á áá¡ á¨áááá¢ááá" #: mailimporter/filters/filtersylpheed.cpp:30 #, kde-format @@ -771,6 +771,7 @@ #, kde-format msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure" msgstr "" +"Thunderbird/Mozilla-áá¡ áááááá£á á ááá¤áá¡á¢áááá¡á áá á¡áá¥áá¦ááááá¡ á¡á¢á á£á¥á¢á£á áá¡ á¨áááá¢ááá" #: mailimporter/filters/filterthunderbird.cpp:26 #, kde-format @@ -889,14 +890,15 @@ #: mailimporterakonadi/filterimporterakonadi.cpp:221 #, kde-format msgid "<b>Warning:</b> Got an invalid message in folder %1." -msgstr "" +msgstr "<b>ááá¤á áá®ááááá:</b> á¡áá¥áá¦ááááá¨á %1 áá¦ááá©áááááá áá áá¡á¬áá á á¨áá¢á§ááááááá." #: mailimporterakonadi/filterimporterakonadi.cpp:275 #, kde-format msgid "<b>Error:</b> Could not add message to folder %1. Reason: %2" msgstr "" +"<b>á¨ááªáááá:</b> á¡áá¥áá¦ááááá¨á %1 á¨áá¢á§áááááááá¡ á©áááá¢ááá á¨áá£á«ááááááá. áááááá: %2" #: mailimporterakonadi/filterimporterakonadi.cpp:295 #, kde-format msgid "Unable to retrieve folder for folder path %1." -msgstr "" +msgstr "á¡áá¥áá¦ááááá¡ ááááááá¡áááá¡ %1 á¡áá¥áá¦ááááá¡ ááá¦ááá á¨áá£á«ááááááá." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/po/zh_CN/libmailimporter.po new/mailimporter-23.08.0/po/zh_CN/libmailimporter.po --- old/mailimporter-23.04.3/po/zh_CN/libmailimporter.po 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/po/zh_CN/libmailimporter.po 2023-08-13 09:04:36.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-10 00:19+0000\n" -"PO-Revision-Date: 2023-07-03 11:40\n" +"PO-Revision-Date: 2023-08-02 12:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/CMakeLists.txt new/mailimporter-23.08.0/src/mailimporter/CMakeLists.txt --- old/mailimporter-23.04.3/src/mailimporter/CMakeLists.txt 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/CMakeLists.txt 2023-08-13 09:04:36.000000000 +0200 @@ -1,26 +1,4 @@ ########### CMake Config Files ########### -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}MailImporter") -set(MAILIMPORTER_KF5_COMPAT FALSE) - -if (BUILD_QCH) - ecm_install_qch_export( - TARGETS KPim${KF_MAJOR_VERSION}MailImporter_QCH - FILE KPim${KF_MAJOR_VERSION}MailImporteQchTargets.cmake - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MailImporterQchTargets.cmake\")") -endif() - -add_library(KPim${KF_MAJOR_VERSION}MailImporter) -add_library(KPim${KF_MAJOR_VERSION}::MailImporter ALIAS KPim${KF_MAJOR_VERSION}MailImporter) -add_library(KF5::MailImporter ALIAS KPim${KF_MAJOR_VERSION}MailImporter) - -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimMailImporterConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - ) ecm_setup_version(PROJECT VARIABLE_PREFIX MAILIMPORTER VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailimporter_version.h" @@ -28,19 +6,9 @@ SOVERSION 5 ) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - -install(EXPORT KPim${KF_MAJOR_VERSION}MailImporterTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}MailImporterTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/mailimporter_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MailImporter COMPONENT Devel - ) +add_library(KPim${KF_MAJOR_VERSION}MailImporter) +add_library(KPim${KF_MAJOR_VERSION}::MailImporter ALIAS KPim${KF_MAJOR_VERSION}MailImporter) target_sources(KPim${KF_MAJOR_VERSION}MailImporter PRIVATE @@ -126,7 +94,7 @@ PUBLIC KF${KF_MAJOR_VERSION}::Archive PRIVATE - KF5::PimCommon + KPim${KF_MAJOR_VERSION}::PimCommon KF${KF_MAJOR_VERSION}::I18n KF${KF_MAJOR_VERSION}::ConfigCore Qt::Xml @@ -240,35 +208,36 @@ COMPONENT Devel ) endif() +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}MailImporter") + +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KPim${KF_MAJOR_VERSION}MailImporter_QCH + FILE KPim${KF_MAJOR_VERSION}MailImporterQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MailImporterQchTargets.cmake\")") +endif() + -if (QT_MAJOR_VERSION STREQUAL "5") -## -# TODO: Backwards compatiblity. Remove in next major version -## -set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailImporter") -set(MAILIMPORTER_KF5_COMPAT TRUE) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimMailImporterConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5MailImporterConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} -) + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + ) + install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5MailImporterConfig.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - COMPONENT Devel -) -install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterConfigVersion.cmake" - RENAME "KF5MailImporterConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel -) -if (0) -install(EXPORT KPim${KF_MAJOR_VERSION}MailImporterTargets - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - FILE KPim${KF_MAJOR_VERSION}MailImporterTargets.cmake - NAMESPACE KF5:: -) -endif() -endif() + ) + +install(EXPORT KPim${KF_MAJOR_VERSION}MailImporterTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}MailImporterTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/mailimporter_version.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MailImporter COMPONENT Devel + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/KPimMailImporterConfig.cmake.in new/mailimporter-23.08.0/src/mailimporter/KPimMailImporterConfig.cmake.in --- old/mailimporter-23.04.3/src/mailimporter/KPimMailImporterConfig.cmake.in 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/KPimMailImporterConfig.cmake.in 2023-08-13 09:04:36.000000000 +0200 @@ -2,15 +2,5 @@ include(CMakeFindDependencyMacro) find_dependency(KF@KF_MAJOR_VERSION@Archive "@KF_MIN_VERSION@") - -if (@MAILIMPORTER_KF5_COMPAT@) - message(WARNING "\n" - "************* DEPRECATION WARNING *************\n" - "Using find_package(KF5MailImporter) and KF5::MailImporter targets is deprecated. " - "Please use find_package(KPim@KF_MAJOR_VERSION@MailImporter) and KPim@KF_MAJOR_VERSION@::MailImporter instead. This backwards " - "compatibility will be removed in the next major version.\n" - "***********************************************\n") -endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filterkmailarchive.h new/mailimporter-23.08.0/src/mailimporter/filters/filterkmailarchive.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filterkmailarchive.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filterkmailarchive.h 2023-08-13 09:04:36.000000000 +0200 @@ -27,11 +27,11 @@ void importMails(const QString &archiveFile); private: - Q_REQUIRED_RESULT bool importDirectory(const KArchiveDirectory *directory, const QString &folderPath); - Q_REQUIRED_RESULT bool importFolder(const KArchiveDirectory *folder, const QString &folderPath); - Q_REQUIRED_RESULT bool importMessage(const KArchiveFile *file, const QString &folderPath); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT bool importDirectory(const KArchiveDirectory *directory, const QString &folderPath); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT bool importFolder(const KArchiveDirectory *folder, const QString &folderPath); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT bool importMessage(const KArchiveFile *file, const QString &folderPath); - int countFiles(const KArchiveDirectory *directory) const; + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT int countFiles(const KArchiveDirectory *directory) const; std::unique_ptr<FilterKMailArchivePrivate> const d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filterlnotes.h new/mailimporter-23.08.0/src/mailimporter/filters/filterlnotes.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filterlnotes.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filterlnotes.h 2023-08-13 09:04:36.000000000 +0200 @@ -30,6 +30,6 @@ * This is were all the real action is gonna be handled. * Gets called once for EACH file imported */ - void ImportLNotes(const QString &file); + MAILIMPORTER_NO_EXPORT void ImportLNotes(const QString &file); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filteroe.h new/mailimporter-23.08.0/src/mailimporter/filters/filteroe.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filteroe.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filteroe.h 2023-08-13 09:04:36.000000000 +0200 @@ -29,16 +29,16 @@ void importMails(const QString &maildir); private: - void importMailBox(const QString &fileName); - void mbxImport(QDataStream &ds); - void dbxImport(QDataStream &ds); - void dbxReadIndex(QDataStream &ds, int filePos); - void dbxReadDataBlock(QDataStream &ds, int filePos); - void dbxReadEmail(QDataStream &ds, int filePos); + MAILIMPORTER_NO_EXPORT void importMailBox(const QString &fileName); + MAILIMPORTER_NO_EXPORT void mbxImport(QDataStream &ds); + MAILIMPORTER_NO_EXPORT void dbxImport(QDataStream &ds); + MAILIMPORTER_NO_EXPORT void dbxReadIndex(QDataStream &ds, int filePos); + MAILIMPORTER_NO_EXPORT void dbxReadDataBlock(QDataStream &ds, int filePos); + MAILIMPORTER_NO_EXPORT void dbxReadEmail(QDataStream &ds, int filePos); /** helperfunctions for folder structure support */ - Q_REQUIRED_RESULT QString parseFolderOEString(QDataStream &ds, int filePos); - Q_REQUIRED_RESULT QString getFolderName(const QString &filename); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT QString parseFolderOEString(QDataStream &ds, int filePos); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT QString getFolderName(const QString &filename); /** which file (of totalFiles) is now in the work? */ int currentFile; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filteropera.h new/mailimporter-23.08.0/src/mailimporter/filters/filteropera.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filteropera.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filteropera.h 2023-08-13 09:04:36.000000000 +0200 @@ -28,7 +28,7 @@ Q_REQUIRED_RESULT static QString isMailerFound(); private: - void importBox(const QDir &importDir, const QStringList &, const QString &accountName = QString()); - void importRecursive(const QDir &maildir, const QString &accountName = QString()); + MAILIMPORTER_NO_EXPORT void importBox(const QDir &importDir, const QStringList &, const QString &accountName = QString()); + MAILIMPORTER_NO_EXPORT void importRecursive(const QDir &maildir, const QString &accountName = QString()); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filtersylpheed.h new/mailimporter-23.08.0/src/mailimporter/filters/filtersylpheed.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filtersylpheed.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filtersylpheed.h 2023-08-13 09:04:36.000000000 +0200 @@ -38,12 +38,12 @@ virtual QString markFile() const; private: - void importDirContents(const QString &); - void importFiles(const QString &); - void processDirectory(const QString &path); + MAILIMPORTER_NO_EXPORT void importDirContents(const QString &); + MAILIMPORTER_NO_EXPORT void importFiles(const QString &); + MAILIMPORTER_NO_EXPORT void processDirectory(const QString &path); - void readMarkFile(const QString &, QHash<QString, unsigned long> &); - MailImporter::MessageStatus msgFlagsToString(unsigned long flags); + MAILIMPORTER_NO_EXPORT void readMarkFile(const QString &, QHash<QString, unsigned long> &); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT MailImporter::MessageStatus msgFlagsToString(unsigned long flags); std::unique_ptr<FilterSylpheedPrivate> const d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filterthebat.h new/mailimporter-23.08.0/src/mailimporter/filters/filterthebat.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filterthebat.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filterthebat.h 2023-08-13 09:04:36.000000000 +0200 @@ -28,9 +28,9 @@ void importMails(const QString &maildir); private: - void importDirContents(const QString &); - void importFiles(const QString &); - void processDirectory(const QString &path); + MAILIMPORTER_NO_EXPORT void importDirContents(const QString &); + MAILIMPORTER_NO_EXPORT void importFiles(const QString &); + MAILIMPORTER_NO_EXPORT void processDirectory(const QString &path); std::unique_ptr<FilterTheBatPrivate> const d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporter/filters/filterthunderbird.h new/mailimporter-23.08.0/src/mailimporter/filters/filterthunderbird.h --- old/mailimporter-23.04.3/src/mailimporter/filters/filterthunderbird.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporter/filters/filterthunderbird.h 2023-08-13 09:04:36.000000000 +0200 @@ -37,8 +37,8 @@ Q_REQUIRED_RESULT virtual QString settingsPath(); private: - void importDirContents(const QString &, const QString &, const QString &); - void importMBox(const QString &, const QString &, const QString &); - Q_REQUIRED_RESULT bool excludeFiles(const QString &file); + MAILIMPORTER_NO_EXPORT void importDirContents(const QString &, const QString &, const QString &); + MAILIMPORTER_NO_EXPORT void importMBox(const QString &, const QString &, const QString &); + Q_REQUIRED_RESULT MAILIMPORTER_NO_EXPORT bool excludeFiles(const QString &file); }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporterakonadi/CMakeLists.txt new/mailimporter-23.08.0/src/mailimporterakonadi/CMakeLists.txt --- old/mailimporter-23.04.3/src/mailimporterakonadi/CMakeLists.txt 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporterakonadi/CMakeLists.txt 2023-08-13 09:04:36.000000000 +0200 @@ -1,23 +1,5 @@ ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadi") -set(MAILIMPORTERAKONADI_KF5_COMPAT FALSE) -if (BUILD_QCH) - ecm_install_qch_export( - TARGETS KPim${KF_MAJOR_VERSION}MailImporterAkonadi_QCH - FILE KPim${KF_MAJOR_VERSION}MailImporterAkonadiQchTargets.cmake - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiQchTargets.cmake\")") -endif() - -add_library(KPim${KF_MAJOR_VERSION}MailImporterAkonadi) -add_library(KPim${KF_MAJOR_VERSION}::MailImporterAkonadi ALIAS KPim${KF_MAJOR_VERSION}MailImporterAkonadi) -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimMailImporterAkonadiConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - ) ecm_setup_version(PROJECT VARIABLE_PREFIX MAILIMPORTER VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailimporterakonadi_version.h" @@ -25,24 +7,13 @@ SOVERSION 5 ) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - -install(EXPORT KPim${KF_MAJOR_VERSION}MailImporterAkonadiTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}MailImporterAkonadiTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) +add_library(KPim${KF_MAJOR_VERSION}MailImporterAkonadi) +add_library(KPim${KF_MAJOR_VERSION}::MailImporterAkonadi ALIAS KPim${KF_MAJOR_VERSION}MailImporterAkonadi) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/mailimporterakonadi_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MailImporterAkonadi COMPONENT Devel - ) target_sources(KPim${KF_MAJOR_VERSION}MailImporterAkonadi PRIVATE filterimporterakonadi.cpp filterimporterakonadi.h - filterimportertestutil.h ) ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}MailImporterAkonadi HEADER mailimporterakonadi_debug.h IDENTIFIER MAILIMPORTERAKONADI_LOG CATEGORY_NAME org.kde.pim.mailimporterakonadi @@ -58,9 +29,6 @@ generate_export_header( KPim${KF_MAJOR_VERSION}MailImporterAkonadi BASE_NAME mailimporterakonadi) -add_library(KPim${KF_MAJOR_VERSION}::MailImporterAkonadi ALIAS KPim${KF_MAJOR_VERSION}MailImporterAkonadi) -add_library(KF5::MailImporterAkonadi ALIAS KPim${KF_MAJOR_VERSION}MailImporterAkonadi) - target_include_directories(KPim${KF_MAJOR_VERSION}MailImporterAkonadi INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MailImporterAkonadi/>") target_include_directories(KPim${KF_MAJOR_VERSION}MailImporterAkonadi PUBLIC "$<BUILD_INTERFACE:${MailImporter_SOURCE_DIR}/src;${MailImporter_BINARY_DIR}/src;>") @@ -146,32 +114,35 @@ COMPONENT Devel ) endif() -if (QT_MAJOR_VERSION STREQUAL "5") -## -# TODO: Backwards compatiblity. Remove in next major version -## -set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailImporterAkonadi") -set(MAILIMPORTERAKONADI_KF5_COMPAT TRUE) + + +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KPim${KF_MAJOR_VERSION}MailImporterAkonadi_QCH + FILE KPim${KF_MAJOR_VERSION}MailImporterAkonadiQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiQchTargets.cmake\")") +endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimMailImporterAkonadiConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5MailImporterAkonadiConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} -) + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + ) + + install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5MailImporterAkonadiConfig.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - COMPONENT Devel -) -install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailImporterAkonadiConfigVersion.cmake" - RENAME "KF5MailImporterAkonadiConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel -) -install(EXPORT KPim${KF_MAJOR_VERSION}MailImporterAkonadiTargets - DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" - FILE KPim${KF_MAJOR_VERSION}MailImporterAkonadiTargets.cmake - NAMESPACE KF5:: -) -endif() + ) + +install(EXPORT KPim${KF_MAJOR_VERSION}MailImporterAkonadiTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}MailImporterAkonadiTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/mailimporterakonadi_version.h + DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MailImporterAkonadi COMPONENT Devel + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporterakonadi/KPimMailImporterAkonadiConfig.cmake.in new/mailimporter-23.08.0/src/mailimporterakonadi/KPimMailImporterAkonadiConfig.cmake.in --- old/mailimporter-23.04.3/src/mailimporterakonadi/KPimMailImporterAkonadiConfig.cmake.in 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporterakonadi/KPimMailImporterAkonadiConfig.cmake.in 2023-08-13 09:04:36.000000000 +0200 @@ -2,15 +2,5 @@ include(CMakeFindDependencyMacro) find_dependency(KPim@KF_MAJOR_VERSION@MailImporter "@PIM_VERSION@") - -if (@MAILIMPORTERAKONADI_KF5_COMPAT@) - message(WARNING "\n" - "************* DEPRECATION WARNING *************\n" - "Using find_package(KF5MailImporterAkonadi) and KF5::MailImporterAkonadi targets is deprecated. " - "Please use find_package(KPim@KF_MAJOR_VERSION@MailImporterAkonadi) and KPim@KF_MAJOR_VERSION@::MailImporterAkonadi instead. This backwards " - "compatibility will be removed in the next major version.\n" - "***********************************************\n") -endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporterakonadi/filterimporterakonadi.h new/mailimporter-23.08.0/src/mailimporterakonadi/filterimporterakonadi.h --- old/mailimporter-23.04.3/src/mailimporterakonadi/filterimporterakonadi.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporterakonadi/filterimporterakonadi.h 2023-08-13 09:04:36.000000000 +0200 @@ -46,20 +46,21 @@ * The "test" collection will be returned. * An invalid collection will be returned in case of an error. */ - Akonadi::Collection parseFolderString(const QString &folderParseString); + MAILIMPORTERAKONADI_NO_EXPORT Akonadi::Collection parseFolderString(const QString &folderParseString); /** * Checks for duplicate messages in the collection by message ID. * returns true if a duplicate was detected. * NOTE: Only call this method if a message ID exists, otherwise * you could get false positives. */ - bool checkForDuplicates(const QString &msgID, const Akonadi::Collection &msgCollection, const QString &messageFolder); + MAILIMPORTERAKONADI_NO_EXPORT bool checkForDuplicates(const QString &msgID, const Akonadi::Collection &msgCollection, const QString &messageFolder); /** * Adds a single subcollection to the given base collection and returns it. * Use parseFolderString() instead if you want to create hierarchies of collections. */ - Akonadi::Collection addSubCollection(const Akonadi::Collection &baseCollection, const QString &newCollectionPathName); - bool addAkonadiMessage(const Akonadi::Collection &collection, const KMime::Message::Ptr &message, Akonadi::MessageStatus status); + MAILIMPORTERAKONADI_NO_EXPORT Akonadi::Collection addSubCollection(const Akonadi::Collection &baseCollection, const QString &newCollectionPathName); + MAILIMPORTERAKONADI_NO_EXPORT bool + addAkonadiMessage(const Akonadi::Collection &collection, const KMime::Message::Ptr &message, Akonadi::MessageStatus status); QMultiMap<QString, QString> mMessageFolderMessageIDMap; QMap<QString, Akonadi::Collection> mMessageFolderCollectionMap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporterakonadi/filterimportertestutil.cpp new/mailimporter-23.08.0/src/mailimporterakonadi/filterimportertestutil.cpp --- old/mailimporter-23.04.3/src/mailimporterakonadi/filterimportertestutil.cpp 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporterakonadi/filterimportertestutil.cpp 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -/* - SPDX-FileCopyrightText: 2017-2023 Laurent Montel <[email protected]> - - SPDX-License-Identifier: GPL-2.0-or-later -*/ - -#include "filterimportertestutil.h" - -FilterImporterTestUtil::FilterImporterTestUtil(const QString &filename) - : mFileName(filename) -{ -} - -QString FilterImporterTestUtil::extractData() -{ - // TODO - return {}; -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-23.04.3/src/mailimporterakonadi/filterimportertestutil.h new/mailimporter-23.08.0/src/mailimporterakonadi/filterimportertestutil.h --- old/mailimporter-23.04.3/src/mailimporterakonadi/filterimportertestutil.h 2023-07-04 07:19:50.000000000 +0200 +++ new/mailimporter-23.08.0/src/mailimporterakonadi/filterimportertestutil.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -/* - SPDX-FileCopyrightText: 2017-2023 Laurent Montel <[email protected]> - - SPDX-License-Identifier: GPL-2.0-or-later -*/ - -#pragma once - -#include <QString> - -class FilterImporterTestUtil -{ -public: - FilterImporterTestUtil(const QString &filename); - QString extractData(); - -private: - QString mFileName; -};
