From owner-svn-ports-head@freebsd.org Fri Nov 8 08:13:42 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0B6FA1AB0DC; Fri, 8 Nov 2019 08:13:42 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 478Y1x6ZWTz42Mv; Fri, 8 Nov 2019 08:13:41 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C521D233D7; Fri, 8 Nov 2019 08:13:41 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA88Dfhv080953; Fri, 8 Nov 2019 08:13:41 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA88DfuJ080951; Fri, 8 Nov 2019 08:13:41 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201911080813.xA88DfuJ080951@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 8 Nov 2019 08:13:41 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/devel/kf5-kio: . files X-SVN-Commit-Revision: 517033 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Nov 2019 08:13:42 -0000 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 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 +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 +