* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/, dev-python/pycairo/files/
@ 2015-10-19 16:29 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-10-19 16:29 UTC (permalink / raw
To: gentoo-commits
commit: d239994c9ce048dc3b4c85d8a11d6549cb1556bf
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 19 13:37:56 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Oct 19 16:29:11 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d239994c
dev-python/pycairo: Add python3.5 support and import latest debian patches
Add missing die
run epatch with multiple patches at once
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../files/pycairo-1.10.0-101_pycairo-region.patch | 917 +++++++++++++++++++++
.../files/pycairo-1.10.0-10_test-target-py3.patch | 18 +
...pycairo-1.10.0-50_specify-encoding-in-waf.patch | 32 +
.../pycairo-1.10.0-70_dont-link-libpython.patch | 29 +
.../files/pycairo-1.10.0-80_fix-pickle.patch | 30 +
.../files/pycairo-1.10.0-81_pickling-again.patch | 37 +
dev-python/pycairo/pycairo-1.10.0-r5.ebuild | 147 ++++
7 files changed, 1210 insertions(+)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
new file mode 100644
index 0000000..4143f33
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-101_pycairo-region.patch
@@ -0,0 +1,917 @@
+Description: Add support for cairo_region_t
+ This patch fix missing support for cairo_region_t.
+Author: Bug Fly
+Origin: https://bugs.freedesktop.org/attachment.cgi?id=61553
+Bug-Debian: http://bugs.debian.org/688079
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/py3cairo/+bug/1028115
+Last-Update: 2012-08-20
+Applied-Upstream: http://cgit.freedesktop.org/pycairo/commit/?id=75e82a1b3f495a3abbc78e50a5c66356d320fb15
+
+--- py3cairo-1.10.0+dfsg.orig/doc/pycairo_c_api.rst
++++ py3cairo-1.10.0+dfsg/doc/pycairo_c_api.rst
+@@ -51,6 +51,8 @@ Objects::
+ PycairoGradient
+ PycairoLinearGradient
+ PycairoRadialGradient
++ PycairoRectangleInt
++ PycairoRegion
+ PycairoScaledFont
+ PycairoSurface
+ PycairoImageSurface
+@@ -78,6 +80,8 @@ Types::
+ PyTypeObject *Gradient_Type;
+ PyTypeObject *LinearGradient_Type;
+ PyTypeObject *RadialGradient_Type;
++ PyTypeObject *RectangleInt_Type;
++ PyTypeObject *Region_Type;
+ PyTypeObject *ScaledFont_Type;
+ PyTypeObject *Surface_Type;
+ PyTypeObject *ImageSurface_Type;
+@@ -115,6 +119,12 @@ Functions
+ .. c:function:: PyObject * PycairoPattern_FromPattern(cairo_pattern_t *pattern, PyObject *base)
+
+
++.. c:function:: PyObject * PycairoRectangleInt_FromRectangleInt(const cairo_rectangle_int_t *rectangle_int)
++
++
++.. c:function:: PyObject * PycairoRegion_FromRegion(const cairo_region_t *region)
++
++
+ .. c:function:: PyObject * PycairoScaledFont_FromScaledFont(cairo_scaled_font_t *scaled_font)
+
+
+--- py3cairo-1.10.0+dfsg.orig/doc/reference/index.rst
++++ py3cairo-1.10.0+dfsg/doc/reference/index.rst
+@@ -15,5 +15,6 @@ Reference
+ matrix
+ paths
+ patterns
++ region
+ surfaces
+ text
+--- /dev/null
++++ py3cairo-1.10.0+dfsg/doc/reference/region.rst
+@@ -0,0 +1,52 @@
++.. _region:
++
++******
++Region
++******
++Region — Representing a pixel-aligned area
++
++.. currentmodule:: cairo
++
++
++class Region()
++==============
++*Region* is a simple graphical data type representing an area of
++integer-aligned rectangles. They are often used on raster surfaces to track
++areas of interest, such as change or clip areas.
++
++
++.. class:: Region([rectangle_int|rectangle_ints])
++
++ :param rectangle_int: a rectangle or a list of rectangle
++ :type rectangle_int: :class:`RectangleInt` or [:class:`RectangleInt`]
++
++ Allocates a new empty region object or a region object with the containing
++ rectangle(s).
++
++
++ .. method:: copy()
++
++ :returns: A newly allocated :class:`Region`.
++ :raises: :exc:`NoMemory` if memory cannot be allocated.
++
++ Allocates a new *Region* object copying the area from original.
++
++
++class RectangleInt()
++====================
++*RectangleInt* is a data structure for holding a rectangle with integer
++coordinates.
++
++
++.. class:: RectangleInt(x=0, y=0, width=0, height=0)
++
++ :param x: X coordinate of the left side of the rectangle
++ :type x: int
++ :param y: Y coordinate of the the top side of the rectangle
++ :type y: int
++ :param width: width of the rectangle
++ :type width: int
++ :param height: height of the rectangle
++ :type height: int
++
++ Allocates a new *RectangleInt* object.
+--- /dev/null
++++ py3cairo-1.10.0+dfsg/src/region.c
+@@ -0,0 +1,598 @@
++/* -*- mode: C; c-basic-offset: 2 -*-
++ *
++ * Copyright © 2005,2010 Steve Chaplin
++ *
++ * This file is part of pycairo.
++ *
++ * Pycairo is free software: you can redistribute it and/or modify it under
++ * the terms of the GNU Lesser General Public License version 3 as published
++ * by the Free Software Foundation.
++ *
++ * Pycairo is distributed in the hope that it will be useful, but WITHOUT ANY
++ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
++ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
++ * more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with pycairo. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#define PY_SSIZE_T_CLEAN
++#include <Python.h>
++#include "structmember.h"
++
++#include "config.h"
++#include "private.h"
++
++/* PycairoRectangleInt_FromRectangleInt
++ * Create a new PycairoRectangleInt from a cairo_rectangle_int_t
++ * rectangle_int - a cairo_rectangle_int_t to 'wrap' into a Python object.
++ * rectangle_int is unreferenced if the PycairoRectangleInt creation
++ * fails.
++ * Return value: New reference or NULL on failure
++ */
++PyObject *
++PycairoRectangleInt_FromRectangleInt (cairo_rectangle_int_t *rectangle_int) {
++ PyObject *o;
++
++ assert (rectangle_int != NULL);
++
++ o = PycairoRectangleInt_Type.tp_alloc (&PycairoRectangleInt_Type, 0);
++ if (o)
++ ((PycairoRectangleInt *)o)->rectangle_int = *rectangle_int;
++ return o;
++}
++
++static void
++rectangle_int_dealloc(PycairoRectangleInt *o) {
++#ifdef DEBUG
++ printf("rectangle_int_dealloc start\n");
++#endif
++ //o->ob_type->tp_free((PyObject *)o);
++ Py_TYPE(o)->tp_free(o);
++#ifdef DEBUG
++ printf("rectangle_int_dealloc end\n");
++#endif
++}
++
++static PyObject *
++rectangle_int_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
++ static char *kwlist[] = { "x", "y", "width", "height", NULL };
++ int x, y, w, h;
++ x = y = w = h = 0;
++ cairo_rectangle_int_t rect;
++
++ if (!PyArg_ParseTupleAndKeywords(args, kwds,
++ "|iiii:RectangleInt.__new__", kwlist,
++ &x, &y, &w, &h))
++ return NULL;
++
++ rect.x = x;
++ rect.y = y;
++ rect.width = w;
++ rect.height = h;
++
++ return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++static PyObject *
++rectangle_int_str(PycairoRectangleInt *rect_o) {
++ PyObject *s;
++ cairo_rectangle_int_t *rect = &(rect_o->rectangle_int);
++ char buf[80];
++ PyOS_snprintf(buf, sizeof(buf), "cairo.RectangleInt(%d, %d, %d, %d)",
++ rect->x, rect->y, rect->width, rect->height);
++ s = PyUnicode_FromString(buf);
++ return s;
++}
++
++static PyObject *
++rectangle_int_richcompare(PycairoRectangleInt *self,
++ PycairoRectangleInt *other, int op) {
++ int res = 0;
++ PyObject *b;
++
++ if (op != Py_EQ && op != Py_NE) {
++ PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
++ return NULL;
++ }
++ if (!PyObject_IsInstance((PyObject*)other,
++ (PyObject*)&PycairoRectangleInt_Type)) {
++ res = 0;
++ }
++ else if (
++ self->rectangle_int.x == other->rectangle_int.x &&
++ self->rectangle_int.y == other->rectangle_int.y &&
++ self->rectangle_int.width == other->rectangle_int.width &&
++ self->rectangle_int.height == other->rectangle_int.height
++ )
++ res = 1;
++ res = op == Py_NE ? !res : res;
++ b = res ? Py_True : Py_False;
++ Py_INCREF(b);
++
++ return b;
++}
++
++static PyMemberDef RectangleInt_members[] = {
++ {"x", T_INT, sizeof(PyObject), 0,
++ "X coordinate of the left side of the rectangle"},
++ {"y", T_INT, sizeof(PyObject)+sizeof(int), 0,
++ "Y coordinate of the the top side of the rectangle"},
++ {"width", T_INT, sizeof(PyObject)+sizeof(int)*2, 0,
++ "width of the rectangle"},
++ {"height", T_INT, sizeof(PyObject)+sizeof(int)*3, 0,
++ "height of the rectangle"},
++ {NULL}
++};
++
++PyTypeObject PycairoRectangleInt_Type = {
++ PyVarObject_HEAD_INIT(&PyType_Type, 0)
++ "cairo.RectangleInt", /* tp_name */
++ sizeof(PycairoRectangleInt), /* tp_basicsize */
++ 0, /* tp_itemsize */
++ (destructor)rectangle_int_dealloc, /* tp_dealloc */
++ 0, /* tp_print */
++ 0, /* tp_getattr */
++ 0, /* tp_setattr */
++ 0, /* tp_compare */
++ 0, /* tp_repr */
++ 0, /* tp_as_number */
++ 0, /* tp_as_sequence */
++ 0, /* tp_as_mapping */
++ 0, /* tp_hash */
++ 0, /* tp_call */
++ (reprfunc)rectangle_int_str, /* tp_str */
++ 0, /* tp_getattro */
++ 0, /* tp_setattro */
++ 0, /* tp_as_buffer */
++ Py_TPFLAGS_DEFAULT, /* tp_flags */
++ 0, /* tp_doc */
++ 0, /* tp_traverse */
++ 0, /* tp_clear */
++ (richcmpfunc)rectangle_int_richcompare, /* tp_richcompare */
++ 0, /* tp_weaklistoffset */
++ 0, /* tp_iter */
++ 0, /* tp_iternext */
++ 0, /* tp_methods */
++ RectangleInt_members, /* tp_members */
++ 0, /* tp_getset */
++ 0, /* tp_base */
++ 0, /* tp_dict */
++ 0, /* tp_descr_get */
++ 0, /* tp_descr_set */
++ 0, /* tp_dictoffset */
++ 0, /* tp_init */
++ 0, /* tp_alloc */
++ (newfunc)rectangle_int_new, /* tp_new */
++};
++
++/* PycairoRegion_FromRegion
++ * Create a new PycairoRegion from a cairo_region_t
++ * region - a cairo_region_t to 'wrap' into a Python object.
++ * region is unreferenced if the PycairoRegion creation fails, or if
++ * region is in an error status.
++ * Return value: New reference or NULL on failure
++ */
++PyObject *
++PycairoRegion_FromRegion (cairo_region_t *region) {
++ PyObject *o;
++
++ assert (region != NULL);
++
++ if (Pycairo_Check_Status (cairo_region_status(region))) {
++ cairo_region_destroy (region);
++ return NULL;
++ }
++
++ o = PycairoRegion_Type.tp_alloc (&PycairoRegion_Type, 0);
++ if (o)
++ ((PycairoRegion *)o)->region = region;
++ else
++ cairo_region_destroy (region);
++ return o;
++}
++
++static void
++region_dealloc(PycairoRegion *o) {
++#ifdef DEBUG
++ printf("region_dealloc start\n");
++#endif
++ if (o->region) {
++ cairo_region_destroy(o->region);
++ o->region = NULL;
++ }
++ //o->ob_type->tp_free((PyObject *)o);
++ Py_TYPE(o)->tp_free(o);
++#ifdef DEBUG
++ printf("region_dealloc end\n");
++#endif
++}
++
++static PyObject *
++region_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
++ PyObject *s = NULL;
++ PycairoRectangleInt *rect_obj = NULL;
++ cairo_region_t *region = NULL;
++ cairo_rectangle_int_t *rect = NULL;
++
++ if (PyArg_ParseTuple(args, "|O!:Region.__new__",
++ &PycairoRectangleInt_Type, &rect_obj)) {
++ if (rect_obj != NULL) {
++ region = cairo_region_create_rectangle(&(rect_obj->rectangle_int));
++ }
++ } else if (!PyArg_ParseTuple(args, "|O:Region.__new__", &s)) {
++ PyErr_SetString(PyExc_TypeError,
++ "argument must be a RectangleInt or a sequence of RectangleInt.");
++ return NULL;
++ }
++ PyErr_Clear(); /* Clear possible err in the 1st arg parser. */
++
++ /* list of rectangle_int or no args */
++ if (s != NULL) {
++ int i;
++ int rect_size;
++ PyObject *seq = NULL;
++ seq = PySequence_Fast (s,
++ "argument must be a RectangleInt or a sequence of RectangleInt.");
++ if (seq == NULL) {
++ return NULL;
++ }
++ rect_size = PySequence_Fast_GET_SIZE(seq);
++ rect = PyMem_Malloc (rect_size * sizeof(cairo_rectangle_int_t));
++ if (rect == NULL) {
++ Py_DECREF(seq);
++ return PyErr_NoMemory();
++ }
++
++ for(i=0; i<rect_size; i++) {
++ PyObject *obj_tmp = PySequence_Fast_GET_ITEM(seq, i);
++ if (PyObject_IsInstance(obj_tmp,
++ (PyObject*)&PycairoRectangleInt_Type) != 1) {
++ Py_DECREF(seq);
++ PyMem_Free(rect);
++ return NULL;
++ }
++ rect_obj = (PycairoRectangleInt*) obj_tmp;
++ rect[i] = rect_obj->rectangle_int;
++ }
++
++ region = cairo_region_create_rectangles(rect, rect_size);
++
++ Py_DECREF(seq);
++ PyMem_Free(rect);
++ }
++
++ if (region == NULL) {
++ region = cairo_region_create();
++ }
++
++ RETURN_NULL_IF_CAIRO_REGION_ERROR(region);
++ return PycairoRegion_FromRegion(region);
++}
++
++PyObject *
++region_copy (PycairoRegion *o) {
++ cairo_region_t *res;
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_copy (o->region);
++ Py_END_ALLOW_THREADS;
++ RETURN_NULL_IF_CAIRO_REGION_ERROR(res);
++ return PycairoRegion_FromRegion(res);
++}
++
++
++PyObject *
++region_get_extents (PycairoRegion *o) {
++ cairo_rectangle_int_t rect;
++ Py_BEGIN_ALLOW_THREADS;
++ cairo_region_get_extents(o->region, &rect);
++ Py_END_ALLOW_THREADS;
++
++ return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++
++PyObject *
++region_num_rectangles (PycairoRegion *o) {
++ int res;
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_num_rectangles(o->region);
++ Py_END_ALLOW_THREADS;
++ return Py_BuildValue("i", res);
++}
++
++
++PyObject *
++region_get_rectangle (PycairoRegion *o, PyObject *args) {
++ cairo_rectangle_int_t rect;
++ int i;
++ int total;
++ if (!PyArg_ParseTuple (args, "i:Region.get_rectangle", &i))
++ return NULL;
++ total = cairo_region_num_rectangles(o->region);
++ if (i >= total || i < 0) {
++ if ( i < 0)
++ PyErr_SetString(PyExc_ValueError, "index must be a positive number");
++ else
++ PyErr_SetString(PyExc_ValueError, "index is to big for the region");
++ return NULL;
++ }
++ Py_BEGIN_ALLOW_THREADS;
++ cairo_region_get_rectangle(o->region, i, &rect);
++ Py_END_ALLOW_THREADS;
++ return PycairoRectangleInt_FromRectangleInt(&rect);
++}
++
++
++PyObject *
++region_is_empty (PycairoRegion *o) {
++ cairo_bool_t res;
++ PyObject *b;
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_is_empty(o->region);
++ Py_END_ALLOW_THREADS;
++ b = res ? Py_True : Py_False;
++ Py_INCREF(b);
++ return b;
++}
++
++
++PyObject *
++region_contains_point (PycairoRegion *o, PyObject *args) {
++ int x, y;
++ cairo_bool_t res;
++ PyObject *b;
++ if (!PyArg_ParseTuple (args, "ii:Region.contains_point", &x, &y))
++ return NULL;
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_contains_point(o->region, x, y);
++ Py_END_ALLOW_THREADS;
++ b = res ? Py_True : Py_False;
++ Py_INCREF(b);
++ return b;
++}
++
++
++PyObject *
++region_contains_rectangle (PycairoRegion *o, PyObject *args) {
++ cairo_region_overlap_t res;
++ PycairoRectangleInt *rect_int;
++ if (!PyArg_ParseTuple (args, "O!:Region.contains_rectangle",
++ &PycairoRectangleInt_Type, &rect_int))
++ return NULL;
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_contains_rectangle(o->region, &(rect_int->rectangle_int));
++ Py_END_ALLOW_THREADS;
++ return Py_BuildValue("i", res);
++}
++
++
++PyObject *
++region_equal (PycairoRegion *o, PyObject *args) {
++ cairo_bool_t res;
++ PyObject *b;
++ PycairoRegion *region_obj;
++ if (!PyArg_ParseTuple (args, "O!:Region.equal",
++ &PycairoRegion_Type, ®ion_obj))
++ return NULL;
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_equal (o->region, region_obj->region);
++ Py_END_ALLOW_THREADS;
++ b = res ? Py_True : Py_False;
++ Py_INCREF(b);
++ return b;
++}
++
++static PyObject *
++region_richcompare(PycairoRegion *self, PycairoRegion *other, int op) {
++ int res = 0;
++ PyObject *b;
++
++ if (op != Py_EQ && op != Py_NE) {
++ PyErr_SetString(PyExc_TypeError, "Only support testing for == or !=");
++ return NULL;
++ }
++ if (!PyObject_IsInstance((PyObject*)other, (PyObject*)&PycairoRegion_Type)) {
++ res = 0;
++ } else {
++ res = cairo_region_equal (self->region, other->region);
++ }
++
++ res = op == Py_NE ? !res : res;
++ b = res ? Py_True : Py_False;
++ Py_INCREF(b);
++
++ return b;
++}
++
++PyObject *
++region_translate (PycairoRegion *o, PyObject *args) {
++ int x, y;
++ if (!PyArg_ParseTuple (args, "ii:Region.translate", &x, &y))
++ return NULL;
++ Py_BEGIN_ALLOW_THREADS;
++ cairo_region_translate (o->region, x, y);
++ Py_END_ALLOW_THREADS;
++ Py_RETURN_NONE;
++}
++
++
++PyObject *
++region_intersect (PycairoRegion *o, PyObject *args) {
++ cairo_status_t res;
++ PyObject *other;
++ if (!PyArg_ParseTuple (args, "O:Region.intersect", &other))
++ return NULL;
++
++ if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_intersect(o->region,
++ ((PycairoRegion *)other)->region);
++ Py_END_ALLOW_THREADS;
++ } else if (PyObject_IsInstance(other,
++ (PyObject*)&PycairoRectangleInt_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_intersect_rectangle(o->region,
++ &(((PycairoRectangleInt *)other)->rectangle_int));
++ Py_END_ALLOW_THREADS;
++ } else {
++ PyErr_SetString(PyExc_TypeError,
++ "argument must be a Region or a RectangleInt.");
++ return NULL;
++ }
++
++ RETURN_NULL_IF_CAIRO_ERROR(res);
++ Py_RETURN_NONE;
++}
++
++PyObject *
++region_subtract (PycairoRegion *o, PyObject *args) {
++ cairo_status_t res;
++ PyObject *other;
++ if (!PyArg_ParseTuple (args, "O:Region.subtract", &other))
++ return NULL;
++
++ if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_subtract(o->region,
++ ((PycairoRegion *)other)->region);
++ Py_END_ALLOW_THREADS;
++ } else if (PyObject_IsInstance(other,
++ (PyObject*)&PycairoRectangleInt_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_subtract_rectangle(o->region,
++ &(((PycairoRectangleInt *)other)->rectangle_int));
++ Py_END_ALLOW_THREADS;
++ } else {
++ PyErr_SetString(PyExc_TypeError,
++ "argument must be a Region or a RectangleInt.");
++ return NULL;
++ }
++ RETURN_NULL_IF_CAIRO_ERROR(res);
++ Py_RETURN_NONE;
++}
++
++PyObject *
++region_union (PycairoRegion *o, PyObject *args) {
++ cairo_status_t res;
++ PyObject *other;
++ if (!PyArg_ParseTuple (args, "O:Region.union", &other))
++ return NULL;
++
++ if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_union(o->region,
++ ((PycairoRegion *)other)->region);
++ Py_END_ALLOW_THREADS;
++ } else if (PyObject_IsInstance(other,
++ (PyObject*)&PycairoRectangleInt_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_union_rectangle(o->region,
++ &(((PycairoRectangleInt *)other)->rectangle_int));
++ Py_END_ALLOW_THREADS;
++ } else {
++ PyErr_SetString(PyExc_TypeError,
++ "argument must be a Region or a RectangleInt.");
++ return NULL;
++ }
++ RETURN_NULL_IF_CAIRO_ERROR(res);
++ Py_RETURN_NONE;
++}
++
++PyObject *
++region_xor (PycairoRegion *o, PyObject *args) {
++ cairo_status_t res;
++ PyObject *other;
++ if (!PyArg_ParseTuple (args, "O:Region.xorg", &other))
++ return NULL;
++
++ if (PyObject_IsInstance(other, (PyObject*)&PycairoRegion_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_xor(o->region,
++ ((PycairoRegion *)other)->region);
++ Py_END_ALLOW_THREADS;
++ } else if (PyObject_IsInstance(other,
++ (PyObject*)&PycairoRectangleInt_Type) == 1) {
++ Py_BEGIN_ALLOW_THREADS;
++ res = cairo_region_xor_rectangle(o->region,
++ &(((PycairoRectangleInt *)other)->rectangle_int));
++ Py_END_ALLOW_THREADS;
++ } else {
++ PyErr_SetString(PyExc_TypeError,
++ "argument must be a Region or a RectangleInt.");
++ return NULL;
++ }
++ RETURN_NULL_IF_CAIRO_ERROR(res);
++ Py_RETURN_NONE;
++}
++
++static PyMethodDef region_methods[] = {
++ /* methods never exposed in a language binding:
++ * cairo_region_destroy()
++ * cairo_region_get_type()
++ * cairo_region_reference()
++ *
++ * cairo_region_status()
++ * - not needed since Pycairo handles status checking
++ *
++ * _(intersect/subtract/union/xor)_rectangle are merged with the region
++ * ones.
++ */
++ {"copy", (PyCFunction)region_copy, METH_NOARGS },
++ {"get_extents", (PyCFunction)region_get_extents, METH_NOARGS },
++ {"num_rectangles", (PyCFunction)region_num_rectangles, METH_NOARGS },
++ {"get_rectangle", (PyCFunction)region_get_rectangle, METH_VARARGS },
++ {"is_empty", (PyCFunction)region_is_empty, METH_NOARGS },
++ {"contains_point", (PyCFunction)region_contains_point, METH_VARARGS },
++ {"contains_rectangle", (PyCFunction)region_contains_rectangle,
++ METH_VARARGS },
++ {"equal", (PyCFunction)region_equal, METH_VARARGS },
++ {"translate", (PyCFunction)region_translate, METH_VARARGS },
++ {"intersect", (PyCFunction)region_intersect, METH_VARARGS },
++ {"subtract", (PyCFunction)region_subtract, METH_VARARGS },
++ {"union", (PyCFunction)region_union, METH_VARARGS },
++ {"xor", (PyCFunction)region_xor, METH_VARARGS },
++ {NULL, NULL, 0, NULL},
++};
++
++PyTypeObject PycairoRegion_Type = {
++ PyVarObject_HEAD_INIT(&PyType_Type, 0)
++ "cairo.Region", /* tp_name */
++ sizeof(PycairoRegion), /* tp_basicsize */
++ 0, /* tp_itemsize */
++ (destructor)region_dealloc, /* tp_dealloc */
++ 0, /* tp_print */
++ 0, /* tp_getattr */
++ 0, /* tp_setattr */
++ 0, /* tp_compare */
++ 0, /* tp_repr */
++ 0, /* tp_as_number */
++ 0, /* tp_as_sequence */
++ 0, /* tp_as_mapping */
++ 0, /* tp_hash */
++ 0, /* tp_call */
++ 0, /* tp_str */
++ 0, /* tp_getattro */
++ 0, /* tp_setattro */
++ 0, /* tp_as_buffer */
++ Py_TPFLAGS_DEFAULT, /* tp_flags */
++ 0, /* tp_doc */
++ 0, /* tp_traverse */
++ 0, /* tp_clear */
++ (richcmpfunc)region_richcompare, /* tp_richcompare */
++ 0, /* tp_weaklistoffset */
++ 0, /* tp_iter */
++ 0, /* tp_iternext */
++ region_methods, /* tp_methods */
++ 0, /* tp_members */
++ 0, /* tp_getset */
++ 0, /* tp_base */
++ 0, /* tp_dict */
++ 0, /* tp_descr_get */
++ 0, /* tp_descr_set */
++ 0, /* tp_dictoffset */
++ 0, /* tp_init */
++ 0, /* tp_alloc */
++ (newfunc)region_new, /* tp_new */
++};
+--- py3cairo-1.10.0+dfsg.orig/src/py3cairo.h
++++ py3cairo-1.10.0+dfsg/src/py3cairo.h
+@@ -67,6 +67,16 @@ typedef struct {
+
+ typedef struct {
+ PyObject_HEAD
++ cairo_rectangle_int_t rectangle_int;
++} PycairoRectangleInt;
++
++typedef struct {
++ PyObject_HEAD
++ cairo_region_t *region;
++} PycairoRegion;
++
++typedef struct {
++ PyObject_HEAD
+ cairo_scaled_font_t *scaled_font;
+ } PycairoScaledFont;
+
+@@ -129,6 +139,14 @@ typedef struct {
+
+ /* misc functions */
+ int (*Check_Status)(cairo_status_t status);
++
++ PyTypeObject *RectangleInt_Type;
++ PyObject *(*RectangleInt_FromRectangleInt)(
++ const cairo_rectangle_int_t *rectangle_int);
++
++ PyTypeObject *Region_Type;
++ PyObject *(*Region_FromRegion)(const cairo_region_t *region);
++
+ } Pycairo_CAPI_t;
+
+
+@@ -156,6 +174,13 @@ typedef struct {
+ #define PycairoRadialGradient_Type *(Pycairo_CAPI->RadialGradient_Type)
+ #define PycairoPattern_FromPattern (Pycairo_CAPI->Pattern_FromPattern)
+
++#define PycairoRectangleInt_Type *(Pycairo_CAPI->RectangleInt_Type)
++#define PycairoRectangleInt_FromRectangleInt \
++ (Pycairo_CAPI->RectangleInt_FromRectangleInt)
++
++#define PycairoRegion_Type *(Pycairo_CAPI->Region_Type)
++#define PycairoRegion_FromRegion (Pycairo_CAPI->Region_FromRegion)
++
+ #define PycairoScaledFont_Type *(Pycairo_CAPI->ScaledFont_Type)
+ #define PycairoScaledFont_FromScaledFont \
+ (Pycairo_CAPI->ScaledFont_FromScaledFont)
+--- py3cairo-1.10.0+dfsg.orig/src/cairomodule.c
++++ py3cairo-1.10.0+dfsg/src/cairomodule.c
+@@ -141,6 +141,12 @@ static Pycairo_CAPI_t CAPI = {
+ PycairoSurface_FromSurface,
+
+ Pycairo_Check_Status,
++
++ &PycairoRectangleInt_Type,
++ PycairoRectangleInt_FromRectangleInt,
++
++ &PycairoRegion_Type,
++ PycairoRegion_FromRegion,
+ };
+
+ static PyObject *
+@@ -230,6 +236,12 @@ PyInit__cairo(void)
+ if (PyType_Ready(&PycairoRadialGradient_Type) < 0)
+ return NULL;
+
++ if (PyType_Ready(&PycairoRectangleInt_Type) < 0)
++ return NULL;
++
++ if (PyType_Ready(&PycairoRegion_Type) < 0)
++ return NULL;
++
+ if (PyType_Ready(&PycairoScaledFont_Type) < 0)
+ return NULL;
+
+@@ -315,6 +327,12 @@ PyInit__cairo(void)
+ PyModule_AddObject(m, "RadialGradient",
+ (PyObject *)&PycairoRadialGradient_Type);
+
++ Py_INCREF(&PycairoRectangleInt_Type);
++ PyModule_AddObject(m, "RectangleInt", (PyObject *)&PycairoRectangleInt_Type);
++
++ Py_INCREF(&PycairoRegion_Type);
++ PyModule_AddObject(m, "Region", (PyObject *)&PycairoRegion_Type);
++
+ Py_INCREF(&PycairoScaledFont_Type);
+ PyModule_AddObject(m, "ScaledFont", (PyObject *)&PycairoScaledFont_Type);
+
+@@ -519,6 +537,10 @@ PyInit__cairo(void)
+ CONSTANT(PS_LEVEL_3);
+ #endif
+
++ CONSTANT(REGION_OVERLAP_IN);
++ CONSTANT(REGION_OVERLAP_OUT);
++ CONSTANT(REGION_OVERLAP_PART);
++
+ CONSTANT(SUBPIXEL_ORDER_DEFAULT);
+ CONSTANT(SUBPIXEL_ORDER_RGB);
+ CONSTANT(SUBPIXEL_ORDER_BGR);
+--- py3cairo-1.10.0+dfsg.orig/src/wscript
++++ py3cairo-1.10.0+dfsg/src/wscript
+@@ -25,6 +25,7 @@ def build(ctx):
+ 'font.c',
+ 'path.c',
+ 'pattern.c',
++ 'region.c',
+ 'matrix.c',
+ 'surface.c',
+ ],
+--- py3cairo-1.10.0+dfsg.orig/src/private.h
++++ py3cairo-1.10.0+dfsg/src/private.h
+@@ -60,6 +60,13 @@ extern PyTypeObject PycairoLinearGradien
+ extern PyTypeObject PycairoRadialGradient_Type;
+ PyObject *PycairoPattern_FromPattern (cairo_pattern_t *pattern,
+ PyObject *base);
++
++extern PyTypeObject PycairoRectangleInt_Type;
++PyObject *PycairoRectangleInt_FromRectangleInt (
++ cairo_rectangle_int_t *rectangle_int);
++
++extern PyTypeObject PycairoRegion_Type;
++PyObject *PycairoRegion_FromRegion (cairo_region_t *region);
+
+ extern PyTypeObject PycairoScaledFont_Type;
+ PyObject *PycairoScaledFont_FromScaledFont (cairo_scaled_font_t *scaled_font);
+@@ -153,6 +160,15 @@ int Pycairo_Check_Status (cairo_status_t
+ if (status != CAIRO_STATUS_SUCCESS) { \
+ Pycairo_Check_Status (status); \
+ return NULL; \
++ } \
++ } while (0)
++
++#define RETURN_NULL_IF_CAIRO_REGION_ERROR(region) \
++ do { \
++ cairo_status_t status = cairo_region_status (region); \
++ if (status != CAIRO_STATUS_SUCCESS) { \
++ Pycairo_Check_Status (status); \
++ return NULL; \
+ } \
+ } while (0)
+
+--- py3cairo-1.10.0+dfsg.orig/test/api_test.py
++++ py3cairo-1.10.0+dfsg/test/api_test.py
+@@ -84,3 +84,65 @@ def test_surface():
+
+ def test_text():
+ pass
++
++
++def test_region():
++ a = cairo.Region()
++ assert a.is_empty() == True
++ assert a.num_rectangles() == 0
++
++ b = cairo.RectangleInt(1, 2, 10, 12)
++ d = cairo.RectangleInt(1, 1, 10, 12)
++ e = cairo.RectangleInt(1, 3, 8, 12)
++ assert (b.x, b.y, b.width, b.height) == (1, 2, 10, 12)
++ c = cairo.Region((b, e))
++ assert not c.is_empty()
++ assert c.num_rectangles() == 2
++ assert c.get_rectangle(1).y == 14
++
++ ex = c.get_extents()
++ assert ex == cairo.RectangleInt(1, 2, 10, 13)
++ assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_PART
++
++ c.translate(10, 20)
++ assert c.contains_rectangle(d) == cairo.REGION_OVERLAP_OUT
++ assert c.get_rectangle(1) == cairo.RectangleInt(11, 34, 8, 1)
++
++ cp = c.copy()
++ assert c.num_rectangles() == cp.num_rectangles()
++ assert c.get_rectangle(0) == cp.get_rectangle(0)
++ assert c == cp
++ assert 3 != c
++ assert c != "test"
++
++ c = cairo.Region((b, e))
++ c.intersect(d)
++ assert c.num_rectangles() == 1
++ assert c.get_rectangle(0) == cairo.RectangleInt(1, 2, 10, 11)
++
++ c = cairo.Region((b, e))
++ c.subtract(d)
++ assert c.num_rectangles() == 2
++ assert c == cairo.Region([
++ cairo.RectangleInt(1, 13, 10, 1), cairo.RectangleInt(1, 14, 8, 1) ])
++
++ d = cairo.Region(d)
++ c = cairo.Region((b, e))
++ c.subtract(d)
++ assert c.num_rectangles() == 2
++ assert c.get_rectangle(0) == cairo.RectangleInt(1, 13, 10, 1)
++
++ c = cairo.Region((b, e))
++ c.union(d)
++ assert c.num_rectangles() == 2
++ assert c == cairo.Region([
++ cairo.RectangleInt(1, 1, 10, 13), cairo.RectangleInt(1, 14, 8, 1) ])
++
++ c = cairo.Region((b, e))
++ c.xor(d)
++ assert c.num_rectangles() == 3
++ assert c == cairo.Region([
++ cairo.RectangleInt(1, 1, 10, 1),
++ cairo.RectangleInt(1, 14, 8, 1),
++ cairo.RectangleInt(1, 13, 10, 1),
++ ])
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch b/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch
new file mode 100644
index 0000000..85d27db
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-10_test-target-py3.patch
@@ -0,0 +1,18 @@
+Description: Use all versions for py.test
+ This patch changes py.test script to use all versions of Python 3 command
+ instead of python.
+Author: Koichi Akabe <vbkaisetsu@gmail.com>
+Last-Update: <2012-04-12>
+
+--- py3cairo-1.10.0+dfsg.orig/test/examples_test.py
++++ py3cairo-1.10.0+dfsg/test/examples_test.py
+@@ -14,7 +14,8 @@ def test_snippets():
+ examples/cairo_snippets/snippets/
+ '''
+ def doSnippets(name):
+- retcode = subprocess.call('python %s -s' % name, shell=True)
++ import sys
++ retcode = subprocess.call('PYTHONPATH=../../test python%d.%d %s -s' % (sys.version_info[0], sys.version_info[1], name), shell=True)
+ assert retcode == 0, 'Error: retcode == {0}'.format(retcode)
+
+ os.chdir(os.path.join(os.path.dirname(__file__), '..', 'examples',
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
new file mode 100644
index 0000000..5356554
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-50_specify-encoding-in-waf.patch
@@ -0,0 +1,32 @@
+Description: specify encoding in waf
+ This patch specifies utf-8 as the encoding in waf library, because python 3.3
+ doesn't fallback to utf-8 on default.
+Author: Matthias Klose <doko@ubuntu.com>
+Origin: http://launchpadlibrarian.net/120606963/py3cairo_1.10.0%2Bdfsg-3~exp2_1.10.0%2Bdfsg-3~exp2ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/691241
+Last-Update: 2012-10-28
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Utils.py
++++ py3cairo-1.10.0+dfsg/waflib/Utils.py
+@@ -77,8 +77,8 @@ except ImportError:
+ return value
+ is_win32=sys.platform=='win32'
+ indicator=is_win32 and'\x1b[A\x1b[K%s%s%s\r'or'\x1b[K%s%s%s\r'
+-def readf(fname,m='r'):
+- f=open(fname,m)
++def readf(fname,m='r',enc=None):
++ f=open(fname,m,encoding=enc)
+ try:
+ txt=f.read()
+ finally:
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/c_preproc.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/c_preproc.py
+@@ -44,7 +44,7 @@ def repl(m):
+ return' '
+ return m.group(3)or''
+ def filter_comments(filename):
+- code=Utils.readf(filename)
++ code=Utils.readf(filename, enc='utf-8')
+ if use_trigraphs:
+ for(a,b)in trig_def:code=code.split(a).join(b)
+ code=re_nl.sub('',code)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch b/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch
new file mode 100644
index 0000000..7ea2efd
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-70_dont-link-libpython.patch
@@ -0,0 +1,29 @@
+Description: don't link libpython
+ This patch removes dependency to libpython
+Author: Matthias Klose <doko@ubuntu.com>
+Origin: http://launchpadlibrarian.net/166876566/py3cairo_1.10.0%2Bdfsg-3build2_1.10.0%2Bdfsg-3ubuntu1.diff.gz
+Bug-Debian: http://bugs.debian.org/739607
+Last-Update: 2014-02-20
+
+--- py3cairo-1.10.0+dfsg.orig/waflib/Tools/python.py
++++ py3cairo-1.10.0+dfsg/waflib/Tools/python.py
+@@ -155,8 +155,10 @@ def check_python_headers(conf):
+ if result:
+ break
+ if result:
+- env['LIBPATH_PYEMBED']=path
+- env.append_value('LIB_PYEMBED',[name])
++ # don't link libpython explicitly
++ #env['LIBPATH_PYEMBED']=path
++ #env.append_value('LIB_PYEMBED',[name])
++ pass
+ else:
+ conf.to_log("\n\n### LIB NOT FOUND\n")
+ if(sys.platform=='win32'or sys.platform.startswith('os2')or sys.platform=='darwin'or dct['Py_ENABLE_SHARED']):
+@@ -278,4 +280,4 @@ feature('pyembed')(init_pyembed)
+ conf(get_python_variables)
+ conf(check_python_headers)
+ conf(check_python_version)
+-conf(check_python_module)
+\ No newline at end of file
++conf(check_python_module)
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
new file mode 100644
index 0000000..3e0cdc3
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-80_fix-pickle.patch
@@ -0,0 +1,30 @@
+Description: During the build process, a Context instance is pickled, or at
+ least attempted to be. This fails because self.node_class is assigned to a
+ class which is nested inside the __init__() method. Because Python cannot
+ find this class at unpickling time (i.e. it cannot be imported), Python
+ refuses to pickle the Context instance, leading to a FTBFS. Since there's no
+ obvious reason why the class has to be so nested, moving it to a module
+ global solves the build failure.
+Author: Barry Warsaw <barry@debian.org>
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=91561
+
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -51,6 +51,8 @@
+ global classes
+ classes.insert(0,cls)
+ ctx=store_context('ctx',(object,),{})
++class node_class(waflib.Node.Node):
++ pass
+ class Context(ctx):
+ errors=Errors
+ tools={}
+@@ -60,8 +62,6 @@
+ except KeyError:
+ global run_dir
+ rd=run_dir
+- class node_class(waflib.Node.Node):
+- pass
+ self.node_class=node_class
+ self.node_class.__module__="waflib.Node"
+ self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
new file mode 100644
index 0000000..3aad325
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.10.0-81_pickling-again.patch
@@ -0,0 +1,37 @@
+Description: Follow up to 80_fix-pickle.patch. Just disable pickling
+ altogether since the previous patch doesn't really fix the problem, and not
+ storing the pickle seems to have no adverse effects on the build, while
+ avoiding the observed traceback.
+Author: Barry Warsaw <barry@debian.org>
+Forwarded: no
+
+--- a/waflib/Build.py
++++ b/waflib/Build.py
+@@ -151,6 +151,7 @@
+ f.close()
+ self.init_dirs()
+ def store(self):
++ return
+ data={}
+ for x in SAVED_ATTRS:
+ data[x]=getattr(self,x)
+--- a/waflib/Context.py
++++ b/waflib/Context.py
+@@ -51,8 +51,6 @@
+ global classes
+ classes.insert(0,cls)
+ ctx=store_context('ctx',(object,),{})
+-class node_class(waflib.Node.Node):
+- pass
+ class Context(ctx):
+ errors=Errors
+ tools={}
+@@ -62,6 +60,8 @@
+ except KeyError:
+ global run_dir
+ rd=run_dir
++ class node_class(waflib.Node.Node):
++ pass
+ self.node_class=node_class
+ self.node_class.__module__="waflib.Node"
+ self.node_class.__name__="Nod3"
diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
new file mode 100644
index 0000000..fb86310
--- /dev/null
+++ b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit eutils python-r1 waf-utils toolchain-funcs
+
+PYCAIRO_PYTHON2_VERSION="${PV}"
+PYCAIRO_PYTHON3_VERSION="${PV}"
+
+DESCRIPTION="Python bindings for the cairo library"
+HOMEPAGE="http://cairographics.org/pycairo/ https://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 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc examples +svg test xcb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Note: xpyb is used as the C header, not Python modules
+RDEPEND="${PYTHON_DEPS}
+ >=x11-libs/cairo-1.10.0[svg?,xcb?]
+ xcb? ( x11-libs/xpyb )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+src_prepare() {
+ pushd "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" > /dev/null || die
+ rm -f src/config.h || die
+ epatch \
+ "${FILESDIR}/${PN}-1.10.0-svg_check.patch" \
+ "${FILESDIR}/${PN}-1.10.0-xpyb.patch" \
+ "${FILESDIR}/${PN}-1.10.0-waf-unpack.patch" \
+ "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch \
+ "${FILESDIR}"/pycairo-1.10.0-101_pycairo-region.patch
+ popd > /dev/null
+
+ pushd "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" > /dev/null || die
+ rm -f src/config.h || die
+ epatch \
+ "${FILESDIR}/py2cairo-1.10.0-svg_check.patch" \
+ "${FILESDIR}/py2cairo-1.10.0-xpyb.patch" \
+ "${FILESDIR}"/py2cairo-1.10.0-ppc-darwin.patch
+ popd > /dev/null
+
+ preparation() {
+ if python_is_python3; then
+ cp -r -l "${WORKDIR}/pycairo-${PYCAIRO_PYTHON3_VERSION}" "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" > /dev/null || die
+ wafdir="$(./waf unpack)"
+ pushd "${wafdir}" > /dev/null || die
+ epatch \
+ "${FILESDIR}/${PN}-1.10.0-waf-py3_4.patch" \
+ "${FILESDIR}"/pycairo-1.10.0-50_specify-encoding-in-waf.patch \
+ "${FILESDIR}"/pycairo-1.10.0-80_fix-pickle.patch \
+ "${FILESDIR}"/pycairo-1.10.0-81_pickling-again.patch
+
+ popd > /dev/null
+ popd > /dev/null
+ else
+ cp -r -l "${WORKDIR}/py2cairo-${PYCAIRO_PYTHON2_VERSION}" "${BUILD_DIR}" || die
+ fi
+ }
+ python_foreach_impl preparation
+}
+
+src_configure() {
+ if ! use svg; then
+ export PYCAIRO_DISABLE_SVG=1
+ fi
+
+ if ! use xcb; then
+ export PYCAIRO_DISABLE_XPYB=1
+ fi
+
+ tc-export PKG_CONFIG
+ # Also export the var with the slightly diff name that waf uses for no good reason.
+ export PKGCONFIG=${PKG_CONFIG}
+
+ # Added by grobian:
+ # If WAF_BINARY is an absolute path, the configure is different and fails to
+ # find Python.h due to a compiler misconfiguration. If WAF_BINARY is just
+ # ./waf or python waf, it works fine. Hooray for reinvented buildsystems
+
+ # floppym:
+ # pycairo and py2cairo bundle different versions of waf (bug 447856)
+ WAF_BINARY="./waf"
+ python_foreach_impl run_in_build_dir waf-utils_src_configure --nopyc --nopyo
+}
+
+src_compile() {
+ python_foreach_impl run_in_build_dir waf-utils_src_compile
+}
+
+src_test() {
+ test_installation() {
+ ./waf install --destdir="${T}/tests/${BUILD_DIR}"
+ PYTHONPATH="${T}/tests/${BUILD_DIR}$(python_get_sitedir)" py.test -v
+ }
+ python_foreach_impl run_in_build_dir test_installation
+}
+
+src_install() {
+ python_foreach_impl run_in_build_dir waf-utils_src_install
+
+ dodoc AUTHORS NEWS README
+
+ if use doc; then
+ pushd doc/_build/html > /dev/null || die
+ dohtml -r [a-z]* _static
+ popd > /dev/null || die
+ fi
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins -r examples/*
+ fi
+
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ # fix install_names; next to waf producing dylibs (not bundles) and
+ # calling them .bundle, it also has no idea what it should do to create
+ # proper ones (dylibs)
+ fix_darwin_install_names() {
+ local x="$(python_get_sitedir)/cairo/_cairo.bundle"
+ install_name_tool -id "${x}" "${ED}${x}"
+ }
+ python_foreach_impl fix_darwin_install_names
+ fi
+}
+
+run_in_build_dir() {
+ pushd "${BUILD_DIR}" > /dev/null || die
+ "$@"
+ popd > /dev/null || die
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/, dev-python/pycairo/files/
@ 2018-11-03 10:15 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2018-11-03 10:15 UTC (permalink / raw
To: gentoo-commits
commit: 4ac4e2c322c93dec2d94fd0c99db4b6217743d41
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 3 10:12:15 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Nov 3 10:14:57 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ac4e2c3
dev-python/pycairo: Fix pkg-config install path
Bug: https://bugs.gentoo.org/664802
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pycairo-1.17.0-pkgconfigdir.patch | 71 ++++++++++++++++++++++
...airo-1.17.0.ebuild => pycairo-1.17.0-r1.ebuild} | 9 +++
2 files changed, 80 insertions(+)
diff --git a/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch
new file mode 100644
index 00000000000..d4d75a172d6
--- /dev/null
+++ b/dev-python/pycairo/files/pycairo-1.17.0-pkgconfigdir.patch
@@ -0,0 +1,71 @@
+From 430c6ffb65cd839be5ba6266a89f645afa8f9442 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 14 Oct 2018 12:30:56 +0200
+Subject: [PATCH] setup.py: Support specifying custom --pkgconfigdir
+
+Support overriding --pkgconfigdir for whenever the autodetection
+gives incorrect result (e.g. PyPy). Fixes #119.
+---
+ setup.py | 21 ++++++++++++++++++---
+ 1 file changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 36641d9..75c8888 100755
+--- a/setup.py
++++ b/setup.py
+@@ -14,6 +14,7 @@ except ImportError:
+ from distutils.core import Extension, Command, Distribution
+ from distutils.ccompiler import new_compiler
+ from distutils.sysconfig import customize_compiler
++from distutils.util import change_root
+ from distutils import log
+ from distutils import sysconfig
+
+@@ -265,11 +266,15 @@ class test_cmd(Command):
+
+ class install_pkgconfig(Command):
+ description = "install .pc file"
+- user_options = []
++ user_options = [
++ ('pkgconfigdir=', None, 'pkg-config file install directory'),
++ ]
+
+ def initialize_options(self):
++ self.root = None
+ self.install_base = None
+ self.install_data = None
++ self.pkgconfigdir = None
+ self.compiler_type = None
+ self.outfiles = []
+
+@@ -280,6 +285,11 @@ class install_pkgconfig(Command):
+ ('install_data', 'install_data'),
+ )
+
++ self.set_undefined_options(
++ 'install',
++ ('root', 'root'),
++ )
++
+ self.set_undefined_options(
+ 'build_ext',
+ ('compiler_type', 'compiler_type'),
+@@ -315,8 +325,13 @@ class install_pkgconfig(Command):
+ "Skipping install_pkgconfig, not supported with MSVC")
+ return
+
+- python_lib = sysconfig.get_python_lib(True, True, self.install_data)
+- pkgconfig_dir = os.path.join(os.path.dirname(python_lib), 'pkgconfig')
++ if self.pkgconfigdir is None:
++ python_lib = sysconfig.get_python_lib(True, True,
++ self.install_data)
++ pkgconfig_dir = os.path.join(os.path.dirname(python_lib),
++ 'pkgconfig')
++ else:
++ pkgconfig_dir = change_root(self.root, self.pkgconfigdir)
+ self.mkpath(pkgconfig_dir)
+
+ pcname = "py3cairo.pc" if sys.version_info[0] == 3 else "pycairo.pc"
+--
+2.19.1
+
diff --git a/dev-python/pycairo/pycairo-1.17.0.ebuild b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
similarity index 85%
rename from dev-python/pycairo/pycairo-1.17.0.ebuild
rename to dev-python/pycairo/pycairo-1.17.0-r1.ebuild
index 65751904ec1..44271087768 100644
--- a/dev-python/pycairo/pycairo-1.17.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.17.0-r1.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
)
"
+PATCHES=(
+ "${FILESDIR}"/pycairo-1.17.0-pkgconfigdir.patch
+)
+
python_compile_all() {
use doc && emake -C docs
}
@@ -36,6 +40,11 @@ python_test() {
esetup.py test
}
+python_install() {
+ distutils-r1_python_install \
+ install_pkgconfig --pkgconfigdir="/usr/$(get_libdir)/pkgconfig"
+}
+
python_install_all() {
use doc && local HTML_DOCS=( docs/_build/. )
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/, dev-python/pycairo/files/
@ 2023-08-05 6:18 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-08-05 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 016e6cbe2a88cbf71a17df970c1b46ad97c79b65
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 06:08:49 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 06:08:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016e6cbe
dev-python/pycairo: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pycairo/Manifest | 1 -
.../pycairo/files/pycairo-1.23.0-fix-sphinx.patch | 28 ----------
dev-python/pycairo/pycairo-1.23.0.ebuild | 65 ----------------------
3 files changed, 94 deletions(-)
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 1a63b4186149..7d7dc567ee93 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,2 +1 @@
-DIST pycairo-1.23.0.tar.gz 344623 BLAKE2B e0551e2d4259d509f3165682b11852f28f0df93e6befcd398ef95bc5f0eed0818dc72a05a9b085148d4369e9b3283bc4d91ce032c6c88a3b15962c83eb03db57 SHA512 fc0cc878cc716a6a2baf89a193facfcd89970c884afd3bb9d7fbecf42894ddd191988a8f0fe79100786509f17fbe4f1990eca33a5299414b2df2539d66de5abf
DIST pycairo-1.24.0.tar.gz 344850 BLAKE2B f1469254ccfcb96ee5e39af49fcae575717e2f0e9a3dc74a13408306b5c94f4557a9c6d6a448541cb1f6dd27781e484b37d5ea9f230dc87f9d3370fac31dfdba SHA512 bbc160bc9c3c9365018c680f6a69347bc222cdaec10ea48d18aedd0341048df74973d3299d783662adf02b414874824660da10943d88f64c30451d3fdccc63fb
diff --git a/dev-python/pycairo/files/pycairo-1.23.0-fix-sphinx.patch b/dev-python/pycairo/files/pycairo-1.23.0-fix-sphinx.patch
deleted file mode 100644
index a86dd935e482..000000000000
--- a/dev-python/pycairo/files/pycairo-1.23.0-fix-sphinx.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/890411
-https://github.com/pygobject/pycairo/pull/318
-
-From 9e78bd1acbaef6659dbe3076934ed779eac27a96 Mon Sep 17 00:00:00 2001
-From: Chris Mayo <aklhfex@gmail.com>
-Date: Sun, 23 Apr 2023 19:44:26 +0100
-Subject: [PATCH] docs: Fix build failure due to extlinks with Sphinx 6
-
-extlinks caption must be None or contain one %s.
-
-Compatible with Sphinx >= 4.0.
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -48,10 +48,10 @@ def exec_module(path):
- ]
-
- extlinks = {
-- 'fdobug': ('https://bugs.freedesktop.org/show_bug.cgi?id=%s', '#fdo-'),
-- 'bug': ('https://github.com/pygobject/pycairo/issues/%s', '#'),
-- 'pr': ('https://github.com/pygobject/pycairo/pull/%s', '#pr-'),
-- 'user': ('https://github.com/%s', ''),
-+ 'fdobug': ('https://bugs.freedesktop.org/show_bug.cgi?id=%s', '#fdo-%s'),
-+ 'bug': ('https://github.com/pygobject/pycairo/issues/%s', '#%s'),
-+ 'pr': ('https://github.com/pygobject/pycairo/pull/%s', '#pr-%s'),
-+ 'user': ('https://github.com/%s', '%s'),
- }
- suppress_warnings = ["image.nonlocal_uri"]
-
diff --git a/dev-python/pycairo/pycairo-1.23.0.ebuild b/dev-python/pycairo/pycairo-1.23.0.ebuild
deleted file mode 100644
index 365a807bab8c..000000000000
--- a/dev-python/pycairo/pycairo-1.23.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
- https://www.cairographics.org/pycairo/
- https://github.com/pygobject/pycairo/
- https://pypi.org/project/pycairo/
-"
-SRC_URI="
- https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- >=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.23.0-fix-sphinx.patch
-)
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
- esetup.py build_tests
- epytest
-}
-
-python_install() {
- distutils-r1_python_install \
- install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/, dev-python/pycairo/files/
@ 2023-11-29 8:48 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2023-11-29 8:48 UTC (permalink / raw
To: gentoo-commits
commit: 7ea6ed882e442b212b20b0ae62c73935dd719682
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 29 08:44:49 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 29 08:44:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea6ed88
dev-python/pycairo: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pycairo/Manifest | 2 -
dev-python/pycairo/files/pycairo-1.25.0-init.patch | 43 ------------
dev-python/pycairo/pycairo-1.24.0.ebuild | 61 -----------------
dev-python/pycairo/pycairo-1.25.0.ebuild | 77 ----------------------
4 files changed, 183 deletions(-)
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 0ad1ac076892..7ef49d2916a7 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1 @@
-DIST pycairo-1.24.0.tar.gz 344850 BLAKE2B f1469254ccfcb96ee5e39af49fcae575717e2f0e9a3dc74a13408306b5c94f4557a9c6d6a448541cb1f6dd27781e484b37d5ea9f230dc87f9d3370fac31dfdba SHA512 bbc160bc9c3c9365018c680f6a69347bc222cdaec10ea48d18aedd0341048df74973d3299d783662adf02b414874824660da10943d88f64c30451d3fdccc63fb
-DIST pycairo-1.25.0.tar.gz 347794 BLAKE2B d05c1f505059c181d176b533ff4753e90888189160b1904531da4d9e9b784976442acb8c848be48d23e04f1fd07fef88a05b374c833ecee1c0b0e2881dadd4d0 SHA512 f34df509d36fbc739e8ddb40e2ead473db6970eacb7a2b0ccad8b82fd41a5daa25c89a5d34e7f2b2b70c4bf74e4e9d87465414aa414280e0aa7a4787b05712da
DIST pycairo-1.25.1.tar.gz 347088 BLAKE2B ba4eedaf47e514bd7c3ad5ea738d099428958988a708255f59df48372d112d0195fe746be03de56aa25ccce9c2366b8898fcdd568b427372d0340c5edd550a5c SHA512 f2b93a09cbe9cd7c2885794ff58a48df6cf59fbe2dbeabf7c6e9d99e68c71ac220abc866ac0d756c7ffb3f821ef63b65dbb8963f0bf7d5bd21ee0efb800e7b23
diff --git a/dev-python/pycairo/files/pycairo-1.25.0-init.patch b/dev-python/pycairo/files/pycairo-1.25.0-init.patch
deleted file mode 100644
index cc670618a261..000000000000
--- a/dev-python/pycairo/files/pycairo-1.25.0-init.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1ef1ea2f0ba3854309114a2395734c34a1e158d8 Mon Sep 17 00:00:00 2001
-From: Tycho Andersen <tycho@tycho.pizza>
-Date: Mon, 16 Oct 2023 20:01:52 -0600
-Subject: [PATCH] module: reorder cairo script surface initialization
-
-PyType_Ready() expects subclasses to be initialized after base classes.
-Since ScriptSurface inherits from Surface, Surface must be initialized
-first.
-
-This causes a segfault in pypy3.10, and the fix was suggested here:
-
-https://foss.heptapod.net/pypy/pypy/-/issues/4017#note_332375
-
-This fixes the seg fault for me.
-
-Signed-off-by: Tycho Andersen <tycho@tycho.pizza>
----
- cairo/cairomodule.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/cairo/cairomodule.c b/cairo/cairomodule.c
-index 0026a0e..f27330f 100644
---- a/cairo/cairomodule.c
-+++ b/cairo/cairomodule.c
-@@ -210,6 +210,9 @@ PYCAIRO_MODINIT_FUNC PyInit__cairo(void)
- if (PyType_Ready(&PycairoTextExtents_Type) < 0)
- return NULL;
-
-+ if (PyType_Ready(&PycairoSurface_Type) < 0)
-+ return NULL;
-+
- #ifdef CAIRO_HAS_SCRIPT_SURFACE
- if (PyType_Ready(&PycairoScriptDevice_Type) < 0)
- return NULL;
-@@ -223,8 +226,6 @@ PYCAIRO_MODINIT_FUNC PyInit__cairo(void)
- if (PyType_Ready(&PycairoScaledFont_Type) < 0)
- return NULL;
-
-- if (PyType_Ready(&PycairoSurface_Type) < 0)
-- return NULL;
- #ifdef CAIRO_HAS_IMAGE_SURFACE
- if (PyType_Ready(&PycairoImageSurface_Type) < 0)
- return NULL;
diff --git a/dev-python/pycairo/pycairo-1.24.0.ebuild b/dev-python/pycairo/pycairo-1.24.0.ebuild
deleted file mode 100644
index e700120bce9f..000000000000
--- a/dev-python/pycairo/pycairo-1.24.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
- https://www.cairographics.org/pycairo/
- https://github.com/pygobject/pycairo/
- https://pypi.org/project/pycairo/
-"
-SRC_URI="
- https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- >=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
- esetup.py build_tests
- epytest
-}
-
-python_install() {
- distutils-r1_python_install \
- install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pycairo/pycairo-1.25.0.ebuild b/dev-python/pycairo/pycairo-1.25.0.ebuild
deleted file mode 100644
index 566314d24f35..000000000000
--- a/dev-python/pycairo/pycairo-1.25.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
- https://www.cairographics.org/pycairo/
- https://github.com/pygobject/pycairo/
- https://pypi.org/project/pycairo/
-"
-SRC_URI="
- https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- >=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}/${P}-init.patch"
-)
-
-python_test() {
- esetup.py build_tests
- epytest
-}
-
-python_install() {
- distutils-r1_python_install
-
- # we need to pass --root via install command, sigh
- cat > "${T}/distutils-extra.cfg" <<-EOF || die
- [install]
- root = ${D}
- EOF
- local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
- esetup.py \
- install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-
- insinto /usr/include/pycairo
- newins cairo/pycairo.h py3cairo.h
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/, dev-python/pycairo/files/
@ 2024-09-22 2:23 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2024-09-22 2:23 UTC (permalink / raw
To: gentoo-commits
commit: 8987b5de9b363ee960da1287ed2fcf27c6b7185e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 22 01:36:54 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 02:22:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8987b5de
dev-python/pycairo: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pycairo/Manifest | 1 -
.../pycairo/files/pycairo-1.26.0-py313.patch | 30 ---------
dev-python/pycairo/pycairo-1.26.0-r1.ebuild | 77 ----------------------
dev-python/pycairo/pycairo-1.26.0.ebuild | 73 --------------------
4 files changed, 181 deletions(-)
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index c95b04ce7722..2e260fbdef52 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,2 @@
-DIST pycairo-1.26.0.tar.gz 346850 BLAKE2B da6c35c929d372764280e8963a8b66ba533ccb99be9ee2bfa10859c635dd16cc087d542607be9ec6a9ffb942feb892100d4b9017d832d478b35c434aa05b9bb9 SHA512 5313f0d408a6e6ce6e70ac92291be5dd8651e01fbf9411d0467061afa21849cde27db273f2a13b4c3c931183f63f75f31fc0f0d3283b8f339ba88e71eab432f1
DIST pycairo-1.26.1.tar.gz 346882 BLAKE2B 52e92b3b7e6ffda89a01b293f0bc6c5da5018ba77dce92d30b221fbf1f8c1b253f5ae279d64a517810b6efe4d7d282c21dbc15e5ef8e372204095c773b12de52 SHA512 4f63fc4fb2b6bf65d8a1cbbeaf4d982c5eb2271309763522ee6f763f691428b3e420434382e8a3e1d6b841821940f44f4bc6f51724eb4474494d60b7ff1c9031
DIST pycairo-1.27.0.tar.gz 661450 BLAKE2B cc1ef54057d02f3e25fed010c995e4fe400ccdf3a5d2f241c029ded167c5db2560a4d9c8cb09b2f0519e674b5962f2244f0570401f45743fe1ec61d5a8982227 SHA512 1b077917b1d99262da1c1d2ff85ae841dd0ff715925a5a20032162aa876576d966fc6b30c154343cc45f104cce243887de9b5f14af1e15775cb71b6c11e553a6
diff --git a/dev-python/pycairo/files/pycairo-1.26.0-py313.patch b/dev-python/pycairo/files/pycairo-1.26.0-py313.patch
deleted file mode 100644
index c3c0d74cb415..000000000000
--- a/dev-python/pycairo/files/pycairo-1.26.0-py313.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://github.com/pygobject/pycairo/pull/366
-
-From 387e27fa36d29bc8f656656ca8b47e7b4996f4f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 29 May 2024 21:25:41 +0200
-Subject: [PATCH] Avoid invalid PyBUF_READ flag in PyObject_GetBuffer()
-
-Since Python 3.13, the flag is no longer allowed.
-
-See https://github.com/python/cpython/pull/114707
-
-Fixes https://github.com/pygobject/pycairo/issues/365
----
- cairo/surface.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cairo/surface.c b/cairo/surface.c
-index 048522c6..f00db8b5 100644
---- a/cairo/surface.c
-+++ b/cairo/surface.c
-@@ -484,7 +484,7 @@ surface_set_mime_data (PycairoSurface *o, PyObject *args) {
- return NULL;
- }
-
-- res = PyObject_GetBuffer (obj, view, PyBUF_READ);
-+ res = PyObject_GetBuffer (obj, view, PyBUF_SIMPLE);
- if (res == -1) {
- PyMem_Free (view);
- return NULL;
-
diff --git a/dev-python/pycairo/pycairo-1.26.0-r1.ebuild b/dev-python/pycairo/pycairo-1.26.0-r1.ebuild
deleted file mode 100644
index 7d4b7ca4d23c..000000000000
--- a/dev-python/pycairo/pycairo-1.26.0-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..13} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
- https://www.cairographics.org/pycairo/
- https://github.com/pygobject/pycairo/
- https://pypi.org/project/pycairo/
-"
-SRC_URI="
- https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- >=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-PATCHES=(
- "${FILESDIR}"/pycairo-1.26.0-py313.patch
-)
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
- esetup.py build_tests
- epytest
-}
-
-python_install() {
- distutils-r1_python_install
-
- # we need to pass --root via install command, sigh
- cat > "${T}/distutils-extra.cfg" <<-EOF || die
- [install]
- root = ${D}
- EOF
- local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
- esetup.py \
- install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-
- insinto /usr/include/pycairo
- doins cairo/py3cairo.h
-}
diff --git a/dev-python/pycairo/pycairo-1.26.0.ebuild b/dev-python/pycairo/pycairo-1.26.0.ebuild
deleted file mode 100644
index ae9149350540..000000000000
--- a/dev-python/pycairo/pycairo-1.26.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_EXT=1
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="
- https://www.cairographics.org/pycairo/
- https://github.com/pygobject/pycairo/
- https://pypi.org/project/pycairo/
-"
-SRC_URI="
- https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
-"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples"
-
-BDEPEND="
- virtual/pkgconfig
- test? (
- dev-python/hypothesis[${PYTHON_USEDEP}]
- )
-"
-RDEPEND="
- >=x11-libs/cairo-1.15.10[svg(+)]
-"
-DEPEND="
- ${RDEPEND}
- x11-base/xorg-proto
-"
-
-distutils_enable_sphinx docs \
- dev-python/sphinx-rtd-theme
-distutils_enable_tests pytest
-
-python_test() {
- esetup.py build_tests
- epytest
-}
-
-python_install() {
- distutils-r1_python_install
-
- # we need to pass --root via install command, sigh
- cat > "${T}/distutils-extra.cfg" <<-EOF || die
- [install]
- root = ${D}
- EOF
- local -x DIST_EXTRA_CONFIG=${T}/distutils-extra.cfg
- esetup.py \
- install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
- if use examples; then
- dodoc -r examples
- fi
-
- distutils-r1_python_install_all
-
- insinto /usr/include/pycairo
- doins cairo/py3cairo.h
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-09-22 2:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-19 16:29 [gentoo-commits] repo/gentoo:master commit in: dev-python/pycairo/, dev-python/pycairo/files/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2018-11-03 10:15 Michał Górny
2023-08-05 6:18 Michał Górny
2023-11-29 8:48 Michał Górny
2024-09-22 2:23 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox