diff -pruN 18.08.3-3/autotests/attachmenttest.cpp 19.08.3-1/autotests/attachmenttest.cpp --- 18.08.3-3/autotests/attachmenttest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/attachmenttest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -19,7 +19,7 @@ #undef QT_USE_FAST_CONCATENATION #undef QT_USE_FAST_OPERATOR_PLUS -#include +#include #include "attachmenttest.h" @@ -167,7 +167,7 @@ void AttachmentTest::testNestedMultipart att->contentType()->setName(QStringLiteral("attachment.jpg"), "utf-8"); mixed->addContent(att); - mixed->contentType("multipart/mixed"); + mixed->contentType()->setMimeType("multipart/mixed"); QVERIFY(KMime::hasAttachment(root)); QVERIFY(KMime::hasAttachment(mixed)); @@ -209,3 +209,93 @@ void AttachmentTest::testEncrypted() QCOMPARE(hasAttachment(root), false); delete root; } + +void AttachmentTest::testAttachment1() +{ + auto root = new KMime::Message; + root->setContent("From: Sender \n" + "To: Receiver \n" + "Subject: Test\n" + "Date: Thu, 19 Jul 2018 10:30:06 +0200\n" + "MIME-Version: 1.0\n" + "Content-Type: multipart/mixed; boundary=\"nextPart5103690.GVhdRC0Mqz\"\n" + "Content-Transfer-Encoding: 7Bit\n" + "\n" + "This is a multi-part message in MIME format.\n" + "\n" + "--nextPart5103690.GVhdRC0Mqz\n" + "Content-Transfer-Encoding: 7Bit\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" + "\n" + "Foo\n" + "\n" + "--nextPart5103690.GVhdRC0Mqz\n" + "Content-Disposition: attachment; filename=\"Screenshot_20180719_102529.png\"\n" + "Content-Transfer-Encoding: base64\n" + "Content-Type: image/png; name=\"Screenshot_20180719_102529.png\"\n" + "\n" + "ddd\n" + "\n" + "--nextPart5103690.GVhdRC0Mqz\n" + "Content-Disposition: attachment; filename=\"Screenshot_20180719_102550.png\"\n" + "Content-Transfer-Encoding: base64\n" + "Content-Type: image/png; name=\"Screenshot_20180719_102550.png\"\n" + "\n" + "zzzz\n" + "\n" + "--nextPart5103690.GVhdRC0Mqz--\n"); + + root->parse(); + QCOMPARE(hasAttachment(root), true); + delete root; +} + +void AttachmentTest::testAttachment2() +{ + auto root = new KMime::Message; + root->setContent("From: Sender \n" + "Content-Type: multipart/alternative; boundary=\"Apple-Mail=_627B41D2-E6ED-4B17-8F96-6CD63EC055AE\"\n" + "MIME-Version: 1.0\n" + "Subject: Test\n" + "Date: Tue, 11 Dec 2018 10:44:41 +0000\n" + "To: Receiver \n" + "\n" + "\n" + "\n" + "--Apple-Mail=_627B41D2-E6ED-4B17-8F96-6CD63EC055AE\n" + "Content-Transfer-Encoding: quoted-printable\n" + "Content-Type: text/plain; charset=\"us-ascii\"\n" + "\n" + "Text blabla\n" + "\n" + "--Apple-Mail=_627B41D2-E6ED-4B17-8F96-6CD63EC055AE\n" + "Content-Type: multipart/mixed; boundary=\"Apple-Mail=_5FDAE280-1EA6-4604-9F81-BBB9B9137CE1\"\n" + "\n" + "\n" + "--Apple-Mail=_5FDAE280-1EA6-4604-9F81-BBB9B9137CE1\n" + "Content-Transfer-Encoding: 7bit\n" + "Content-Type: text/html; charset=\"us-ascii\"\n" + "\n" + "foo\n" + "--Apple-Mail=_5FDAE280-1EA6-4604-9F81-BBB9B9137CE1\n" + "Content-Disposition: inline; filename=\"bla.pdf\"\n" + "Content-Type: application/pdf; name=\"bla.pdf\"; x-unix-mode=\"0644\"\n" + "Content-Transfer-Encoding: base64\n" + "\n" + "bla\n" + "\n" + "--Apple-Mail=_5FDAE280-1EA6-4604-9F81-BBB9B9137CE1\n" + "Content-Transfer-Encoding: quoted-printable\n" + "Content-Type: text/html; charset=\"us-ascii\"\n" + "\n" + "foo html=\n" + "\n" + "--Apple-Mail=_5FDAE280-1EA6-4604-9F81-BBB9B9137CE1--\n" + "\n" + "--Apple-Mail=_627B41D2-E6ED-4B17-8F96-6CD63EC055AE--\n"); + + root->parse(); + //Fix show has attachment + QCOMPARE(hasAttachment(root), true); + delete root; +} diff -pruN 18.08.3-3/autotests/attachmenttest.h 19.08.3-1/autotests/attachmenttest.h --- 18.08.3-3/autotests/attachmenttest.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/attachmenttest.h 2019-10-11 05:06:10.000000000 +0000 @@ -31,6 +31,8 @@ private Q_SLOTS: void testHasAttachment(); void testNestedMultipart(); void testEncrypted(); + void testAttachment1(); + void testAttachment2(); }; #endif diff -pruN 18.08.3-3/autotests/charfreqtest.cpp 19.08.3-1/autotests/charfreqtest.cpp --- 18.08.3-3/autotests/charfreqtest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/charfreqtest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -18,7 +18,7 @@ */ #include "charfreqtest.h" -#include +#include #include diff -pruN 18.08.3-3/autotests/contentindextest.cpp 19.08.3-1/autotests/contentindextest.cpp --- 18.08.3-3/autotests/contentindextest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/contentindextest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -24,7 +24,7 @@ using namespace KMime; -#include +#include QTEST_MAIN(ContentIndexTest) diff -pruN 18.08.3-3/autotests/contenttest.cpp 19.08.3-1/autotests/contenttest.cpp --- 18.08.3-3/autotests/contenttest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/contenttest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -20,7 +20,7 @@ #include "contenttest.h" #include -#include +#include #include #include diff -pruN 18.08.3-3/autotests/dateformattertest.cpp 19.08.3-1/autotests/dateformattertest.cpp --- 18.08.3-3/autotests/dateformattertest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/dateformattertest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -19,7 +19,7 @@ #include "kmime_dateformatter.h" -#include +#include #include #include #include diff -pruN 18.08.3-3/autotests/headerfactorytest.cpp 19.08.3-1/autotests/headerfactorytest.cpp --- 18.08.3-3/autotests/headerfactorytest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/headerfactorytest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -22,7 +22,7 @@ //#include #include -#include +#include #include #include diff -pruN 18.08.3-3/autotests/headertest.cpp 19.08.3-1/autotests/headertest.cpp --- 18.08.3-3/autotests/headertest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/headertest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -20,7 +20,7 @@ #include "headertest.h" #include -#include +#include #include @@ -277,7 +277,7 @@ void HeaderTest::testAddressListHeader() QCOMPARE(h->as7BitString(false), QByteArray("\"Some ?=U=?se =?r\" ")); delete h; - // based on bug #139477, trailing '.' in domain name (RFC 3696, section 2 - http://tools.ietf.org/html/rfc3696#page-4) + // based on bug #139477, trailing '.' in domain name (RFC 3696, section 2 - https://tools.ietf.org/html/rfc3696#page-4) h = new Headers::Generics::AddressList(); h->from7BitString("joe@where.test."); QVERIFY(!h->isEmpty()); @@ -739,7 +739,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(1997, 11, 21)); QCOMPARE(h->dateTime().time(), QTime(9, 55, 6)); - QCOMPARE(h->dateTime().utcOffset(), -6 * 3600); + QCOMPARE(h->dateTime().offsetFromUtc(), -6 * 3600); QCOMPARE(h->as7BitString(), QByteArray("Date: Fri, 21 Nov 1997 09:55:06 -0600")); // clear it again @@ -753,7 +753,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(1969, 2, 13)); QCOMPARE(h->dateTime().time(), QTime(23, 32)); - QCOMPARE(h->dateTime().utcOffset(), -12600); + QCOMPARE(h->dateTime().offsetFromUtc(), -12600); QCOMPARE(h->as7BitString(false), QByteArray("Thu, 13 Feb 1969 23:32:00 -0330")); delete h; @@ -763,7 +763,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(1997, 11, 21)); QCOMPARE(h->dateTime().time(), QTime(9, 55, 6)); - QCOMPARE(h->dateTime().utcOffset(), 0); + QCOMPARE(h->dateTime().offsetFromUtc(), 0); delete h; // obsolete whitespaces and commnets (from RFC 2822, Appendix A.6.3) @@ -772,7 +772,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(1997, 11, 21)); QCOMPARE(h->dateTime().time(), QTime(9, 55, 6)); - QCOMPARE(h->dateTime().utcOffset(), -6 * 3600); + QCOMPARE(h->dateTime().offsetFromUtc(), -6 * 3600); delete h; // Make sure uppercase OCT is parsed correctly - bug 150620 @@ -781,7 +781,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2008, 10, 8)); QCOMPARE(h->dateTime().time(), QTime(16, 54, 05)); - QCOMPARE(h->dateTime().utcOffset(), 0); + QCOMPARE(h->dateTime().offsetFromUtc(), 0); delete h; // Test for bug 111633, year < 1970 @@ -790,7 +790,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(1956, 8, 27)); QCOMPARE(h->dateTime().time(), QTime(21, 31, 46)); - QCOMPARE(h->dateTime().utcOffset(), +2 * 3600); + QCOMPARE(h->dateTime().offsetFromUtc(), +2 * 3600); delete h; // Test for bug 207766 @@ -799,7 +799,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2009, 9, 18)); QCOMPARE(h->dateTime().time(), QTime(4, 44, 55)); - QCOMPARE(h->dateTime().utcOffset(), -4 * 3600); + QCOMPARE(h->dateTime().offsetFromUtc(), -4 * 3600); delete h; // Test for bug 260761 @@ -808,7 +808,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2010, 12, 18)); QCOMPARE(h->dateTime().time(), QTime(14, 1, 21)); - QCOMPARE(h->dateTime().utcOffset(), 0); + QCOMPARE(h->dateTime().offsetFromUtc(), 0); delete h; // old asctime()-like formatted date; regression to KDE3; see bug 117848 @@ -817,7 +817,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2006, 3, 30)); QCOMPARE(h->dateTime().time(), QTime(18, 36, 28)); - QCOMPARE(h->dateTime().utcOffset(), 2 * 3600); + QCOMPARE(h->dateTime().offsetFromUtc(), 2 * 3600); delete h; h = new Date; @@ -825,7 +825,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2006, 3, 30)); QCOMPARE(h->dateTime().time(), QTime(18, 36, 28)); - QCOMPARE(h->dateTime().utcOffset(), 0); + QCOMPARE(h->dateTime().offsetFromUtc(), 0); delete h; // regression to KDE3; see bug 54098 @@ -834,7 +834,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2003, 2, 4)); QCOMPARE(h->dateTime().time(), QTime(0, 1, 20)); - QCOMPARE(h->dateTime().utcOffset(), 0); + QCOMPARE(h->dateTime().offsetFromUtc(), 0); delete h; // date in a DST change to the future so in a time that doesn't exist @@ -844,7 +844,7 @@ void HeaderTest::testDateHeader() QVERIFY(!h->isEmpty()); QCOMPARE(h->dateTime().date(), QDate(2013, 3, 31)); QCOMPARE(h->dateTime().time(), QTime(2, 29, 44)); - QCOMPARE(h->dateTime().utcOffset(), -18000); + QCOMPARE(h->dateTime().offsetFromUtc(), -18000); delete h; } diff -pruN 18.08.3-3/autotests/messagetest.cpp 19.08.3-1/autotests/messagetest.cpp --- 18.08.3-3/autotests/messagetest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/messagetest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -18,8 +18,8 @@ */ #include "messagetest.h" -#include -#include +#include +#include #include #include diff -pruN 18.08.3-3/autotests/parsedatetimetest.cpp 19.08.3-1/autotests/parsedatetimetest.cpp --- 18.08.3-3/autotests/parsedatetimetest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/parsedatetimetest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -19,7 +19,7 @@ #include "parsedatetimetest.h" -#include +#include #include @@ -32,16 +32,36 @@ void ParseDateTimeTest::testParseDateTim QTest::addColumn("input"); QTest::addColumn("expResult"); - QTest::newRow("1") << QByteArray("Sat, 25 Apr 2015 12:10:48 +0000") << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-25T12:10:48+00:00"), Qt::ISODate)); - QTest::newRow("2") << QByteArray("Fri, 24 Apr 2015 10:22:42 +0200") << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:22:42+02:00"), Qt::ISODate)); - QTest::newRow("3") << QByteArray("Thu, 23 Apr 2015 21:43:32 -0300") << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-23T21:43:32-03:00"), Qt::ISODate)); - QTest::newRow("4") << QByteArray("Fri 24 Apr 2015 10:39:15 +0200") << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:39:15+02:00"), Qt::ISODate)); - QTest::newRow("5") << QByteArray("Fri 24 Apr 2015 10:39:15 +02:00") << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:39:15+02:00"), Qt::ISODate)); - QTest::newRow("6") << QByteArray("Fri 24 Apr 2015 10:39:15 +02:23") << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:39:15+02:23"), Qt::ISODate)); - QTest::newRow("7") << QByteArray("Fri 24 Apr 2015 10:39:15 +02a") << QDateTime(); - QTest::newRow("8") << QByteArray("Fri 24 Apr 2015 10:39:15 +02:") << QDateTime(); - QTest::newRow("9") << QByteArray("Fri 24 Apr 2015 10:39:15 +02:af") << QDateTime(); - QTest::newRow("10") << QByteArray("Fri 24 Apr 2015 10:39:15 +in:af") << QDateTime(); + QTest::newRow("1") + << QByteArray("Sat, 25 Apr 2015 12:10:48 +0000") + << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-25T12:10:48+00:00"), Qt::ISODate)); + QTest::newRow("2") + << QByteArray("Fri, 24 Apr 2015 10:22:42 +0200") + << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:22:42+02:00"), Qt::ISODate)); + QTest::newRow("3") + << QByteArray("Thu, 23 Apr 2015 21:43:32 -0300") + << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-23T21:43:32-03:00"), Qt::ISODate)); + QTest::newRow("4") + << QByteArray("Fri 24 Apr 2015 10:39:15 +0200") + << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:39:15+02:00"), Qt::ISODate)); + QTest::newRow("5") + << QByteArray("Fri 24 Apr 2015 10:39:15 +02:00") + << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:39:15+02:00"), Qt::ISODate)); + QTest::newRow("6") + << QByteArray("Fri 24 Apr 2015 10:39:15 +02:23") + << QDateTime(QDateTime::fromString(QStringLiteral("2015-04-24T10:39:15+02:23"), Qt::ISODate)); + QTest::newRow("7") + << QByteArray("Fri 24 Apr 2015 10:39:15 +02a") + << QDateTime(); + QTest::newRow("8") + << QByteArray("Fri 24 Apr 2015 10:39:15 +02:") + << QDateTime(); + QTest::newRow("9") + << QByteArray("Fri 24 Apr 2015 10:39:15 +02:af") + << QDateTime(); + QTest::newRow("10") + << QByteArray("Fri 24 Apr 2015 10:39:15 +in:af") + << QDateTime(); } void ParseDateTimeTest::testParseDateTime() @@ -53,8 +73,8 @@ void ParseDateTimeTest::testParseDateTim const char *scursor = input.constData(); const char *send = input.constData() + input.length(); - KMime::HeaderParsing::parseDateTime(scursor, send, result, false); - + const bool success = KMime::HeaderParsing::parseDateTime(scursor, send, result, false); + QCOMPARE(success, !result.isNull()); QCOMPARE(result, expResult); } diff -pruN 18.08.3-3/autotests/rfc2047test.cpp 19.08.3-1/autotests/rfc2047test.cpp --- 18.08.3-3/autotests/rfc2047test.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/rfc2047test.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include "rfc2047test.h" diff -pruN 18.08.3-3/autotests/rfc2231test.cpp 19.08.3-1/autotests/rfc2231test.cpp --- 18.08.3-3/autotests/rfc2231test.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/rfc2231test.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -16,7 +16,7 @@ Boston, MA 02110-1301, USA. */ -#include +#include #include "rfc2231test.h" diff -pruN 18.08.3-3/autotests/sizetest.cpp 19.08.3-1/autotests/sizetest.cpp --- 18.08.3-3/autotests/sizetest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/sizetest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -21,7 +21,7 @@ #include "kmime_content_p.h" #include "kmime_headers_p.h" -#include +#include #include #include diff -pruN 18.08.3-3/autotests/typestest.cpp 19.08.3-1/autotests/typestest.cpp --- 18.08.3-3/autotests/typestest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/typestest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -19,7 +19,7 @@ #include "kmime_types.h" -#include +#include #include #include diff -pruN 18.08.3-3/autotests/utiltest.cpp 19.08.3-1/autotests/utiltest.cpp --- 18.08.3-3/autotests/utiltest.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/autotests/utiltest.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -19,7 +19,7 @@ #undef QT_USE_FAST_CONCATENATION #undef QT_USE_FAST_OPERATOR_PLUS -#include +#include #include "utiltest.h" diff -pruN 18.08.3-3/CMakeLists.txt 19.08.3-1/CMakeLists.txt --- 18.08.3-3/CMakeLists.txt 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/CMakeLists.txt 2019-11-05 04:15:29.000000000 +0000 @@ -1,28 +1,29 @@ -cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.9.3") +cmake_minimum_required(VERSION 3.5) +set(PIM_VERSION "5.12.3") project(KMime VERSION ${PIM_VERSION}) # ECM setup -set(KF5_VERSION "5.47.0") +set(KF5_MIN_VERSION "5.60.0") -find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) +find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(GenerateExportHeader) include(ECMGeneratePriFile) -include(CMakePackageConfigHelpers) + include(ECMGenerateHeaders) include(ECMSetupVersion) include(FeatureSummary) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(ECMCoverageOption) + set(KMIME_LIB_VERSION ${PIM_VERSION}) -set(QT_REQUIRED_VERSION "5.9.0") +set(QT_REQUIRED_VERSION "5.11.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core) ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME @@ -32,12 +33,11 @@ ecm_setup_version(PROJECT VARIABLE_PREFI ) ########### Find packages ########### -find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) -find_package(KF5Codecs ${KF5_VERSION} CONFIG REQUIRED) +find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) +find_package(KF5Codecs ${KF5_MIN_VERSION} CONFIG REQUIRED) add_definitions(-DTRANSLATION_DOMAIN=\"libkmime5\") -add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII") -add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) -add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + +#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) ########### Targets ########### add_subdirectory(src) diff -pruN 18.08.3-3/debian/changelog 19.08.3-1/debian/changelog --- 18.08.3-3/debian/changelog 2019-11-14 22:48:53.000000000 +0000 +++ 19.08.3-1/debian/changelog 2019-11-30 21:54:22.000000000 +0000 @@ -1,3 +1,23 @@ +kmime (19.08.3-1) unstable; urgency=medium + + [ Sandro Knauß ] + * New upstream release (19.08.3). + + -- Sandro Knauß Sat, 30 Nov 2019 22:54:22 +0100 + +kmime (19.08.2-1) experimental; urgency=medium + + [ Sandro Knauß ] + * Bump Standards-Version to 4.4.1 (No changes needed). + * New upstream release (19.08.2). + * Update build-deps and deps with the info from cmake. + * Remove upstream applied patches. + * Update patch hunks. + * Remove breaks against kde-l10n packages. + * Update libkf5mime-dev dependencies. + + -- Sandro Knauß Fri, 08 Nov 2019 10:38:50 +0100 + kmime (18.08.3-3) unstable; urgency=medium [ Sandro Knauß ] diff -pruN 18.08.3-3/debian/control 19.08.3-1/debian/control --- 18.08.3-3/debian/control 2019-11-14 22:33:24.000000000 +0000 +++ 19.08.3-1/debian/control 2019-11-30 21:30:46.000000000 +0000 @@ -3,14 +3,14 @@ Section: libs Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers Uploaders: Maximiliano Curia , Sandro Knauß -Build-Depends: cmake (>= 3.0~), +Build-Depends: cmake (>= 3.5~), debhelper-compat (= 12), - extra-cmake-modules (>= 5.47.0~), - libkf5codecs-dev (>= 5.47.0~), - libkf5i18n-dev (>= 5.47.0~), + extra-cmake-modules (>= 5.60.0~), + libkf5codecs-dev (>= 5.60.0~), + libkf5i18n-dev (>= 5.60.0~), pkg-kde-tools (>> 0.15.15), - qtbase5-dev (>= 5.9.0~), -Standards-Version: 4.4.0 + qtbase5-dev (>= 5.11.0~) +Standards-Version: 4.4.1 Homepage: https://projects.kde.org/projects/kde/pim/kmime Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kmime Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kmime.git @@ -19,8 +19,6 @@ Package: libkf5mime-data Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Breaks: ${kde-l10n:all} -Replaces: ${kde-l10n:all} Description: Arch independent data for library for handling MIME data This library provides an API for handling MIME data. MIME (Multipurpose Internet Mail Extensions) is an Internet Standard that extends the format @@ -34,9 +32,11 @@ Package: libkf5mime-dev Section: libdevel Architecture: any Multi-Arch: same -Depends: libkf5mime5abi1 (= ${binary:Version}), - qtbase5-dev (>= 5.9.0~), - ${misc:Depends}, +Depends: libkf5codecs-dev (>= 5.60.0~), + libkf5i18n-dev (>= 5.60.0~), + libkf5mime5abi1 (= ${binary:Version}), + qtbase5-dev (>= 5.11.0~), + ${misc:Depends} Description: library for handling MIME data - development files This library provides an API for handling MIME data. MIME (Multipurpose Internet Mail Extensions) is an Internet Standard that extends the format @@ -53,7 +53,7 @@ Architecture: any Multi-Arch: same Depends: libkf5mime-data (= ${source:Version}), ${misc:Depends}, - ${shlibs:Depends}, + ${shlibs:Depends} Provides: ${ABI:VirtualPackage} Description: library for handling MIME data This library provides an API for handling MIME data. MIME (Multipurpose diff -pruN 18.08.3-3/debian/patches/enable_debianabimanager.diff 19.08.3-1/debian/patches/enable_debianabimanager.diff --- 18.08.3-3/debian/patches/enable_debianabimanager.diff 2019-11-14 22:33:24.000000000 +0000 +++ 19.08.3-1/debian/patches/enable_debianabimanager.diff 2019-11-30 21:30:46.000000000 +0000 @@ -1,8 +1,8 @@ --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -39,6 +39,7 @@ add_definitions("-DQT_NO_CAST_FROM_ASCII - add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) - add_definitions(-DQT_NO_URL_CAST_FROM_STRING) +@@ -39,6 +39,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"l + + #add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) + ########### Targets ########### diff -pruN 18.08.3-3/debian/patches/missing_headers 19.08.3-1/debian/patches/missing_headers --- 18.08.3-3/debian/patches/missing_headers 2019-11-14 22:33:24.000000000 +0000 +++ 19.08.3-1/debian/patches/missing_headers 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -From: Debian/Kubuntu Qt/KDE Maintainers -Date: Thu, 21 Apr 2016 00:55:13 +0200 -Subject: missing_headers - -=================================================================== ---- - includes/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt -index 6d3eeff..dd30706 100644 ---- a/includes/CMakeLists.txt -+++ b/includes/CMakeLists.txt -@@ -1,7 +1,6 @@ - # The KMime headers names are prepended with kmime_ to avoid name clashes. - # We can't use ecm_generate_headers if the CamelCase header doesn't match the filename - set(KMime_HEADERS -- Codecs - Content - ContentIndex - DateFormatter diff -pruN 18.08.3-3/debian/patches/series 19.08.3-1/debian/patches/series --- 18.08.3-3/debian/patches/series 2019-11-14 22:33:24.000000000 +0000 +++ 19.08.3-1/debian/patches/series 2019-11-30 21:30:46.000000000 +0000 @@ -1,2 +1 @@ -missing_headers enable_debianabimanager.diff diff -pruN 18.08.3-3/debian/rules 19.08.3-1/debian/rules --- 18.08.3-3/debian/rules 2019-11-14 22:33:24.000000000 +0000 +++ 19.08.3-1/debian/rules 2019-11-30 21:30:46.000000000 +0000 @@ -1,10 +1,7 @@ #!/usr/bin/make -f -l10npkgs_firstversion_ok := 4:16.04.3-9~ - include /usr/share/dpkg/pkg-info.mk include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk -include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk AbiVirtualPackageVersion = $(call dpkg_late_eval,AbiVirtualPackageVersion,echo '${DEB_VERSION_UPSTREAM}' | sed -e 's/\.[0-9]\+$$//') pkgs_lib = $(filter-out %-dev %-dbg %-bin %-data,$(filter lib%,$(shell dh_listpackages))) diff -pruN 18.08.3-3/.gitignore 19.08.3-1/.gitignore --- 18.08.3-3/.gitignore 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/.gitignore 2019-10-11 05:06:10.000000000 +0000 @@ -1,2 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp *.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* *.unc-backup* diff -pruN 18.08.3-3/includes/CMakeLists.txt 19.08.3-1/includes/CMakeLists.txt --- 18.08.3-3/includes/CMakeLists.txt 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/includes/CMakeLists.txt 2019-10-11 05:06:10.000000000 +0000 @@ -1,7 +1,6 @@ # The KMime headers names are prepended with kmime_ to avoid name clashes. # We can't use ecm_generate_headers if the CamelCase header doesn't match the filename set(KMime_HEADERS - Codecs Content ContentIndex DateFormatter diff -pruN 18.08.3-3/includes/Codecs 19.08.3-1/includes/Codecs --- 18.08.3-3/includes/Codecs 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/includes/Codecs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -#include "kmime/kmime_codecs.h" diff -pruN 18.08.3-3/KF5MimeConfig.cmake.in 19.08.3-1/KF5MimeConfig.cmake.in --- 18.08.3-3/KF5MimeConfig.cmake.in 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/KF5MimeConfig.cmake.in 2019-10-11 05:06:10.000000000 +0000 @@ -1,5 +1,6 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) find_dependency(Qt5Core @QT_REQUIRED_VERSION@) +find_dependency(KF5Codecs @KF5_REQUIRED_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5MimeTargets.cmake") diff -pruN 18.08.3-3/metainfo.yaml 19.08.3-1/metainfo.yaml --- 18.08.3-3/metainfo.yaml 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/metainfo.yaml 2019-10-11 05:06:10.000000000 +0000 @@ -10,9 +10,7 @@ release: false libraries: - qmake: KMime cmake: "KF5::Mime" - cmakename: KF5Mime +cmakename: KF5Mime public_lib: true group: kdepim -platforms: - - name: Linux diff -pruN 18.08.3-3/po/ar/libkmime5.po 19.08.3-1/po/ar/libkmime5.po --- 18.08.3-3/po/ar/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/ar/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2018-02-01 00:08+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" diff -pruN 18.08.3-3/po/ast/libkmime5.po 19.08.3-1/po/ast/libkmime5.po --- 18.08.3-3/po/ast/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/ast/libkmime5.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# enolp , 2016. -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" -"PO-Revision-Date: 2016-12-19 03:06+0100\n" -"Last-Translator: enolp \n" -"Language-Team: Asturian \n" -"Language: ast\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 2.0\n" - -#: kmime_dateformatter.cpp:262 -#, kde-format -msgctxt "invalid time specified" -msgid "unknown" -msgstr "" - -#: kmime_dateformatter.cpp:278 -#, kde-format -msgid "Today %1" -msgstr "" - -#: kmime_dateformatter.cpp:282 -#, kde-format -msgid "Yesterday %1" -msgstr "" - -#: kmime_dateformatter.cpp:287 -#, kde-format -msgctxt "1. weekday, 2. time" -msgid "%1 %2" -msgstr "%1 %2" - -#: kmime_mdn.cpp:63 -#, kde-format -msgid "" -"The message sent on ${date} to ${to} with subject \"${subject}\" has been " -"displayed. This is no guarantee that the message has been read or understood." -msgstr "" - -#: kmime_mdn.cpp:69 -#, kde-format -msgid "" -"The message sent on ${date} to ${to} with subject \"${subject}\" has been " -"deleted unseen. This is no guarantee that the message will not be \"undeleted" -"\" and nonetheless read later on." -msgstr "" - -#: kmime_mdn.cpp:76 -#, kde-format -msgid "" -"The message sent on ${date} to ${to} with subject \"${subject}\" has been " -"dispatched. This is no guarantee that the message will not be read later on." -msgstr "" - -#: kmime_mdn.cpp:82 -#, kde-format -msgid "" -"The message sent on ${date} to ${to} with subject \"${subject}\" has been " -"processed by some automatic means." -msgstr "" - -#: kmime_mdn.cpp:87 -#, kde-format -msgid "" -"The message sent on ${date} to ${to} with subject \"${subject}\" has been " -"acted upon. The sender does not wish to disclose more details to you than " -"that." -msgstr "" - -#: kmime_mdn.cpp:93 -#, kde-format -msgid "" -"Generation of a Message Disposition Notification for the message sent on " -"${date} to ${to} with subject \"${subject}\" failed. Reason is given in the " -"Failure: header field below." -msgstr "" diff -pruN 18.08.3-3/po/bg/libkmime5.po 19.08.3-1/po/bg/libkmime5.po --- 18.08.3-3/po/bg/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/bg/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2009-08-28 11:45+0300\n" "Last-Translator: Yasen Pramatarov \n" "Language-Team: Bulgarian \n" diff -pruN 18.08.3-3/po/bs/libkmime5.po 19.08.3-1/po/bs/libkmime5.po --- 18.08.3-3/po/bs/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/bs/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: kdepimlibs\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2012-09-03 13:39+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" diff -pruN 18.08.3-3/po/ca/libkmime5.po 19.08.3-1/po/ca/libkmime5.po --- 18.08.3-3/po/ca/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/ca/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of libkmime5.po to Catalan -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2004-2014 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-11-18 20:55+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -pruN 18.08.3-3/po/ca@valencia/libkmime5.po 19.08.3-1/po/ca@valencia/libkmime5.po --- 18.08.3-3/po/ca@valencia/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/ca@valencia/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of libkmime5.po to Catalan (Valencian) -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2004-2014 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-11-18 20:55+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -pruN 18.08.3-3/po/cs/libkmime5.po 19.08.3-1/po/cs/libkmime5.po --- 18.08.3-3/po/cs/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/cs/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-10-21 14:02+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" diff -pruN 18.08.3-3/po/da/libkmime5.po 19.08.3-1/po/da/libkmime5.po --- 18.08.3-3/po/da/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/da/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-03-30 12:57+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" diff -pruN 18.08.3-3/po/de/libkmime5.po 19.08.3-1/po/de/libkmime5.po --- 18.08.3-3/po/de/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/de/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-05-10 12:07+0200\n" "Last-Translator: Thomas Reitelbach \n" "Language-Team: German \n" diff -pruN 18.08.3-3/po/el/libkmime5.po 19.08.3-1/po/el/libkmime5.po --- 18.08.3-3/po/el/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/el/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-02-22 21:02+0200\n" "Last-Translator: Spiros Georgaras \n" "Language-Team: Greek \n" diff -pruN 18.08.3-3/po/en_GB/libkmime5.po 19.08.3-1/po/en_GB/libkmime5.po --- 18.08.3-3/po/en_GB/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/en_GB/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-08-17 13:15+0100\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" diff -pruN 18.08.3-3/po/eo/libkmime5.po 19.08.3-1/po/eo/libkmime5.po --- 18.08.3-3/po/eo/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/eo/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau \n" "Language-Team: esperanto \n" diff -pruN 18.08.3-3/po/es/libkmime5.po 19.08.3-1/po/es/libkmime5.po --- 18.08.3-3/po/es/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/es/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2016-01-07 13:45+0100\n" "Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" diff -pruN 18.08.3-3/po/et/libkmime5.po 19.08.3-1/po/et/libkmime5.po --- 18.08.3-3/po/et/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/et/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-06-03 21:20+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" diff -pruN 18.08.3-3/po/eu/libkmime5.po 19.08.3-1/po/eu/libkmime5.po --- 18.08.3-3/po/eu/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/eu/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2005-02-12 07:12+0100\n" "Last-Translator: Ion Gaztañaga \n" "Language-Team: Euskara \n" diff -pruN 18.08.3-3/po/fa/libkmime5.po 19.08.3-1/po/fa/libkmime5.po --- 18.08.3-3/po/fa/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/fa/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2007-01-01 11:35+0330\n" "Last-Translator: Nasim Daniarzadeh \n" "Language-Team: Persian \n" diff -pruN 18.08.3-3/po/fi/libkmime5.po 19.08.3-1/po/fi/libkmime5.po --- 18.08.3-3/po/fi/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/fi/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2016-02-15 00:07+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" diff -pruN 18.08.3-3/po/fr/libkmime5.po 19.08.3-1/po/fr/libkmime5.po --- 18.08.3-3/po/fr/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/fr/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2013-06-06 14:27+0200\n" "Last-Translator: xavier \n" "Language-Team: French \n" diff -pruN 18.08.3-3/po/ga/libkmime5.po 19.08.3-1/po/ga/libkmime5.po --- 18.08.3-3/po/ga/libkmime5.po 2018-11-06 00:19:51.000000000 +0000 +++ 19.08.3-1/po/ga/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: kdepim/libkmime.po\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2004-12-03 14:52-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" diff -pruN 18.08.3-3/po/gl/libkmime5.po 19.08.3-1/po/gl/libkmime5.po --- 18.08.3-3/po/gl/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/gl/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2018-04-30 00:14+0100\n" "Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" @@ -15,12 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Poedit-Language: Galician\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" #: kmime_dateformatter.cpp:262 #, kde-format diff -pruN 18.08.3-3/po/hi/libkmime5.po 19.08.3-1/po/hi/libkmime5.po --- 18.08.3-3/po/hi/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/hi/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-01-27 15:51+0530\n" "Last-Translator: Ravishankar Shrivastava \n" "Language-Team: Hindi \n" diff -pruN 18.08.3-3/po/hu/libkmime5.po 19.08.3-1/po/hu/libkmime5.po --- 18.08.3-3/po/hu/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/hu/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: KDE 4.1\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-05-26 11:11+0100\n" "Last-Translator: Tamas Szanto \n" "Language-Team: Hungarian \n" diff -pruN 18.08.3-3/po/ia/libkmime5.po 19.08.3-1/po/ia/libkmime5.po --- 18.08.3-3/po/ia/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/ia/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2012-07-24 14:18+0200\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua \n" diff -pruN 18.08.3-3/po/it/libkmime5.po 19.08.3-1/po/it/libkmime5.po --- 18.08.3-3/po/it/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/it/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-07-19 00:09+0200\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" diff -pruN 18.08.3-3/po/ja/libkmime5.po 19.08.3-1/po/ja/libkmime5.po --- 18.08.3-3/po/ja/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/ja/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-03-01 07:00+0900\n" "Last-Translator: Yukiko Bando \n" "Language-Team: Japanese \n" diff -pruN 18.08.3-3/po/kk/libkmime5.po 19.08.3-1/po/kk/libkmime5.po --- 18.08.3-3/po/kk/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/kk/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2012-03-01 05:24+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" diff -pruN 18.08.3-3/po/km/libkmime5.po 19.08.3-1/po/km/libkmime5.po --- 18.08.3-3/po/km/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/km/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2010-06-24 15:49+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" diff -pruN 18.08.3-3/po/ko/libkmime5.po 19.08.3-1/po/ko/libkmime5.po --- 18.08.3-3/po/ko/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/ko/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,11 +5,11 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-03-03 00:28+0900\n" "Last-Translator: Shinjo Park \n" -"Language-Team: Korean \n" +"Language-Team: Korean \n" "Language: ko\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -pruN 18.08.3-3/po/lt/libkmime5.po 19.08.3-1/po/lt/libkmime5.po --- 18.08.3-3/po/lt/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/lt/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2009-03-07 16:19+0300\n" "Last-Translator: Andrius Štikonas \n" "Language-Team: Lithuanian \n" diff -pruN 18.08.3-3/po/lv/libkmime5.po 19.08.3-1/po/lv/libkmime5.po --- 18.08.3-3/po/lv/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/lv/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-06-18 08:24+0300\n" "Last-Translator: Viesturs Zarins \n" "Language-Team: Latvian \n" diff -pruN 18.08.3-3/po/mr/libkmime5.po 19.08.3-1/po/mr/libkmime5.po --- 18.08.3-3/po/mr/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/mr/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2013-03-16 11:56+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" diff -pruN 18.08.3-3/po/nb/libkmime5.po 19.08.3-1/po/nb/libkmime5.po --- 18.08.3-3/po/nb/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/nb/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-09-17 15:12+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" diff -pruN 18.08.3-3/po/nds/libkmime5.po 19.08.3-1/po/nds/libkmime5.po --- 18.08.3-3/po/nds/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/nds/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-06-01 16:37+0200\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" diff -pruN 18.08.3-3/po/nl/libkmime5.po 19.08.3-1/po/nl/libkmime5.po --- 18.08.3-3/po/nl/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/nl/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2012-03-08 07:56+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" diff -pruN 18.08.3-3/po/nn/libkmime5.po 19.08.3-1/po/nn/libkmime5.po --- 18.08.3-3/po/nn/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/nn/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-08-07 22:23+0200\n" "Last-Translator: Eirik U. Birkeland \n" "Language-Team: Norwegian Nynorsk \n" diff -pruN 18.08.3-3/po/pa/libkmime5.po 19.08.3-1/po/pa/libkmime5.po --- 18.08.3-3/po/pa/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/pa/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2009-01-20 09:03+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi \n" diff -pruN 18.08.3-3/po/pl/libkmime5.po 19.08.3-1/po/pl/libkmime5.po --- 18.08.3-3/po/pl/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/pl/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-08-16 08:03+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" diff -pruN 18.08.3-3/po/pt/libkmime5.po 19.08.3-1/po/pt/libkmime5.po --- 18.08.3-3/po/pt/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/pt/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-02-20 21:24+0000\n" "Last-Translator: José Nuno Pires \n" "Language-Team: pt \n" diff -pruN 18.08.3-3/po/pt_BR/libkmime5.po 19.08.3-1/po/pt_BR/libkmime5.po --- 18.08.3-3/po/pt_BR/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/pt_BR/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-08-16 10:56-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" diff -pruN 18.08.3-3/po/ro/libkmime5.po 19.08.3-1/po/ro/libkmime5.po --- 18.08.3-3/po/ro/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/ro/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2009-01-14 11:49+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" diff -pruN 18.08.3-3/po/ru/libkmime5.po 19.08.3-1/po/ru/libkmime5.po --- 18.08.3-3/po/ru/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/ru/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2010-12-04 22:33+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" diff -pruN 18.08.3-3/po/sk/libkmime5.po 19.08.3-1/po/sk/libkmime5.po --- 18.08.3-3/po/sk/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/sk/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -3,8 +3,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-08-14 14:19+0200\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" diff -pruN 18.08.3-3/po/sl/libkmime5.po 19.08.3-1/po/sl/libkmime5.po --- 18.08.3-3/po/sl/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/sl/libkmime5.po 2019-11-05 04:15:28.000000000 +0000 @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-08-29 16:54+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" diff -pruN 18.08.3-3/po/sr/libkmime5.po 19.08.3-1/po/sr/libkmime5.po --- 18.08.3-3/po/sr/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/sr/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"POT-Creation-Date: 2018-08-16 09:12+0200\n" "PO-Revision-Date: 2009-12-14 00:24+0100\n" "Last-Translator: Dalibor Djuric \n" "Language-Team: Serbian \n" diff -pruN 18.08.3-3/po/sv/libkmime5.po 19.08.3-1/po/sv/libkmime5.po --- 18.08.3-3/po/sv/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/sv/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-04-19 12:22+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" diff -pruN 18.08.3-3/po/tr/libkmime5.po 19.08.3-1/po/tr/libkmime5.po --- 18.08.3-3/po/tr/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/tr/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: kdepimlibs-kde4\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2014-11-12 01:06+0200\n" "Last-Translator: Kaan Ozdincer \n" "Language-Team: Turkish \n" diff -pruN 18.08.3-3/po/ug/libkmime5.po 19.08.3-1/po/ug/libkmime5.po --- 18.08.3-3/po/ug/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/ug/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" diff -pruN 18.08.3-3/po/uk/libkmime5.po 19.08.3-1/po/uk/libkmime5.po --- 18.08.3-3/po/uk/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/uk/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of libkmime5.po to Ukrainian -# Copyright (C) 2014 This_file_is_part_of_KDE +# Copyright (C) 2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime5\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2009-06-20 19:02+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" diff -pruN 18.08.3-3/po/wa/libkmime5.po 19.08.3-1/po/wa/libkmime5.po --- 18.08.3-3/po/wa/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/wa/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-12-26 15:45+0100\n" "Last-Translator: Jean Cayron \n" "Language-Team: Walloon \n" diff -pruN 18.08.3-3/po/zh_CN/libkmime5.po 19.08.3-1/po/zh_CN/libkmime5.po --- 18.08.3-3/po/zh_CN/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/zh_CN/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -5,10 +5,10 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" -"PO-Revision-Date: 2018-11-01 23:18\n" -"Last-Translator: guoyunhe \n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" +"PO-Revision-Date: 2019-10-09 10:05\n" +"Last-Translator: Guo Yunhe (guoyunhe)\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -pruN 18.08.3-3/po/zh_TW/libkmime5.po 19.08.3-1/po/zh_TW/libkmime5.po --- 18.08.3-3/po/zh_TW/libkmime5.po 2018-11-06 00:19:52.000000000 +0000 +++ 19.08.3-1/po/zh_TW/libkmime5.po 2019-11-05 04:15:29.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: libkmime\n" -"Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2018-02-11 03:21+0100\n" +"Report-Msgid-Bugs-To: https://bugs.kde.org\n" +"POT-Creation-Date: 2019-08-30 07:49+0200\n" "PO-Revision-Date: 2008-02-20 13:14+0800\n" "Last-Translator: Franklin Weng \n" "Language-Team: Chinese Traditional \n" diff -pruN 18.08.3-3/README.md 19.08.3-1/README.md --- 18.08.3-3/README.md 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/README.md 2019-10-11 05:06:10.000000000 +0000 @@ -10,11 +10,11 @@ newsgroup articles are based on the same refer to both mail messages and newsgroup articles. KMime deals solely with the in-memory representation of messages, topics such a transport or storage -of messages are handled by other libraries, for example by [the mailtransport library](http://api.kde.org/4.x-api/kdepimlibs-apidocs/mailtransport/html/index.html) -or by [the KIMAP library](http://api.kde.org/4.x-api/kdepimlibs-apidocs/kimap/html/index.html). +of messages are handled by other libraries, for example by [the mailtransport library](https://api.kde.org/kdepim/kmailtransport/html/index.html) +or by [the KIMAP library](https://api.kde.org/kdepim/kimap/html/index.html). Similary, this library does not deal with displaying messages or advanced composing, for those there are the [messageviewer](http://api.kde.org/4.x-api/kdepim-apidocs/messageviewer/html/index.html) -and the [messagecomposer](http://websvn.kde.org/trunk/KDE/kdepim/messagecomposer/") +and the [messagecomposer](https://websvn.kde.org/trunk/KDE/kdepim/messagecomposer/") components in the KDEPIM module. KMime's main function is to parse, modify and assemble messages in-memory. In a @@ -48,22 +48,22 @@ The MIME standard is quite new (1993), e existence. Because of this, the MIME standard has to keep backwards compatibility. The email standard before MIME lacked many capabilities like encodings other than ASCII or attachments. These and other things were later added by MIME. The standard for messages before MIME is defined in -[RFC 5233](http://tools.ietf.org/html/rfc5322). In [RFC 2045](http://tools.ietf.org/html/rfc2045) -to [RFC 2049](http://tools.ietf.org/html/rfc2049), several backward-compatible extensions +[RFC 5233](https://tools.ietf.org/html/rfc5322). In [RFC 2045](https://tools.ietf.org/html/rfc2045) +to [RFC 2049](https://tools.ietf.org/html/rfc2049), several backward-compatible extensions to the basic message format are defined, adding support for attachments, different encodings and many others. -Actually, there is an even older standard, defined in [RFC 733](http://tools.ietf.org/html/rfc733) +Actually, there is an even older standard, defined in [RFC 733](https://tools.ietf.org/html/rfc733) (*Standard for the format of ARPA network text messages*, introduced in 1977). This standard is now obsoleted by RFC 5322, but backwards compatibilty is in some cases supported, as there are still messages in this format around. Since pre-MIME messages had no way to handle attachments, attachments were sometimes added to the message -text in an [uuencoded](http://en.wikipedia.org/wiki/Uuencoding) form. Although this is also +text in an [uuencoded](https://en.wikipedia.org/wiki/Uuencoding) form. Although this is also obsolete, reading uuencoded attachments is still supported by KMime. After MIME was introduced, people realized that there is no way to have the filename of attachments -encoded in anything different than ASCII. Thus, [RFC 2231](http://tools.ietf.org/html/rfc2231) +encoded in anything different than ASCII. Thus, [RFC 2231](https://tools.ietf.org/html/rfc2231) was introduced to allow abitrary encodings for parameter values, such as the attachment filename. ## MIME by examples ## {#examples} @@ -143,7 +143,7 @@ a byte array as a text string is called In Qt, the class for text strings is QString, and the class for byte arrays is QByteArray. The base class of all codecs is QTextCodec. -With the US-ASCII charset, encoding and decoding text is easy, one just has to look at an [ASCII table](http://en.wikipedia.org/wiki/ASCII_table) +With the US-ASCII charset, encoding and decoding text is easy, one just has to look at an [ASCII table](https://en.wikipedia.org/wiki/ASCII_table) to be able to convert text strings to byte arrays and byte arrays to text strings. For example, the letter 'A' is represented by a single byte with the value of 65. When encountering a byte with the value 84, we can look that up in the table and see that it represents the letter 'T'. @@ -159,11 +159,11 @@ Note that the byte values are written in Now, what if we want to write a message that contains German umlauts or Chinese letters? Those are not in the ASCII table, therefore a different charset has to be used. There is a wealth of charsets to chose from. Not all charsets can handle all letters, for example the -[ISO-8859-1](http://en.wikipedia.org/wiki/ISO-8859-1#ISO-8859-1) charset can handle -German umlauts, but can not handle Chinese or Arabic letters. The [Unicode standard](http://en.wikipedia.org/wiki/Unicode) +[ISO-8859-1](https://en.wikipedia.org/wiki/ISO-8859-1#ISO-8859-1) charset can handle +German umlauts, but can not handle Chinese or Arabic letters. The [Unicode standard](https://en.wikipedia.org/wiki/Unicode) is an attempt to introduce charsets that can handle all known letters in the -world, in all languages. Unicode actually has several charsets, for example [UTF-8](http://en.wikipedia.org/wiki/UTF-8) -and [UTF-16](http://en.wikipedia.org/wiki/UTF-16). In an ideal world, everyone would be using +world, in all languages. Unicode actually has several charsets, for example [UTF-8](https://en.wikipedia.org/wiki/UTF-8) +and [UTF-16](https://en.wikipedia.org/wiki/UTF-16). In an ideal world, everyone would be using Unicode charsets, but for historic and legacy reasons, other charsets are still much in use. Charsets other than US-ASCII don't generally have as nice properties: A single letter can be represented @@ -198,14 +198,14 @@ charset. To indicate which charset was u or even the complete `Content-Type` header field is left out, the receiver can not know how to interpret the byte array! In these cases, the byte array is usually decoded incorrectly, and the text strings contain wrong letters or lots of questionmarks. There is even a special term for such wrongly decoded text, -[Mojibake](http://en.wikipedia.org/wiki/Mojibake). It is important to always know what charset +[Mojibake](https://en.wikipedia.org/wiki/Mojibake). It is important to always know what charset your byte array is encoded with, otherwise an attempt at decoding the byte array into a text string will fail and produce Mojibake. **There is no such thing as plain text!** If there is no `Content-Type` header field in a message, the message body should be interpreted as US-ASCII. To learn more about charsets and encodings, read -[The Absolute Minimum Every Software Developer Absolutely, Positively Must Know About Unicode and Character Sets (No Excuses!)](http://www.joelonsoftware.com/articles/Unicode.html) -and [A tutorial on character code issues](http://www.cs.tut.fi/~jkorpela/chars.html). Especially +[The Absolute Minimum Every Software Developer Absolutely, Positively Must Know About Unicode and Character Sets (No Excuses!)](https://www.joelonsoftware.com/articles/Unicode.html) +and [A tutorial on character code issues](https://www.cs.tut.fi/~jkorpela/chars.html). Especially the first article should really be read, as the name indicates. #### Content Transfer Encoding #### @@ -232,7 +232,7 @@ The quoted-printable encoding is not a g outside the 7-bit range, as the resulting byte array will be three times as big in the worst case, which is a waste of space. Therefore another content transfer encoding was introduced, **Base64**. The details of the base64 encoding are too much to write about here; refer to the -[Wikipedia article](http://en.wikipedia.org/wiki/Base64) or the [RFC](http://tools.ietf.org/html/rfc2045#section-6.8) +[Wikipedia article](https://en.wikipedia.org/wiki/Base64) or the [RFC](https://tools.ietf.org/html/rfc2045#section-6.8) for details. As an example, the ISO-8859-1 encoded text string "Grüezi Welt!" is, after encoding it with base64, represented by the following ASCII string: `R3L8ZXppIFdlbHQh`. To express the same in byte arrays: The byte array `47 72 FC 65 7A 69 20 57 65 6C 74 21` @@ -245,7 +245,7 @@ case when the byte array is already comp text using the US-ASCII charset. 8-bit is also a marker to indicate that no content transfer encoding was used. This time, not because it was not necessary, but because of a special exception, byte values outside of the 7-bit range are allowed. For example, some SMTP servers support the -[8BITMIME](http://tools.ietf.org/html/rfc1652) extension, which indicates that they accept +[8BITMIME](https://tools.ietf.org/html/rfc1652) extension, which indicates that they accept bytes outside of the 7-bit range. In this case, one can simply use the byte arrays as-is, without using any content transfer encoding. Creating messages with 8-bit content transfer encoding is currently not supported by KMime. The advantage of 8-bit is that there is no overhead in size, unlike with @@ -334,7 +334,7 @@ a mail to a mailbox with the display nam The header fields are limited to characters in the 7-bit range, and are interpreted as US-ASCII. That means the header field names, such as "From: ", are all encoded in US-ASCII. The header field bodies, such as the "1.0" of `MIME-Version`, are also encoded with US-ASCII. This is mandated by -[the RFC](http://tools.ietf.org/html/rfc5322#section-2). +[the RFC](https://tools.ietf.org/html/rfc5322#section-2). The `Content-Type` and the `Content-Transfer-Encoding` header fields only apply to the message body, they have no meaning for other header fields. @@ -358,7 +358,7 @@ The above example shows how text that is in the message header. This can be seen in the bodies of the `Subject` header field and the `To` header field. In this example, the body of the message is unimportant, it is just "bla bla bla" in US-ASCII. The way the header field bodies are encoded is sometimes referred to as a **RFC2047 string** or as an **encoded word**, which has -the origin in the [RFC](http://tools.ietf.org/html/rfc2047) where this encoding scheme is defined. +the origin in the [RFC](https://tools.ietf.org/html/rfc2047) where this encoding scheme is defined. RFC2047 strings are only allowed in some of the header fields, like `Subject` and in the display name of mailboxes in header fields like `From` and `To`. In other header fields, such as `Date` and `MIME-Version`, they are not allowed, but they wouldn't make much sense there anyway, since those are @@ -378,7 +378,7 @@ The *second encoding* here is almost ide possible encodings, **b** and **q**. The `b` encoding is the same as the base64 encoding of the content transfer encoding. The `q` encoding is very similar to the quoted-printable encoding of the content transfer encoding, but with some little differences that are described in -[the RFC](http://tools.ietf.org/html/rfc2047#section-4.2). +[the RFC](https://tools.ietf.org/html/rfc2047#section-4.2). Let's examine the subject of the message, `=?iso-8859-1?q?Gr=FCezi!?=`, in detail: @@ -488,7 +488,7 @@ The content type consists of a **media t need to specify a charset, as those nodes are the only nodes of which the body is interpreted as a text string. The only header field not yet encountered in previous sections is the **Content-Disposition** header field, -which is defined in a [separate RFC](http://tools.ietf.org/html/rfc2183). It describes how +which is defined in a [separate RFC](https://tools.ietf.org/html/rfc2183). It describes how the message viewer application should display the MIME part. In the case of the image part, is should be presented as an attachment. The **filename** parameter tells the message viewer application which filename should be used by default when the user saves the attachment to disk. @@ -671,7 +671,7 @@ at the end of the message, while inline image file that is either a file on disk or an URL to an image on the Internet. To make inline images work with MIME messages, a different mechanism is needed, since the image is not a file on disk or on the Internet, but a MIME part somewhere in the same message. As specified in -[RFC 2557](http://tools.ietf.org/html/rfc2557), the way this can be done is by refering +[RFC 2557](https://tools.ietf.org/html/rfc2557), the way this can be done is by refering to a **Content-ID** in the `img` tag, and marking the MIME part that is the image with that content ID as well. @@ -819,11 +819,11 @@ are both in the MIME body of the `messag ### Signed and Encrypted Messages ### {#crypto} MIME messages can be cryptographically signed and/or encrypted. The format for those messages is -defined in [RFC 1847](http://tools.ietf.org/html/rfc1847, which specifies two new +defined in [RFC 1847](https://tools.ietf.org/html/rfc1847, which specifies two new multipart subtypes, **multipart/signed** and **multipart/encrypted**. The crypto format of these new security multiparts is defined in additional RFCs; the most common formats are -[OpenPGP](http://tools.ietf.org/html/rfc3156) and [S/MIME](http://tools.ietf.org/html/rfc2633). -Both formats use the principle of [public-key cryptography](http://en.wikipedia.org/wiki/Public-key_cryptography). +[OpenPGP](https://tools.ietf.org/html/rfc3156) and [S/MIME](https://tools.ietf.org/html/rfc2633). +Both formats use the principle of [public-key cryptography](https://en.wikipedia.org/wiki/Public-key_cryptography). OpenPGP uses **key**s, and S/MIME uses **certificates**. For easier text flow, only the term `key` will be used for both keys and certificates in the text below. @@ -836,7 +836,7 @@ security multiparts are very flexible. Security multiparts are not supported by KMime. However, it is possible for applications to use KMime when providing support for crypto messages. For example, the [messageviewer](http://api.kde.org/4.x-api/kdepim-apidocs/messageviewer/html/index.html) component in KDEPIM supports signed and encrypted MIME parts, and the -[messagecomposer](http://websvn.kde.org/trunk/KDE/kdepim/messagecomposer/) library can create +[messagecomposer](https://websvn.kde.org/trunk/KDE/kdepim/messagecomposer/) library can create such messages. Signed MIME parts are signed with the private key of the sender, everybody who has the @@ -1122,29 +1122,29 @@ as the base class. # RFCs # {#rfcs} -* [RFC 5322](http://tools.ietf.org/html/rfc5322): Internet Message Format -* [RFC 5536](http://tools.ietf.org/html/rfc5536): Netnews Article Format -* [RFC 2045](http://tools.ietf.org/html/rfc2045): Multipurpose Internet Mail Extensions (MIME), Part 1: Format of Internet Message Bodies -* [RFC 2046](http://tools.ietf.org/html/rfc2046): Multipurpose Internet Mail Extensions (MIME), Part 2: Media Types -* [RFC 2047](http://tools.ietf.org/html/rfc2047): Multipurpose Internet Mail Extensions (MIME), Part 3: Message Header Extensions for Non-ASCII Text -* [RFC 2048](http://tools.ietf.org/html/rfc2048): Multipurpose Internet Mail Extensions (MIME), Part 4: Registration Procedures -* [RFC 2049](http://tools.ietf.org/html/rfc2049): Multipurpose Internet Mail Extensions (MIME), Part 5: Conformance Criteria and Examples -* [RFC 2231](http://tools.ietf.org/html/rfc2231): MIME Parameter Value and Encoded Word Extensions: Character Sets, Languages, and Continuations -* [RFC 2183](http://tools.ietf.org/html/rfc2183): Communicating Presentation Information in Internet Message: The Content-Disposition Header Field -* [RFC 2557](http://tools.ietf.org/html/rfc2557): MIME Encapsulation of Aggregate Documents, such as HTML (MHTML) -* [RFC 1847](http://tools.ietf.org/html/rfc1847): Security Multiparts for MIME: Multipart/Signed and Multipart/Encrypted -* [RFC 3851](http://tools.ietf.org/html/rfc3851): S/MIME Version 3 Message Specification -* [RFC 3156](http://tools.ietf.org/html/rfc3156): MIME Security with OpenPGP -* [RFC 2298](http://tools.ietf.org/html/rfc2298): An Extensible Message Format for Message Disposition Notifications -* [RFC 2646](http://tools.ietf.org/html/rfc2646): The Text/Plain Format Parameter (not supported by KMime) +* [RFC 5322](https://tools.ietf.org/html/rfc5322): Internet Message Format +* [RFC 5536](https://tools.ietf.org/html/rfc5536): Netnews Article Format +* [RFC 2045](https://tools.ietf.org/html/rfc2045): Multipurpose Internet Mail Extensions (MIME), Part 1: Format of Internet Message Bodies +* [RFC 2046](https://tools.ietf.org/html/rfc2046): Multipurpose Internet Mail Extensions (MIME), Part 2: Media Types +* [RFC 2047](https://tools.ietf.org/html/rfc2047): Multipurpose Internet Mail Extensions (MIME), Part 3: Message Header Extensions for Non-ASCII Text +* [RFC 2048](https://tools.ietf.org/html/rfc2048): Multipurpose Internet Mail Extensions (MIME), Part 4: Registration Procedures +* [RFC 2049](https://tools.ietf.org/html/rfc2049): Multipurpose Internet Mail Extensions (MIME), Part 5: Conformance Criteria and Examples +* [RFC 2231](https://tools.ietf.org/html/rfc2231): MIME Parameter Value and Encoded Word Extensions: Character Sets, Languages, and Continuations +* [RFC 2183](https://tools.ietf.org/html/rfc2183): Communicating Presentation Information in Internet Message: The Content-Disposition Header Field +* [RFC 2557](https://tools.ietf.org/html/rfc2557): MIME Encapsulation of Aggregate Documents, such as HTML (MHTML) +* [RFC 1847](https://tools.ietf.org/html/rfc1847): Security Multiparts for MIME: Multipart/Signed and Multipart/Encrypted +* [RFC 3851](https://tools.ietf.org/html/rfc3851): S/MIME Version 3 Message Specification +* [RFC 3156](https://tools.ietf.org/html/rfc3156): MIME Security with OpenPGP +* [RFC 2298](https://tools.ietf.org/html/rfc2298): An Extensible Message Format for Message Disposition Notifications +* [RFC 2646](https://tools.ietf.org/html/rfc2646): The Text/Plain Format Parameter (not supported by KMime) # Further Reading # {#section} -* [Wikipedia article on MIME](http://en.wikipedia.org/wiki/MIME) -* [The Absolute Minimum Every Software Developer Absolutely, Positively Must Know About Unicode and Character Sets (No Excuses!)](http://www.joelonsoftware.com/articles/Unicode.html) -* [A tutorial on character code issues](http://www.cs.tut.fi/~jkorpela/chars.html) -* [Online Base64 encoder and decoder](http://www.motobit.com/util/base64-decoder-encoder.asp) -* [Online quoted-printable encoder](http://www.motobit.com/util/quoted-printable-encoder.asp) -* [Onlinw quota reached](http://www.motobit.com/util/quoted-printable-decoder.asp) -* [Online charset converter](http://www.motobit.com/util/charset-codepage-conversion.asp) -* [Wikipedia article on public-key cryptography](http://en.wikipedia.org/wiki/Public-key_cryptography) +* [Wikipedia article on MIME](https://en.wikipedia.org/wiki/MIME) +* [The Absolute Minimum Every Software Developer Absolutely, Positively Must Know About Unicode and Character Sets (No Excuses!)](https://www.joelonsoftware.com/articles/Unicode.html) +* [A tutorial on character code issues](https://www.cs.tut.fi/~jkorpela/chars.html) +* [Online Base64 encoder and decoder](https://www.motobit.com/util/base64-decoder-encoder.asp) +* [Online quoted-printable encoder](https://www.motobit.com/util/quoted-printable-encoder.asp) +* [Onlinw quota reached](https://www.motobit.com/util/quoted-printable-decoder.asp) +* [Online charset converter](https://www.motobit.com/util/charset-codepage-conversion.asp) +* [Wikipedia article on public-key cryptography](https://en.wikipedia.org/wiki/Public-key_cryptography) diff -pruN 18.08.3-3/src/kmime_content.cpp 19.08.3-1/src/kmime_content.cpp --- 18.08.3-3/src/kmime_content.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_content.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -46,7 +46,7 @@ #include #include -#include +#include #include #include @@ -342,7 +342,7 @@ QByteArray Content::decodedContent() KCodecs::Codec *codec = KCodecs::Codec::codecForName("base64"); Q_ASSERT(codec); ret.resize(codec->maxDecodedSizeFor(d_ptr->body.size())); - KCodecs::Decoder *decoder = codec->makeDecoder(); + QScopedPointer decoder(codec->makeDecoder()); QByteArray::const_iterator inputIt = d_ptr->body.constBegin(); QByteArray::iterator resultIt = ret.begin(); decoder->decode(inputIt, d_ptr->body.constEnd(), resultIt, ret.end()); @@ -405,11 +405,7 @@ QString Content::decodedText(bool trimTe } s.truncate(i + 1); } else { -#if QT_VERSION < QT_VERSION_CHECK(5,9,0) - if (s.right(1) == QLatin1String("\n")) { -#else if (s.right(1) == QLatin1Char('\n')) { -#endif s.truncate(s.length() - 1); // remove trailing new-line } } diff -pruN 18.08.3-3/src/kmime_contentindex.h 19.08.3-1/src/kmime_contentindex.h --- 18.08.3-3/src/kmime_contentindex.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_contentindex.h 2019-10-11 05:06:10.000000000 +0000 @@ -27,7 +27,7 @@ @authors Volker Krause \ @glossary @anchor RFC3501 @anchor rfc3501 @b RFC @b 3501: - RFC that defines the + RFC that defines the Internet Message Access Protocol (IMAP). */ diff -pruN 18.08.3-3/src/kmime_dateformatter.h 19.08.3-1/src/kmime_dateformatter.h --- 18.08.3-3/src/kmime_dateformatter.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_dateformatter.h 2019-10-11 05:06:10.000000000 +0000 @@ -31,12 +31,12 @@ @authors the KMime authors (see AUTHORS file) @glossary @anchor RFC2822 @anchor rfc2822 @b RFC @b 2822: - RFC that defines the + RFC that defines the Internet Message Format. @glossary @anchor ISO8601 @anchor iso8601 @b ISO @b 8601: International Standards Organization (ISO) standard that defines the - + international standard for date and time representations. @glossary @anchor ctime @b ctime: diff -pruN 18.08.3-3/src/kmime_header_parsing.h 19.08.3-1/src/kmime_header_parsing.h --- 18.08.3-3/src/kmime_header_parsing.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_header_parsing.h 2019-10-11 05:06:10.000000000 +0000 @@ -31,7 +31,7 @@ #include #include -#include +#include template class QMap; class QStringList; @@ -52,7 +52,7 @@ namespace Types // byte array or a string. // In most places where this is used, it should simply be replaced by QByteArray struct KMIME_EXPORT QStringOrQPair { - QStringOrQPair() : qstring(), qpair(0, 0) {} + QStringOrQPair() : qstring(), qpair(nullptr, 0) {} QString qstring; QPair qpair; }; diff -pruN 18.08.3-3/src/kmime_headers.cpp 19.08.3-1/src/kmime_headers.cpp --- 18.08.3-3/src/kmime_headers.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_headers.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -77,7 +77,7 @@ subclass::~subclass() { \ Q_D(subclass); \ delete d; \ - d_ptr = 0; \ + d_ptr = nullptr; \ } // end kmime_mk_trivial_ctor_with_dptr diff -pruN 18.08.3-3/src/kmime_mdn.cpp 19.08.3-1/src/kmime_mdn.cpp --- 18.08.3-3/src/kmime_mdn.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_mdn.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -37,7 +37,7 @@ #include "kmime_codecs.h" #include -#include +#include #include diff -pruN 18.08.3-3/src/kmime_mdn.h 19.08.3-1/src/kmime_mdn.h --- 18.08.3-3/src/kmime_mdn.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_mdn.h 2019-10-11 05:06:10.000000000 +0000 @@ -39,7 +39,7 @@ Their format and usage is outlined in @ref RFC2298. @glossary @anchor RFC2298 @anchor rfc2298 @b RFC @b 2298: - RFC that defines the + RFC that defines the An Extensible Message Format for Message Disposition Notifications. */ diff -pruN 18.08.3-3/src/kmime_newsarticle.h 19.08.3-1/src/kmime_newsarticle.h --- 18.08.3-3/src/kmime_newsarticle.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_newsarticle.h 2019-10-11 05:06:10.000000000 +0000 @@ -25,13 +25,13 @@ #include "kmime_export.h" #include "kmime_message.h" -#include #include namespace KMime { +/** NNTP news article. */ class KMIME_EXPORT NewsArticle : public Message { public: @@ -40,6 +40,11 @@ public: */ typedef QSharedPointer Ptr; + ///@cond PRIVATE + // needed for Akonadi polymorphic payload support + typedef Message SuperClass; + ///@endcond + /** Creates a NewsArticle object. */ @@ -48,7 +53,7 @@ public: /** Destroys this NewsArticle. */ - ~NewsArticle(); + ~NewsArticle() override; /** Returns the Control header. @@ -92,12 +97,4 @@ protected: } // namespace KMime -//@cond PRIVATE -// super class trait specialization -namespace Akonadi -{ -template <> struct SuperClass : public SuperClassTrait {}; -} -//@endcond - #endif // __KMIME_NEWSARTICLE_H__ diff -pruN 18.08.3-3/src/kmime_util.cpp 19.08.3-1/src/kmime_util.cpp --- 18.08.3-3/src/kmime_util.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_util.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include @@ -613,7 +613,7 @@ bool hasAttachment(Content *content) // Ok, content itself is not an attachment. now we deal with multiparts auto ct = content->contentType(false); - if (ct && ct->isMultipart() && !ct->isSubtype("related") && !ct->isSubtype("alternative")) { + if (ct && ct->isMultipart() && !ct->isSubtype("related")) {// && !ct->isSubtype("alternative")) { Q_FOREACH (Content *child, content->contents()) { if (hasAttachment(child)) { return true; diff -pruN 18.08.3-3/src/kmime_util.h 19.08.3-1/src/kmime_util.h --- 18.08.3-3/src/kmime_util.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_util.h 2019-10-11 05:06:10.000000000 +0000 @@ -212,7 +212,7 @@ KMIME_EXPORT extern void addQuotes(QStri * leading to "Firstname Lastname", so the whole mailbox is displayed * correctly as "Firstname Lastname" again. * - * See http://unicode.org/reports/tr9 for more information on bidi control chars. + * See https://unicode.org/reports/tr9 for more information on bidi control chars. * * @param input the display name of a mailbox, which is checked for unbalanced Unicode * direction control characters diff -pruN 18.08.3-3/src/kmime_util_p.h 19.08.3-1/src/kmime_util_p.h --- 18.08.3-3/src/kmime_util_p.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/kmime_util_p.h 2019-10-11 05:06:10.000000000 +0000 @@ -40,7 +40,7 @@ extern QByteArray cachedCharset(const QB @param folded true if the headder is folded into multiple lines @returns the end index of the header, -1 if the @p dataBegin was -1. */ -extern int findHeaderLineEnd(const QByteArray &src, int &dataBegin, bool *folded = 0); +extern int findHeaderLineEnd(const QByteArray &src, int &dataBegin, bool *folded = nullptr); /** Finds the first header of type @p name in @p src. @@ -49,7 +49,7 @@ extern int findHeaderLineEnd(const QByte @param folded true if the headder is folded into multiple lines @returns the begin index of the header, -1 if not found. */ -extern int indexOfHeader(const QByteArray &src, const QByteArray &name, int &end, int &dataBegin, bool *folded = 0); +extern int indexOfHeader(const QByteArray &src, const QByteArray &name, int &end, int &dataBegin, bool *folded = nullptr); /** * Uses current time, pid and random numbers to construct a string diff -pruN 18.08.3-3/src/supertrait.h 19.08.3-1/src/supertrait.h --- 18.08.3-3/src/supertrait.h 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/src/supertrait.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -/* - Copyright (c) 2009 Volker Krause - - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published by - the Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public - License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. -*/ - -#ifndef AKONADI_SUPERTRAIT_H -#define AKONADI_SUPERTRAIT_H - -// NOTE: This header is a copy of akonadi/src/core/supertrait.h because we can't -// depend on Akonadi -// DO NOT change include guards or namespace. - -//@cond PRIVATE -namespace Akonadi -{ -/** - @internal - @see super_class -*/ -template -struct SuperClassTrait { - typedef Super Type; -}; - -/** - Type trait to provide information about a base class for a given class. - Used eg. for the Akonadi payload mechanism. - - To provide base class introspection for own types, extend this trait as follows: - @code - namespace Akonadi - { - template <> struct SuperClass : public SuperClassTrait{}; - } - @endcode -*/ -template struct SuperClass : public SuperClassTrait {}; -} -//@endcond - -#endif diff -pruN 18.08.3-3/tests/test_dates.cpp 19.08.3-1/tests/test_dates.cpp --- 18.08.3-3/tests/test_dates.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/tests/test_dates.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -1,6 +1,6 @@ #include "kmime_dateformatter.h" #include "kmime_header_parsing.h" -#include +#include using namespace KMime; int diff -pruN 18.08.3-3/tests/test_kmime_header_parsing.cpp 19.08.3-1/tests/test_kmime_header_parsing.cpp --- 18.08.3-3/tests/test_kmime_header_parsing.cpp 2018-10-11 11:15:23.000000000 +0000 +++ 19.08.3-1/tests/test_kmime_header_parsing.cpp 2019-10-11 05:06:10.000000000 +0000 @@ -463,8 +463,8 @@ int main(int argc, char *argv[]) cout << (ok ? "OK" : "BAD") << endl << "result.time (in local timezone): " << ctime(&timet) - << "result.secsEastOfGMT: " << result.utcOffset() - << " (" << result.utcOffset() / 60 << "mins)" + << "result.secsEastOfGMT: " << result.offsetFromUtc() + << " (" << result.offsetFromUtc() / 60 << "mins)" << endl; } break;