From 9452fa18bd4924d64e07424c6f00873f42974e12 Mon Sep 17 00:00:00 2001 From: dongyuzhen Date: Sat, 8 Jan 2022 12:13:09 +0800 Subject: [PATCH] fixes for python 3.9 --- backport-fixes-for-python-3.9.patch | 42 +++++++++++++++++++++++++++++ xcb-proto.spec | 11 +++++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 backport-fixes-for-python-3.9.patch diff --git a/backport-fixes-for-python-3.9.patch b/backport-fixes-for-python-3.9.patch new file mode 100644 index 0000000..6bbaeff --- /dev/null +++ b/backport-fixes-for-python-3.9.patch @@ -0,0 +1,42 @@ +From 426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= +Date: Mon, 1 Jun 2020 12:24:16 +0200 +Subject: [PATCH] xcbgen: Use math.gcd() for Python >= 3.5. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +fractions.gcd() has been deprecated since Python 3.5, and +was finally dropped in Python 3.9. It is recommended to +use math.gcd() instead. + +Signed-off-by: Bj枚rn Esser + +Conflict:NA +Reference:https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/commit/426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 + +--- + xcbgen/align.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xcbgen/align.py b/xcbgen/align.py +index d4c12ee..5c4f517 100644 +--- a/xcbgen/align.py ++++ b/xcbgen/align.py +@@ -2,7 +2,12 @@ + This module contains helper classes for alignment arithmetic and checks + ''' + +-from fractions import gcd ++from sys import version_info ++ ++if version_info[:2] >= (3, 5): ++ from math import gcd ++else: ++ from fractions import gcd + + class Alignment(object): + +-- +GitLab + diff --git a/xcb-proto.spec b/xcb-proto.spec index 06d999f..617e670 100644 --- a/xcb-proto.spec +++ b/xcb-proto.spec @@ -1,11 +1,14 @@ %define debug_package %{nil} Name: xcb-proto Version: 1.14 -Release: 1 +Release: 2 Summary: XCB protocol descriptions License: MIT URL: https://xcb.freedesktop.org/ Source0: https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.gz + +Patch6000: backport-fixes-for-python-3.9.patch + BuildArch: noarch BuildRequires: python3-devel @@ -36,6 +39,12 @@ export PYTHON="python3" %{python3_sitelib}/xcbgen %changelog +* Sat Jan 08 2022 dongyuzhen - 1.14-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fixes for python 3.9 + * Mon Jul 27 2020 chxssg - 1.14-1 - update package to 1.14 -- Gitee