diff --git a/0001-Fix-crash-in-rename-dialog.patch b/0001-Fix-crash-in-rename-dialog.patch deleted file mode 100644 index 7c76cb5..0000000 --- a/0001-Fix-crash-in-rename-dialog.patch +++ /dev/null @@ -1,54 +0,0 @@ -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/kio-5.20.0.tar.xz b/kio-5.20.0.tar.xz deleted file mode 100644 index 85e0f96..0000000 --- a/kio-5.20.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0385883d4b12d044ed6ee030a3e02ddbddae55a131b74022db95f0f974bee7a9 -size 2895068 diff --git a/kio-5.21.0.tar.xz b/kio-5.21.0.tar.xz new file mode 100644 index 0000000..fbe36d6 --- /dev/null +++ b/kio-5.21.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:583e403f6d7813be1cd03f9b14c69bd1a6d8398dfd1e9fd87aa5883d6b949923 +size 2895592 diff --git a/kio.changes b/kio.changes index e04e2e2..8638b50 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Apr 4 14:21:01 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.21.0 (boo#974793) + * FavIconsCache: sync after write, so other apps see it, + and to avoid crash on destruction + * Fix many threading issues in KUrlCompletion + * Fix crash in rename dialog (360488) + * KOpenWithDialog: improve window title and description text + (359233) + * Allow for better cross-platform deployment of io slaves by + bundling protocol info in plugin meta data + * Upgrade Qt version requirement to 5.4.0 + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.21.0.php +- Drop upstreamed 0001-Fix-crash-in-rename-dialog.patch + ------------------------------------------------------------------- Thu Mar 17 17:06:57 UTC 2016 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 1240d95..24818f4 100644 --- a/kio.spec +++ b/kio.spec @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.20 +%define _tar_path 5.21 Name: kio -Version: 5.20.0 +Version: 5.21.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -49,15 +49,15 @@ BuildRequires: kxmlgui-devel >= %{_tar_path} BuildRequires: libacl-devel BuildRequires: libattr-devel BuildRequires: solid-devel >= %{_tar_path} -BuildRequires: cmake(Qt5Concurrent) >= 5.3.0 -BuildRequires: cmake(Qt5Core) >= 5.3.0 -BuildRequires: cmake(Qt5DBus) >= 5.3.0 -BuildRequires: cmake(Qt5Network) >= 5.3.0 -BuildRequires: cmake(Qt5Script) >= 5.3.0 -BuildRequires: cmake(Qt5Test) >= 5.3.0 -BuildRequires: cmake(Qt5Widgets) >= 5.3.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.3.0 -BuildRequires: cmake(Qt5Xml) >= 5.3.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.4.0 +BuildRequires: cmake(Qt5Core) >= 5.4.0 +BuildRequires: cmake(Qt5DBus) >= 5.4.0 +BuildRequires: cmake(Qt5Network) >= 5.4.0 +BuildRequires: cmake(Qt5Script) >= 5.4.0 +BuildRequires: cmake(Qt5Test) >= 5.4.0 +BuildRequires: cmake(Qt5Widgets) >= 5.4.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.4.0 +BuildRequires: cmake(Qt5Xml) >= 5.4.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) Requires: %{name}-core = %{version} @@ -75,8 +75,6 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-% Source1: baselibs.conf # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch -# PATCH-FIX-UPSTREAM 0001-Fix-crash-in-rename-dialog.patch -Patch1: 0001-Fix-crash-in-rename-dialog.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -111,7 +109,7 @@ Requires: kjobwidgets-devel >= %{_tar_path} Requires: kservice-devel >= %{_tar_path} Requires: kxmlgui-devel >= %{_tar_path} Requires: solid-devel >= %{_tar_path} -Requires: cmake(Qt5Network) >= 5.3.0 +Requires: cmake(Qt5Network) >= 5.4.0 %description devel This framework implements almost all the file management functions you @@ -123,7 +121,6 @@ Development files. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build %cmake_kf5 -d build @@ -176,20 +173,12 @@ done %dir %{_kf5_plugindir}/kf5 %dir %{_kf5_plugindir}/kf5/kio %{_kf5_plugindir}/kf5/kio/file.so -%{_kf5_servicesdir}/file.protocol %{_kf5_plugindir}/kf5/kio/ftp.so -%{_kf5_servicesdir}/ftp.protocol %{_kf5_plugindir}/kf5/kio/help.so %{_kf5_plugindir}/kf5/kio/ghelp.so -%{_kf5_servicesdir}/help.protocol -%{_kf5_servicesdir}/ghelp.protocol %{_kf5_libexecdir}/kio_http_cache_cleaner %{_kf5_plugindir}/kf5/kio/http.so %{_kf5_servicesdir}/http_cache_cleaner.desktop -%{_kf5_servicesdir}/http.protocol -%{_kf5_servicesdir}/https.protocol -%{_kf5_servicesdir}/webdav.protocol -%{_kf5_servicesdir}/webdavs.protocol %{_kf5_bindir}/kmailservice5 %{_kf5_applicationsdir}/kmailservice5.desktop %{_kf5_servicesdir}/data.protocol @@ -205,7 +194,6 @@ done %{_kf5_plugindir}/kf5/kio/trash.so %{_kf5_bindir}/ktrash5 %{_kf5_plugindir}/kcm_trash.so -%{_kf5_servicesdir}/trash.protocol %{_kf5_servicesdir}/kcmtrash.desktop %{_kf5_libexecdir}/kiod5 %{_kf5_sharedir}/dbus-1/services/org.kde.kiod5.service diff --git a/kio_help-fallback-to-kde4-docs.patch b/kio_help-fallback-to-kde4-docs.patch index 8f10420..1f4cae2 100644 --- a/kio_help-fallback-to-kde4-docs.patch +++ b/kio_help-fallback-to-kde4-docs.patch @@ -11,5 +11,5 @@ index cb27a77..0157c4f 100644 + QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/kde/HTML"), QStandardPaths::LocateDirectory); + localDoc.append(fallbacklocalDoc); - QStringList langs = QLocale().uiLanguages(); + QStringList langs = KLocalizedString::languages(); langs.append(QStringLiteral("en"));