$ git diff --patch-with-stat --summary beb1e4125c89ead1d8135129c377326b29ec8070..f81d77cafd34ea066fbdf25ae3d4f0c5ec97a774
.abf.yml | 2 +-
kio-5.24.0-fileplaces.patch | 28 ++++++++++++++--------------
kio.spec | 13 +++++++------
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index 3e14c4d..709a150 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,2 @@
sources:
- kio-5.43.0.tar.xz: 847baf65183fc094580aefb356194fc499106fbd
+ kio-5.48.0.tar.xz: 70bdf9606c98152505248481c7927cbc006ce6b8
diff --git a/kio-5.24.0-fileplaces.patch b/kio-5.24.0-fileplaces.patch
index 04060d8..429df09 100644
--- a/kio-5.24.0-fileplaces.patch
+++ b/kio-5.24.0-fileplaces.patch
@@ -1,17 +1,19 @@
---- kio-5.41.0/src/filewidgets/kfileplacesmodel.cpp.0000~ 2017-12-02 21:05:51.000000000 +0100
-+++ kio-5.41.0/src/filewidgets/kfileplacesmodel.cpp 2017-12-03 22:06:44.105563535 +0100
+diff -up kio-5.46.0/src/filewidgets/kfileplacesmodel.cpp.0000~ kio-5.46.0/src/filewidgets/kfileplacesmodel.cpp
+--- kio-5.46.0/src/filewidgets/kfileplacesmodel.cpp.0000~ 2018-05-20 14:46:02.952656062 +0200
++++ kio-5.46.0/src/filewidgets/kfileplacesmodel.cpp 2018-05-20 14:48:20.250448268 +0200
@@ -30,6 +30,7 @@
- #include <QtCore/QMimeData>
- #include <QtCore/QTimer>
- #include <QtCore/QFile>
-+#include <QtCore/QStandardPaths>
+ #include <QMimeData>
+ #include <QTimer>
+ #include <QFile>
++#include <QStandardPaths>
#include <QColor>
#include <QAction>
#include <QUrlQuery>
-@@ -210,6 +211,22 @@ KFilePlacesModel::KFilePlacesModel(QObje
- KFilePlacesItem::createSystemBookmark(d->bookmarkManager,
+@@ -240,6 +241,21 @@ KFilePlacesModel::KFilePlacesModel(const
QStringLiteral("Home"), I18N_NOOP2("KFile System Bookmarks", "Home"),
QUrl::fromLocalFile(QDir::homePath()), QStringLiteral("user-home"));
+
++
+ // We add Documents, Music, Downloads, Pictures, Videos
+ KFilePlacesItem::createSystemBookmark(d->bookmarkManager,
+ QStringLiteral("Documents"), ki18nc("KFile System Bookmarks", "Documents").toString("openmandriva-kde-translation"),
@@ -20,14 +22,12 @@
+ QStringLiteral("Music"), ki18nc("KFile System Bookmarks", "Music").toString("openmandriva-kde-translation"),
+ QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::MusicLocation)), "folder-sound");
+ KFilePlacesItem::createSystemBookmark(d->bookmarkManager,
-+ QStringLiteral("Downloads"), ki18nc("KFile System Bookmarks", "Downloads").toString("openmandriva-kde-translation"),
-+ QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + "/"), "folder-downloads");
-+ KFilePlacesItem::createSystemBookmark(d->bookmarkManager,
+ QStringLiteral("Videos"), ki18nc("KFile System Bookmarks", "Videos").toString("openmandriva-kde-translation"),
+ QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::MoviesLocation)), "folder-video");
+ KFilePlacesItem::createSystemBookmark(d->bookmarkManager,
+ QStringLiteral("Pictures"), ki18nc("KFile System Bookmarks", "Pictures").toString("openmandriva-kde-translation"),
+ QUrl::fromLocalFile(QStandardPaths::writableLocation(QStandardPaths::PicturesLocation)), "folder-image");
- KFilePlacesItem::createSystemBookmark(d->bookmarkManager,
- QStringLiteral("Network"), I18N_NOOP2("KFile System Bookmarks", "Network"),
- QUrl(QStringLiteral("remote:/")), QStringLiteral("network-workgroup"));
++
+ // Some distros may not create various standard XDG folders by default
+ // so check for their existance before adding bookmarks for them
+ const QString desktopFolder = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
diff --git a/kio.spec b/kio.spec
index 1d20fb2..e3800fe 100644
--- a/kio.spec
+++ b/kio.spec
@@ -5,7 +5,7 @@
%define stable %([ "`echo %{version} |cut -d. -f3`" -ge 80 ] && echo -n un; echo -n stable)
Name: kio
-Version: 5.43.0
+Version: 5.48.0
Release: 1
Source0: http://download.kde.org/%{stable}/frameworks/%(echo %{version} |cut -d. -f1-2)/%{name}-%{version}.tar.xz
Summary: The KDE Frameworks 5 framework for handling Input and Output (I/O)
@@ -17,6 +17,7 @@ BuildRequires: cmake(ECM)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Test)
+BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(libxslt)
BuildRequires: pkgconfig(mit-krb5-gssapi)
BuildRequires: cmake(KF5Archive)
@@ -34,11 +35,14 @@ BuildRequires: cmake(KF5JobWidgets)
BuildRequires: cmake(KF5Notifications)
BuildRequires: cmake(KF5Service)
BuildRequires: cmake(KF5Solid)
+BuildRequires: cmake(KF5TextWidgets)
BuildRequires: cmake(KF5Wallet)
BuildRequires: cmake(KF5WidgetsAddons)
BuildRequires: cmake(KF5WindowSystem)
BuildRequires: cmake(KF5XmlGui)
BuildRequires: cmake(KF5DocTools)
+BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(com_err)
BuildRequires: acl-devel
BuildRequires: attr-devel
Requires: openmandriva-kde-translation
@@ -76,26 +80,23 @@ Development files (Headers etc.) for %{name}.
%ninja_install -C build
%find_lang %{name}%{major}
-%find_lang kcm_webshortcuts || touch kcm_webshortcuts.lang
-%files -f %{name}%{major}.lang,kcm_webshortcuts.lang
-%{_sysconfdir}/dbus-1/system.d/org.kde.kio.file.conf
+%files -f %{name}%{major}.lang
%{_sysconfdir}/xdg/accept-languages.codes
%{_sysconfdir}/xdg/kshorturifilterrc
%{_bindir}/*
+%{_datadir}/kconf_update/filepicker.upd
%{_datadir}/kservicetypes5/*
%{_datadir}/kservices5/*
%{_datadir}/knotifications5/*
%{_datadir}/kf5/kcookiejar
%{_datadir}/dbus-1/*/*
%{_datadir}/applications/*
-%{_datadir}/polkit-1/actions/*
%{_libdir}/qt5/plugins/kcm*.so
%{_libdir}/qt5/plugins/kf5/kded
%{_libdir}/qt5/plugins/kf5/kio
%{_libdir}/qt5/plugins/kf5/kiod
%{_libdir}/qt5/plugins/kf5/urifilters
-%{_libdir}/libexec/kauth/*
%{_libdir}/libexec/kf5/*
%doc %{_docdir}/HTML/*/kioslave5
%doc %{_docdir}/HTML/*/kcontrol5