From ad73b1fc65adb4726f127affc88ced7731d0be71 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sep 16 2021 12:45:21 +0000 Subject: Update to 41.0 --- diff --git a/.gitignore b/.gitignore index 1ecbc1d..47fc671 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/0001-Fix-compatibility-with-Python-3.10.patch b/0001-Fix-compatibility-with-Python-3.10.patch deleted file mode 100644 index 6c47bc7..0000000 --- a/0001-Fix-compatibility-with-Python-3.10.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5ae6ba625b5262780f3d4fea3da363af7a0b01cb Mon Sep 17 00:00:00 2001 -From: Kalev Lember -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 - diff --git a/orca.spec b/orca.spec index f9c3bbb..9b83e95 100644 --- a/orca.spec +++ b/orca.spec @@ -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 - 41.0-1 +- Update to 41.0 + * Fri Sep 10 2021 Kalev Lember - 41~rc-2 - Fix compatibility with Python 3.10 (#1973397) diff --git a/sources b/sources index d848d27..03bcec1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orca-41.rc.tar.xz) = 56873a904f508b606d2e7ab4c50f4b4e61cf2152d6db0ea51c764d47b2b0b4f4ef9cf22f05e371dae8eb3ce7168490c06be9478a23d522c2fc7b53c49269e3c0 +SHA512 (orca-41.0.tar.xz) = abc085a5f48f3ec80baeafc4acb5aab0b413d76bfd536c59ad6db7b003250a51c2921989963393d96010ef773a3f75d90cf87cb5906547904901ad1a53750eef