!7 [sync] PR-5: upgrade to xcb-proto-1.15
From: @openeuler-sync-bot Reviewed-by: @caodongxia Signed-off-by: @caodongxia
This commit is contained in:
commit
6ac19e3ad3
@ -1,42 +0,0 @@
|
||||
From 426ae35bee1fa0fdb8b5120b1dcd20cee6e34512 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
|
||||
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 <besser82@fedoraproject.org>
|
||||
|
||||
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
|
||||
|
||||
Binary file not shown.
BIN
xcb-proto-1.15.tar.gz
Normal file
BIN
xcb-proto-1.15.tar.gz
Normal file
Binary file not shown.
@ -1,14 +1,12 @@
|
||||
%define debug_package %{nil}
|
||||
Name: xcb-proto
|
||||
Version: 1.14
|
||||
Release: 2
|
||||
Version: 1.15
|
||||
Release: 1
|
||||
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
|
||||
@ -23,7 +21,6 @@ to the protocol, improved threading support, and extensibility.
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
|
||||
%build
|
||||
export PYTHON="python3"
|
||||
%configure --libdir=%{_datadir}
|
||||
%make_build
|
||||
|
||||
@ -39,6 +36,9 @@ export PYTHON="python3"
|
||||
%{python3_sitelib}/xcbgen
|
||||
|
||||
%changelog
|
||||
* Thu Oct 27 2022 wangkerong <wangkerong@h-partners.com> - 1.15-1
|
||||
- upgrade to 1.15
|
||||
|
||||
* Sat Jan 08 2022 dongyuzhen <dongyuzhen@huawei.com> - 1.14-2
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user