diff options
| -rw-r--r-- | abs/core/pycairo/PKGBUILD | 26 | ||||
| -rw-r--r-- | abs/core/pycairo/pycairo-1.8.0-threading.diff | 67 |
2 files changed, 14 insertions, 79 deletions
diff --git a/abs/core/pycairo/PKGBUILD b/abs/core/pycairo/PKGBUILD index 51fa905..08d2db2 100644 --- a/abs/core/pycairo/PKGBUILD +++ b/abs/core/pycairo/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 23420 2009-01-10 05:29:10Z allan $ +# $Id: PKGBUILD 96553 2010-10-22 08:47:59Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=pycairo -pkgver=1.8.0 -pkgrel=2 +pkgver=1.8.10 +pkgrel=3 pkgdesc="Python bindings for the cairo graphics library" -arch=(i686 x86_64) +arch=('i686' 'x86_64') license=('LGPL' 'MPL') -depends=('python' 'cairo>=1.8.6') +depends=('python2' 'cairo>=1.8.10') options=('!libtool') -source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz - pycairo-1.8.0-threading.diff) -url="http://www.cairographics.org/" -md5sums=('847f5377c32228a656819f5bd18eb6b4' - '5259928a3d58750d5c54af60d71f2493') +source=(http://cairographics.org/releases/py2cairo-${pkgver}.tar.gz) +url="http://www.cairographics.org/pycairo" +md5sums=('87421a6a70304120555ba7ba238f3dc3') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}"/pycairo-1.8.0-threading.diff || return 1 - ./configure --prefix=/usr || return 1 + PYTHON=python2 ./configure --prefix=/usr make || return 1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install || return 1 } + diff --git a/abs/core/pycairo/pycairo-1.8.0-threading.diff b/abs/core/pycairo/pycairo-1.8.0-threading.diff deleted file mode 100644 index ce1a80f..0000000 --- a/abs/core/pycairo/pycairo-1.8.0-threading.diff +++ /dev/null @@ -1,67 +0,0 @@ -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); - } - |