commit: 9c0c4a346dfbe1d155e31d7ad0533c4e798decc9 Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Thu Mar 17 09:59:49 2016 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Thu Mar 17 15:18:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c0c4a34
kde-frameworks/kio: Fix crash on in-place copy/paste See also: https://bugs.kde.org/show_bug.cgi?id=360488 Package-Manager: portage-2.2.27 .../kio/files/kio-5.20.0-rename-crash.patch | 54 ++++++++++++++++++++++ .../{kio-5.20.0.ebuild => kio-5.20.0-r1.ebuild} | 2 + 2 files changed, 56 insertions(+) diff --git a/kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch b/kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch new file mode 100644 index 0000000..34c5cfb --- /dev/null +++ b/kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch @@ -0,0 +1,54 @@ +From a5f62007c294220c13bb080287035aeab77ae640 Mon Sep 17 00:00:00 2001 +From: Emmanuel Pescosta <emmanuelpescosta...@gmail.com> +Date: Thu, 17 Mar 2016 10:28:09 +0100 +Subject: [PATCH] Fix crash in rename dialog +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +ResizePanels must only be called in case of overwrite, all other cases violate +the preconditions. + +BUG: 360488 +--- + src/widgets/renamedialog.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp +index 2d456c7..cb3c0fb 100644 +--- a/src/widgets/renamedialog.cpp ++++ b/src/widgets/renamedialog.cpp +@@ -105,6 +105,8 @@ public: + m_destPendingPreview = false; + m_srcPreview = 0; + m_destPreview = 0; ++ m_srcArea = Q_NULLPTR; ++ m_destArea = Q_NULLPTR; + } + + void setRenameBoxText(const QString &fileName) +@@ -385,7 +387,9 @@ RenameDialog::RenameDialog(QWidget *parent, const QString &_caption, + + #if 1 // without kfilemetadata + // don't wait for kfilemetadata, but wait until the layouting is done +- QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection); ++ if (_options & RenameDialog_Overwrite) { ++ QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection); ++ } + #endif + } + +@@ -584,6 +588,11 @@ void RenameDialog::showDestPreview(const KFileItem &fileitem, const QPixmap &pix + + void RenameDialog::resizePanels() + { ++ Q_ASSERT(d->m_srcArea != Q_NULLPTR); ++ Q_ASSERT(d->m_destArea != Q_NULLPTR); ++ Q_ASSERT(d->m_srcPreview != Q_NULLPTR); ++ Q_ASSERT(d->m_destPreview != Q_NULLPTR); ++ + // using QDesktopWidget geometry as Kephal isn't accessible here in kdelibs + const QSize screenSize = QApplication::desktop()->availableGeometry(this).size(); + QSize halfSize = d->m_srcArea->widget()->sizeHint().expandedTo(d->m_destArea->widget()->sizeHint()); +-- +2.7.3 + diff --git a/kde-frameworks/kio/kio-5.20.0.ebuild b/kde-frameworks/kio/kio-5.20.0-r1.ebuild similarity index 97% rename from kde-frameworks/kio/kio-5.20.0.ebuild rename to kde-frameworks/kio/kio-5.20.0-r1.ebuild index 29b28be..c778b74 100644 --- a/kde-frameworks/kio/kio-5.20.0.ebuild +++ b/kde-frameworks/kio/kio-5.20.0-r1.ebuild @@ -67,6 +67,8 @@ RDEPEND="${COMMON_DEPEND}" # tests hang RESTRICT="test" +PATCHES=( "${FILESDIR}/${P}-rename-crash.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package acl ACL)
