gentoo resync : 16.01.2018

3 files changed, 33 insertions, 2 deletions

diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index f9ae6e723b0b..6b4d1b1450cf 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,6 +1,7 @@
 AUX kmailtransport-17.11.80-deps.patch 1450 BLAKE2B dfb1e3c3d0e232986bd187e0bd1b623a0f1895750af69b9aa03876dce49c0baf09c2d2dbb83c40241da280d40045f9898ff218f4e8cafc4df09daee8f3fd27f8 SHA512 037a7efb891883cfa388d252a8e4fc12994a851eea56770c0f6c7acc368fe507d66937392ff6a401cf2781c30cff748e2521f014024ca2f61c690664b63b5af9
+AUX kmailtransport-17.12.1-draft-message-fix.patch 1103 BLAKE2B e97cdf8f44390c5d0cef047203ad43a9fbd492f6ce305a572f8c6079de27979bfe4854418312b665237c0b724b94785283dbc3c69fed869a2bc5afcd99436c36 SHA512 f96c698b375d60c0eb855993c9d9d44034b8f5686cdbb9a0210d940cc91224dd44121512e10e47cd5895aa7e588882a87acd514628c0e8fddf9b546bc5c2201f
 DIST kmailtransport-17.08.3.tar.xz 232936 BLAKE2B dd6f69e110dcb775e6cfacaaeb51acabda8d50a471e64ea9579313fef4a641a250245b8244c43f9c648a2e38d175d70012af0ca2a7be6ca7918d147e0f79693c SHA512 ad7d4edfcc63945c270e4b89f0b48be47ceddb1962e8051a6d3419bf41ada6c00739e6c75d8af1e30240c01721088e2e78e53227f96dd118da2d243468cdb66f
 DIST kmailtransport-17.12.1.tar.xz 165220 BLAKE2B 0939b06f55aea75ede4121b9f6a8215c018ecf65e35e2a356948316df338fb783008818d4c66e89dab59fdf4076439517e983d73a1c56af7c5d6a9e7c7ec7215 SHA512 56a9e2dffe6418f71587aadd98a98044fabb1fb5818aa52597904071c2301c53425e42759c240ef36c49df70708bbae83b1ebb78b31869ed65624e6eb09c892b
 EBUILD kmailtransport-17.08.3.ebuild 1157 BLAKE2B a76e53ace05dc677a12306349d303d55332b87c39c0fff5a86d515cd1bf3d16f31dd4e27bb1d46e5dc059a707152ac36460b88192bfe7c1cb1055108bd269f1d SHA512 700d660d2d56dd5ffb051d1bbc6041928e043264bb99253613dff7612a5da0541242c2dd84ccb1d71be538a09e4f34a8a600794270c2b955a3b69964fb781ced
-EBUILD kmailtransport-17.12.1.ebuild 975 BLAKE2B 78c0711458f21b99171236609866cf45af83d565cff74e784ec90b863f526f17144c252b4e544f1bef3984e3460f07d0368e87987de0d74290bdbd3f8d792800 SHA512 48a9c8bc71c3f7dbefe2f8c0a239ad4deede5446aafbdd60e2262270579cb7ca7f1317d4fc81f5274d0331272b0885ae08008c6a45730299a628e432bcdab982
+EBUILD kmailtransport-17.12.1-r1.ebuild 1020 BLAKE2B ae4ef51604991d2a0aaacb033f05b171a92c66d42761a93120c62192a118c78a7d3d2a3c2c584d2fd21fbee8adbb7641b0d4abb15234fbb35e73bd52838adcee SHA512 3f9368deac629a549ceca710a2210b77b74cd645fb7d7e2eefc6bded56946fdcf18638eff93b0cae74ccd7f4ae6fcefe92d80a6ef52d6566842ed3f36eb26c80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
new file mode 100644
index 000000000000..78a52547561a
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
@@ -0,0 +1,27 @@
+From 424f0273dbebd115da6812e0b680fb911f282cd4 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 15 Jan 2018 07:04:47 +0100
+Subject: Fix Bug 388573 - Draft message is confused about mail transport
+
+FIXED-IN: 5.7.2
+BUG: 388573
+---
+ src/kmailtransport/widgets/transportcombobox.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kmailtransport/widgets/transportcombobox.cpp b/src/kmailtransport/widgets/transportcombobox.cpp
+index b538f98..f198c4e 100644
+--- a/src/kmailtransport/widgets/transportcombobox.cpp
++++ b/src/kmailtransport/widgets/transportcombobox.cpp
+@@ -37,7 +37,7 @@ TransportComboBox::TransportComboBox(QWidget *parent)
+     : QComboBox(parent)
+     , d(new TransportComboBoxPrivate)
+ {
+-    QMetaObject::invokeMethod(this, "updateComboboxList");
++    updateComboboxList();
+     connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList);
+     connect(TransportManager::self(), &TransportManager::transportRemoved, this, &TransportComboBox::transportRemoved);
+ }
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
index 1cd4221e5d16..a954a87a9c26 100644
--- a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
@@ -38,6 +38,9 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepimlibs:4
 "
 
-PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-17.11.80-deps.patch"
+	"${FILESDIR}/${P}-draft-message-fix.patch"
+)
 
 RESTRICT+=" test"