summaryrefslogtreecommitdiff
path: root/kde-frameworks/kio
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-03-21 03:42:52 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-03-21 03:43:49 +1100
commit1cbbc866f2b42b79b28d2ebd09e6772acc9985d7 (patch)
tree77e3797ad0be4441eebf0ac712df1c0ce7c754ff /kde-frameworks/kio
parentbbe7e2d2c1bdf8db2b25a7e98523f4e5a4f8990d (diff)
downloadgentoo-1cbbc866f2b42b79b28d2ebd09e6772acc9985d7.tar.gz
gentoo-1cbbc866f2b42b79b28d2ebd09e6772acc9985d7.tar.xz
kde-frameworks: version bump 5.20
Package-Manager: portage-2.2.28
Diffstat (limited to 'kde-frameworks/kio')
-rw-r--r--kde-frameworks/kio/Manifest1
-rw-r--r--kde-frameworks/kio/files/kio-5.20.0-rename-crash.patch54
-rw-r--r--kde-frameworks/kio/kio-5.20.0-r1.ebuild82
3 files changed, 137 insertions, 0 deletions
diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index f9f1a5c1e51..77b489d3de1 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,2 +1,3 @@
DIST kio-5.18.0.tar.xz 2877312 SHA256 da526bb9b7f02b9670cf6bea54645a89a5b32d008204a4f2253bdd5e74df0f08 SHA512 35a1fbf27b4d0ffdf3297659e2c1a8b9add92d20f1cf6a3adbb79eed36164abc21caa543931ad3be39695f001d250638c091ed398e1776cc6e1fda8c3556d3a0 WHIRLPOOL ad812a7f12b78b00de95d5d41186927c14a37ef431c3adc5a611a5f0d89340c1f63e1bdffe16216a831229b3a995de312744e55245893953b6408ebcaae60883
DIST kio-5.19.0.tar.xz 2889500 SHA256 db26d787efd4b9f7da1970fb9814bca130f6d3adc578a847e93b4ac5ceadfa30 SHA512 5ebcfa03170e15b7fd1a686a8897945724c3fe14407ac64af502139ebb427edc7b3b63ab5ed009160dae8245fba01df8be59faa5bb25aff4b57b9850ee1b913d WHIRLPOOL 5a8985b3d2c55e07bf5b84bd22e280cfaebbc5a226b17092c28ae3fc07f51ec4afb3d78461181a7500e4d924d5c664958be1cfc860da147db32ff8feaadf574f
+DIST kio-5.20.0.tar.xz 2895068 SHA256 0385883d4b12d044ed6ee030a3e02ddbddae55a131b74022db95f0f974bee7a9 SHA512 88412a0df99bc0793b8e407c7010efcba5fa6dce2fbfb0478730e573fc19a7805f18819c69d2abc7cfe86ddbf7ccfb8a52fd2e12c588032935310b6cdd30277f WHIRLPOOL fa92b94052c3444d5e3fd0e96cba678298ac8e39fff51ab85bac27962df7bb34b737a60082847891db77d27dfdef9a692c3621b2152f4564f4efb61137a97153
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 <emmanuelpescosta099@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-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
+}