Update to 41.0

This commit is contained in:
Kalev Lember 2021-09-16 14:45:21 +02:00
parent 46994c2e00
commit ad73b1fc65
4 changed files with 7 additions and 37 deletions

1
.gitignore vendored
View File

@ -149,3 +149,4 @@ orca-2.31.6.tar.bz2
/orca-41.alpha.tar.xz
/orca-41.beta.tar.xz
/orca-41.rc.tar.xz
/orca-41.0.tar.xz

View File

@ -1,31 +0,0 @@
From 5ae6ba625b5262780f3d4fea3da363af7a0b01cb Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Fri, 10 Sep 2021 10:12:23 +0200
Subject: [PATCH] Fix compatibility with Python 3.10
Python 3.10 removed aliases to Collections Abstract Base Classes that
were deprecated in Python 3.3.
Fix this by just using collections.abc directly without using the alias.
https://docs.python.org/3.10/whatsnew/changelog.html#python-3-10-0-alpha-5
---
src/orca/generator.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/orca/generator.py b/src/orca/generator.py
index e98970992..e9a9d89de 100644
--- a/src/orca/generator.py
+++ b/src/orca/generator.py
@@ -78,7 +78,7 @@ class Generator:
self._activeProgressBars = {}
self._methodsDict = {}
for method in \
- [z for z in [getattr(self, y).__get__(self, self.__class__) for y in [x for x in dir(self) if x.startswith(METHOD_PREFIX)]] if isinstance(z, collections.Callable)]:
+ [z for z in [getattr(self, y).__get__(self, self.__class__) for y in [x for x in dir(self) if x.startswith(METHOD_PREFIX)]] if isinstance(z, collections.abc.Callable)]:
name = method.__name__[len(METHOD_PREFIX):]
name = name[0].lower() + name[1:]
self._methodsDict[name] = method
--
2.31.1

View File

@ -1,17 +1,14 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: orca
Version: 41~rc
Release: 2%{?dist}
Version: 41.0
Release: 1%{?dist}
Summary: Assistive technology for people with visual impairments
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/Orca
Source0: https://download.gnome.org/sources/%{name}/41/%{name}-%{tarball_version}.tar.xz
# Backported from https://gitlab.gnome.org/GNOME/orca/-/merge_requests/118
Patch0: 0001-Fix-compatibility-with-Python-3.10.patch
BuildArch: noarch
BuildRequires: pkgconfig(atk-bridge-2.0)
@ -79,6 +76,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.de
%changelog
* Thu Sep 16 2021 Kalev Lember <klember@redhat.com> - 41.0-1
- Update to 41.0
* Fri Sep 10 2021 Kalev Lember <klember@redhat.com> - 41~rc-2
- Fix compatibility with Python 3.10 (#1973397)

View File

@ -1 +1 @@
SHA512 (orca-41.rc.tar.xz) = 56873a904f508b606d2e7ab4c50f4b4e61cf2152d6db0ea51c764d47b2b0b4f4ef9cf22f05e371dae8eb3ce7168490c06be9478a23d522c2fc7b53c49269e3c0
SHA512 (orca-41.0.tar.xz) = abc085a5f48f3ec80baeafc4acb5aab0b413d76bfd536c59ad6db7b003250a51c2921989963393d96010ef773a3f75d90cf87cb5906547904901ad1a53750eef