[arch-commits] Commit in kdepim-runtime/trunk (PKGBUILD fix-carddav-support.patch)

[Andrea Scarpino]

    Date: Wednesday, May 16, 2012 @ 15:52:07
  Author: andrea
Revision: 159143

upgpkg: kdepim-runtime 4.8.3-2

Fix broken cardDAV support (FS#29881)

Added:
  kdepim-runtime/trunk/fix-carddav-support.patch
Modified:
  kdepim-runtime/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   12 ++++++++----
 fix-carddav-support.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-16 19:50:18 UTC (rev 159142)
+++ PKGBUILD	2012-05-16 19:52:07 UTC (rev 159143)
@@ -4,7 +4,7 @@
 
 pkgname=kdepim-runtime
 pkgver=4.8.3
-pkgrel=1
+pkgrel=2
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -12,16 +12,20 @@
 depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('f1c6691522113887dc5f098678ccbbacfecb9390')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+        'fix-carddav-support.patch')
+sha1sums=('f1c6691522113887dc5f098678ccbbacfecb9390'
+          '1362bc04e82a3fdf870578c051a2e16170c43e86')
 
 build() {
+    cd "${srcdir}"/${pkgname}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-carddav-support.patch
+
     cd "${srcdir}"
 	mkdir build
 	cd build
 	cmake ../${pkgname}-${pkgver} \
 		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	make
 }

Added: fix-carddav-support.patch
===================================================================
--- fix-carddav-support.patch	                        (rev 0)
+++ fix-carddav-support.patch	2012-05-16 19:52:07 UTC (rev 159143)
@@ -0,0 +1,26 @@
+commit bec63a313160ec6dc1833029d5e99746779ed3f4
+Author: Gregory Oestreicher <greg at 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;
+ }
+