gentoo resync : 03.11.2019

10 files changed, 39 insertions, 7 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 2ac9741724c8..6a0fc2d6dd63 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/kapidox/Manifest b/kde-frameworks/kapidox/Manifest
index 417841a8edc5..46883e7b75ee 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.60.0.tar.xz 396600 BLAKE2B e0bf009bb59de72f1bc7aba021c8c2751e4322702eea6912da55c745522d4981ad116a5baa22bf0a98148699d0fd738850a71e08989691101fad5d02eefdceec SHA512 f2ee7a486a3740ad2124f95264f83242b07454f189defc8eefac1cb20e7b6b1c37c579fd8b620148ee2197b8473d3a5a80e773fb0f0abd2f6cdfca7a4a1bcea6
 DIST kapidox-5.63.0.tar.xz 396748 BLAKE2B c65be0250154e7a2898fb68ae5887f898067e9e4f5feec4343db24aa366e341dbac4f85f133b0c567da3a8715553b2cba329b17bcbc59320925d7f6579bfe17e SHA512 408d03720b5511587c5246a263be276b8acda9fa892fac6b1956b7a9259aca695c145e7678fe5852e31fd162547051131c649bda884bd008d737136b7eba74fd
-EBUILD kapidox-5.60.0.ebuild 608 BLAKE2B eaa6095abeb963ae6a371ff2fbbf5786ddf75a0533786b07e5ad26910cbb6a4fb98e9e68e6eaeddcc400eace76c3a44d1b5e2b42d0c347b4f811f89d9eac9309 SHA512 2128a14fc51410cdd16d561bd40fc9b525f19a23c8a8a7e040b8d7bd3c5fa34dc76f56cf20490e3fe8ef110f8e134bfb90516dd4af3f79aa0f7318bd9d5f0f27
-EBUILD kapidox-5.63.0.ebuild 625 BLAKE2B 090a159457332fef02e189931e7f12cb19c17ed06d4acdc03c33fa84293c8e02cc78e074fd1831df95058775c4d46cfb2c6c7aaada09d86105c1891134d88c10 SHA512 d193a27c7dbb44db34d5b09fe22fc462ee0eef15e9c7b55603b122e16e2fb824fa1a9ec292dad07cb165c42c87a68bc688c693a574c3aacf58adec8bf90a8f4e
+EBUILD kapidox-5.60.0.ebuild 627 BLAKE2B 0b46736115e377246805e764ea1e7e32f5cdbab348fea97f18c17cb0f2419a0f642586321a7ed6f7512f5f2c3591114cec62a2fba107eab891697c24b4dfe710 SHA512 15c05516f819181eed4e0f9ecdbba40d9959a3c7093506385ae936198bfcc87ecca1a00970aa1c2ecb798104107d11fd88fa6f4107a8e7db6b22eda09a4f7065
+EBUILD kapidox-5.63.0.ebuild 644 BLAKE2B 41840c29c883575140e9e642ebfdafb0ee356b729cdaa43e6a008d758486b77ad0d8ea7656749736e761bf3c92ecc1570bec3a2eb5865758023e524a5fdc73a3 SHA512 287d11760092910bb9763a40e27c9dd6519e759a4fd45f63d1049d5de4465d1a8105cb423e5aff86f14a56b61ef580e98594215efe851fc797adbea7482abe02
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.60.0.ebuild b/kde-frameworks/kapidox/kapidox-5.60.0.ebuild
index 274a643f1e54..f8299a4c5cb8 100644
--- a/kde-frameworks/kapidox/kapidox-5.60.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.60.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
+KDE_QTHELP="false"
 KDE_TEST="false"
 DISTUTILS_SINGLE_IMPL="true"
 PYTHON_COMPAT=( python2_7 )
diff --git a/kde-frameworks/kapidox/kapidox-5.63.0.ebuild b/kde-frameworks/kapidox/kapidox-5.63.0.ebuild
index 0a2cd53035ed..a50c4f72e196 100644
--- a/kde-frameworks/kapidox/kapidox-5.63.0.ebuild
+++ b/kde-frameworks/kapidox/kapidox-5.63.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 KDE_AUTODEPS="false"
 KDE_DEBUG="false"
+KDE_QTHELP="false"
 KDE_TEST="false"
 DISTUTILS_SINGLE_IMPL="true"
 PYTHON_COMPAT=( python2_7 python3_{6,7} )
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 0104e580acff..3b6a72f64183 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.60.0.tar.xz 367204 BLAKE2B 8668129cc94e3a0cb13d3bfc34699d9b4f336238467bd9744cef2df5d6497effe7d5e6d26211fed742645499061f92311aded38543879c5fd33cd04090750f77 SHA512 ee5ed8a3cde88331f26126019c42cfe59f5057872ec147a0676b57b17f1937469e4e888d55c0476d964313b0377c8a7dd431b9d05cc6a3a570ee7973bf61f685
 DIST kcoreaddons-5.63.0.tar.xz 374680 BLAKE2B 23c6ffcf530a933013105078ce3ca7e98cabf71fdd22f597da609e172639b1e85ab96ff0032303e812d76abbc31e42856709a5fd3487b0c10fcb6ff69213be98 SHA512 4d279cfe1f31f1db61a4e36d831f9db7cf70a9e522376a6a6cce4cf36488ba02e00f57857b3cddc81a1aa1e809ef8dc737e841dddc6f009d741ee13d92771f50
-EBUILD kcoreaddons-5.60.0.ebuild 728 BLAKE2B 9aa4d28c28ee62d0521b21b1bc2822b5803256fd84ee3595da58bd1021089d3c6d115a145a6a23d671693bde384eac66e7dad596c4ee475aa70a45cba6d1fc8c SHA512 9eada6e84d0c32eb89f7c837b4f8fc4cb8feaf6472778d3260f523feee746a4a0c8e1a7e62c96f6eded97ec7fe0baa70e92bf64240858215e85c6eb81201a4fb
-EBUILD kcoreaddons-5.63.0.ebuild 731 BLAKE2B 5b81bbe4154a76b977a6b71f0c82b50c947eba0c273dfdf81f34f8dda1289b202cb5806c64a093cb5b2adcc834644709d0abf1123811ff6e0646c28c0cc0f124 SHA512 2045acf1f5671b89baf068538954ea1129e58bb38b6eee14c6ad2e28685c9bcb95fcabf62ddf475a0d59a6f0cf418a28ffd98cd779694278576639396f470596
+EBUILD kcoreaddons-5.60.0.ebuild 752 BLAKE2B be90072fd40b492de86409c3d6114bc63b5c0ece9296ee2fa6d77be3bc489ad5532acb82e1d12408e52d40b17eef638f5c662a4831781085465fa714abb31b27 SHA512 f9ea2122c620b46e17ac227b3ede9859e450875bdb92804ec042b59e2193ddfc435bbe35aeb40a5d4b09298c32560188d62731721e9c32a38f75e7f777365a1e
+EBUILD kcoreaddons-5.63.0.ebuild 755 BLAKE2B f1993351517047f5e982277717805a4b25c8cb58dda92f90d1cb24b87e7379be38dbeca19168cbe194f3c2159979c6a7baf90165e189f8653b8ba58508832ca6 SHA512 c43ae070a89a6d33ba5d5343626aecd7e1736209bfa7c4d0be5933a7bcf1f2c6373519734021bdd5e1962eff413c4780b1b5d26fb47a621ffd8d49875eb623bd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.60.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.60.0.ebuild
index 1006300d5245..f37f71c0d180 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.60.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.60.0.ebuild
@@ -32,7 +32,7 @@ src_test() {
 	# bugs: 619656, 632398, 647414, 665682
 	local myctestargs=(
 		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)"
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
 	)
 
 	kde5_src_test
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.63.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.63.0.ebuild
index 8edceeab04a8..b8fa9525e9c6 100644
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.63.0.ebuild
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.63.0.ebuild
@@ -32,7 +32,7 @@ src_test() {
 	# bugs: 619656, 632398, 647414, 665682
 	local myctestargs=(
 		-j1
-		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kformattest)"
+		-E "(kautosavefiletest|kdirwatch_qfswatch_unittest|kdirwatch_stat_unittest|kformattest)"
 	)
 
 	kde5_src_test
diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest
index 8d0d51e5cc2a..badc4e8e6050 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,6 @@
+AUX ktexteditor-5.63.0-crashfix.patch 1260 BLAKE2B 8e53de884ff50f12a68e849b35f84ff0c6ef3accb8132c268867fa3ec2937a138d2495779f85afd5019263f7cf3bec1c4f17c2c3ee2abb549b4d3507fbeea799 SHA512 306cf700d7ddbacb648536807fa34de7ba2aa7ae62182e7f1dd6530c9166785279bb621a43800f289f77131ea7596e85f1c889884ff3fbdd835ac78166f1bd13
 DIST ktexteditor-5.60.0.tar.xz 2321556 BLAKE2B 908443a648a402b73cf223e63f70165abf4b5c636a3c2b894ce3f3633383f12be1fb41e195d65a9703ab9d17d9ad6cccc058edbffec139db4934dc714de09d86 SHA512 16741e4f6aab274b856fdff42a578f936bd72d5452d88e52e1cf739d6462e461e330b51360f1583fa9c4c1f51998d2ea27d78f9456118bca2b381dda7e809272
 DIST ktexteditor-5.63.0.tar.xz 2350016 BLAKE2B 38cfe56fd769277d11b8c53acd2b20ef28757cc123ecf3e7f1ee392b6bf9eaaec122786e07a6a6bf3c7f57390d4eb180113a465f9c359ed9d44a42c347adab6a SHA512 e16a814b921febe08c5f506c4b882686f5d4ba70c24148bc6d0071b36ed768920b2acadf468588ff56b17fc912454907c830455d78c10240814eab4e288e4876
 EBUILD ktexteditor-5.60.0.ebuild 1402 BLAKE2B 2b57119583107c1e2293bcfb4dbeab4019b442205863034e0299d0b09cccbb30d6487d2abb4df9f346e5857f39aa73f1f8c637c373c6900fe7bf71b28507d4ea SHA512 5ec514329969cfbfab32a3274f9f2ede46a7807254ec712b63b889c65f55113de7f8b6ac73355736656e6bf9d700a26a2d2b96891954aef6ac4ef27455b31b77
-EBUILD ktexteditor-5.63.0.ebuild 1405 BLAKE2B 64dc1e7b0b371b6d43d8fa1c7b457ed3423f00a89906cc6c2c50e64df058ab6dbada60bb2378e767b76fb4e3ad7e8422ac8244885cb0dfa1dae2fe27e32364d6 SHA512 fb63fc8877d3d40ce989daa3e3e84d4b4f38be2b794dccc5d128e3a427b2b2e174c723f8889f2746acbd644e0880377fafe38a6600d7803345b2d0450673af06
+EBUILD ktexteditor-5.63.0-r1.ebuild 1452 BLAKE2B de8b45b623589e4773e81b04333347e569dca18b0a6c1ca6c76613692f954388222c99c3d6453864beac47efec7aa9aef497f655f924e17b33ebdb0f4cded2bf SHA512 ed6fcb2dbb2f5c0d56506da75e796f7b62c9044de4e158a11ce06f66976c3f1ce0bf5a6d76245b2e41aac663f9969bbf53cc807c63bac16c9f5ade6c55b92bcc
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch
new file mode 100644
index 000000000000..f6c867cad656
--- /dev/null
+++ b/kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch
@@ -0,0 +1,27 @@
+From f6e72a23052339253daa79095391625cf01c96f1 Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann <cullmann@kde.org>
+Date: Mon, 28 Oct 2019 20:32:13 +0100
+Subject: fix crash
+
+BUG: 413474
+---
+ src/utils/katevariableexpansionhelpers.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/utils/katevariableexpansionhelpers.cpp b/src/utils/katevariableexpansionhelpers.cpp
+index db71d0f..89aab3d 100644
+--- a/src/utils/katevariableexpansionhelpers.cpp
++++ b/src/utils/katevariableexpansionhelpers.cpp
+@@ -278,7 +278,9 @@ KateVariableExpansionDialog::KateVariableExpansionDialog(QWidget *parent)
+     connect(m_listView, &QAbstractItemView::activated, [this, lblDescription, lblCurrentValue](const QModelIndex &index) {
+         if (index.isValid()) {
+             const auto &var = m_variables[m_filterModel->mapToSource(index).row()];
+-            const auto name = QStringLiteral("%{") + var.name() + QLatin1Char('}');
++
++            // not auto, don't fall for string builder, see bug 413474
++            const QString name = QStringLiteral("%{") + var.name() + QLatin1Char('}');
+ 
+             if (parentWidget() && parentWidget()->window()) {
+                 auto currentWidget = parentWidget()->window()->focusWidget();
+-- 
+cgit v1.1
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.63.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild
index 4413fff50646..371a1c9b8ec3 100644
--- a/kde-frameworks/ktexteditor/ktexteditor-5.63.0.ebuild
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild
@@ -46,6 +46,8 @@ RDEPEND="${DEPEND}"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package editorconfig EditorConfig)