Update to 1.18.2

This commit is contained in:
Kalev Lember 2019-10-24 23:45:33 +02:00
parent 1c419b2ca9
commit 0b07efa13b
4 changed files with 7 additions and 32 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@ pycairo-1.8.8.tar.gz
/pycairo-1.17.1.tar.gz
/pycairo-1.18.0.tar.gz
/pycairo-1.18.1.tar.gz
/pycairo-1.18.2.tar.gz

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;

View File

@ -1,15 +1,12 @@
Name: pycairo
Version: 1.18.1
Release: 4%{?dist}
Version: 1.18.2
Release: 1%{?dist}
Summary: Python bindings for the cairo library
License: MPLv1.1 or LGPLv2
URL: http://cairographics.org/pycairo
Source0: https://github.com/pygobject/pycairo/releases/download/v%{version}/pycairo-%{version}.tar.gz
# Python 3.8 support
Patch0: https://github.com/pygobject/pycairo/commit/71c81741495cdce132b6f45a0f596d70909c1e4d.patch
BuildRequires: cairo-devel
BuildRequires: gcc
BuildRequires: pkgconfig
@ -97,6 +94,9 @@ libraries so that they interoperate with py3cairo.
%{_libdir}/pkgconfig/py3cairo.pc
%changelog
* Thu Oct 24 2019 Kalev Lember <klember@redhat.com> - 1.18.2-1
- Update to 1.18.2
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 1.18.1-4
- Rebuilt for Python 3.8.0rc1 (#1748018)

View File

@ -1 +1 @@
SHA512 (pycairo-1.18.1.tar.gz) = fef6b0d863d45a182a1ba671ddc4f6cb15745447cdaed3e1efeb05fad97f02aa0a56698517648a942bde263d74e06ad7781bcf487757aeb3b124ef64dc525024
SHA512 (pycairo-1.18.2.tar.gz) = 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0