[arch-commits] Commit in pycairo/repos (3 files)

[Jan de Groot]

    Date: Friday, May 15, 2009 @ 14:24:26
  Author: jgc
Revision: 39368

Merged revisions 39367 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/pycairo/trunk

........
  r39367 | jgc | 2009-05-15 18:24:10 +0000 (Fri, 15 May 2009) | 1 line
  
  upgpkg: pycairo 1.8.4-1
........

Modified:
  pycairo/repos/extra-x86_64/	(properties)
  pycairo/repos/extra-x86_64/PKGBUILD
Deleted:
  pycairo/repos/extra-x86_64/pycairo-1.8.0-threading.diff

------------------------------+
 PKGBUILD                     |    8 +---
 pycairo-1.8.0-threading.diff |   67 -----------------------------------------
 2 files changed, 3 insertions(+), 72 deletions(-)


Property changes on: pycairo/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /pycairo/trunk:1-26008
   + /pycairo/trunk:1-39367

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-05-15 18:24:10 UTC (rev 39367)
+++ extra-x86_64/PKGBUILD	2009-05-15 18:24:26 UTC (rev 39368)
@@ -2,16 +2,16 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=pycairo
-pkgver=1.8.2
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="Python bindings for the cairo graphics library"
 arch=(i686 x86_64)
 license=('LGPL' 'MPL')
 depends=('python' 'cairo>=1.8.6')
 options=('!libtool')
-source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz
-        pycairo-1.8.0-threading.diff)
+source=(http://cairographics.org/releases/${pkgname}-${pkgver}.tar.gz)
 url="http://www.cairographics.org/"
+md5sums=('6adff10f58818004839fe9edc9dc6a9b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -19,5 +19,3 @@
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1
 }
-md5sums=('bbfc0c2fef08dfb0c5b8baa5f0b67a87'
-         '5259928a3d58750d5c54af60d71f2493')

Deleted: extra-x86_64/pycairo-1.8.0-threading.diff
===================================================================
--- extra-x86_64/pycairo-1.8.0-threading.diff	2009-05-15 18:24:10 UTC (rev 39367)
+++ extra-x86_64/pycairo-1.8.0-threading.diff	2009-05-15 18:24:26 UTC (rev 39368)
@@ -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);
- }
-