Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 8 Nov 2019 08:13:41 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517033 - in head/devel/kf5-kio: . files
Message-ID:  <201911080813.xA88DfuJ080951@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tcberner
Date: Fri Nov  8 08:13:41 2019
New Revision: 517033
URL: https://svnweb.freebsd.org/changeset/ports/517033

Log:
  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>

Added:
  head/devel/kf5-kio/files/
  head/devel/kf5-kio/files/patch-git_02a8d3d   (contents, props changed)
Modified:
  head/devel/kf5-kio/Makefile

Modified: head/devel/kf5-kio/Makefile
==============================================================================
--- head/devel/kf5-kio/Makefile	Fri Nov  8 05:36:35 2019	(r517032)
+++ head/devel/kf5-kio/Makefile	Fri Nov  8 08:13:41 2019	(r517033)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kio
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org

Added: head/devel/kf5-kio/files/patch-git_02a8d3d
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/kf5-kio/files/patch-git_02a8d3d	Fri Nov  8 08:13:41 2019	(r517033)
@@ -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
+

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911080813.xA88DfuJ080951>