Fixed location of packages.

12 files changed, 151 insertions, 72 deletions

diff --git a/abs/extra-testing/atk/PKGBUILD b/abs/core-testing/atk/PKGBUILD
index bca7854..bca7854 100644
--- a/abs/extra-testing/atk/PKGBUILD
+++ b/abs/core-testing/atk/PKGBUILD
diff --git a/abs/core-testing/cairo/PKGBUILD b/abs/core-testing/cairo/PKGBUILD
index 16f38b3..4bdb085 100644
--- a/abs/core-testing/cairo/PKGBUILD
+++ b/abs/core-testing/cairo/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 491 2008-04-20 11:39:47Z jgc $
+# $Id: PKGBUILD 22041 2008-12-21 12:11:48Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Brice Carpentier <brice@daknet.org>
 
 pkgname=cairo
-pkgver=1.6.4
+pkgver=1.8.6
 pkgrel=1
 pkgdesc="Cairo vector graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 url="http://cairographics.org/"
-depends=('libpng>=1.2.25' 'libxrender' 'fontconfig>=2.5.0' 'pixman>=0.10.0')
+depends=('libpng>=1.2.33' 'libxrender' 'fontconfig>=2.6.0' 'pixman>=0.12.0' 'xcb-util>=0.3.2')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a198d509f9e3a35b78de8bb02174ebb9')
+md5sums=('4e64139ef6f668df24450f3b81dd0771')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --localstatedir=/var --enable-xcb --disable-static || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }
diff --git a/abs/core-testing/libxcb/PKGBUILD b/abs/core-testing/libxcb/PKGBUILD
index b1eadee..c61df23 100644
--- a/abs/core-testing/libxcb/PKGBUILD
+++ b/abs/core-testing/libxcb/PKGBUILD
@@ -1,29 +1,34 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 8004 2008-08-05 18:11:40Z jgc $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 pkgname=libxcb
-pkgver=1.1
+pkgver=1.1.90.1
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=(i686 x86_64)
 url="http://xcb.freedesktop.org/"
-depends=('xcb-proto>=1.1' 'libxdmcp' 'libxau')
-makedepends=('pkgconfig' 'libxslt' 'libpthread-stubs')
+depends=('xcb-proto>=1.2' 'libxdmcp' 'libxau')
+makedepends=('pkgconfig' 'libxslt' 'python')
 options=('!libtool')
 license=('custom')
-source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2)
+source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2
+	libxcb-1.1-no-pthread-stubs.patch
+	libxcb-1.1-sloppy-lock.patch)
+md5sums=('c4b67c5576ed58e2fd4a2855c0b21aa6'
+         'a53f09ab3ec5cbfc1b0848bd137c535a'
+         '4b3fbedc471d7ab336a18f1d0f853ddd')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr \
-              --build=${CHOST} --host=${CHOST}
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ${srcdir}/libxcb-1.1-no-pthread-stubs.patch || return 1
+  patch -Np1 -i ${srcdir}/libxcb-1.1-sloppy-lock.patch || return 1
+  libtoolize --force --copy || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake --add-missing || return 1
+  ./configure --prefix=/usr --enable-xinput || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  # Remove pthread-stubs dependency from pc files,
-  # the stubs package doesn't provide any libs since our libc is complete.
-  sed -i -e 's/pthread-stubs//' ${startdir}/pkg/usr/lib/pkgconfig/*.pc
-
-  install -m644 -D ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR=${pkgdir} install || return 1
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums=('9310b02433273d75d42f10da3c7455aa')
diff --git a/abs/core-testing/libxcb/libxcb-1.1-no-pthread-stubs.patch b/abs/core-testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
new file mode 100644
index 0000000..67a09f2
--- /dev/null
+++ b/abs/core-testing/libxcb/libxcb-1.1-no-pthread-stubs.patch
@@ -0,0 +1,12 @@
+diff -up libxcb-1.1/configure.ac.pthread-stubs libxcb-1.1/configure.ac
+--- libxcb-1.1/configure.ac.pthread-stubs	2007-11-04 18:17:11.000000000 -0500
++++ libxcb-1.1/configure.ac	2007-11-12 10:27:06.000000000 -0500
+@@ -31,7 +31,7 @@ AC_SUBST(HTML_CHECK_RESULT)
+ 
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
+-NEEDED="pthread-stubs xau >= 0.99.2"
++NEEDED="xau >= 0.99.2"
+ PKG_CHECK_MODULES(NEEDED, $NEEDED)
+ 
+ have_xdmcp="no"
diff --git a/abs/core-testing/libxcb/libxcb-1.1-sloppy-lock.patch b/abs/core-testing/libxcb/libxcb-1.1-sloppy-lock.patch
new file mode 100644
index 0000000..130890e
--- /dev/null
+++ b/abs/core-testing/libxcb/libxcb-1.1-sloppy-lock.patch
@@ -0,0 +1,12 @@
+diff -up libxcb-1.1/src/xcb_conn.c.jx libxcb-1.1/src/xcb_conn.c
+--- libxcb-1.1/src/xcb_conn.c.jx	2007-10-28 16:11:18.000000000 -0400
++++ libxcb-1.1/src/xcb_conn.c	2008-04-22 11:58:05.000000000 -0400
+@@ -63,7 +63,7 @@ static int _xcb_xlib_init(_xcb_xlib *xli
+ {
+     xlib->lock = 0;
+ #ifndef NDEBUG
+-    xlib->sloppy_lock = (getenv("LIBXCB_ALLOW_SLOPPY_LOCK") != 0);
++    xlib->sloppy_lock = 1;
+ #endif
+     pthread_cond_init(&xlib->cond, 0);
+     return 1;
diff --git a/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD b/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD
index 2b9ab76..06c0aae 100755
--- a/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD
+++ b/abs/core-testing/mythtv/stable/mythdb-initial/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=mythdb-initial
 pkgver=1
-pkgrel=9
+pkgrel=10
 pkgdesc="setup the initial mythtv database for linhes"
 url=""
 license=""
diff --git a/abs/core-testing/pixman/PKGBUILD b/abs/core-testing/pixman/PKGBUILD
index a3fcb97..306acd9 100644
--- a/abs/core-testing/pixman/PKGBUILD
+++ b/abs/core-testing/pixman/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 490 2008-04-20 11:35:45Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
+# $Id: PKGBUILD 12786 2008-09-20 08:34:14Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=pixman
-pkgver=0.10.0
+pkgver=0.12.0
 pkgrel=1
 pkgdesc="Pixman library"
 arch=(i686 x86_64)
@@ -10,11 +11,11 @@ license=()
 depends=('glibc')
 options=('!libtool')
 source=(http://xorg.freedesktop.org/releases/individual/lib/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('fb23e17a8a0308e8fad6dc153753ba9a')
+md5sums=('494af78c1c7d825c9ad6815d7b91f17d')
 
 build() {
-  cd "${startdir}/src/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --disable-static || return 1
   make || return 1
-  make DESTDIR="${startdir}/pkg" install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }
diff --git a/abs/core-testing/pycairo/PKGBUILD b/abs/core-testing/pycairo/PKGBUILD
index 283ed43..51fa905 100644
--- a/abs/core-testing/pycairo/PKGBUILD
+++ b/abs/core-testing/pycairo/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 1020 2008-04-27 18:50:59Z jgc $
+# $Id: PKGBUILD 23420 2009-01-10 05:29:10Z allan $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pycairo
-pkgver=1.4.12
-pkgrel=1
+pkgver=1.8.0
+pkgrel=2
 pkgdesc="Python bindings for the cairo graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
-depends=('python>=2.5' 'cairo>=1.6.4')
+depends=('python' 'cairo>=1.8.6')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
+source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
+        pycairo-1.8.0-threading.diff)
 url="http://www.cairographics.org/"
-md5sums=('c63199d35b1e1d3c5133509f315f70d7')
+md5sums=('847f5377c32228a656819f5bd18eb6b4'
+         '5259928a3d58750d5c54af60d71f2493')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}"/pycairo-1.8.0-threading.diff || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
+  make DESTDIR="${pkgdir}" install || return 1
 }
diff --git a/abs/core-testing/pycairo/pycairo-1.8.0-threading.diff b/abs/core-testing/pycairo/pycairo-1.8.0-threading.diff
new file mode 100644
index 0000000..ce1a80f
--- /dev/null
+++ b/abs/core-testing/pycairo/pycairo-1.8.0-threading.diff
@@ -0,0 +1,67 @@
+diff -Naur pycairo-1.8.0-old/cairo/pycairo-surface.c pycairo-1.8.0/cairo/pycairo-surface.c
+--- pycairo-1.8.0-old/cairo/pycairo-surface.c	2008-12-10 17:41:16.000000000 +1000
++++ pycairo-1.8.0/cairo/pycairo-surface.c	2009-01-10 15:08:36.000000000 +1000
+@@ -310,10 +310,10 @@
+ 	    return NULL;
+ 	}
+ 	Py_DECREF(writer);
+-	Py_BEGIN_ALLOW_THREADS
++	/*Py_BEGIN_ALLOW_THREADS*/ /*seg faults reported*/
+ 	status = cairo_surface_write_to_png_stream (o->surface, _write_func,
+ 						    file);
+-	Py_END_ALLOW_THREADS
++	/*Py_END_ALLOW_THREADS*/
+     }
+     RETURN_NULL_IF_CAIRO_ERROR(status);
+     Py_RETURN_NONE;
+@@ -505,9 +505,9 @@
+     }
+     Py_DECREF(reader);
+ 
+-    Py_BEGIN_ALLOW_THREADS
++    /*Py_BEGIN_ALLOW_THREADS*/ /*seg faults reported*/
+     is = cairo_image_surface_create_from_png_stream (_read_func, file);
+-    Py_END_ALLOW_THREADS
++    /*Py_END_ALLOW_THREADS*/
+     return PycairoSurface_FromSurface (is, NULL);
+ }
+ #endif /* CAIRO_HAS_PNG_FUNCTIONS */
+@@ -712,10 +712,10 @@
+     }
+     Py_DECREF(writer);
+ 
+-    Py_BEGIN_ALLOW_THREADS
++    /*Py_BEGIN_ALLOW_THREADS*/ /*seg faults reported*/
+     sfc = cairo_pdf_surface_create_for_stream (_write_func, file,
+ 					       width_in_points, height_in_points);
+-    Py_END_ALLOW_THREADS
++    /*Py_END_ALLOW_THREADS*/
+     return PycairoSurface_FromSurface (sfc, file);
+ }
+ 
+@@ -818,10 +818,10 @@
+     }
+     Py_DECREF(writer);
+ 
+-    Py_BEGIN_ALLOW_THREADS
++    /*Py_BEGIN_ALLOW_THREADS*/ /*seg faults reported*/
+     sfc = cairo_ps_surface_create_for_stream (_write_func, file,
+ 					width_in_points, height_in_points);
+-    Py_END_ALLOW_THREADS
++    /*Py_END_ALLOW_THREADS*/
+     return PycairoSurface_FromSurface (sfc, file);
+ }
+ 
+@@ -1010,10 +1010,10 @@
+     }
+     Py_DECREF(writer);
+ 
+-    Py_BEGIN_ALLOW_THREADS
++    /*Py_BEGIN_ALLOW_THREADS*/ /*seg faults reported*/
+     sfc = cairo_svg_surface_create_for_stream (_write_func, file,
+ 					 width_in_points, height_in_points);
+-    Py_END_ALLOW_THREADS
++    /*Py_END_ALLOW_THREADS*/
+     return PycairoSurface_FromSurface (sfc, file);
+ }
+ 
diff --git a/abs/core-testing/xcb-proto/PKGBUILD b/abs/core-testing/xcb-proto/PKGBUILD
index b17aa2d..e59e26b 100644
--- a/abs/core-testing/xcb-proto/PKGBUILD
+++ b/abs/core-testing/xcb-proto/PKGBUILD
@@ -1,21 +1,23 @@
-# $Id: PKGBUILD 356 2008-04-18 22:56:27Z aaron $
+# $Id: PKGBUILD 17316 2008-10-28 12:25:37Z douglas $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
+
 pkgname=xcb-proto
-pkgver=1.1
-pkgrel=1
+pkgver=1.2
+pkgrel=2
 pkgdesc="XML-XCB protocol descriptions"
 arch=(i686 x86_64)
 url="http://xcb.freedesktop.org/"
 license=('custom')
+makedepends=('python' 'libxml2')
 source=(${url}/dist/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('09f912486d8a2353bb4b99ddc28ba3c7')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install || return 1
-  install -m644 -D ${startdir}/src/${pkgname}-${pkgver}/COPYING \
-                   ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
+  make DESTDIR=${pkgdir} install || return 1
+  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
+  install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
 }
-md5sums=('dd34acc58c0a438e812f72a9afe7b2a0')
diff --git a/abs/extra-testing/xcb-util/PKGBUILD b/abs/core-testing/xcb-util/PKGBUILD
index 734f57d..734f57d 100644
--- a/abs/extra-testing/xcb-util/PKGBUILD
+++ b/abs/core-testing/xcb-util/PKGBUILD
diff --git a/abs/extra-testing/cairo/PKGBUILD b/abs/extra-testing/cairo/PKGBUILD
deleted file mode 100644
index 4bdb085..0000000
--- a/abs/extra-testing/cairo/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 22041 2008-12-21 12:11:48Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Brice Carpentier <brice@daknet.org>
-
-pkgname=cairo
-pkgver=1.8.6
-pkgrel=1
-pkgdesc="Cairo vector graphics library"
-arch=(i686 x86_64)
-license=('LGPL' 'MPL')
-url="http://cairographics.org/"
-depends=('libpng>=1.2.33' 'libxrender' 'fontconfig>=2.6.0' 'pixman>=0.12.0' 'xcb-util>=0.3.2')
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4e64139ef6f668df24450f3b81dd0771')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-xcb --disable-static || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install || return 1
-}