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

[Andrea Scarpino]

    Date: Wednesday, June 6, 2012 @ 12:14:02
  Author: andrea
Revision: 160818

KDE 4.8.4

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-06-06 16:13:58 UTC (rev 160817)
+++ PKGBUILD	2012-06-06 16:14:02 UTC (rev 160818)
@@ -3,8 +3,8 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdepim-runtime
-pkgver=4.8.3
-pkgrel=2
+pkgver=4.8.4
+pkgrel=1
 pkgdesc='KDE PIM Runtime Environment'
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -12,15 +12,10 @@
 depends=('kdepimlibs' 'kdebase-runtime')
 makedepends=('cmake' 'automoc4' 'boost')
 install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
-        'fix-carddav-support.patch')
-sha1sums=('f1c6691522113887dc5f098678ccbbacfecb9390'
-          '1362bc04e82a3fdf870578c051a2e16170c43e86')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('3a375afb62b4ee01d491c4787b559132317aa983')
 
 build() {
-    cd "${srcdir}"/${pkgname}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-carddav-support.patch
-
     cd "${srcdir}"
 	mkdir build
 	cd build

Deleted: fix-carddav-support.patch
===================================================================
--- fix-carddav-support.patch	2012-06-06 16:13:58 UTC (rev 160817)
+++ fix-carddav-support.patch	2012-06-06 16:14:02 UTC (rev 160818)
@@ -1,26 +0,0 @@
-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;
- }
-