git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@2911 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
2011-06-08 15:26:24 +00:00
parent c35386c0cc
commit 9f2a2c1429
47 changed files with 3861 additions and 21 deletions

View File

@@ -0,0 +1,385 @@
# ChangeLog for dev-python/pycairo
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/ChangeLog,v 1.100 2011/05/08 21:28:41 arfrever Exp $
*pycairo-1.10.0-r1 (08 May 2011)
08 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+pycairo-1.10.0-r1.ebuild, +files/py2cairo-1.10.0-svg_check.patch:
1.10.0 version bump for Python 2.
*pycairo-1.10.0 (24 Apr 2011)
24 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+files/pycairo-1.8.10-cairo.version_info.patch, +pycairo-1.10.0.ebuild,
+files/pycairo-1.10.0-svg_check.patch:
Version bump. This ebuild provides pycairo 1.10.0 for Python 3 and pycairo
1.8.10 for Python 2. Fix cairo.version_info in pycairo 1.8.10 for Python 2
(bug #361781).
23 Oct 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-pycairo-1.8.8.ebuild, -files/pycairo-1.8.8-pkgconfig_dir.patch:
Delete.
18 Oct 2010; Jeroen Roovers <jer@gentoo.org> pycairo-1.8.10.ebuild:
Stable for PPC (bug #337146).
18 Oct 2010; Jeroen Roovers <jer@gentoo.org> pycairo-1.8.10.ebuild:
Stable for HPPA (bug #337146).
03 Oct 2010; Raúl Porcel <armin76@gentoo.org> pycairo-1.8.10.ebuild:
alpha/arm/ia64/sh/sparc stable wrt #337146
02 Oct 2010; Fabian Groffen <grobian@gentoo.org> pycairo-1.8.10.ebuild:
Marked ~x64-macos, bug #333981
26 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> pycairo-1.8.10.ebuild:
ppc64 stable wrt #337146
21 Sep 2010; Markos Chandras <hwoarang@gentoo.org> pycairo-1.8.10.ebuild:
Stable on amd64 wrt bug #337146
15 Sep 2010; Christian Faulhammer <fauli@gentoo.org>
pycairo-1.8.10.ebuild:
stable x86, bug 337146
25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> pycairo-1.8.10.ebuild:
Keyworded on alpha, bug #324617
25 Jul 2010; Tobias Klausmann <klausman@gentoo.org> pycairo-1.8.10.ebuild:
Stable on alpha, bug #324617
21 Jul 2010; Markus Meier <maekke@gentoo.org> pycairo-1.8.10.ebuild:
add ~arm, bug #324617
09 Jul 2010; Jeroen Roovers <jer@gentoo.org> pycairo-1.8.10.ebuild:
Marked ~hppa (bug #324617).
02 Jul 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.10.ebuild:
Fix tests (bug #326635).
*pycairo-1.8.10 (18 Jun 2010)
18 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-pycairo-1.4.12.ebuild, -pycairo-1.8.2.ebuild, -pycairo-1.8.4.ebuild,
-pycairo-1.8.6.ebuild, +pycairo-1.8.10.ebuild,
+files/pycairo-1.8.10-pkgconfig_dir.patch:
Version bump.
07 Feb 2010; Peter Volkov <pva@gentoo.org> pycairo-1.8.8.ebuild:
Add inherit eutils: epatch is defined there.
10 Nov 2009; Brent Baude <ranger@gentoo.org> pycairo-1.8.8.ebuild:
Marking pycairo-1.8.8 ppc64 for bug 285115
19 Oct 2009; Raúl Porcel <armin76@gentoo.org> pycairo-1.8.8.ebuild:
arm/ia64/sh/sparc stable wrt #285115
11 Oct 2009; Fabian Groffen <grobian@gentoo.org> pycairo-1.8.8.ebuild:
Merge from Prefix
07 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild:
Fix tests (bug #285688).
01 Oct 2009; Tobias Klausmann <klausman@gentoo.org> pycairo-1.8.8.ebuild:
Stable on alpha, bug #285115
27 Sep 2009; nixnut <nixnut@gentoo.org> pycairo-1.8.8.ebuild:
ppc stable #285115
22 Sep 2009; Markus Meier <maekke@gentoo.org> pycairo-1.8.8.ebuild:
amd64/x86 stable, bug #285115
19 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild, +files/pycairo-1.8.8-svg_check.patch:
Improve dependencies (bug #269682).
17 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild:
Update dependency on dev-python/sphinx. Fix tests.
16 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild, +files/pycairo-1.8.8-pkgconfig_dir.patch:
Install pycairo.pc in correct directory (bug #283360).
14 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild:
Don't enable "svg" USE flag by IUSE (bug #284833).
10 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.8.ebuild:
Add "svg" USE flag (bug #269682).
*pycairo-1.8.8 (29 Aug 2009)
29 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+pycairo-1.8.8.ebuild:
Version bump.
08 Aug 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.6.ebuild:
Set SUPPORT_PYTHON_ABIS.
10 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
pycairo-1.8.6.ebuild:
Add "doc" USE flag (bug #276805).
*pycairo-1.8.6 (09 Jul 2009)
09 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+pycairo-1.8.6.ebuild:
Version bump.
01 May 2009; Raúl Porcel <armin76@gentoo.org> pycairo-1.8.2.ebuild:
alpha/arm/ia64/sh/sparc stable wrt #267433
29 Apr 2009; Brent Baude <ranger@gentoo.org> pycairo-1.8.2.ebuild:
stable ppc64, bug 267433
28 Apr 2009; Jeroen Roovers <jer@gentoo.org> pycairo-1.8.2.ebuild:
Stable for HPPA (bug #267433).
27 Apr 2009; Markus Meier <maekke@gentoo.org> pycairo-1.8.2.ebuild:
amd64/x86 stable, bug #267433
26 Apr 2009; Brent Baude <ranger@gentoo.org> pycairo-1.8.2.ebuild:
stable ppc, bug 267433
*pycairo-1.8.4 (25 Apr 2009)
25 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
-files/pycairo-1.2.2-no-automagic-deps.patch,
-files/pycairo-1.2.6-no-automagic-deps.patch, -pycairo-1.2.2.ebuild,
-pycairo-1.2.6.ebuild, -pycairo-1.4.0.ebuild, pycairo-1.8.2,
+pycairo-1.8.4.ebuild:
Version bump.
*pycairo-1.8.2 (24 Jan 2009)
24 Jan 2009; Patrick Lauer <patrick@gentoo.org> +pycairo-1.8.2.ebuild:
Bump to 1.8.2, fixes #255360
10 Nov 2008; Raúl Porcel <armin76@gentoo.org> pycairo-1.4.12.ebuild:
arm/sh stable
06 Aug 2008; Jesus Rivero <neurogeek@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
21 Jul 2008; nixnut <nixnut@gentoo.org> pycairo-1.4.12.ebuild:
Stable on ppc wrt bug 232327
19 Jul 2008; Jeroen Roovers <jer@gentoo.org> pycairo-1.4.12.ebuild:
Stable for HPPA (bug #232327).
19 Jul 2008; Olivier Crête <tester@gentoo.org> pycairo-1.4.12.ebuild:
Stable on amd64, bug #232327
29 May 2008; Ali Polatel <hawking@gentoo.org> pycairo-1.2.2.ebuild,
pycairo-1.2.6.ebuild:
python_mod_optimize is ROOT aware.
12 May 2008; Markus Rothe <corsair@gentoo.org> pycairo-1.4.12.ebuild:
Stable on ppc64
10 Mar 2008; <ricmm@gentoo.org> pycairo-1.2.6.ebuild,
pycairo-1.4.0.ebuild:
Drop to ~mips to match x11-libs/cairo
07 Feb 2008; Raúl Porcel <armin76@gentoo.org> pycairo-1.4.12.ebuild:
alpha/ia64/sparc/x86 stable
26 Dec 2007; Ali Polatel <hawking@gentoo.org> pycairo-1.4.12.ebuild:
Use DOCS, fixes #203333
*pycairo-1.4.12 (15 Dec 2007)
15 Dec 2007; Lukasz Strzygowski <lucass@gentoo.org>
+pycairo-1.4.12.ebuild:
Version bump.
06 Aug 2007; Joshua Kinard <kumba@gentoo.org> pycairo-1.4.0.ebuild:
Stable on mips, per #185823.
24 Jul 2007; Steve Dibb <beandog@gentoo.org> pycairo-1.4.0.ebuild:
amd64 stable, bug 185649
20 Jul 2007; nixnut <nixnut@gentoo.org> pycairo-1.4.0.ebuild:
Stable on ppc wrt bug 185649
17 Jul 2007; Jeroen Roovers <jer@gentoo.org> pycairo-1.4.0.ebuild:
Stable for HPPA (bug #185649).
17 Jul 2007; Markus Rothe <corsair@gentoo.org> pycairo-1.4.0.ebuild:
Stable on ppc64; bug #185649
17 Jul 2007; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-1.4.0.ebuild:
Stable on sparc wrt #185649
17 Jul 2007; Raúl Porcel <armin76@gentoo.org> pycairo-1.4.0.ebuild:
alpha/ia64/x86 stable wrt #185649
17 Jul 2007; Ali Polatel <hawking@gentoo.org> pycairo-1.4.0.ebuild:
Use distutils, added src_test
30 Jun 2007; Ali Polatel <hawking@gentoo.org> pycairo-1.2.2.ebuild,
pycairo-1.2.6.ebuild, pycairo-1.4.0.ebuild:
Add python_mod_optimize/cleanup wrt bug 177559, use NEED_PYTHON, add
trailing slash to HOMEPAGE
15 Jun 2007; Doug Goldstein <cardoe@gentoo.org> -pycairo-1.0.2.ebuild:
remove old version since cairo 1.0.x is going bye bye
27 May 2007; Joshua Kinard <kumba@gentoo.org> pycairo-1.2.6.ebuild:
Stable on mips.
*pycairo-1.4.0 (14 Mar 2007)
14 Mar 2007; Marien Zwart <marienz@gentoo.org> +pycairo-1.4.0.ebuild:
Version bump, thanks to Cardoe for reporting.
28 Jan 2007; Roy Marples <uberlord@gentoo.org> pycairo-1.2.6.ebuild:
Reverted to make install as emake install with a high -j fails on fbsd.
26 Jan 2007; Alexander H. Færøy <eroyf@gentoo.org> pycairo-1.2.6.ebuild:
Added ~mips; bug #161039
20 Jan 2007; Bryan Østergaard <kloeri@gentoo.org> pycairo-1.2.2.ebuild:
Stable on Alpha.
08 Jan 2007; Tiziano Müller <dev-zero@gentoo.org> pycairo-1.2.2.ebuild:
Added WANT_AUTO*, bug #160246
*pycairo-1.2.6 (06 Jan 2007)
06 Jan 2007; Tiziano Müller <dev-zero@gentoo.org>
-files/pycairo-1.2.0-no-automagic-deps.patch,
+files/pycairo-1.2.6-no-automagic-deps.patch, pycairo-1.0.2.ebuild,
-pycairo-1.0.2-r1.ebuild, -pycairo-1.2.0.ebuild, pycairo-1.2.2.ebuild,
+pycairo-1.2.6.ebuild:
Added examples USE-flag (bug #111508). Dropped old versions. Version bump.
01 Dec 2006; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-1.2.2.ebuild:
Stable on hppa wrt #155544
24 Nov 2006; Markus Rothe <corsair@gentoo.org> pycairo-1.2.2.ebuild:
Stable on ppc64; bug #155544
21 Nov 2006; Christian Faulhammer <opfer@gentoo.org> pycairo-1.2.2.ebuild:
stable x86, bug #155544
21 Nov 2006; Joseph Jezak <josejx@gentoo.org> pycairo-1.2.2.ebuild:
Marked ppc stable for bug #155713.
20 Nov 2006; <blubb@gentoo.org> pycairo-1.2.2.ebuild:
stable on amd64
20 Nov 2006; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-1.2.2.ebuild:
Stable on sparc wrt #155544
01 Oct 2006; Marien Zwart <marienz@gentoo.org> pycairo-1.0.2.ebuild,
pycairo-1.0.2-r1.ebuild, pycairo-1.2.0.ebuild, pycairo-1.2.2.ebuild:
Add pkgconfig to DEPEND. Closes bug #149730, thanks to bonsaikitten for
reporting.
*pycairo-1.2.2 (25 Sep 2006)
25 Sep 2006; Marien Zwart <marienz@gentoo.org>
+files/pycairo-1.2.2-no-automagic-deps.patch, +pycairo-1.2.2.ebuild:
Version bump with an updated ebuild by Martin von Gagern
<Martin.vGagern@gmx.net> from bug #145399.
06 Sep 2006; Javier Villavicencio <the_paya@gentoo.org>
pycairo-1.2.0.ebuild:
Add ~x86-fbsd keyword.
04 Sep 2006; Joshua Kinard <kumba@gentoo.org> pycairo-1.0.2.ebuild:
Marked stable on mips.
07 Aug 2006; Alastair Tse <liquidx@gentoo.org> pycairo-1.0.2.ebuild,
pycairo-1.0.2-r1.ebuild:
fix pycairo-1.0.2 deps to cairo-1.0* (#142998)
*pycairo-1.2.0 (04 Jul 2006)
04 Jul 2006; Marien Zwart <marienz@gentoo.org>
+files/pycairo-1.2.0-no-automagic-deps.patch, +pycairo-1.2.0.ebuild:
Version bump (in package.mask). Fix automagic dependencies, minor quoting fix.
06 Jun 2006; Carsten Lohrke <carlo@gentoo.org> ChangeLog:
Fix use of nonexistent versioned virtual/python.
06 Jun 2006; Carsten Lohrke <carlo@gentoo.org> -pycairo-0.1.4.ebuild,
-pycairo-0.9.0.ebuild:
Clean up.
*pycairo-1.0.2-r1 (12 May 2006)
12 May 2006; John N. Laliberte <allanonjl@gentoo.org>
+pycairo-1.0.2-r1.ebuild:
remove dep on pygtk since the cairo.gtk is not built if pygtk is >=2.7.0.
fixes a circular dep with pygtk <-> pycairo.
04 Feb 2006; Aron Griffis <agriffis@gentoo.org> pycairo-1.0.2.ebuild:
Mark 1.0.2 stable on ia64
03 Feb 2006; Guy Martin <gmsoft@gentoo.org> pycairo-1.0.2.ebuild:
Stable on hppa.
31 Jan 2006; Aron Griffis <agriffis@gentoo.org> pycairo-1.0.2.ebuild:
Mark 1.0.2 stable on alpha
22 Jan 2006; Tobias Scherbaum <dertobi123@gentoo.org>
pycairo-1.0.2.ebuild:
Marked ppc stable for bug #119634; Stabilize Gnome-2.12.2
22 Jan 2006; <dang@gentoo.org> pycairo-1.0.2.ebuild:
Marked stable on amd64 per bug #119634
22 Jan 2006; Markus Rothe <corsair@gentoo.org> pycairo-1.0.2.ebuild:
Stable on ppc64
22 Jan 2006; Joshua Jackson <tsunam@gentoo.org> pycairo-1.0.2.ebuild:
Stable on x86 for bug #119634; Stabilize Gnome-2.12.2
20 Jan 2006; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-1.0.2.ebuild:
Stable on sparc wrt #119634
26 Dec 2005; Bryan Østergaard <kloeri@gentoo.org pycairo-0.9.0.ebuild,
pycairo-1.0.2.ebuild:
~alpha keyword.
*pycairo-1.0.2 (21 Dec 2005)
21 Dec 2005; Lukasz Strzygowski <lucass@gentoo.org> +pycairo-1.0.2.ebuild:
Version bump and cleanup. Closing bug #104060.
31 Oct 2005; Bryan Østergaard <kloeri@gentoo.org> pycairo-0.9.0.ebuild:
~ia64 keyword.
19 Oct 2005; Tom Gall <tgall@gentoo.org> pycairo-0.9.0.ebuild:
added ~ppc64, bug #108808
25 Sep 2005; Tobias Scherbaum <dertobi123@gentoo.org>
pycairo-0.9.0.ebuild:
Added to ~ppc
20 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org> pycairo-0.9.0.ebuild:
Keyworded ~sparc
30 Aug 2005; <dang@gentoo.org> pycairo-0.9.0.ebuild:
Marked ~amd64
*pycairo-0.9.0 (26 Aug 2005)
26 Aug 2005; John N. Laliberte <allanonjl@gentoo.org>
+pycairo-0.9.0.ebuild:
new version, needed for pygtk. approved by kloeri
*pycairo-0.1.4 (04 Feb 2005)
04 Feb 2005; Fernando Serboncini <fserb@gentoo.org> +metadata.xml,
+pycairo-0.1.4.ebuild:
Initial ebuild

View File

@@ -0,0 +1,8 @@
AUX py2cairo-1.10.0-svg_check.patch 2912 RMD160 79cbae6b38baeb1a55309aa41cb40bd0bb2ad1b2 SHA1 fdd5a4f9b9f17aa0f48e62ef97359f57046da46e SHA256 c35d96be5be571c2f4c3415e4016a7e70a5edd6164818af80d16855e4e4efe72
AUX pycairo-1.10.0-svg_check.patch 2924 RMD160 e0a01e9587ad47dc00a0d449fb3d00fcfbacfe7a SHA1 3969a610e8431938605c7eae5a86b43ef0c9881c SHA256 f9d2bac70bcca57c523e69403cb7332bf4ade0427998b6a3dc16730bcc17b6c7
AUX pycairo-1.10.0-waf-multilib.patch 761 RMD160 1e2210e0a7c7ec2fc19245d512c0d762ca9aed1f SHA1 bbaef5a3699a53023efb659a86a97180e34dee56 SHA256 8e9e081bf7b4beced282a8de265b6e8901b113df7fbe892d7f0f93c63c771e5b
DIST py2cairo-1.10.0.tar.bz2 402070 RMD160 ce75db9af32ef1a3e90f6aaa649cbb2493a941a4 SHA1 2efa8dfafbd6b8e492adaab07231556fec52d6eb SHA256 d30439f06c2ec1a39e27464c6c828b6eface3b22ee17b2de05dc409e429a7431
DIST pycairo-1.10.0.tar.bz2 246556 RMD160 7d1c1c05113e5bbad32dbe96c65c918b170cac33 SHA1 b4283aa1cc9aafd12fd72ad371303a486da1d014 SHA256 9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be
EBUILD pycairo-1.10.0-r1.ebuild 2965 RMD160 8777233fc03ea1c7fa8994312d95c430ed97fb66 SHA1 f52ac254bff7448f32e3fc052efc6a8f603807fb SHA256 528d7723ca4eda234ba4d18966ef14f576881d735fdef3090b3ba990327787a0
MISC ChangeLog 13184 RMD160 c9122413c01cacebdde1da762953875c826e316d SHA1 ff8f80eda412b871b03cb561c452b1614c86b588 SHA256 71b07a92fb00e450a1a9baa0fa9a0d6e25f861c1c0e709d145f7220455ddaaa0
MISC metadata.xml 160 RMD160 e730f96ab97c5be577a6d6d05f04990374a0dffb SHA1 2aa5e6be9c265c0e7bceb78ee9fd20df5f818e36 SHA256 6cd954a9de2307c57d32b25fa3599dee2908a4ddc6a98594f593d53577307a3a

View File

@@ -0,0 +1,126 @@
--- src/cairomodule.c
+++ src/cairomodule.c
@@ -127,7 +127,7 @@
#else
0,
#endif
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
&PycairoSVGSurface_Type,
#else
0,
@@ -223,7 +223,7 @@
if (PyType_Ready(&PycairoPSSurface_Type) < 0)
return;
#endif
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
return;
#endif
@@ -305,7 +305,7 @@
PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
#endif
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
Py_INCREF(&PycairoSVGSurface_Type);
PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
#endif
@@ -379,7 +379,7 @@
#else
PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
#else
PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
--- src/private.h
+++ src/private.h
@@ -86,7 +86,7 @@
extern PyTypeObject PycairoPSSurface_Type;
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
extern PyTypeObject PycairoSVGSurface_Type;
#endif
--- src/pycairo.h
+++ src/pycairo.h
@@ -182,7 +182,7 @@
#define PycairoPSSurface_Type *(Pycairo_CAPI->PSSurface_Type)
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
#define PycairoSVGSurface_Type *(Pycairo_CAPI->SVGSurface_Type)
#endif
--- src/surface.c
+++ src/surface.c
@@ -83,7 +83,7 @@
type = &PycairoPSSurface_Type;
break;
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
case CAIRO_SURFACE_TYPE_SVG:
type = &PycairoSVGSurface_Type;
break;
@@ -1015,7 +1015,7 @@
/* Class SVGSurface(Surface) ----------------------------------------------- */
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
#include <cairo-svg.h>
static PyObject *
@@ -1125,7 +1125,7 @@
0, /* tp_is_gc */
0, /* tp_bases */
};
-#endif /* CAIRO_HAS_SVG_SURFACE */
+#endif /* PYCAIRO_ENABLE_SVG */
#if CAIRO_HAS_WIN32_SURFACE
--- wscript
+++ wscript
@@ -1,6 +1,7 @@
# -*- python -*-
import os
+import subprocess
top = '.'
out = 'build_directory'
@@ -11,6 +12,17 @@
cairo_version_required = '1.10.0'
+def check_svg():
+ if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
+ return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
+ if return_code == 0:
+ return True
+ else:
+ return False
+ else:
+ return False
+
+
def options(ctx):
print(' %s/options()' %d)
ctx.tool_options('gnu_dirs')
@@ -39,6 +51,8 @@
ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
ctx.define('PYCAIRO_VERSION_MINOR', version[1])
ctx.define('PYCAIRO_VERSION_MICRO', version[2])
+ if check_svg():
+ ctx.define('PYCAIRO_ENABLE_SVG', 1)
ctx.write_config_header('src/config.h')

View File

@@ -0,0 +1,126 @@
--- src/cairomodule.c
+++ src/cairomodule.c
@@ -116,7 +116,7 @@
#else
0,
#endif
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
&PycairoSVGSurface_Type,
#else
0,
@@ -247,7 +247,7 @@
if (PyType_Ready(&PycairoPSSurface_Type) < 0)
return NULL;
#endif
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
if (PyType_Ready(&PycairoSVGSurface_Type) < 0)
return NULL;
#endif
@@ -337,7 +337,7 @@
PyModule_AddObject(m, "PSSurface", (PyObject *)&PycairoPSSurface_Type);
#endif
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
Py_INCREF(&PycairoSVGSurface_Type);
PyModule_AddObject(m, "SVGSurface", (PyObject *)&PycairoSVGSurface_Type);
#endif
@@ -399,7 +399,7 @@
#else
PyModule_AddIntConstant(m, "HAS_PS_SURFACE", 0);
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 1);
#else
PyModule_AddIntConstant(m, "HAS_SVG_SURFACE", 0);
--- src/private.h
+++ src/private.h
@@ -75,7 +75,7 @@
extern PyTypeObject PycairoPSSurface_Type;
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
extern PyTypeObject PycairoSVGSurface_Type;
#endif
--- src/py3cairo.h
+++ src/py3cairo.h
@@ -171,7 +171,7 @@
#define PycairoPSSurface_Type *(Pycairo_CAPI->PSSurface_Type)
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
#define PycairoSVGSurface_Type *(Pycairo_CAPI->SVGSurface_Type)
#endif
--- src/surface.c
+++ src/surface.c
@@ -72,7 +72,7 @@
type = &PycairoPSSurface_Type;
break;
#endif
-#if CAIRO_HAS_SVG_SURFACE
+#if PYCAIRO_ENABLE_SVG
case CAIRO_SURFACE_TYPE_SVG:
type = &PycairoSVGSurface_Type;
break;
@@ -1022,7 +1022,7 @@
/* Class SVGSurface(Surface) ----------------------------------------------- */
-#ifdef CAIRO_HAS_SVG_SURFACE
+#ifdef PYCAIRO_ENABLE_SVG
#include <cairo-svg.h>
static PyObject *
@@ -1133,7 +1133,7 @@
0, /* tp_is_gc */
0, /* tp_bases */
};
-#endif /* CAIRO_HAS_SVG_SURFACE */
+#endif /* PYCAIRO_ENABLE_SVG */
#if CAIRO_HAS_WIN32_SURFACE
--- wscript
+++ wscript
@@ -1,6 +1,7 @@
# -*- python -*-
import os
+import subprocess
top = '.'
out = 'build_directory'
@@ -11,6 +12,17 @@
cairo_version_required = '1.10.0'
+def check_svg():
+ if os.environ.get('PYCAIRO_DISABLE_SVG', None) is None:
+ return_code = subprocess.call(['pkg-config', '--exists', 'cairo-svg'])
+ if return_code == 0:
+ return True
+ else:
+ return False
+ else:
+ return False
+
+
def options(ctx):
print(' %s/options()' %d)
ctx.tool_options('gnu_dirs')
@@ -39,6 +51,8 @@
ctx.define('PYCAIRO_VERSION_MAJOR', version[0])
ctx.define('PYCAIRO_VERSION_MINOR', version[1])
ctx.define('PYCAIRO_VERSION_MICRO', version[2])
+ if check_svg():
+ ctx.define('PYCAIRO_ENABLE_SVG', 1)
ctx.write_config_header('src/config.h')

View File

@@ -0,0 +1,17 @@
From: Nathan Phillip Brink <binki@gentoo.org>
Date: 2011/05/14
Subject: Don't assume that /usr/bin/python-config* is a python
script. Fixes build on portage-multilib where abi-wrapper is a
bash script wrapping around the different python-configs.
--- a/waflib/Tools/python.py
+++ b/waflib/Tools/python.py
@@ -169,7 +169,7 @@
conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
includes=[]
if conf.env.PYTHON_CONFIG:
- for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
+ for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
if(incstr.startswith('-I')or incstr.startswith('/I')):
incstr=incstr[2:]
if incstr not in includes:

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
</pkgmetadata>

View File

@@ -0,0 +1,106 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pycairo/pycairo-1.10.0-r1.ebuild,v 1.1 2011/05/08 21:28:41 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6 3:3.1"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.4 2.5 3.0 *-jython"
inherit eutils python waf-utils
PYCAIRO_PYTHON2_VERSION="${PV}"
PYCAIRO_PYTHON3_VERSION="${PV}"
DESCRIPTION="Python bindings for the cairo library"
HOMEPAGE="http://cairographics.org/pycairo/ http://pypi.python.org/pypi/pycairo"
SRC_URI="http://cairographics.org/releases/py2cairo-${PYCAIRO_PYTHON2_VERSION}.tar.bz2
http://cairographics.org/releases/pycairo-${PYCAIRO_PYTHON3_VERSION}.tar.bz2"
# LGPL-3 for pycairo 1.10.0.
# || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10.
LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc examples +svg test"
RDEPEND=">=x11-libs/cairo-1.10.0[svg?]"
DEPEND="${RDEPEND}
dev-util/pkgconfig
test? ( dev-python/pytest )"
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
src_prepare() {
pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null
./waf
pushd .waf*
epatch "${FILESDIR}/pycairo-1.10.0-waf-multilib.patch"
popd
epatch "${FILESDIR}/${PN}-1.10.0-svg_check.patch"
popd > /dev/null
pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null
./waf
pushd .waf*
epatch "${FILESDIR}/pycairo-1.10.0-waf-multilib.patch"
popd
epatch "${FILESDIR}/py2cairo-1.10.0-svg_check.patch"
popd > /dev/null
preparation() {
if [[ "${PYTHON_ABI}" == 3.* ]]; then
cp -r "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${WORKDIR}/${P}-${PYTHON_ABI}"
else
cp -r "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${WORKDIR}/${P}-${PYTHON_ABI}"
fi
}
python_execute_function preparation
}
src_configure() {
if ! use svg; then
export PYCAIRO_DISABLE_SVG="1"
fi
python_execute_function -s waf-utils_src_configure --nopyc --nopyo
}
src_compile() {
python_execute_function -s waf-utils_src_compile
}
src_test() {
test_installation() {
./waf install --destdir="${T}/tests/${PYTHON_ABI}"
}
python_execute_function -q -s test_installation
python_execute_py.test -P '${T}/tests/${PYTHON_ABI}${EPREFIX}$(python_get_sitedir)' -s
}
src_install() {
python_execute_function -s waf-utils_src_install
dodoc AUTHORS NEWS README || die "dodoc failed"
if use doc; then
pushd doc/_build/html > /dev/null
insinto /usr/share/doc/${PF}/html
doins -r [a-z]* _static || die "Installation of documentation failed"
popd > /dev/null
fi
if use examples; then
insinto /usr/share/doc/${PF}/examples
doins -r examples/* || die "Installation of examples failed"
fi
}
pkg_postinst() {
python_mod_optimize cairo
}
pkg_postrm() {
python_mod_cleanup cairo
}