summaryrefslogtreecommitdiff
path: root/extra/kdepim-runtime
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2012-05-18 16:54:29 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2012-05-18 16:54:29 +0200
commit6d3d853af3b9042559c2d86a7e3907f97921fb28 (patch)
treec792505884d2ffee7dee3e9060637acfe25a7021 /extra/kdepim-runtime
parent5880798304726de24b4c520a62a15b3090950c08 (diff)
parent2f104ecf78d6a93ba8d67273b76364cb1365a6cf (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: extra/soprano/PKGBUILD extra/xfce4-sensors-plugin/PKGBUILD
Diffstat (limited to 'extra/kdepim-runtime')
-rw-r--r--extra/kdepim-runtime/PKGBUILD14
-rw-r--r--extra/kdepim-runtime/fix-carddav-support.patch26
2 files changed, 35 insertions, 5 deletions
diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD
index d5915b8dc..c3fe6981b 100644
--- a/extra/kdepim-runtime/PKGBUILD
+++ b/extra/kdepim-runtime/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 158355 2012-05-03 22:30:17Z andrea $
+# $Id: PKGBUILD 159144 2012-05-16 19:52:39Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Pierre Schmitz <pierre@archlinux.de>
pkgname=kdepim-runtime
pkgver=4.8.3
-pkgrel=1
+pkgrel=2
pkgdesc='KDE PIM Runtime Environment'
arch=('i686' 'x86_64' 'mips64el')
url='http://www.kde.org'
@@ -12,16 +12,20 @@ license=('GPL' 'LGPL' 'FDL')
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
}
diff --git a/extra/kdepim-runtime/fix-carddav-support.patch b/extra/kdepim-runtime/fix-carddav-support.patch
new file mode 100644
index 000000000..25c281307
--- /dev/null
+++ b/extra/kdepim-runtime/fix-carddav-support.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;
+ }
+