diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
| commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
| tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /kde-frameworks/ktexteditor | |
| parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) | |
gentoo resync : 03.11.2019
Diffstat (limited to 'kde-frameworks/ktexteditor')
| -rw-r--r-- | kde-frameworks/ktexteditor/Manifest | 3 | ||||
| -rw-r--r-- | kde-frameworks/ktexteditor/files/ktexteditor-5.63.0-crashfix.patch | 27 | ||||
| -rw-r--r-- | kde-frameworks/ktexteditor/ktexteditor-5.63.0-r1.ebuild (renamed from kde-frameworks/ktexteditor/ktexteditor-5.63.0.ebuild) | 2 |
3 files changed, 31 insertions, 1 deletions
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) |