10 files changed, 137 insertions, 5 deletions
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 4b402aa183fc..3352af7e6963 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 2bbd03ac7c62..7ad78c0bf445 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,6 @@
+AUX kalzium-17.12.1-knewstuff-optional.patch 1614 BLAKE2B 66cb70494818194741b53e979292bb018730f0e21d5054d156fac7b77e4820172e3b7a449bd2ac4ba5c6af1d5b4e8ffec4070fabcb0c7141e0cfce837738aa5c SHA512 20b0278fe8d569bd609be10cbfdb6a95951616d2cee448d51b286c5d745af4e20fc4c4effec0afe82aee098992ab97f250f004906a588966e307f00b07b14f22
 DIST kalzium-17.08.3.tar.xz 24450828 BLAKE2B 2586dd46a0847e6ef7becb5773e6b32f67bc24e3d91166287fd6df10c498eaeb0f8d2ba777d951db3226b47b2a94a7ef1e01a5623ee7c3c89ee6f035ae3567f5 SHA512 a421091154d9de89ce70c79b093e716c925c6573958bb8b3f02279d890d0c7c7dbf91ff3ee455688df6628059804a377d571bb8b75a68748d1b9f4eb003b1dbe
 DIST kalzium-17.12.1.tar.xz 24451344 BLAKE2B 0bd94b87dec53c37f170765e302e2b8cb948c8a4bd2203bc0ba293552f1dbabd4cf0d8668ab63d7b840b34e88692e539165cd946f2992929427cb89a0ef5bfa8 SHA512 35d5cdb803d261da248276746fea8eedf2eb16b62cfdde7320a6c1383b14b4b13654671e5775a1db00b533a645a98b1638f05009b661894554c6bd5539a4af50
 EBUILD kalzium-17.08.3.ebuild 1559 BLAKE2B 308da3c1790106361a169df03109b8f60666763e36f1d8d39fa3e094b402cad5ae4839195909237fca26f9899faee2bc63b6bf990fd1b65c21d4b306cafb4df5 SHA512 6a21f9fde13a7f7d36df5b99a70dc5c58f7e4c4b27e338b61117a72832fcc5fdd087f89e72b763265cd3b59f4b38dced9345a667d7ce47376e0c157e779cd02b
-EBUILD kalzium-17.12.1.ebuild 1561 BLAKE2B b056267968f93850bf53797a4dea44c96a1c91873a2776b5031ee0fa67c2ad9c15f5dbc976342fa53b191b42a52e62186260232ea4ea18b88e06a241fe3fb5ea SHA512 989687284fad983f81a731d2eb5a1f50dcead0587098e7ac85b1aae865457e050a089fb203d1ec2ff05a2a374bef2682bab26aeb5e27b28f357f779a2804e01d
+EBUILD kalzium-17.12.1-r1.ebuild 1622 BLAKE2B 89ab7537e35ae06da459c2c8060f1fe9b7f812d29ccd3bec8d3c6e9863f0cc7af582f78e2629eb318b5a548473a7902530d0a4b25ec243be5019457aca313f52 SHA512 5af6784cf7ba5a4295492c136b73cd4891f87cf999c670e9db5d56dbd5e84d8394eb4198acabd9149c4465dad29a2c22a090443b3d41d09e03205814e120c10d
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
new file mode 100644
index 000000000000..e60a6594a34c
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
@@ -0,0 +1,58 @@
+From 4f7922a93bbea8582d29eebb194932708f9e21cd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 16 Jan 2018 12:53:56 +0100
+Subject: [PATCH] KF5NewStuff is only used in moleculeview, conditional on
+ Eigen3 and AvogadroLibs
+
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4309a683..a12d4e36 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,7 +55,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     I18n
+     KDELibs4Support
+     KHtml
+-    NewStuff
+     Parts
+     Plotting
+     Solid
+@@ -93,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
+ endif(MSVC)
+ 
+ if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
++  find_package(KF5NewStuff REQUIRED)
+   # avoid compilerwarnings about redefinitions
+   # todo: use check_function_exits() ?
+   message(STATUS "Kalzium molecular editor enabled")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 623ba2e5..0b1936eb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -139,18 +139,17 @@ target_link_libraries(kalzium
+     KF5::Plotting
+     KF5::KHtml
+     KF5::KDELibs4Support
+-    KF5::NewStuff
+     KF5::UnitConversion
+     Qt5::Script
+     Qt5::Svg
+     Qt5::Quick
+     science
+-    ${OPENBABEL2_LIBRARIES}
+ )
+ if (OPENBABEL2_FOUND)
+    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+    if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
+       target_link_libraries(kalzium
++         KF5::NewStuff
+          Qt5::OpenGL
+          compoundviewer
+          AvogadroQtGui
+-- 
+2.15.1
+
diff --git a/kde-apps/kalzium/kalzium-17.12.1.ebuild b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
index ea7cedd67ed8..9aa752c327f0 100644
--- a/kde-apps/kalzium/kalzium-17.12.1.ebuild
+++ b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
@@ -32,9 +32,10 @@ DEPEND="
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	editor? (
+		$(add_frameworks_dep knewstuff)
 		dev-cpp/eigen:3
-		|| ( sci-libs/avogadrolibs sci-chemistry/avogadro )
 		sci-chemistry/openbabel
+		sci-libs/avogadrolibs
 	)
 	solver? ( dev-ml/facile[ocamlopt] )
 "
@@ -42,6 +43,8 @@ RDEPEND="${DEPEND}
 	sci-chemistry/chemical-mime-data
 "
 
+PATCHES=( "${FILESDIR}/${P}-knewstuff-optional.patch" )
+
 src_configure(){
 	# Fix missing finite()
 	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index e4b84c9caac9..c483d855558c 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,6 @@
+AUX kmail-17.12.1-applyfilters.patch 1623 BLAKE2B 34cbf7cb63fef036f8f775afbb0c7183f91d7f433532b9dd4ce4dc58389d9a03cda0f537efce4fe2ad11b7b68b282db75d4dc41f5e4b15fcb71bd1357c2de1b3 SHA512 3ef62d848dc7efa3b8d295684ce6cee12ec076e0b41548ecc6407d5b4aed898bad9a2263bbe2d9849eacd4970ad243bcffebff2d25f5205f77d7edf8f9cad561
 DIST kmail-17.08.3.tar.xz 4735776 BLAKE2B 7a83cc6cd7a00b4aa17521f4b3d8af95b8b6c1d229888a5d1b95279ab32615901619a816cc108dc56fa2009f7c52a8b8f8844762588731f30aec28de1ea7a58a SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7
 DIST kmail-17.12.1.tar.xz 4752528 BLAKE2B 1693e819d48eaf10fc1cf61a6e487c47cb0682d5f9cc423501f4576d119ca3668f89a7dd98e379a493b06b204082cc8880c259403132dbd5ddb1ee89b5e091e5 SHA512 2c67cb9f67b11a532309aeea7386c516be413ec2a5670c4aa18ad241edbaf00fb6a7687f57d1771f0aff57208cf43969cc7270060dcd3f0f6fd73fc8aa43645c
 EBUILD kmail-17.08.3.ebuild 3160 BLAKE2B 3383cd41dfc78f384fbbd213502989dce0003ece10ead6ed03256078a017aa5de27a61440431bce8040d56d5ea51d4d6480a0d193171b460d76526e992ac7602 SHA512 775d88af08392905b6f6446f5297128c8aef7ededa45f52dbcf46e7fc17f8fd1753075e43b5b4a7ff4ce35578b5a47dbc45082b74d652c0e50c0ac3e47c5bf99
-EBUILD kmail-17.12.1.ebuild 3203 BLAKE2B 6f6087dc3b093c54c0c467d9284d01627ad77be64a688fc64bec6c94a526e69bf4a17b6b45032a806da1fdb319db7fb8b96de7431a23fc315d03d0d5825f84d1 SHA512 862190655ee234de81599e453aae86780a3164487a05cd45015d4a12c1fcd07a0ccb8882c942418575445c8cd36e251e594b8c54cfd2838926c478b90364dfff
+EBUILD kmail-17.12.1-r1.ebuild 3254 BLAKE2B ccde7c0a6f49a80f5bb5d658c1de083208aea91c9a7c269e1e25467e0cc1781ab7a5bc155794967a67f4253bf51db5cd008e3f37e07584eed4c354c041eac6de SHA512 cac7ca7ac4d9fff3d8ed3986eb9d16c49c0faec7e84b5966422655ce749f6474a2e6bb53e7b4e6513005366060fad8c96df924b082f1dd5650f6810ccd424b33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
new file mode 100644
index 000000000000..4952628ecc68
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
@@ -0,0 +1,36 @@
+From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 15 Jan 2018 13:50:15 +0100
+Subject: Fix Bug 388953 - Apply filters on folder doesn't work anymore
+
+FIXED-IN: 5.7.2
+BUG: 388953
+---
+ src/kmmainwidget.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index d0edc48..ab0996e 100644
+--- a/src/kmmainwidget.cpp
++++ b/src/kmmainwidget.cpp
+@@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions()
+     {
+         mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
+         actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction);
+-        connect(mServerSideSubscription, &QAction::triggered,
++        connect(mApplyAllFiltersFolderAction, &QAction::triggered,
+                 this, [this] { slotApplyFiltersOnFolder(/* recursive */ false);
+                 });
+     }
+@@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions()
+     {
+         mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
+         actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction);
+-        connect(mServerSideSubscription, &QAction::triggered,
++        connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered,
+                 this, [this] { slotApplyFiltersOnFolder(/* recursive */ true);
+                 });
+     }
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kmail/kmail-17.12.1.ebuild b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
index 446bd9837650..86fcd8766e47 100644
--- a/kde-apps/kmail/kmail-17.12.1.ebuild
+++ b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
@@ -83,6 +83,8 @@ RDEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test" # bug 616878
 
+PATCHES=( "${FILESDIR}/${P}-applyfilters.patch" )
+
 src_prepare() {
 	cmake-utils_src_prepare
 
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"