Accepting request 348567 from KDE:Frameworks5

Update to 5.17.0

OBS-URL: https://build.opensuse.org/request/show/348567
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2015-12-29 11:53:16 +00:00 committed by Git OBS Bridge
commit f84bab27c5
5 changed files with 18 additions and 53 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3b5ee93fe1796091d387b9cabdc768c9d3b111b30cee24da74d9bab9b927a9d6
size 2865420

3
kio-5.17.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1491a8dfe12bef2b5e889a1fa61eab9c4247608db2934bd22a7b0270d714d0b5
size 2868916

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Dec 10 23:06:56 UTC 2015 - hrvoje.senjan@gmail.com
- Update to 5.17.0
* Cookie dialogue: make it work as intended
* Fix filename suggestion changing to something random when
changing save-as mimetype.
* Register DBus name for kioexec (kde#353037)
* Update KProtocolManager after configuration change.
* For more details please see:
https://www.kde.org/announcements/kde-frameworks-5.17.0.php
- Drop upstreamed register-dbus-name-for-kioexec.patch
-------------------------------------------------------------------
Fri Nov 27 12:47:46 UTC 2015 - wbauer@tmo.at

View File

@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.16
%define _tar_path 5.17
Name: kio
Version: 5.16.0
Version: 5.17.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 2.8.12
@ -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 register-dbus-name-for-kioexec.patch boo#924764, kde#353037 -- prevent klauncher from freezing and displaying an error message when opening documents
Patch1: register-dbus-name-for-kioexec.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -123,7 +121,6 @@ Development files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build

View File

@ -1,45 +0,0 @@
From: Weng Xuetian <wengxt@gmail.com>
Date: Wed, 25 Nov 2015 08:33:47 +0000
Subject: Register DBus name for kioexec
X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=1b4289ca0e00bf7ba59b19837ea2b2519f42a984
---
Register DBus name for kioexec
KLauncher expects kioexec to register org.kde.kioexec on dbus.
REVIEW: 126164
BUG: 353037
FIXED-IN: 5.17.0
---
--- a/src/kioexec/CMakeLists.txt
+++ b/src/kioexec/CMakeLists.txt
@@ -10,6 +10,7 @@
KF5::KIOWidgets # KRun
KF5::WidgetsAddons # KMessageBox
KF5::WindowSystem # KStartupInfo
+ KF5::DBusAddons # KDBusService
)
if (HAVE_X11)
--- a/src/kioexec/main.cpp
+++ b/src/kioexec/main.cpp
@@ -37,6 +37,7 @@
#include <KService>
#include <KLocalizedString>
#include <KAboutData>
+#include <KDBusService>
#include <QCommandLineParser>
#include <QCommandLineOption>
@@ -282,6 +283,7 @@
aboutData.addAuthor(i18n("Waldo Bastian"),QString(), QStringLiteral("bastian@kde.org"));
aboutData.addAuthor(i18n("Oswald Buddenhagen"),QString(), QStringLiteral("ossi@kde.org"));
KAboutData::setApplicationData(aboutData);
+ KDBusService service(KDBusService::Multiple);
QCommandLineParser parser;
parser.addHelpOption();