!1 update to 1.18.2

Merge pull request !1 from yanan-rock/test_ci
This commit is contained in:
openeuler-ci-bot 2020-01-08 11:43:34 +08:00 committed by Gitee
commit fa74911ec3
4 changed files with 5 additions and 29 deletions

View File

@ -1,26 +0,0 @@
From 71c81741495cdce132b6f45a0f596d70909c1e4d Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 15 Jun 2019 16:07:00 +0200
Subject: [PATCH] enum: explicitely set enum.__str__
Python 3.8 has removed the int.__str__ implementation. So we don't fall
back to object.__str__ and thus enum.__repr__ set __str__ to int.__repr__
instead. This gives us the same behaviour with all python versions.
See https://github.com/python/cpython/commit/96aeaec64738b730
---
cairo/enums.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/cairo/enums.c b/cairo/enums.c
index 08fbaf3..4273232 100644
--- a/cairo/enums.c
+++ b/cairo/enums.c
@@ -257,6 +257,7 @@ init_enums (PyObject *module) {
PyObject *ev;
Pycairo_IntEnum_Type.tp_repr = (reprfunc)int_enum_repr;
+ Pycairo_IntEnum_Type.tp_str = PYCAIRO_PyLong_Type.tp_repr;
Pycairo_IntEnum_Type.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE;
Pycairo_IntEnum_Type.tp_methods = int_enum_methods;
Pycairo_IntEnum_Type.tp_base = &PYCAIRO_PyLong_Type;

Binary file not shown.

BIN
pycairo-1.18.2.tar.gz Normal file

Binary file not shown.

View File

@ -1,11 +1,10 @@
Name: pycairo
Version: 1.18.1
Release: 2
Version: 1.18.2
Release: 1
Summary: A python module providing bindings for the cairo graphics library
License: MPLv1.1 or LGPLv2
URL: https://cairographics.org/pycairo
Source0: https://github.com/pygobject/pycairo/releases/download/v%{version}/pycairo-%{version}.tar.gz
Patch0: 71c81741495cdce132b6f45a0f596d70909c1e4d.patch
BuildRequires: cairo-devel gcc pkgconfig python2-devel python2-pytest python3-devel python3-pytest
@ -86,6 +85,9 @@ in order to interoperate with py3cairo.
%{_libdir}/pkgconfig/py*.pc
%changelog
* Wed Jan 8 2020 openEuler Buildteam <buildteam@openeuler.org> - 1.18.2-1
- update to 1.18.2
* Mon Oct 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.18.1-2
- Type:enhancement
- Id:NA