Revision bump adds upstream patch to fix dav sync wrt bug #415401. Remove old revision which reverted upstream changes introduced in 4.8.3 as workaround.

(Portage version: 2.2.0_alpha105/cvs/Linux i686)

4 files changed, 37 insertions, 47 deletions

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index 6275150cd047..05b9751c5e19 100644
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.75 2012/05/14 08:25:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.76 2012/05/15 20:28:57 johu Exp $
+
+*kdepim-runtime-4.8.3-r2 (15 May 2012)
+
+  15 May 2012; Johannes Huber <johu@gentoo.org>
+  +files/kdepim-runtime-4.8.3-fix-dav.patch, +kdepim-runtime-4.8.3-r2.ebuild,
+  -files/kdepim-runtime-4.8.3-revert-dav.patch, -kdepim-runtime-4.8.3-r1.ebuild:
+  Revision bump adds upstream patch to fix dav sync wrt bug #415401. Remove old
+  revision which reverted upstream changes introduced in 4.8.3 as workaround.
 
 *kdepim-runtime-4.8.3-r1 (14 May 2012)
 
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.8.3-fix-dav.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.8.3-fix-dav.patch
new file mode 100644
index 000000000000..25c2813074fb
--- /dev/null
+++ b/kde-base/kdepim-runtime/files/kdepim-runtime-4.8.3-fix-dav.patch
@@ -0,0 +1,26 @@
+commit bec63a313160ec6dc1833029d5e99746779ed3f4
+Author: Gregory Oestreicher <greg@kamago.net>
+Date:   Tue May 15 21:19:17 2012 +0200
+
+    Add a prop-filter in the CardDAV requests
+    
+    BUG: 299482
+    FIXED-IN: 4.8.4
+
+diff --git a/resources/dav/protocols/carddavprotocol.cpp b/resources/dav/protocols/carddavprotocol.cpp
+index 38eca17..9c58653 100644
+--- a/resources/dav/protocols/carddavprotocol.cpp
++++ b/resources/dav/protocols/carddavprotocol.cpp
+@@ -35,6 +35,12 @@ CarddavProtocol::CarddavProtocol()
+   propElement.appendChild( document.createElementNS( "DAV:", "resourcetype" ) );
+   propElement.appendChild( document.createElementNS( "DAV:", "getetag" ) );
+ 
++  QDomElement filterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "filter" );
++  queryElement.appendChild( filterElement );
++  QDomElement propfilterElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "prop-filter" );
++  propfilterElement.setAttribute( "name", "FN" );
++  filterElement.appendChild( propfilterElement );
++
+   mItemsQueries << document;
+ }
+ 
diff --git a/kde-base/kdepim-runtime/files/kdepim-runtime-4.8.3-revert-dav.patch b/kde-base/kdepim-runtime/files/kdepim-runtime-4.8.3-revert-dav.patch
deleted file mode 100644
index e9a7e564accc..000000000000
--- a/kde-base/kdepim-runtime/files/kdepim-runtime-4.8.3-revert-dav.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 30e6af37a955be25a3030f1430d66a30a4661353 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Mon, 14 May 2012 10:16:59 +0200
-Subject: [PATCH] Revert "Use a report query to list items for CardDav"
-
-gentoo bug #415401
-kde bug #299482
-
-This reverts commit 5e322ff7de454404976368d00049b3b5773538a8.
----
- resources/dav/protocols/carddavprotocol.cpp |    8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/resources/dav/protocols/carddavprotocol.cpp b/resources/dav/protocols/carddavprotocol.cpp
-index 38eca17..d5b9ac9 100644
---- a/resources/dav/protocols/carddavprotocol.cpp
-+++ b/resources/dav/protocols/carddavprotocol.cpp
-@@ -25,11 +25,11 @@ CarddavProtocol::CarddavProtocol()
- {
-   QDomDocument document;
- 
--  QDomElement queryElement = document.createElementNS( "urn:ietf:params:xml:ns:carddav", "addressbook-query" );
--  document.appendChild( queryElement );
-+  QDomElement propfindElement = document.createElementNS( "DAV:", "propfind" );
-+  document.appendChild( propfindElement );
- 
-   QDomElement propElement = document.createElementNS( "DAV:", "prop" );
--  queryElement.appendChild( propElement );
-+  propfindElement.appendChild( propElement );
- 
-   propElement.appendChild( document.createElementNS( "DAV:", "displayname" ) );
-   propElement.appendChild( document.createElementNS( "DAV:", "resourcetype" ) );
-@@ -45,7 +45,7 @@ bool CarddavProtocol::supportsPrincipals() const
- 
- bool CarddavProtocol::useReport() const
- {
--  return true;
-+  return false;
- }
- 
- bool CarddavProtocol::useMultiget() const
--- 
-1.7.10
-
diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.8.3-r1.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.8.3-r2.ebuild
index ad75aa66d108..84af4c736cce 100644
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.8.3-r1.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.8.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.8.3-r1.ebuild,v 1.1 2012/05/14 08:25:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.8.3-r2.ebuild,v 1.1 2012/05/15 20:28:57 johu Exp $
 
 EAPI=4
 
@@ -32,4 +32,4 @@ RDEPEND="${DEPEND}
 # nepomuk_email_feeder moved here in 4.8
 add_blocker kdepim-common-libs 4.7.50
 
-PATCHES=( "${FILESDIR}/${P}-revert-dav.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-dav.patch" )