From a712dc92423a31a4d3ab34fe660df550feebf442 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 13 Sep 2011 23:14:39 +0000
Subject: Tue Sep 13 23:14:39 UTC 2011

---
 extra/kdelibs/PKGBUILD | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'extra/kdelibs/PKGBUILD')

diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD
index 03ce95ca9..ec77e5271 100644
--- a/extra/kdelibs/PKGBUILD
+++ b/extra/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 137354 2011-09-07 17:12:53Z andrea $
+# $Id: PKGBUILD 137929 2011-09-12 16:31:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.1
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -19,20 +19,25 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl'
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'fix-kdirwatch-with-linux3.patch')
 sha1sums=('661cc56f199b7250bd825cc0e85ff442b85171e2'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          '54e6cbd7a8c4f9df947f18692512ca618c824c43')
 
 build() {
-       cd ${srcdir}/${pkgname}-${pkgver}
+       cd "${srcdir}"/${pkgname}-${pkgver}
 
        # avoid file conflict with gnome-menu
-       patch -p1 -i $srcdir/kde-applications-menu.patch
+       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
        # add Archlinux menu entry
-       patch -p1 -i $srcdir/archlinux-menu.patch
+       patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
-       cd ${srcdir}
+       # Already fixed upstream
+       patch -p1 -i "${srcdir}"/fix-kdirwatch-with-linux3.patch
+
+       cd "${srcdir}"
        mkdir build
        cd build
        cmake ../${pkgname}-${pkgver} \
@@ -48,11 +53,11 @@ build() {
 }
 
 package() {
-       cd $srcdir/build
-       make DESTDIR=$pkgdir install
+       cd "${srcdir}"/build
+       make DESTDIR="${pkgdir}" install
 
        # cert bundle seems to be hardcoded
        # link it to the one from ca-certificates
-       rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt
-       ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt
+       rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+       ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
 }
-- 
cgit v1.2.3-54-g00ecf