From b41d0787252afa3b89b181e039c884c629f76b97 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 18 Sep 2021 22:41:09 +0200 Subject: [PATCH] orca: update to 41.1. --- srcpkgs/orca/patches/python3.10.patch | 31 --------------------------- srcpkgs/orca/template | 6 +++--- 2 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/orca/patches/python3.10.patch diff --git a/srcpkgs/orca/patches/python3.10.patch b/srcpkgs/orca/patches/python3.10.patch deleted file mode 100644 index 53565ec4fa..0000000000 --- a/srcpkgs/orca/patches/python3.10.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 41b7a370addd507d6583c135c8ac99c7c06076e5 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 --- -GitLab - diff --git a/srcpkgs/orca/template b/srcpkgs/orca/template index 6199c40332..2980092559 100644 --- a/srcpkgs/orca/template +++ b/srcpkgs/orca/template @@ -1,7 +1,7 @@ # Template file for 'orca' pkgname=orca -version=40.0 -revision=4 +version=41.1 +revision=1 build_style=gnu-configure hostmakedepends="intltool itstool pkg-config" makedepends="at-spi2-atk-devel liblouis-devel python3-gobject-devel" @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Orca" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0000eee390b906a0f5611eb601633bd5ec03d231662ee7d865d1016459fb0043 +checksum=1fd02b99094f09f6e72df779e1a72dce41427ec82e245a4ea83233a97eeda271 if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-gobject-devel"