diff --git a/.gitignore b/.gitignore index 47fc671..bf2810a 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,4 @@ orca-2.31.6.tar.bz2 /orca-41.beta.tar.xz /orca-41.rc.tar.xz /orca-41.0.tar.xz +/orca-41.1.tar.xz diff --git a/121.patch b/121.patch deleted file mode 100644 index 2cfa66e..0000000 --- a/121.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cea2bebdbd9fd69561945d191d9d44beeef655cc Mon Sep 17 00:00:00 2001 -From: Valentin Villenave -Date: Mon, 15 Nov 2021 14:45:02 +0100 -Subject: [PATCH] modify collections module import for Python3.10 compatibility - ---- - src/orca/generator.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/orca/generator.py b/src/orca/generator.py -index 2058a436d..a7ff8f856 100644 ---- a/src/orca/generator.py -+++ b/src/orca/generator.py -@@ -27,7 +27,6 @@ __copyright__ = "Copyright (c) 2009 Sun Microsystems Inc." \ - "Copyright (c) 2015-2016 Igalia, S.L." - __license__ = "LGPL" - --import collections - import pyatspi - import sys - import time -@@ -41,6 +40,12 @@ from . import object_properties - from . import settings - from . import settings_manager - -+# Python 3.10 compatibility: -+try: -+ import collections.abc as collections_abc -+except ImportError: -+ import collections as collections_abc -+ - def _formatExceptionInfo(maxTBlevel=5): - cla, exc, trbk = sys.exc_info() - excName = cla.__name__ -@@ -78,7 +83,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.abc.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 --- -GitLab - diff --git a/orca.spec b/orca.spec index 1bc95a7..d8a74a2 100644 --- a/orca.spec +++ b/orca.spec @@ -1,18 +1,14 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: orca -Version: 41.0 -Release: 2%{?dist} +Version: 41.1 +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 upstream -# https://gitlab.gnome.org/GNOME/orca/-/merge_requests/121 -Patch0: 121.patch - BuildArch: noarch BuildRequires: pkgconfig(atk-bridge-2.0) @@ -80,6 +76,9 @@ desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/orca-autostart.de %changelog +* Tue Dec 07 2021 Kalev Lember - 41.1-1 +- Update to 41.1 + * Tue Nov 16 2021 Kalev Lember - 41.0-2 - Backport another fix for compatibility with Python 3.10 (#2023682) diff --git a/sources b/sources index 03bcec1..78a9353 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (orca-41.0.tar.xz) = abc085a5f48f3ec80baeafc4acb5aab0b413d76bfd536c59ad6db7b003250a51c2921989963393d96010ef773a3f75d90cf87cb5906547904901ad1a53750eef +SHA512 (orca-41.1.tar.xz) = 4f6534025d70231b6c43cfe1f6d8d5c8f33b4727a0bc83417e65c564364a63a64d44d61be2786166814dbd7b1b7bad38f69b008ce119ca45b0fc9be0f512549b