Wolfgang Bauer 2019-11-07 18:07:52 +00:00 committed by Git OBS Bridge
parent 0eae40f27d
commit cb26435915
7 changed files with 27 additions and 66 deletions

View File

@ -1,48 +0,0 @@
From 02a8d3deb4f97046da4a0bb79abf9510d2d1c0a2 Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 23 Oct 2019 09:29:55 +0200
Subject: kio_http: avoid double Content-Type and Depth when used by KDAV
References: kde#413316
Upstream: merged
Summary: This makes libkdav 19.08 work again after commit 9713ea02e49eda.
Test Plan: syncing a CALDAV calendar in korganizer no longer fails
Reviewers: vkrause
Subscribers: kde-frameworks-devel
Tags: #frameworks
Differential Revision: https://phabricator.kde.org/D24880
---
src/ioslaves/http/http.cpp | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp
index e3bad6c..11dd7af 100644
--- a/src/ioslaves/http/http.cpp
+++ b/src/ioslaves/http/http.cpp
@@ -172,7 +172,8 @@ static QString sanitizeCustomHTTPHeader(const QString &_header)
if (!header.contains(QLatin1Char(':')) ||
header.startsWith(QLatin1String("host"), Qt::CaseInsensitive) ||
header.startsWith(QLatin1String("proxy-authorization"), Qt::CaseInsensitive) ||
- header.startsWith(QLatin1String("via"), Qt::CaseInsensitive)) {
+ header.startsWith(QLatin1String("via"), Qt::CaseInsensitive) ||
+ header.startsWith(QLatin1String("depth"), Qt::CaseInsensitive)) {
continue;
}
@@ -2599,7 +2600,7 @@ bool HTTPProtocol::sendQuery()
davHeader += metaData(QStringLiteral("davHeader"));
// Set content type of webdav data
- if (hasDavData) {
+ if (hasDavData && !header.contains(QLatin1String("Content-Type: "))) {
davHeader += QStringLiteral("Content-Type: text/xml; charset=utf-8\r\n");
}
--
cgit v1.1

View File

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

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl2ZyZ8ACgkQWNDuZIpI
s7u8xAf+IIF3XAtL6cS7iUlN5ODlqMQ8lTzJ8dAMuDnD80yWnIoIFtxQOrddVP7P
NJj7TUd727WSeXliBBfI414QgjZXYX6wi+IfRDucmDlbEkwWNm8bpnrVfOf7sOAf
yD8cHXXKV6OW0pune2iOBSIOMrxvUTVW0hbUiIRuN1Vz9Z0OPfsD4gxsSYEBP1pQ
xAHxe3hUtA8EH4PV1k24YArtM06q6fcTgwrjtvHrboPSywwhv8inNPpUepsyA78k
A/PtbvqyHkUgtd/v3pndMD7ep9fC97gVs5p0JvZ0i3HU52r07OeEka6T3K4f+REv
K6ub7FrGK2fkCHEEIX6aqnABOSsGBA==
=QCbf
-----END PGP SIGNATURE-----

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

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

11
kio-5.64.0.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl2+ymwACgkQWNDuZIpI
s7uZ6ggAiL+a0QdHxjJWstYvN+FotQE/48/LLsVHMaVyg08251x42aP3KZCQHrAe
Hju1lsjHxY1PELvUK5fIsz7YJ1M2zPMRPUrfbVV+b7aOY/Ag7ns3e3z2szQu2EI1
S5cKd6k/JSoEi23dDARsHytYGL5XnLZ5pmMLrDl7iTtNYcgOP2dx5sg9nkTZl7tL
zRAjldu9CU61tPBYCyO/CzU3upXD86vzTQqdj1v5V7T60BFAn9TQktCKAWr3imus
BtMZA2k2ZQ/gAnoyBQ93+R8dhehYNzE0voVzs4s3/Z1YvBYKQ9VYlufx8lVYqeui
UJqMLIBzG01tFSXpvWT5rP+7V+Z+Yw==
=km1E
-----END PGP SIGNATURE-----

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Nov 3 15:47:05 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
Update to 5.64.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.64.0.php
- Too many changes since 5.63.0, only listing bugfixes:
* Treat "application/x-ms-dos-executable" as executable on all platforms (kde#412694)
- Drop kio-5.63.0-fix-depth-with-kdav.patch. Merged upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 23 14:08:56 UTC 2019 - Matthias Fehring <buschmann23@opensuse.org> Wed Oct 23 14:08:56 UTC 2019 - Matthias Fehring <buschmann23@opensuse.org>

View File

@ -16,14 +16,14 @@
# #
%define _tar_path 5.63 %define _tar_path 5.64
# Full KF5 version (e.g. 5.33.0) # Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}} %{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33) # 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}')} %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang %bcond_without lang
Name: kio Name: kio
Version: 5.63.0 Version: 5.64.0
Release: 0 Release: 0
Summary: Network transparent access to files and data Summary: Network transparent access to files and data
License: LGPL-2.1-or-later License: LGPL-2.1-or-later
@ -37,8 +37,6 @@ Source2: frameworks.keyring
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 # 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 Patch0: kio_help-fallback-to-kde4-docs.patch
# PATCH-FIX-UPSTREAM kio-5.63.0-fix-depth-with-kdav.patch kde#413316 -- content of nextcloud calendars not visible
Patch1: kio-5.63.0-fix-depth-with-kdav.patch
BuildRequires: cmake >= 3.0 BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
BuildRequires: fdupes BuildRequires: fdupes