From e045dfe503f5c40f17568c536db6e6290bfce3f7 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Sun, 18 Mar 2018 16:03:06 +0100
Subject: [PATCH] Trojita: bump (#2343)

---
 .../patches/trojita-0.7.0~git.patchset        | 79 -------------------
 mail-client/trojita/trojita-0.7.0~git.recipe  | 11 ++-
 2 files changed, 7 insertions(+), 83 deletions(-)

diff --git a/mail-client/trojita/patches/trojita-0.7.0~git.patchset b/mail-client/trojita/patches/trojita-0.7.0~git.patchset
index f033fc444..6174e8e72 100644
--- a/mail-client/trojita/patches/trojita-0.7.0~git.patchset
+++ b/mail-client/trojita/patches/trojita-0.7.0~git.patchset
@@ -50,82 +50,3 @@ index 31e8670..1d6d5b5 100644
        # which suffer from races (the keygen.sh is run multiple times in parallel within the CI environment).
 -- 
 2.14.2
-
-
-From 4c02000a91f499dcd9caf5a3d77cd6fd2d2734fe Mon Sep 17 00:00:00 2001
-From: Caspar Schutijser <caspar@schutijser.com>
-Date: Mon, 30 Oct 2017 14:47:58 +0100
-Subject: [PATCH] Apply "Construct On First Use Idiom" to warningBorder
-
-It suffered from the "static initialization order fiasco" [1], as
-pointed out by Jan, which was accidentally introduced by
-commit f70690899d2a6c69495d225214a7279ba8c1ff73. First reported by
-miqlas on IRC.
-
-1: https://isocpp.org/wiki/faq/ctors#static-init-order
-
-BUG: 386351
-BUG: 386353
-
-Change-Id: I559c12e606883068e09072de26bdaac3b1d5d73c
----
-
-diff --git a/src/Gui/ComposeWidget.cpp b/src/Gui/ComposeWidget.cpp
-index 1f96ce8..7b4388f 100644
---- a/src/Gui/ComposeWidget.cpp
-+++ b/src/Gui/ComposeWidget.cpp
-@@ -589,7 +589,7 @@
-         auto lbl = new QLabel(tr("<b>This message appears to be malformed, please be careful before sending it.</b>")
-                               + QStringLiteral("<ul><li>") + warnings.join(QStringLiteral("</li><li>")) + QStringLiteral("</li></ul>"),
-                               w);
--        lbl->setStyleSheet(Gui::Util::Css::warningBorder);
-+        lbl->setStyleSheet(Gui::Util::cssWarningBorder());
-         w->ui->verticalSplitter->insertWidget(1, lbl);
-     }
- 
-diff --git a/src/Gui/SettingsDialog.cpp b/src/Gui/SettingsDialog.cpp
-index 6535caf..e496481 100644
---- a/src/Gui/SettingsDialog.cpp
-+++ b/src/Gui/SettingsDialog.cpp
-@@ -63,7 +63,7 @@
- namespace Gui
- {
- 
--QString SettingsDialog::warningStyleSheet = Util::Css::warningBorder + QStringLiteral("font-weight: bold;");
-+QString SettingsDialog::warningStyleSheet = Util::cssWarningBorder() + QStringLiteral("font-weight: bold;");
- 
- /** @short Check a text field for being non empty. If it's empty, show an error to the user. */
- template<typename T>
-diff --git a/src/Gui/Util.cpp b/src/Gui/Util.cpp
-index 8c5c522..08cd97c 100644
---- a/src/Gui/Util.cpp
-+++ b/src/Gui/Util.cpp
-@@ -129,7 +129,11 @@
-     return false;
- }
- 
--const QString Css::warningBorder = QStringLiteral("border: 2px solid red; background-color: #E7C575; color: black; padding: 5px; margin: 5px; text-align: center;");
-+QString cssWarningBorder()
-+{
-+    static QString border = QStringLiteral("border: 2px solid red; background-color: #E7C575; color: black; padding: 5px; margin: 5px; text-align: center;");
-+    return border;
-+}
- 
- } // namespace Util
- 
-diff --git a/src/Gui/Util.h b/src/Gui/Util.h
-index aaf3668..eee843d 100644
---- a/src/Gui/Util.h
-+++ b/src/Gui/Util.h
-@@ -51,9 +51,7 @@
- 
- bool isFromDistinctImapAccount(QDropEvent* de);
- 
--struct Css {
--    static const QString warningBorder;
--};
-+QString cssWarningBorder();
- 
- } // namespace Util
- 
-
diff --git a/mail-client/trojita/trojita-0.7.0~git.recipe b/mail-client/trojita/trojita-0.7.0~git.recipe
index af28e889f..7b8c8364b 100644
--- a/mail-client/trojita/trojita-0.7.0~git.recipe
+++ b/mail-client/trojita/trojita-0.7.0~git.recipe
@@ -14,12 +14,12 @@ Plays well with the rest of the ecosystem. We don't like reinventing \
 wheels, but when the existing wheels quite don't fit the tracks, we're \
 not afraid of making them work."
 HOMEPAGE="http://trojita.flaska.net/"
-COPYRIGHT="2006-2017 Trojitá developers"
+COPYRIGHT="2006-2018 Trojitá developers"
 LICENSE="GNU GPL v2"
-REVISION="3"
-srcGitRev="93f73aae1c317698883b37aab5cf94ba1d82753d"
+REVISION="4"
+srcGitRev="64b489aa33101ed28168c894e3d92f4d1a0b5416"
 SOURCE_URI="https://github.com/KDE/trojita/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="37eac9f7d333a84eff1a2c834ea8b0ef7242174b59a6a605d8b9b87dd3a26bb0"
+CHECKSUM_SHA256="e0ab025c42efc925386aabc7facec59e3f0699bee79c725e9365157b2c1f77e8"
 SOURCE_DIR="trojita-$srcGitRev"
 SOURCE_FILENAME="trojita-$srcGitRev.tar.gz"
 ADDITIONAL_FILES="trojita.rdef.in"
@@ -86,6 +86,9 @@ BUILD_PREREQUIRES="
 	cmd:xargs
 	"
 
+defineDebugInfoPackage trojita$secondaryArchSuffix \
+	"$appsDir"/Trojita/Trojita
+
 BUILD()
 {
 	#Downloading i10n, requires network connection