--- PKGBUILD.original	2013-03-17 14:45:32.000000000 +0100
+++ PKGBUILD.new	2013-03-17 14:45:23.000000000 +0100
@@ -2,7 +2,7 @@
 # Based on the official cairo package
 
 pkgname=cairo-git
-pkgver=20101120
+pkgver=20130317
 pkgrel=1
 pkgdesc="Cairo vector graphics library (git version)"
 arch=(i686 x86_64)
@@ -19,16 +19,22 @@ _gitroot='git://anongit.freedesktop.org/
 _gitname='cairo'
 
 build() {
-  if [ -d "${srcdir}"/${_gitname} ]; then
-    cd "${srcdir}"/${_gitname}
-    git pull
+  cd "${srcdir}"
+  msg "Connecting to GIT server...."
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
   else
-    cd "${srcdir}"
-    git clone ${_gitroot}
-    cd ${_gitname}
+    git clone $_gitroot
   fi
+  msg "GIT checkout done or server timeout"
 
-  patch -Np1 -i "${srcdir}/cairo-1.10.0-buggy_gradients.patch"
+  msg "Starting make..."
+  rm -rf "${srcdir}/${_gitname}-build"
+  git clone "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
+  cd "${srcdir}/${_gitname}-build"
+
+  patch -Np1 -i "$srcdir/cairo-1.10.0-buggy_gradients.patch"
 
   #  sed -i -e 's/libpng13/libpng14/g' configure
   ./autogen.sh --prefix=/usr --sysconfdir=/etc \