aboutsummaryrefslogtreecommitdiff
path: root/devel/kf5-kio
diff options
context:
space:
mode:
authorTobias C. Berner <tcberner@FreeBSD.org>2019-11-08 08:13:41 +0000
committerTobias C. Berner <tcberner@FreeBSD.org>2019-11-08 08:13:41 +0000
commit9f81018336f27b83ad51b18cfe30f0cda18f6ef8 (patch)
tree289c12f0572993c2b265a560c897741fad85c27d /devel/kf5-kio
parent4eeae50a1c5f92443556220d30bdaa8a3fcd4de7 (diff)
downloadports-9f81018336f27b83ad51b18cfe30f0cda18f6ef8.tar.gz
ports-9f81018336f27b83ad51b18cfe30f0cda18f6ef8.zip
devel/kf5-kio: add upstream patch for nextcloud calendar support.
Upstream PR: https://bugs.kde.org/show_bug.cgi?id=413316 PR: 241741 Reported by: Greg Rivers <gcr@tharned.org>
Notes
Notes: svn path=/head/; revision=517033
Diffstat (limited to 'devel/kf5-kio')
-rw-r--r--devel/kf5-kio/Makefile1
-rw-r--r--devel/kf5-kio/files/patch-git_02a8d3d46
2 files changed, 47 insertions, 0 deletions
diff --git a/devel/kf5-kio/Makefile b/devel/kf5-kio/Makefile
index 7ebee2475878..670d4ace9327 100644
--- a/devel/kf5-kio/Makefile
+++ b/devel/kf5-kio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kio
DISTVERSION= ${KDE_FRAMEWORKS_VERSION}
+PORTREVISION= 1
CATEGORIES= devel kde kde-frameworks
MAINTAINER= kde@FreeBSD.org
diff --git a/devel/kf5-kio/files/patch-git_02a8d3d b/devel/kf5-kio/files/patch-git_02a8d3d
new file mode 100644
index 000000000000..415bc73a2706
--- /dev/null
+++ b/devel/kf5-kio/files/patch-git_02a8d3d
@@ -0,0 +1,46 @@
+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
+
+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
+--- src/ioslaves/http/http.cpp
++++ 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
+