diff --git a/0001-RenameDialog-Add-missing-nullptr-initialization.patch b/0001-RenameDialog-Add-missing-nullptr-initialization.patch deleted file mode 100644 index d2a4633..0000000 --- a/0001-RenameDialog-Add-missing-nullptr-initialization.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001 -From: Ismael Asensio -Date: Tue, 22 Dec 2020 22:23:17 +0100 -Subject: [PATCH] RenameDialog: Add missing nullptr initialization - -It fixes a crash when pressing `Apply to All` in those cases where -the action was not present, as the code checks for nullptr - -BUG: 430374 -FIXED-IN: 5.78 ---- - src/widgets/renamedialog.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp -index ac1d91d2..c3e04753 100644 ---- a/src/widgets/renamedialog.cpp -+++ b/src/widgets/renamedialog.cpp -@@ -161,6 +161,7 @@ public: - bCancel = nullptr; - bRename = bSkip = nullptr; - bOverwrite = nullptr; -+ bOverwriteWhenOlder = nullptr; - bResume = bSuggestNewName = nullptr; - bApplyAll = nullptr; - m_pLineEdit = nullptr; --- -2.29.2 - diff --git a/kio-5.77.0.tar.xz b/kio-5.77.0.tar.xz deleted file mode 100644 index 16851d5..0000000 --- a/kio-5.77.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:237c85c9dbcfcd366290512005b0e8498c10f3b300524633bbc9319a8327a14f -size 3293128 diff --git a/kio-5.77.0.tar.xz.sig b/kio-5.77.0.tar.xz.sig deleted file mode 100644 index 53fca74..0000000 --- a/kio-5.77.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl/Ln4wACgkQWNDuZIpI -s7tTegf/baxY86EFZQn4ovABlkwqvs6fPV3o87a9WigeLhEk4qiTt0wPr9VujmRu -jRI+3OGNhW3gjuZRc49wktqq1EPpLPRl19apQC9kWRDtwqyK+wroY24F3+u789+/ -x8heoTyfO6+LQf0iFgOk6LlmI9nGgafNEjOgTsLd2LE2F6r4HBeUmaVblhra+LXd -YIiSN2lAVRD5lC0/WLQyjBdP6rP6h0CnBmHRT3N264OopcBYWVb0/081NMYsnvwP -u841Mtdmu37Dg01C0JeW6VYEWMKHHYsVvu5IH25AqkDyT9A+fvUi0VqLONruqGPq -nRcly1jgZaqs2LfF+iMFWdo/lLIONw== -=Dkuy ------END PGP SIGNATURE----- diff --git a/kio-5.78.0.tar.xz b/kio-5.78.0.tar.xz new file mode 100644 index 0000000..71bb48f --- /dev/null +++ b/kio-5.78.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e211dba2c1ed73b67188d3ddbaf40043409912ab731aed4eba5bea32a587d620 +size 3308004 diff --git a/kio-5.78.0.tar.xz.sig b/kio-5.78.0.tar.xz.sig new file mode 100644 index 0000000..d2f78cb --- /dev/null +++ b/kio-5.78.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl/wei0ACgkQWNDuZIpI +s7t61Af/VxafIXewpnR0hxDotxWA2I4jc2AFHB+IL2eFzdffdn9HzgPKo0l+MU8K +W0BfQXlQ7eds4DlWnpppf6Y1VeTpwW1y1LEeWiynMsuzc6bKVrV9wej7LFVFKiXk +te9KVIYRUyfwjepbqXTSev/8e2wosDk3zYCnUhSmhLdzzHhK2htYffYWEIgkcjB/ +RkXJcl+QdfTmQ8cdXkeQhyTf88DM+jgz0ubHmidpmiQwip8qjbF1cI8drFnbFJ17 +RjEPI2WP5c3xnN04qlLZ/G4LsDciJFHllQZh7xoh9aRpc6TYyu1XR11cFemt6cGm +EbmOXXy5B3WNw5R2tF5EcMPLoSLFgQ== +=hoRt +-----END PGP SIGNATURE----- diff --git a/kio.changes b/kio.changes index 2071e69..a01d2df 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jan 6 10:47:45 UTC 2021 - Christophe Giboudeaux + +- Update to 5.78.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.78.0 +- Too many changes since 5.77.0, only listing bugfixes: + * Remove knetattach item from the remote:// ioslave's view (kde#430211) + * RenameDialog: Add missing nullptr initialization (kde#430374) + * KFileItemActions: fix condition, we want to exclude only remote dirs (kde#430293) + * KUrlNavigator: resolve relative dir paths (kde#319700) + * KFileWidget: allow files that begin with a ':' to be selected (kde#322837) + * KFilePlacesView: allow setting a static icon size (kde#182089) + * KFileItemActions: add new method to insert openwith actions (kde#423765) +- Drop 0001-RenameDialog-Add-missing-nullptr-initialization.patch + ------------------------------------------------------------------- Tue Dec 22 22:11:18 UTC 2020 - Luca Beltrame diff --git a/kio.spec b/kio.spec index f7ad954..e4bed26 100644 --- a/kio.spec +++ b/kio.spec @@ -1,7 +1,7 @@ # # spec file for package kio # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%define _tar_path 5.77 +%define _tar_path 5.78 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio -Version: 5.77.0 +Version: 5.78.0 Release: 0 Summary: Network transparent access to files and data License: LGPL-2.1-or-later @@ -35,10 +35,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}- Source2: frameworks.keyring %endif Source99: baselibs.conf -# PATCH-FIX-UPSTREAM -Patch0: 0001-RenameDialog-Add-missing-nullptr-initialization.patch # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 -Patch100: kio_help-fallback-to-kde4-docs.patch +Patch0: kio_help-fallback-to-kde4-docs.patch BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -67,16 +65,16 @@ BuildRequires: cmake(KF5Wallet) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WidgetsAddons) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} BuildRequires: cmake(KF5XmlGui) >= %{_kf5_bugfix_version} -BuildRequires: cmake(Qt5Concurrent) >= 5.13.0 -BuildRequires: cmake(Qt5Core) >= 5.13.0 -BuildRequires: cmake(Qt5DBus) >= 5.13.0 -BuildRequires: cmake(Qt5Network) >= 5.13.0 -BuildRequires: cmake(Qt5Qml) >= 5.13.0 -BuildRequires: cmake(Qt5Test) >= 5.13.0 -BuildRequires: cmake(Qt5UiPlugin) >= 5.13.0 -BuildRequires: cmake(Qt5Widgets) >= 5.13.0 -BuildRequires: cmake(Qt5X11Extras) >= 5.13.0 -BuildRequires: cmake(Qt5Xml) >= 5.13.0 +BuildRequires: cmake(Qt5Concurrent) >= 5.14.0 +BuildRequires: cmake(Qt5Core) >= 5.14.0 +BuildRequires: cmake(Qt5DBus) >= 5.14.0 +BuildRequires: cmake(Qt5Network) >= 5.14.0 +BuildRequires: cmake(Qt5Qml) >= 5.14.0 +BuildRequires: cmake(Qt5Test) >= 5.14.0 +BuildRequires: cmake(Qt5UiPlugin) >= 5.14.0 +BuildRequires: cmake(Qt5Widgets) >= 5.14.0 +BuildRequires: cmake(Qt5X11Extras) >= 5.14.0 +BuildRequires: cmake(Qt5Xml) >= 5.14.0 BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(x11) Requires: %{name}-core = %{version} @@ -121,9 +119,9 @@ Requires: cmake(KF5Service) >= %{_kf5_bugfix_version} Requires: cmake(KF5Solid) >= %{_kf5_bugfix_version} Requires: cmake(KF5WindowSystem) >= %{_kf5_bugfix_version} Requires: cmake(KF5XmlGui) >= %{_kf5_bugfix_version} -Requires: cmake(Qt5Concurrent) >= 5.13.0 -Requires: cmake(Qt5DBus) >= 5.13.0 -Requires: cmake(Qt5Network) >= 5.13.0 +Requires: cmake(Qt5Concurrent) >= 5.14.0 +Requires: cmake(Qt5DBus) >= 5.14.0 +Requires: cmake(Qt5Network) >= 5.14.0 %description devel This framework implements almost all the file management functions you