commit: 9df4995d2d5ddf1fa053e266a0636c1eb3784afc Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> AuthorDate: Tue Oct 5 06:48:47 2021 +0000 Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> CommitDate: Tue Oct 5 07:36:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df4995d
mail-client/trojita: treeclean Bug: https://bugs.gentoo.org/685750 Bug: https://bugs.gentoo.org/808528 Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> mail-client/trojita/Manifest | 1 - .../trojita/files/trojita-0.7-CVE-2019-10734.patch | 104 ----------- .../trojita/files/trojita-0.7-CVE-2020-15047.patch | 82 -------- .../trojita/files/trojita-0.7-cmake-cxx11.patch | 66 ------- .../files/trojita-0.7-crash-w-attachments.patch | 68 ------- .../files/trojita-0.7-desktop-spec-namespace.patch | 57 ------ .../trojita/files/trojita-0.7-gpg-tests.patch | 27 --- mail-client/trojita/files/trojita-0.7-gpgme.patch | 34 ---- .../trojita/files/trojita-0.7-metainfo.patch | 26 --- .../trojita/files/trojita-0.7-qt-5.11b3.patch | 207 --------------------- .../trojita/files/trojita-0.7-qt-5.13.patch | 37 ---- .../trojita/files/trojita-0.7-qt-5.15.patch | 28 --- mail-client/trojita/metadata.xml | 23 --- mail-client/trojita/trojita-0.7-r6.ebuild | 90 --------- mail-client/trojita/trojita-9999.ebuild | 81 -------- profiles/package.mask | 5 - 16 files changed, 936 deletions(-) diff --git a/mail-client/trojita/Manifest b/mail-client/trojita/Manifest deleted file mode 100644 index 3d815f73deb..00000000000 --- a/mail-client/trojita/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST trojita-0.7.tar.xz 1038212 BLAKE2B 92dfb01fc1849d04958fd26ea731835c7287d5a6989d8e0c97c6679ce8f1c9f33a0f67c3f293fc85188e9d289c0dddee9847f4151b6f64396f3de86635b11f32 SHA512 fe4d9316f97d913619f27d24a5023c3d8dd4a6b9fb058651be12c67188f394aa8cbb60c7593e5eb28fc12fc883b76deeeb5f4f631edd255fdec4c5862c9a91c8 diff --git a/mail-client/trojita/files/trojita-0.7-CVE-2019-10734.patch b/mail-client/trojita/files/trojita-0.7-CVE-2019-10734.patch deleted file mode 100644 index d52edb042ad..00000000000 --- a/mail-client/trojita/files/trojita-0.7-CVE-2019-10734.patch +++ /dev/null @@ -1,104 +0,0 @@ -From 8db7f450d52539b4c72ee968384911b6813ad1e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> -Date: Thu, 25 Jun 2020 21:39:34 +0200 -Subject: [PATCH] Prevent a possible decryption oracle attack -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Thanks to Jens Mueller (Ruhr-Uni Bochum and FH Münster) for reporting -this. The gist is that an attacker can embed arbitrary ciphertext into -their messages. Trojita decrypts that, and when we hit reply, the -original *cleartext* gets quoted and put into a reply for the attacker -to see. - -Fix this by not quoting any plaintext which originated in an encrypted -message. That's pretty draconian, but hey, it works and we never came up -with any better patch. Also, given that Trojita does not encrypt -outgoing messages yet, this is probably also a conservative thing to do. - -Change-Id: I84c45b9e707eb7c99eb7183c6ef59ef41cd62c43 -CVE: CVE-2019-10734 -BUG: 404697 ---- - src/Cryptography/GpgMe++.cpp | 2 ++ - src/Gui/MessageView.cpp | 9 ++++++++- - src/Gui/PartWidget.cpp | 8 ++++++++ - src/Imap/Model/ItemRoles.h | 2 +- - 4 files changed, 19 insertions(+), 2 deletions(-) - -diff --git a/src/Cryptography/GpgMe++.cpp b/src/Cryptography/GpgMe++.cpp -index e012f603..716b8aff 100644 ---- a/src/Cryptography/GpgMe++.cpp -+++ b/src/Cryptography/GpgMe++.cpp -@@ -267,6 +267,8 @@ QVariant GpgMePart::data(int role) const - switch (role) { - case Imap::Mailbox::RolePartSignatureVerifySupported: - return m_wasSigned; -+ case RolePartDecryptionSupported: -+ return m_isAllegedlyEncrypted; - case RolePartCryptoNotFinishedYet: - return m_waitingForData || - (m_crypto.valid() && -diff --git a/src/Gui/MessageView.cpp b/src/Gui/MessageView.cpp -index 7d649308..c95e0878 100644 ---- a/src/Gui/MessageView.cpp -+++ b/src/Gui/MessageView.cpp -@@ -354,7 +354,6 @@ bool MessageView::eventFilter(QObject *object, QEvent *event) - QString MessageView::quoteText() const - { - if (auto w = bodyWidget()) { -- QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n'))); - const Imap::Message::Envelope &e = message.data(Imap::Mailbox::RoleMessageEnvelope).value<Imap::Message::Envelope>(); - QString sender; - if (!e.from.isEmpty()) -@@ -362,6 +361,14 @@ QString MessageView::quoteText() const - if (e.from.isEmpty()) - sender = tr("you"); - -+ if (messageModel->index(0, 0) /* fake message root */.child(0, 0) /* first MIME part */.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) { -+ // This is just an UX improvement shortcut: real filtering for CVE-2019-10734 is in -+ // MultipartSignedEncryptedWidget::quoteMe(). -+ // That is required because the encrypted part might not be the root part of the message. -+ return tr("On %1, %2 sent an encrypted message:\n> ...\n\n").arg(e.date.toLocalTime().toString(Qt::SystemLocaleLongDate), sender); -+ } -+ -+ QStringList quote = Composer::quoteText(w->quoteMe().split(QLatin1Char('\n'))); - // One extra newline at the end of the quoted text to separate the response - quote << QString(); - -diff --git a/src/Gui/PartWidget.cpp b/src/Gui/PartWidget.cpp -index bb27604d..96eff338 100644 ---- a/src/Gui/PartWidget.cpp -+++ b/src/Gui/PartWidget.cpp -@@ -378,6 +378,14 @@ void MultipartSignedEncryptedWidget::updateStatusIndicator() - - QString MultipartSignedEncryptedWidget::quoteMe() const - { -+ if (m_partIndex.data(Imap::Mailbox::RolePartDecryptionSupported).toBool()) { -+ // See CVE-2019-10734, the point is not to leak cleartext from encrypted content. Even when Trojita starts supporting -+ // encryption of outgoing mail, we will have to check whether the encrypted cleartext is from the same sender, whether -+ // it matches the list of recipients (which is dynamic and can be set later on), etc etc. -+ // TL;DR, this is a can of worms. -+ return tr("[Encrypted message]"); -+ } -+ - return quoteMeHelper(children()); - } - -diff --git a/src/Imap/Model/ItemRoles.h b/src/Imap/Model/ItemRoles.h -index 4588d4d0..00adb3bb 100644 ---- a/src/Imap/Model/ItemRoles.h -+++ b/src/Imap/Model/ItemRoles.h -@@ -193,7 +193,7 @@ enum { - RolePartSignatureVerifySupported, - /** @short Is the format of this particular multipart/encrypted supported and recognized? - -- See RolePartSignatureVerifySupported, this is an equivalent. -+ If true, this message part represents content of an encrypted message that Trojita can attempt to decrypt. - */ - RolePartDecryptionSupported, - /** @short Is there any point in waiting longer? --- -GitLab - diff --git a/mail-client/trojita/files/trojita-0.7-CVE-2020-15047.patch b/mail-client/trojita/files/trojita-0.7-CVE-2020-15047.patch deleted file mode 100644 index 44f1a5dab01..00000000000 --- a/mail-client/trojita/files/trojita-0.7-CVE-2020-15047.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 77ddd5d44f2bf4155d0c9b6f7d05f01713b32d5d Mon Sep 17 00:00:00 2001 -From: Jan Kundrát <[email protected]> -Date: Thu, 25 Jun 2020 11:30:51 +0200 -Subject: [PATCH] SMTP: Do not ignore TLS errors - -This fixes a CVE-2020-15047 (category: CWE-295). Since commit 0083eea5ed -which added initial, experimental support for SMTP message submission, -we have apparently never implemented proper SSL/TLS error handling, and -the code has ever since just kept silently ignoring any certificate -verification errors. As a result, Trojita was susceptible to a MITM -attack when sending e-mails. The information leaked include user's -authentication details, including the password, and the content of sent -messages. - -Sorry for this :(. - -Now, this patch re-enabes proper TLS error handling. It was not possible -to directly re-use our code for TLS key pinning which we are using for -IMAP connections. In the Qt TLS code, the decision to accept or not -accept a TLS connection is a blocking one, so the IMAP code relies upon -the protocol state machine (i.e., another layer) for deciding whether to -use or not to use the just-established TLS connection. Implementing an -equivalent code in the SMTP library would be nice, but this hot-fix has -a priority. As a result, SMTP connections to hosts with, e.g., -self-signed TLS certs, are no longer possible. Let's hope that this is -not a practical problem with Lets Encrypt anymore. - -Thanks to Damian Poddebniak for reporting this bug. - -Change-Id: Icd6bbb2b0fb3e45159fc9699ebd07ab84262fe37 -CVE: CVE-2020-15047 -BUG: 423453 ---- - -diff --git a/src/MSA/SMTP.cpp b/src/MSA/SMTP.cpp -index 3a05451..ac1eefc 100644 ---- a/src/MSA/SMTP.cpp -+++ b/src/MSA/SMTP.cpp -@@ -21,6 +21,7 @@ - along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - #include "SMTP.h" -+#include "UiUtils/Formatting.h" - - namespace MSA - { -@@ -32,8 +33,8 @@ - user(user), failed(false), isWaitingForPassword(false), sendingMode(MODE_SMTP_INVALID) - { - qwwSmtp = new QwwSmtpClient(this); -- // FIXME: handle SSL errors properly -- connect(qwwSmtp, &QwwSmtpClient::sslErrors, qwwSmtp, &QwwSmtpClient::ignoreSslErrors); -+ // FIXME: handle SSL errors in the same way as we handle IMAP TLS errors, with key pinning, etc. -+ connect(qwwSmtp, &QwwSmtpClient::sslErrors, this, &SMTP::handleSslErrors); - connect(qwwSmtp, &QwwSmtpClient::connected, this, &AbstractMSA::sending); - connect(qwwSmtp, &QwwSmtpClient::done, this, &SMTP::handleDone); - connect(qwwSmtp, &QwwSmtpClient::socketError, this, &SMTP::handleError); -@@ -78,6 +79,12 @@ - emit error(msg); - } - -+void SMTP::handleSslErrors(const QList<QSslError>& errors) -+{ -+ auto msg = UiUtils::Formatting::sslErrorsToHtml(errors); -+ emit error(tr("<p>Cannot send message due to an SSL/TLS error</p>\n%1").arg(msg)); -+} -+ - void SMTP::setPassword(const QString &password) - { - pass = password; -diff --git a/src/MSA/SMTP.h b/src/MSA/SMTP.h -index 453407d..913bb87 100644 ---- a/src/MSA/SMTP.h -+++ b/src/MSA/SMTP.h -@@ -43,6 +43,7 @@ - virtual void setPassword(const QString &password); - void handleDone(bool ok); - void handleError(QAbstractSocket::SocketError err, const QString &msg); -+ void handleSslErrors(const QList<QSslError>& errors); - private: - QwwSmtpClient *qwwSmtp; - QString host; diff --git a/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch b/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch deleted file mode 100644 index 71ab15950b8..00000000000 --- a/mail-client/trojita/files/trojita-0.7-cmake-cxx11.patch +++ /dev/null @@ -1,66 +0,0 @@ -From e2e35bfda75a2f4950408c93ede72fabfe86360e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> -Date: Wed, 19 Oct 2016 22:15:16 +0200 -Subject: [PATCH] cmake: Speed up cmake by using native features for enforcing - C++11 - -This saves about 8 seconds in my (limited) testing with a 2016-era -laptop with plenty of RAM and a fast SSD. - -We still attempt to support ancient pre-3.1 CMake by adding that blurb -into CXXFLAGS, maybe it even works. - -I should probably start tracking time I spend supporting old -environments and evaluate whether this is worth the effort. Once we are -ready to distribute flatpaks/appimages/whatevers, I suspect that my life -will become much easier. - -Change-Id: Ibbbe3d8440a7d29ef27440a99938d313bfe9699f ---- - CMakeLists.txt | 26 ++-- - 24 files changed, 8 insertions(+), 468 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9393b19c..92a682f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,6 +18,14 @@ if(POLICY CMP0043) - cmake_policy(SET CMP0043 OLD) - endif() - -+if(CMAKE_VERSION VERSION_LESS "3.1") -+ # If you aren't using and old Linux with an old GCC and old CMake, please just upgrade. -+ set(CMAKE_CXX_FLAGS "--std=c++11 ${CMAKE_CXX_FLAGS}") -+else() -+ set(CMAKE_CXX_STANDARD 11) -+ set(CMAKE_CXX_STANDARD_REQUIRED ON) -+endif() -+ - # Set a default build type if none was specified. This was shamelessly stolen - # from VTK's cmake setup because these guys produce both CMake and a project that - # manipulates this variable, and the web is full of posts where people say that -@@ -34,24 +42,6 @@ endif() - - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - --include(FindCXXFeatures) --if(NOT CXXFeatures_auto_FOUND) -- message(SEND_ERROR "Your compiler doesn't support C++11's auto") --endif() --if(NOT CXXFeatures_static_assert_FOUND) -- message(SEND_ERROR "Your compiler doesn't support C++11's static_assert") --endif() --if(NOT CXXFeatures_alignof_FOUND) -- message(SEND_ERROR "Your compiler doesn't support C++11's alignof") --endif() --if(NOT CXXFeatures_nullptr_FOUND) -- message(SEND_ERROR "Your compiler doesn't support C++11's nullptr") --endif() --if(NOT CXXFeatures_lambda_FOUND) -- message(SEND_ERROR "Your compiler doesn't support C++11's lambda functions") --endif() --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}") -- - include(TrojitaOption) - - trojita_option(WITH_DESKTOP "Build desktop version" ON) diff --git a/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch b/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch deleted file mode 100644 index 38d11316e5e..00000000000 --- a/mail-client/trojita/files/trojita-0.7-crash-w-attachments.patch +++ /dev/null @@ -1,68 +0,0 @@ -From cf2364b80fa8ae844df8350cd5833d47cce235f2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> -Date: Mon, 9 Mar 2020 08:24:48 -0700 -Subject: [PATCH] Fix possible crash when downloading attachments - -Turns out we've been happily deleting network replies from the -QNetworkReply::finished(). That was never a good thing to do, but it did -not use to crash with older Qt. Now it does. - -After changing to deleteLater(), there's a window for -already-deregistered replies to generate events, therefore the assert -has to go, too, otherwise Bad Things happen: - - (gdb) bt - #0 __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50 - #1 0x00007ffff16bdcd2 in __GI_abort () at abort.c:89 - #2 0x00007ffff2400bcb in qt_message_fatal (context=..., message=<synthetic pointer>...) at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qlogging.cpp:1904 - #3 QMessageLogger::fatal (this=this@entry=0x7fffffffc990, msg=msg@entry=0x7ffff2690b10 "ASSERT: \"%s\" in file %s, line %d") at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qlogging.cpp:888 - #4 0x00007ffff23fff7c in qt_assert (assertion=assertion@entry=0x5555558451d7 "reply", file=file@entry=0x555555841a38 "/home/jkt/work/prog/trojita/src/Imap/Network/FileDownloadManager.cpp", line=line@entry=142) - at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/global/qglobal.cpp:3247 - #5 0x00005555555da840 in Imap::Network::FileDownloadManager::onPartDataTransfered (this=0x555556a20990) - #6 0x00007ffff25f1bdf in QtPrivate::QSlotObjectBase::call (a=0x7fffffffcaa0, r=0x555556a20990, this=0x5555569f99c0) at ../../include/QtCore/../../../qtcore-5.13.9999/src/corelib/kernel/qobjectdefs_impl.h:394 - #7 QMetaObject::activate(QObject*, int, int, void**) () at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/kernel/qobject.cpp:3787 - #8 0x00007ffff25f20b7 in QMetaObject::activate (sender=sender@entry=0x555556a21370, m=m@entry=0x7ffff3f96b00 <QNetworkReply::staticMetaObject>, local_signal_index=local_signal_index@entry=1, argv=argv@entry=0x0) - at /var/tmp/portage/dev-qt/qtcore-5.13.9999/work/qtcore-5.13.9999/src/corelib/kernel/qobject.cpp:3658 - #9 0x00007ffff3d3cbf3 in QNetworkReply::finished (this=this@entry=0x555556a21370) at .moc/moc_qnetworkreply.cpp:385 - #10 0x0000555555709485 in Imap::Network::MsgPartNetworkReply::slotMyDataChanged() () at /home/jkt/work/prog/trojita/src/Imap/Network/MsgPartNetworkReply.cpp:112 - -BUG: 417697 -Reported-by: Stefan de Konink <[email protected]> -Change-Id: I79f340c5a471430a14474472513d0a055c7238d6 ---- - src/Imap/Network/FileDownloadManager.cpp | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/Imap/Network/FileDownloadManager.cpp b/src/Imap/Network/FileDownloadManager.cpp -index 16b6c8df..c3f72176 100644 ---- a/src/Imap/Network/FileDownloadManager.cpp -+++ b/src/Imap/Network/FileDownloadManager.cpp -@@ -139,7 +139,9 @@ void FileDownloadManager::downloadMessage() - - void FileDownloadManager::onPartDataTransfered() - { -- Q_ASSERT(reply); -+ if (!reply) { -+ return; -+ } - if (reply->error() == QNetworkReply::NoError) { - if (!saving.open(QIODevice::WriteOnly)) { - emit transferError(saving.errorString()); -@@ -192,11 +194,11 @@ void FileDownloadManager::onCombinerTransferError(const QString &message) - - void FileDownloadManager::deleteReply(QNetworkReply *reply) - { -- if (reply == this->reply) { -+ if (reply && reply == this->reply) { - if (!saved) - onPartDataTransfered(); -- delete reply; -- this->reply = 0; -+ reply->deleteLater(); -+ this->reply = nullptr; - } - } - --- -GitLab - diff --git a/mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch b/mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch deleted file mode 100644 index 27ffe2c1ad0..00000000000 --- a/mail-client/trojita/files/trojita-0.7-desktop-spec-namespace.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d080f7855707634867593163e7d20ac85694f5be Mon Sep 17 00:00:00 2001 -From: Luigi Toscano <[email protected]> -Date: Mon, 3 Oct 2016 22:29:22 +0200 -Subject: [PATCH] Add namespace to desktop and appdata files - -Add the organization namespace to the desktop and then appdata files, -according the Desktop Entry specification. - -Change-Id: I4c400ef0f120c3f549c0e19b4e74550cc8b54be8 ---- - CMakeLists.txt | 6 +++--- - .../{trojita.appdata.xml => org.kde.trojita.appdata.xml} | 2 +- - src/Gui/{trojita.desktop => org.kde.trojita.desktop} | 0 - 3 files changed, 4 insertions(+), 4 deletions(-) - rename src/Gui/{trojita.appdata.xml => org.kde.trojita.appdata.xml} (99%) - rename src/Gui/{trojita.desktop => org.kde.trojita.desktop} (100%) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index da40ddb3..d242eda0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -728,10 +728,10 @@ if(WITH_ABOOKADDRESSBOOK_PLUGIN) - endif() - - if(WITH_DESKTOP) -- copy_desktop_file_without_cruft("${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/trojita.desktop" "${CMAKE_CURRENT_BINARY_DIR}/trojita-DesktopGui.desktop") -+ copy_desktop_file_without_cruft("${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.desktop" "${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop") - install(TARGETS trojita RUNTIME DESTINATION bin) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/trojita-DesktopGui.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" RENAME trojita.desktop) -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata/") -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" RENAME org.kde.trojita.desktop) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata/") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps/") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps/") - endif() -diff --git a/src/Gui/trojita.appdata.xml b/src/Gui/org.kde.trojita.appdata.xml -similarity index 99% -rename from src/Gui/trojita.appdata.xml -rename to src/Gui/org.kde.trojita.appdata.xml -index 39548041..04f9873c 100644 ---- a/src/Gui/trojita.appdata.xml -+++ b/src/Gui/org.kde.trojita.appdata.xml -@@ -1,6 +1,6 @@ - <?xml version="1.0" encoding="utf-8"?> - <component type="desktop"> -- <id>trojita.desktop</id> -+ <id>org.kde.trojita.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-2.0+</project_license> - <name>Trojitá</name> -diff --git a/src/Gui/trojita.desktop b/src/Gui/org.kde.trojita.desktop -similarity index 100% -rename from src/Gui/trojita.desktop -rename to src/Gui/org.kde.trojita.desktop --- -GitLab - diff --git a/mail-client/trojita/files/trojita-0.7-gpg-tests.patch b/mail-client/trojita/files/trojita-0.7-gpg-tests.patch deleted file mode 100644 index db41ee577e8..00000000000 --- a/mail-client/trojita/files/trojita-0.7-gpg-tests.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit be8fd5831afa0a04f14cd6206e6576f03ee59558 -Author: Amaury Pouly <[email protected]> -Date: Sat Sep 17 16:40:46 2016 +0100 - - Fix GPG test - - At least GnuPG, when run with both --fingerprint and --with-colons will output - the fingerprint of the public key and the subkey. The command below will thus - output two fingerprints and the delete command will fail because it cannot - find the second fingerprint (which is a subkey and not a public key). It seems - that a safe approach is to consider only the first fingerprint line. - - Change-Id: I4c6aa79e4473bca146aa087728a5652d91586a81 - -diff --git a/tests/Cryptography/keygen.sh b/tests/Cryptography/keygen.sh -index c94c0ab..98c69ca 100755 ---- a/tests/Cryptography/keygen.sh -+++ b/tests/Cryptography/keygen.sh -@@ -115,7 +115,7 @@ $TAIL" > crypto_test_data.h - echo -n "key *\nexpire\nseconds=1\nsave\n" | ${GPG} --no-tty --quiet --command-fd 0 --edit-key "[email protected]" - - # extract fingerprint of key to be deleted --FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint [email protected] | grep fpr | cut -d : -f 10)" -+FINGERPRINT="$(${GPG} --quiet --no-tty --list-keys --with-colons --fingerprint [email protected] | grep fpr | head -n 1 | cut -d : -f 10)" - - # delete key - yes | DISPLAY="" ${GPG} --quiet --batch --no-tty --delete-secret-and-public-key --yes --command-fd 0 --passphrase-fd 0 "${FINGERPRINT}" diff --git a/mail-client/trojita/files/trojita-0.7-gpgme.patch b/mail-client/trojita/files/trojita-0.7-gpgme.patch deleted file mode 100644 index 2a7a6d5e708..00000000000 --- a/mail-client/trojita/files/trojita-0.7-gpgme.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit 1978d0a12d2cb4886c5612d6a50b145f409d815c -Author: Andreas Sturmlechner <[email protected]> -Date: Wed Oct 26 22:42:47 2016 +0200 - - Switch from KF5Gpgmepp to Gpgmepp - - Gpgmepp is part of GpgME since 1.7.0. - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index edf3e79..6993d2e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ trojita_plugin_option(WITH_QTKEYCHAIN_PLUGIN "Build Qtkeychain password plugin" - trojita_find_package(Git "" "" "" "") - - trojita_find_package(Mimetic "" "http://www.codesink.org/mimetic_mime_library.html"; "C++ MIME Library" "Required for client-side MIME parsing" WITH_MIMETIC) --trojita_find_package(KF5Gpgmepp "" "https://quickgit.kde.org/?p=gpgmepp.git"; "C++ bindings for gpgme" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) -+trojita_find_package(QGpgme 1.8.0 "http://www.gnupg.org"; "Qt5/C++ bindings for GpgME" "Needed for encrypted/signed e-mails" WITH_GPGMEPP) - trojita_option(WITH_CRYPTO_MESSAGES "Enable support for encrypted messages" AUTO "WITH_MIMETIC;WITH_GPGMEPP") - - if(WIN32) -@@ -615,11 +615,7 @@ if(WITH_MIMETIC) - endif() - if(WITH_CRYPTO_MESSAGES) - if(WITH_GPGMEPP) -- if (WIN32) -- target_link_libraries(Cryptography KF5::Gpgmepp KF5::QGpgme) -- else() -- target_link_libraries(Cryptography KF5::Gpgmepp-pthread KF5::QGpgme) -- endif() -+ target_link_libraries(Cryptography QGpgme) - endif() - endif() - diff --git a/mail-client/trojita/files/trojita-0.7-metainfo.patch b/mail-client/trojita/files/trojita-0.7-metainfo.patch deleted file mode 100644 index 705fe714376..00000000000 --- a/mail-client/trojita/files/trojita-0.7-metainfo.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4706896bbc3d7d9189a64117b75c01399b5271b9 Mon Sep 17 00:00:00 2001 -From: Luigi Toscano <[email protected]> -Date: Mon, 3 Oct 2016 22:30:22 +0200 -Subject: [PATCH] Use the new directory for metadata (metainfo) files - -Change-Id: I06d721c6e082166fc303435b39e42c9f358ecca9 ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d242eda0..9393b19c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -731,7 +731,7 @@ if(WITH_DESKTOP) - copy_desktop_file_without_cruft("${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.desktop" "${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop") - install(TARGETS trojita RUNTIME DESTINATION bin) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.trojita-DesktopGui.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications/" RENAME org.kde.trojita.desktop) -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata/") -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/Gui/org.kde.trojita.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo/") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.png DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/32x32/apps/") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/icons/trojita.svg DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps/") - endif() --- -GitLab - diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch b/mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch deleted file mode 100644 index 32d1a021972..00000000000 --- a/mail-client/trojita/files/trojita-0.7-qt-5.11b3.patch +++ /dev/null @@ -1,207 +0,0 @@ -From 7a9f7e0629aa28ffafc4433bbdf43a011754d7c3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <[email protected]> -Date: Wed, 18 Apr 2018 18:53:23 +0200 -Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) - ---- - CMakeLists.txt | 1 - - cmake/TrojitaOption.cmake | 2 +- - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3a882370..781e576b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,7 +1,6 @@ - project(trojita) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - --# Qt5's qt5_use_modules need 2.8.9+ - # On win32, we need QtMain linking, which means 2.8.11+ - # EL7 ships 2.8.11, Debian 8 ships 3.0.2, and Ubuntu 14.04 LTS has 2.8.12 - cmake_minimum_required(VERSION 2.8.11) -diff --git a/cmake/TrojitaOption.cmake b/cmake/TrojitaOption.cmake -index ed99e952..8ac6b6be 100644 ---- a/cmake/TrojitaOption.cmake -+++ b/cmake/TrojitaOption.cmake -@@ -100,7 +100,7 @@ macro(trojita_add_plugin target type) - set_property(TARGET ${target} APPEND PROPERTY COMPILE_DEFINITIONS BUILD_PLUGIN) - target_link_libraries(${target} Plugins) - if (WITH_QT5) -- qt5_use_modules(${target} Core) -+ target_link_libraries(${target} Qt5::Core) - else() - target_link_libraries(${target} ${QT_QTCORE_LIBRARY}) - endif() --- -2.17.0 - -From 94adf1d2e3e2d4a9e0c59fa9423ae711cf55c6fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jan=20Kundr=C3=A1t?= <[email protected]> -Date: Wed, 19 Oct 2016 21:58:57 +0200 -Subject: [PATCH] cmake: do not use qt5_use_modules - -...because the documentation suggests going with imported targets and -target_link_libraries. - -Change-Id: I403d40d0b0ac8d88cadb011c2c2a643221f15daf ---- - CMakeLists.txt | 42 ++++++++++++++++-------------------------- - 1 file changed, 16 insertions(+), 26 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 92a682f7..f0d395d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -552,13 +552,13 @@ set_source_files_properties(${version_files} - add_library(Common STATIC ${libCommon_SOURCES}) - set_property(TARGET Common APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - add_dependencies(Common version) --qt5_use_modules(Common Core Network) -+target_link_libraries(Common Qt5::Network) - - add_library(AppVersion STATIC ${libAppVersion_SOURCES}) - set_property(TARGET AppVersion APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - add_dependencies(AppVersion version) - target_link_libraries(AppVersion Common) --qt5_use_modules(AppVersion Core) -+target_link_libraries(AppVersion Qt5::Core) - - if(WITH_SHARED_PLUGINS) - add_library(Plugins SHARED ${libPlugins_SOURCES}) -@@ -569,12 +569,11 @@ else() - endif() - set_target_properties(Plugins PROPERTIES OUTPUT_NAME trojita_plugins) - set_property(TARGET Plugins APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) --qt5_use_modules(Plugins Core) -+target_link_libraries(Plugins Qt5::Core) - - add_library(UiUtils STATIC ${libUiUtils_SOURCES}) - set_property(TARGET UiUtils APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) --target_link_libraries(UiUtils Plugins Common) --qt5_use_modules(UiUtils Core Gui Network) -+target_link_libraries(UiUtils Plugins Common Qt5::Gui) - - add_library(Streams STATIC ${libStreams_SOURCES}) - set_property(TARGET Streams APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) -@@ -582,36 +581,32 @@ if(WITH_ZLIB) - set_property(TARGET Streams APPEND PROPERTY INCLUDE_DIRECTORIES ${ZLIB_INCLUDE_DIR}) - target_link_libraries(Streams ${ZLIB_LIBRARIES}) - endif() --qt5_use_modules(Streams Network) -+target_link_libraries(Streams Qt5::Network) - - add_library(IPC STATIC ${libIPC_SOURCES}) - set_property(TARGET IPC APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - if(WITH_DBUS) -- qt5_use_modules(IPC DBus Widgets) -+ target_link_libraries(IPC Qt5::DBus Qt5::Widgets) - else() -- qt5_use_modules(IPC Core) -+ target_link_libraries(IPC Qt5::Core) - endif() - - add_library(qwwsmtpclient STATIC ${libqwwsmtpclient_SOURCES}) --qt5_use_modules(qwwsmtpclient Network) -+target_link_libraries(qwwsmtpclient Qt5::Network) - - add_library(MSA STATIC ${libMSA_SOURCES}) - set_property(TARGET MSA APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - target_link_libraries(MSA Imap Streams qwwsmtpclient) --qt5_use_modules(MSA Network) - - add_library(Composer STATIC ${libComposer_SOURCES}) - set_property(TARGET Composer APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - target_link_libraries(Composer Common MSA Streams UiUtils qwwsmtpclient) --qt5_use_modules(Composer Gui Network) - - add_library(Imap STATIC ${libImap_SOURCES}) - set_property(TARGET Imap APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) --target_link_libraries(Imap Common Streams UiUtils) --qt5_use_modules(Imap Gui Network Sql) -+target_link_libraries(Imap Common Streams UiUtils Qt5::Sql) - - add_library(Cryptography STATIC ${libCryptography_SOURCES}) --qt5_use_modules(Cryptography Core) - set_property(TARGET Cryptography APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - target_link_libraries(Cryptography Common Imap) - if(WITH_MIMETIC) -@@ -636,8 +631,7 @@ endif() - ## QtKeyChain plugin - if(WITH_QTKEYCHAIN_PLUGIN) - trojita_add_plugin(trojita_plugin_QtKeychainPasswordPlugin WITH_QTKEYCHAIN_PLUGIN src/Plugins/QtKeyChain/QtKeyChainPassword.cpp) -- qt5_use_modules(trojita_plugin_QtKeychainPasswordPlugin Core DBus) -- target_link_libraries(trojita_plugin_QtKeychainPasswordPlugin ${QTKEYCHAIN_LIBRARIES}) -+ target_link_libraries(trojita_plugin_QtKeychainPasswordPlugin ${QTKEYCHAIN_LIBRARIES} Qt5::DBus) - set_property(TARGET trojita_plugin_QtKeychainPasswordPlugin APPEND PROPERTY INCLUDE_DIRECTORIES ${QTKEYCHAIN_INCLUDE_DIRS}) - endif() - -@@ -662,7 +656,7 @@ if(WITH_ABOOKADDRESSBOOK_PLUGIN) - trojita_add_plugin(trojita_plugin_AbookAddressbookPlugin WITH_ABOOKADDRESSBOOK_PLUGIN ${libAbookAddressbook_SOURCES} ${libAbookAddressbook_UI_OUT}) - set_property(TARGET trojita_plugin_AbookAddressbookPlugin APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - -- qt5_use_modules(trojita_plugin_AbookAddressbookPlugin Widgets) -+ target_link_libraries(trojita_plugin_AbookAddressbookPlugin Qt5::Widgets) - - set(be_contacts_SOURCES - ${path_AbookAddressbook}/main.cpp -@@ -675,7 +669,7 @@ if(WITH_ABOOKADDRESSBOOK_PLUGIN) - set_property(TARGET be.contacts APPEND PROPERTY COMPILE_DEFINITIONS QT_STATICPLUGIN) - target_link_libraries(be.contacts trojita_plugin_AbookAddressbookPlugin) - endif() -- qt5_use_modules(be.contacts Widgets) -+ target_link_libraries(be.contacts Qt5::Widgets) - endif() - - # Generate file static_plugins.h.in -@@ -695,15 +689,13 @@ if(WITH_DESKTOP) - # The following is needed for the LineEdit widget within the .ui files. - # The ${path_DesktopGui} is needed so that the generated ui_*.h file can find the headers of the custom widgets - set_property(TARGET DesktopGui APPEND PROPERTY INCLUDE_DIRECTORIES ${path_DesktopGui}) -- target_link_libraries(DesktopGui Common UiUtils Composer Cryptography Imap IPC MSA Plugins Streams qwwsmtpclient) -+ target_link_libraries(DesktopGui Common UiUtils Composer Cryptography Imap IPC MSA Plugins Streams qwwsmtpclient Qt5::WebKitWidgets) - - # On Windows build a real Win32 GUI application without console window - # On other platforms WIN32 flag is ignored - add_executable(trojita WIN32 ${trojita_desktop_SOURCES} ${trojita_QM}) - set_property(TARGET trojita APPEND PROPERTY COMPILE_DEFINITIONS QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII) - target_link_libraries(trojita AppVersion Common UiUtils DesktopGui ${STATIC_PLUGINS}) -- qt5_use_modules(DesktopGui Network WebKitWidgets) -- qt5_use_modules(trojita Widgets Network) - endif() - - -@@ -737,17 +729,15 @@ if(WITH_TESTS) - tests/Utils/LibMailboxSync.cpp - ) - add_library(test_LibMailboxSync STATIC ${test_LibMailboxSync_SOURCES}) -- qt5_use_modules(test_LibMailboxSync Test Network) - set_property(TARGET test_LibMailboxSync APPEND PROPERTY INCLUDE_DIRECTORIES - ${CMAKE_CURRENT_SOURCE_DIR}/tests - ${CMAKE_CURRENT_SOURCE_DIR}/tests/Utils) -- target_link_libraries(test_LibMailboxSync Imap MSA Streams Common Composer) -+ target_link_libraries(test_LibMailboxSync Imap MSA Streams Common Composer Qt5::Test) - - macro(trojita_test dir fname) - set(test_${fname}_SOURCES tests/${dir}/test_${fname}.cpp) - add_executable(test_${fname} ${test_${fname}_SOURCES}) - target_link_libraries(test_${fname} Imap MSA Streams Common Composer Cryptography test_LibMailboxSync) -- qt5_use_modules(test_${fname} Network Sql Test Widgets) - set_property(TARGET test_${fname} APPEND PROPERTY INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/tests) - if(NOT CMAKE_CROSSCOMPILING) - add_test(test_${fname} test_${fname}) -@@ -759,9 +749,9 @@ if(WITH_TESTS) - enable_testing() - trojita_test(Composer Composer_Submission) - trojita_test(Composer Composer_responses) -+ target_link_libraries(test_Composer_responses Qt5::WebKitWidgets) - trojita_test(Composer Html_formatting) -- qt5_use_modules(test_Composer_responses WebKitWidgets) -- qt5_use_modules(test_Html_formatting WebKitWidgets) -+ target_link_libraries(test_Html_formatting Qt5::WebKitWidgets) - trojita_test(Imap Imap_DisappearingMailboxes) - trojita_test(Imap Imap_Idle) - trojita_test(Imap Imap_LowLevelParser) --- -2.17.0 - diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.13.patch b/mail-client/trojita/files/trojita-0.7-qt-5.13.patch deleted file mode 100644 index 9f1ab3e7e88..00000000000 --- a/mail-client/trojita/files/trojita-0.7-qt-5.13.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 39772585033c1c0aff96f297e93de7be53f9b114 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Sat, 23 Mar 2019 01:17:11 +0100 -Subject: [PATCH] tests: Fix build with Qt 5.13 - -QTest::toString(QModelIndex) was added in -7ef0b575b38d267bd3dc14ff46935d556562ff00 and thus causes a build -error with Qt 5.13 because it's redefined here. - -Change-Id: I015800e49cf8d0e87f3541642406396f150d0eeb ---- - tests/Imap/test_Imap_BodyParts.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/Imap/test_Imap_BodyParts.cpp b/tests/Imap/test_Imap_BodyParts.cpp -index f1c577fa..b6e0421d 100644 ---- a/tests/Imap/test_Imap_BodyParts.cpp -+++ b/tests/Imap/test_Imap_BodyParts.cpp -@@ -51,6 +51,7 @@ struct Data { - - Q_DECLARE_METATYPE(QList<Data>) - -+#if QT_VERSION < QT_VERSION_CHECK(5, 13, 0) - namespace QTest { - template <> - char *toString(const QModelIndex &index) -@@ -60,6 +61,7 @@ char *toString(const QModelIndex &index) - return qstrdup(buf.toUtf8().constData()); - } - } -+#endif - - using namespace Imap::Mailbox; - --- -GitLab - diff --git a/mail-client/trojita/files/trojita-0.7-qt-5.15.patch b/mail-client/trojita/files/trojita-0.7-qt-5.15.patch deleted file mode 100644 index f6ce4cc938d..00000000000 --- a/mail-client/trojita/files/trojita-0.7-qt-5.15.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2869c385e72932cbed7398742b8a4d5e3feda765 Mon Sep 17 00:00:00 2001 -From: Heiko Becker <[email protected]> -Date: Tue, 24 Mar 2020 13:14:43 +0100 -Subject: Fix build with Qt 5.15.0 - -QPainterPath is no longer included via qtransform.h (since -5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git). - -Change-Id: Ibb59e769bba8514d86aa886afee26a2395d458ef ---- - src/Gui/Window.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Gui/Window.cpp b/src/Gui/Window.cpp -index 65ba246..8d74874 100644 ---- a/src/Gui/Window.cpp -+++ b/src/Gui/Window.cpp -@@ -32,6 +32,7 @@ - #include <QKeyEvent> - #include <QMenuBar> - #include <QMessageBox> -+#include <QPainterPath> - #include <QProgressBar> - #include <QRegularExpression> - #include <QScopedPointer> --- -cgit v1.1 - diff --git a/mail-client/trojita/metadata.xml b/mail-client/trojita/metadata.xml deleted file mode 100644 index 8cee3d85364..00000000000 --- a/mail-client/trojita/metadata.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person" proxied="yes"> - <email>[email protected]</email> - <name>Jan Kundrát</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Qt Project</name> - </maintainer> - <maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo KDE Project</name> - </maintainer> - <use> - <flag name="password">Store passwords securely via <pkg>dev-libs/qtkeychain</pkg></flag> - <flag name="pim">Enable support for KDE PIM resources integration via <pkg>kde-apps/akonadi</pkg> addressbook plugin</flag> - </use> - <upstream> - <remote-id type="sourceforge">trojita</remote-id> - </upstream> -</pkgmetadata> diff --git a/mail-client/trojita/trojita-0.7-r6.ebuild b/mail-client/trojita/trojita-0.7-r6.ebuild deleted file mode 100644 index 7c1b4c0b6fa..00000000000 --- a/mail-client/trojita/trojita-0.7-r6.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"; - inherit git-r3 -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="amd64 x86" -fi -inherit cmake virtualx xdg - -DESCRIPTION="A Qt IMAP e-mail client" -HOMEPAGE="http://trojita.flaska.net/"; - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -IUSE="+crypt +dbus debug +password test +zlib" - -REQUIRED_USE="password? ( dbus )" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 - zlib? ( virtual/pkgconfig ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - crypt? ( - >=app-crypt/gpgme-1.8.0[cxx,qt5] - dev-libs/mimetic - ) - dbus? ( dev-qt/qtdbus:5 ) - password? ( dev-libs/qtkeychain[qt5(+)] ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -DOCS=( README LICENSE ) - -PATCHES=( - "${FILESDIR}/${P}-gpgme.patch" - "${FILESDIR}/${P}-gpg-tests.patch" - "${FILESDIR}/${P}-qt-5.11b3.patch" - "${FILESDIR}/${P}-qt-5.13.patch" # bug 730058 - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-CVE-2019-10734.patch" # KDE-bug 404697 - "${FILESDIR}/${P}-CVE-2020-15047.patch" # bug 729596 - "${FILESDIR}/${P}-cmake-cxx11.patch" - "${FILESDIR}/${P}-desktop-spec-namespace.patch" - "${FILESDIR}/${P}-metainfo.patch" # bug 730140 - "${FILESDIR}/${P}-crash-w-attachments.patch" # KDE-Bug 417697 -) - -src_prepare() { - cmake_src_prepare - - # the build system is taking a look at `git describe ... --dirty` and - # gentoo's modifications to CMakeLists.txt break these - sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check" -} - -src_configure() { - local mycmakeargs=( - -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7 - -DWITH_CRYPTO_MESSAGES=$(usex crypt) - -DWITH_GPGMEPP=$(usex crypt) - -DWITH_MIMETIC=$(usex crypt) - -DWITH_DBUS=$(usex dbus) - -DWITH_QTKEYCHAIN_PLUGIN=$(usex password) - -DWITH_TESTS=$(usex test) - -DWITH_ZLIB=$(usex zlib) - ) - - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} diff --git a/mail-client/trojita/trojita-9999.ebuild b/mail-client/trojita/trojita-9999.ebuild deleted file mode 100644 index 0908d71cbc9..00000000000 --- a/mail-client/trojita/trojita-9999.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://anongit.kde.org/${PN}.git"; - inherit git-r3 -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake virtualx xdg - -DESCRIPTION="A Qt IMAP e-mail client" -HOMEPAGE="http://trojita.flaska.net/"; - -LICENSE="|| ( GPL-2 GPL-3 )" -SLOT="0" -IUSE="+crypt +dbus debug +password pim +spell test +zlib" - -REQUIRED_USE="password? ( dbus )" -RESTRICT="!test? ( test )" - -BDEPEND=" - dev-qt/linguist-tools:5 - zlib? ( virtual/pkgconfig ) -" -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtsvg:5 - dev-qt/qtwebkit:5 - dev-qt/qtwidgets:5 - crypt? ( - >=app-crypt/gpgme-1.8.0[cxx,qt5] - dev-libs/mimetic - ) - dbus? ( dev-qt/qtdbus:5 ) - password? ( dev-libs/qtkeychain[qt5(+)] ) - pim? ( kde-apps/akonadi-contacts:5 ) - spell? ( kde-frameworks/sonnet:5 ) - zlib? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND} - test? ( dev-qt/qttest:5 ) -" - -DOCS=( README LICENSE ) - -src_prepare() { - cmake_src_prepare - - # the build system is taking a look at `git describe ... --dirty` and - # gentoo's modifications to CMakeLists.txt break these - sed -e "s/--dirty//" -i cmake/TrojitaVersion.cmake || die "Cannot fix the version check" -} - -src_configure() { - local mycmakeargs=( - -DWITH_RAGEL=OFF # bug 739866, broken by ragel-7 - -DWITH_ABOOKADDRESSBOOK_PLUGIN=ON - -DWITH_CRYPTO_MESSAGES=$(usex crypt) - -DWITH_GPGMEPP=$(usex crypt) - -DWITH_MIMETIC=$(usex crypt) - -DWITH_DBUS=$(usex dbus) - -DWITH_QTKEYCHAIN_PLUGIN=$(usex password) - -DWITH_AKONADIADDRESSBOOK_PLUGIN=$(usex pim) - -DWITH_SONNET_PLUGIN=$(usex spell) - -DBUILD_TESTING=$(usex test) - -DWITH_ZLIB=$(usex zlib) - ) - - cmake_src_configure -} - -src_test() { - virtx cmake_src_test -} diff --git a/profiles/package.mask b/profiles/package.mask index cce8b5bb87b..4e64dbc33fd 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -334,11 +334,6 @@ games-puzzle/gnudoku # Preparing for final 5.0.0 release >=app-text/tesseract-5.0.0_beta -# Andreas Sturmlechner <[email protected]> (2021-08-02) -# Depends on Qt5WebKit with more holes in it than swiss cheese. Bug #685750 -# Last release in 2016. Removal on 2021-10-04. -mail-client/trojita - # Andreas Sturmlechner <[email protected]> (2021-08-02) # Depends on Qt5WebKit with more holes in it than swiss cheese. Bug #740416 # Removal on 2021-10-04.
