From 80135637ec2345988f33d8be62be98192ec43fcd0c8c193c348716884fa6bf38 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Wed, 12 Jul 2017 05:33:05 +0000
Subject: [PATCH] KDE Frameworks 5.36.0 checkin

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=189
---
 kio-5.35.0.tar.xz                    |  3 ---
 kio-5.36.0.tar.xz                    |  3 +++
 kio.changes                          | 20 ++++++++++++++++++++
 kio.spec                             |  4 ++--
 kio_help-fallback-to-kde4-docs.patch | 14 +++++++-------
 5 files changed, 32 insertions(+), 12 deletions(-)
 delete mode 100644 kio-5.35.0.tar.xz
 create mode 100644 kio-5.36.0.tar.xz

diff --git a/kio-5.35.0.tar.xz b/kio-5.35.0.tar.xz
deleted file mode 100644
index b23bca3..0000000
--- a/kio-5.35.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d2fb8d17addf69fc438558526accf5bf4edb3dbe24fbd87a4c097f8818ff235
-size 3081392
diff --git a/kio-5.36.0.tar.xz b/kio-5.36.0.tar.xz
new file mode 100644
index 0000000..d230ca7
--- /dev/null
+++ b/kio-5.36.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f18f51d5d85156de52bf21e7344e06b9fcb6c815043797615171c7a66bb743c8
+size 3081976
diff --git a/kio.changes b/kio.changes
index 674f1bc..ec07cbf 100644
--- a/kio.changes
+++ b/kio.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Wed Jul 12 07:14:01 CEST 2017 - lbeltrame@kde.org
+
+- Update to 5.36.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/kde-frameworks-5.36.0.php
+- Changes since 5.35.0:
+  * [KNewFileMenu] Hide "Link To Device" menu if it would be empty
+  * Use KIO::rename instead of KIO::moveAs in setData (kde#380897, kde#380898)
+  * Get the doc dirs with the newly exported function
+  * Fix drop menu position on Wayland
+  * KUrlRequester: Set NOTIFY signal to textChanged() for text property.
+  * [KOpenWithDialog] HTML-escape file name
+  * tests: dropjobtest: register KIO::CopyJob* as metatype
+  * tests: fix krununittest when install prefix has spaces
+  * [FEATURE] Option to build & install QCH file with the public API dox
+  * KCoreDirLister::cachedItemForUrl: don't create the cache if it didn't exist
+  * Use "data" as filename when copying data urls (kde#379093)
+
 -------------------------------------------------------------------
 Sun Jun 11 09:27:43 CEST 2017 - lbeltrame@kde.org
 
diff --git a/kio.spec b/kio.spec
index a51f7e9..a692eff 100644
--- a/kio.spec
+++ b/kio.spec
@@ -17,9 +17,9 @@
 
 
 %bcond_without lang
-%define _tar_path 5.35
+%define _tar_path 5.36
 Name:           kio
-Version:        5.35.0
+Version:        5.36.0
 Release:        0
 %define kf5_version %{version}
 BuildRequires:  cmake >= 3.0
diff --git a/kio_help-fallback-to-kde4-docs.patch b/kio_help-fallback-to-kde4-docs.patch
index 1f4cae2..9e72e8f 100644
--- a/kio_help-fallback-to-kde4-docs.patch
+++ b/kio_help-fallback-to-kde4-docs.patch
@@ -1,13 +1,13 @@
-diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp
-index cb27a77..0157c4f 100644
---- a/src/ioslaves/help/kio_help.cpp
-+++ b/src/ioslaves/help/kio_help.cpp
-@@ -49,7 +49,9 @@ QString HelpProtocol::langLookup(const QString &fname)
+Index: kio-5.36.0git.20170624T013155~b715b585/src/ioslaves/help/kio_help.cpp
+===================================================================
+--- kio-5.36.0git.20170624T013155~b715b585.orig/src/ioslaves/help/kio_help.cpp
++++ kio-5.36.0git.20170624T013155~b715b585/src/ioslaves/help/kio_help.cpp
+@@ -51,7 +51,9 @@ QString HelpProtocol::langLookup(const Q
      QStringList search;
  
      // assemble the local search paths
--    const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
-+    QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
+-    const QStringList localDoc = KDocTools::documentationDirs();
++    QStringList localDoc = KDocTools::documentationDirs();
 +    QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/kde/HTML"), QStandardPaths::LocateDirectory);
 +    localDoc.append(fallbacklocalDoc);