From 9c0c4a346dfbe1d155e31d7ad0533c4e798decc9 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 17 Mar 2016 10:59:49 +0100 Subject: 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 ++++++++++++++ kde-frameworks/kio/kio-5.20.0-r1.ebuild | 82 ++++++++++++++++++++++ kde-frameworks/kio/kio-5.20.0.ebuild | 80 --------------------- 3 files changed, 136 insertions(+), 80 deletions(-) create mode 100644 kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch create mode 100644 kde-frameworks/kio/kio-5.20.0-r1.ebuild delete mode 100644 kde-frameworks/kio/kio-5.20.0.ebuild 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 00000000000..34c5cfbf4f1 --- /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 +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-r1.ebuild b/kde-frameworks/kio/kio-5.20.0-r1.ebuild new file mode 100644 index 00000000000..c778b7419c6 --- /dev/null +++ b/kde-frameworks/kio/kio-5.20.0-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing transparent file and data management" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl +handbook kerberos +kwallet X" + +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork 'ssl') + $(add_qt_dep qtscript) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/libxml2 + dev-libs/libxslt + acl? ( + sys-apps/attr + virtual/acl + ) + kerberos? ( virtual/krb5 ) + kwallet? ( $(add_frameworks_dep kwallet) ) + X? ( $(add_qt_dep qtx11extras) ) +" +DEPEND="${COMMON_DEPEND} + $(add_qt_dep qtconcurrent) + handbook? ( $(add_frameworks_dep kdoctools) ) + test? ( sys-libs/zlib ) + X? ( + x11-libs/libX11 + x11-libs/libXrender + x11-proto/xproto + ) +" +PDEPEND=" + $(add_frameworks_dep kded) +" +RDEPEND="${COMMON_DEPEND}" + +# tests hang +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-rename-crash.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package acl ACL) + $(cmake-utils_use_find_package handbook KF5DocTools) + $(cmake-utils_use_find_package kerberos GSSAPI) + $(cmake-utils_use_find_package kwallet KF5Wallet) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kio/kio-5.20.0.ebuild b/kde-frameworks/kio/kio-5.20.0.ebuild deleted file mode 100644 index 29b28be7d25..00000000000 --- a/kde-frameworks/kio/kio-5.20.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -inherit kde5 - -DESCRIPTION="Framework providing transparent file and data management" -LICENSE="LGPL-2+" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="acl +handbook kerberos +kwallet X" - -COMMON_DEPEND=" - $(add_frameworks_dep karchive) - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kcodecs) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork 'ssl') - $(add_qt_dep qtscript) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/libxml2 - dev-libs/libxslt - acl? ( - sys-apps/attr - virtual/acl - ) - kerberos? ( virtual/krb5 ) - kwallet? ( $(add_frameworks_dep kwallet) ) - X? ( $(add_qt_dep qtx11extras) ) -" -DEPEND="${COMMON_DEPEND} - $(add_qt_dep qtconcurrent) - handbook? ( $(add_frameworks_dep kdoctools) ) - test? ( sys-libs/zlib ) - X? ( - x11-libs/libX11 - x11-libs/libXrender - x11-proto/xproto - ) -" -PDEPEND=" - $(add_frameworks_dep kded) -" -RDEPEND="${COMMON_DEPEND}" - -# tests hang -RESTRICT="test" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package acl ACL) - $(cmake-utils_use_find_package handbook KF5DocTools) - $(cmake-utils_use_find_package kerberos GSSAPI) - $(cmake-utils_use_find_package kwallet KF5Wallet) - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} -- cgit v1.2.3