[arch-commits] Commit in pitivi/trunk (PKGBUILD python310.patch)

[Antonio Rojas]

    Date: Sunday, July 3, 2022 @ 20:24:13
  Author: arojas
Revision: 1243850

Update to 22.06

Modified:
  pitivi/trunk/PKGBUILD
Deleted:
  pitivi/trunk/python310.patch

-----------------+
 PKGBUILD        |   21 ++++-----------------
 python310.patch |   44 --------------------------------------------
 2 files changed, 4 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-03 20:19:49 UTC (rev 1243849)
+++ PKGBUILD	2022-07-03 20:24:13 UTC (rev 1243850)
@@ -4,8 +4,8 @@
 # Contributor: Gabor Nyekhelyi (n0gabor) <n0gabor at vipmail.hu>
 
 pkgname=pitivi
-pkgver=2021.05
-pkgrel=4
+pkgver=2022.06
+pkgrel=1
 pkgdesc='Editor for audio/video projects using the GStreamer framework'
 arch=('x86_64')
 url='http://pitivi.org/'
@@ -16,22 +16,9 @@
 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"
-        $pkgname-meson-0.61.patch::https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6.patch
-        $pkgname-add-icons-removed-from-adwaita.patch::https://gitlab.gnome.org/GNOME/pitivi/-/commit/ac64d971fd47.patch
-        python310.patch)
-sha256sums=('cf5693c46c42ab0da14a2e59bfcf4bc880604b41e9cd3aa8d2ebdc60827b75c7'
-            'bbf4d3c329572f8e4e2c735bd9514c5bd9c2ee2df3aadece3f1a85b4d214e8fd'
-            'af822fccf021241fc68762acb8d90fb8298cca5c9af78185dfe9c6ccad49e477'
-            'bebb9d3308a1ff5f1bd47cbab23b534e72b41b59f7366fa6333999aad0d2ab7f')
+source=("https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
+sha256sums=('533d38e3c6d211c2bd0e95e2b96b0f0833bdf0d5d477ace07df611583506c838')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../$pkgname-meson-0.61.patch
-  patch -Np1 --no-backup-if-mismatch -i ../$pkgname-add-icons-removed-from-adwaita.patch
-  patch -Np1 --no-backup-if-mismatch -i ../python310.patch
-}
-
 build() {
   arch-meson $pkgname-$pkgver build
   meson compile -C build

Deleted: python310.patch
===================================================================
--- python310.patch	2022-07-03 20:19:49 UTC (rev 1243849)
+++ python310.patch	2022-07-03 20:24:13 UTC (rev 1243850)
@@ -1,44 +0,0 @@
-From 4391235c1c1705504dfacfa2585c90e130f9e98c Mon Sep 17 00:00:00 2001
-From: Gwyn Ciesla <gwync at 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
-