[arch-commits] Commit in kdepim-runtime/repos (6 files)

[Andrea Scarpino]

    Date: Friday, June 8, 2012 @ 02:34:24
  Author: andrea
Revision: 161093

db-move: moved kdepim-runtime from [staging] to [extra] (x86_64)

Added:
  kdepim-runtime/repos/extra-x86_64/PKGBUILD
    (from rev 161082, kdepim-runtime/repos/staging-x86_64/PKGBUILD)
  kdepim-runtime/repos/extra-x86_64/kdepim-runtime.install
    (from rev 161082, kdepim-runtime/repos/staging-x86_64/kdepim-runtime.install)
Deleted:
  kdepim-runtime/repos/extra-x86_64/PKGBUILD
  kdepim-runtime/repos/extra-x86_64/fix-carddav-support.patch
  kdepim-runtime/repos/extra-x86_64/kdepim-runtime.install
  kdepim-runtime/repos/staging-x86_64/

---------------------------+
 PKGBUILD                  |   67 ++++++++++++++++++++------------------------
 fix-carddav-support.patch |   26 -----------------
 kdepim-runtime.install    |   26 ++++++++---------
 3 files changed, 44 insertions(+), 75 deletions(-)

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-06-08 06:34:23 UTC (rev 161092)
+++ extra-x86_64/PKGBUILD	2012-06-08 06:34:24 UTC (rev 161093)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.8.3
-pkgrel=2
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-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"
-        '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_INSTALL_PREFIX=/usr
-	make
-}
-
-package() {
-	cd "${srcdir}"/build
-	make DESTDIR="${pkgdir}" install
-}

Copied: kdepim-runtime/repos/extra-x86_64/PKGBUILD (from rev 161082, kdepim-runtime/repos/staging-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-06-08 06:34:24 UTC (rev 161093)
@@ -0,0 +1,31 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdepim-runtime
+pkgver=4.8.4
+pkgrel=1
+pkgdesc='KDE PIM Runtime Environment'
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+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=('3a375afb62b4ee01d491c4787b559132317aa983')
+
+build() {
+    cd "${srcdir}"
+	mkdir build
+	cd build
+	cmake ../${pkgname}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+}
+
+package() {
+	cd "${srcdir}"/build
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/fix-carddav-support.patch
===================================================================
--- extra-x86_64/fix-carddav-support.patch	2012-06-08 06:34:23 UTC (rev 161092)
+++ extra-x86_64/fix-carddav-support.patch	2012-06-08 06:34:24 UTC (rev 161093)
@@ -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;
- }
- 

Deleted: extra-x86_64/kdepim-runtime.install
===================================================================
--- extra-x86_64/kdepim-runtime.install	2012-06-08 06:34:23 UTC (rev 161092)
+++ extra-x86_64/kdepim-runtime.install	2012-06-08 06:34:24 UTC (rev 161093)
@@ -1,13 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdepim-runtime/repos/extra-x86_64/kdepim-runtime.install (from rev 161082, kdepim-runtime/repos/staging-x86_64/kdepim-runtime.install)
===================================================================
--- extra-x86_64/kdepim-runtime.install	                        (rev 0)
+++ extra-x86_64/kdepim-runtime.install	2012-06-08 06:34:24 UTC (rev 161093)
@@ -0,0 +1,13 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-mime-database usr/share/mime &> /dev/null
+    update-desktop-database -q
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}