Date: Monday, December 13, 2021 @ 23:51:35
Author: foutrelis
Revision: 1072575
upgpkg: pitivi 2021.05-3: add upstream fix for Python 3.10 (FS#73006)
Added:
pitivi/trunk/python310.patch
Modified:
pitivi/trunk/PKGBUILD
-----------------+
PKGBUILD | 13 ++++++++++---
python310.patch | 44 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-13 22:55:43 UTC (rev 1072574)
+++ PKGBUILD 2021-12-13 23:51:35 UTC (rev 1072575)
@@ -5,7 +5,7 @@
pkgname=pitivi
pkgver=2021.05
-pkgrel=2
+pkgrel=3
pkgdesc='Editor for audio/video projects using the GStreamer framework'
arch=('x86_64')
url='http://pitivi.org/'
@@ -16,9 +16,16 @@
optdepends=('frei0r-plugins: additional video effects, clip transformation
feature'
'gst-libav: additional multimedia codecs'
'gst-plugins-ugly: additional multimedia codecs')
-source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz";)
-sha256sums=('cf5693c46c42ab0da14a2e59bfcf4bc880604b41e9cd3aa8d2ebdc60827b75c7')
+source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz";
+ python310.patch)
+sha256sums=('cf5693c46c42ab0da14a2e59bfcf4bc880604b41e9cd3aa8d2ebdc60827b75c7'
+ 'bebb9d3308a1ff5f1bd47cbab23b534e72b41b59f7366fa6333999aad0d2ab7f')
+prepare() {
+ cd $pkgname-$pkgver
+ patch -Np1 --no-backup-if-mismatch -i ../python310.patch
+}
+
build() {
arch-meson $pkgname-$pkgver build
meson compile -C build
Added: python310.patch
===================================================================
--- python310.patch (rev 0)
+++ python310.patch 2021-12-13 23:51:35 UTC (rev 1072575)
@@ -0,0 +1,44 @@
+From 4391235c1c1705504dfacfa2585c90e130f9e98c Mon Sep 17 00:00:00 2001
+From: Gwyn Ciesla <gw...@protonmail.com>
+Date: Mon, 6 Sep 2021 06:32:00 +0000
+Subject: [PATCH] utils: Update collections import
+
+Fixes #2571
+---
+ pitivi/utils/loggable.py | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/pitivi/utils/loggable.py b/pitivi/utils/loggable.py
+index b002665ea..20048d241 100644
+--- a/pitivi/utils/loggable.py
++++ b/pitivi/utils/loggable.py
+@@ -14,7 +14,7 @@
+ #
+ # You should have received a copy of the GNU Lesser General Public
+ # License along with this program; if not, see <http://www.gnu.org/licenses/>.
+-import collections
++import collections.abc
+ import errno
+ import fnmatch
+ import os
+@@ -714,7 +714,7 @@ def add_log_handler(func):
+ Raises:
+ TypeError: When func is not a callable.
+ """
+- if not isinstance(func, collections.Callable):
++ if not isinstance(func, collections.abc.Callable):
+ raise TypeError("func must be callable")
+
+ if func not in _log_handlers:
+@@ -736,7 +736,7 @@ def add_limited_log_handler(func):
+ Raises:
+ TypeError: When func is not a callable.
+ """
+- if not isinstance(func, collections.Callable):
++ if not isinstance(func, collections.abc.Callable):
+ raise TypeError("func must be callable")
+
+ if func not in _log_handlers_limited:
+--
+GitLab
+
