* [PR PATCH] quodlibet: patch for python 3.10
@ 2021-10-15 23:47 CameronNemo
2021-10-15 23:48 ` [PR PATCH] [Updated] " CameronNemo
2021-10-15 23:52 ` [PR PATCH] [Merged]: " ahesford
0 siblings, 2 replies; 3+ messages in thread
From: CameronNemo @ 2021-10-15 23:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
There is a new pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages quodlibet-3.10
https://github.com/void-linux/void-packages/pull/33580
quodlibet: patch for python 3.10
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-quodlibet-3.10-33580.patch --]
[-- Type: text/x-diff, Size: 4730 bytes --]
From 3ef047dea6f61463ecd8c0c0d0631568fbb1eccd Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 15 Oct 2021 16:47:02 -0700
Subject: [PATCH] quodlibet: patch for python 3.10
---
.../quodlibet/patches/collections_abc.patch | 103 ++++++++++++++++++
srcpkgs/quodlibet/template | 3 +-
2 files changed, 105 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/quodlibet/patches/collections_abc.patch
diff --git a/srcpkgs/quodlibet/patches/collections_abc.patch b/srcpkgs/quodlibet/patches/collections_abc.patch
new file mode 100644
index 000000000000..60cf01bb04b4
--- /dev/null
+++ b/srcpkgs/quodlibet/patches/collections_abc.patch
@@ -0,0 +1,103 @@
+Upstream: yes
+
+commit d4e05aef03fe9775de9c00f2730d89815450022e
+Author: LuK1337 <priv.luk@gmail.com>
+Date: Sat Sep 11 11:46:46 2021 +0200
+
+ Finish up collections -> collections.abc migration
+
+ This lets us start QuodLibet on Python 3.10 ^.^
+
+diff --git a/quodlibet/packages/raven/context.py b/quodlibet/packages/raven/context.py
+index 272259a3b..2a3eab4a7 100644
+--- a/quodlibet/packages/raven/context.py
++++ b/quodlibet/packages/raven/context.py
+@@ -7,7 +7,10 @@ raven.context
+ """
+ from __future__ import absolute_import
+
+-from collections import Mapping, Iterable
++try:
++ from collections import abc
++except ImportError:
++ import collections as abc # type: ignore
+ from threading import local
+ from weakref import ref as weakref
+
+@@ -30,7 +33,7 @@ def get_active_contexts():
+ return []
+
+
+-class Context(local, Mapping, Iterable):
++class Context(local, abc.Mapping, abc.Iterable):
+ """
+ Stores context until cleared.
+
+diff --git a/quodlibet/player/gstbe/util.py b/quodlibet/player/gstbe/util.py
+index 2611f8120..7439b716a 100644
+--- a/quodlibet/player/gstbe/util.py
++++ b/quodlibet/player/gstbe/util.py
+@@ -6,7 +6,10 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+
+-import collections
++try:
++ from collections import abc
++except ImportError:
++ import collections as abc # type: ignore
+ import subprocess
+ from enum import Enum
+ from typing import Iterable, Tuple
+@@ -183,7 +186,7 @@ def GStreamerSink(pipeline_desc):
+ return pipe, pipeline_desc
+
+
+-class TagListWrapper(collections.Mapping):
++class TagListWrapper(abc.Mapping):
+ def __init__(self, taglist, merge=False):
+ self._list = taglist
+ self._merge = merge
+diff --git a/quodlibet/util/collection.py b/quodlibet/util/collection.py
+index b726f98e9..83646b8af 100644
+--- a/quodlibet/util/collection.py
++++ b/quodlibet/util/collection.py
+@@ -24,7 +24,10 @@ from quodlibet.formats._audio import (TAG_TO_SORT, NUMERIC_ZERO_DEFAULT,
+ AudioFile)
+ from quodlibet.formats._audio import PEOPLE as _PEOPLE
+ from quodlibet.pattern import Pattern
+-from collections import Iterable
++try:
++ from collections import abc
++except ImportError:
++ import collections as abc # type: ignore
+
+ from quodlibet.util import is_windows
+ from quodlibet.util.path import escape_filename, unescape_filename, limit_path
+@@ -332,7 +335,7 @@ class Album(Collection):
+
+ @hashable
+ @total_ordering
+-class Playlist(Collection, Iterable):
++class Playlist(Collection, abc.Iterable):
+ """A Playlist is a `Collection` that has list-like features
+ Songs can appear more than once.
+ """
+diff --git a/quodlibet/util/collections.py b/quodlibet/util/collections.py
+index ba9d5c1a4..f0b83b5e9 100644
+--- a/quodlibet/util/collections.py
++++ b/quodlibet/util/collections.py
+@@ -9,7 +9,12 @@
+
+ from __future__ import absolute_import
+
+-from collections import MutableSequence, defaultdict
++try:
++ from collections.abc import MutableSequence
++except ImportError:
++ from collections import MutableSequence
++from collections import defaultdict
++from typing import Any
+
+ from .misc import total_ordering
+
diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template
index 0253eb320bfe..9d08f9952a59 100644
--- a/srcpkgs/quodlibet/template
+++ b/srcpkgs/quodlibet/template
@@ -1,7 +1,7 @@
# Template file for 'quodlibet'
pkgname=quodlibet
version=4.4.0
-revision=2
+revision=3
build_style=python3-module
pycompile_module="quodlibet"
hostmakedepends="intltool python3-devel"
@@ -14,3 +14,4 @@ license="GPL-2.0-or-later"
homepage="https://quodlibet.readthedocs.io/en/latest/"
distfiles="https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"
checksum=a03318d2767e4959551763d0a87fad977387af712608fe572714176a24bbf367
+make_check=no # requires X server
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] quodlibet: patch for python 3.10
2021-10-15 23:47 [PR PATCH] quodlibet: patch for python 3.10 CameronNemo
@ 2021-10-15 23:48 ` CameronNemo
2021-10-15 23:52 ` [PR PATCH] [Merged]: " ahesford
1 sibling, 0 replies; 3+ messages in thread
From: CameronNemo @ 2021-10-15 23:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by CameronNemo against master on the void-packages repository
https://github.com/CameronNemo/void-packages quodlibet-3.10
https://github.com/void-linux/void-packages/pull/33580
quodlibet: patch for python 3.10
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/33580.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-quodlibet-3.10-33580.patch --]
[-- Type: text/x-diff, Size: 4890 bytes --]
From 5de243a9e88147e904af9be84bc7912b4029ecbd Mon Sep 17 00:00:00 2001
From: Cameron Nemo <cnemo@tutanota.com>
Date: Fri, 15 Oct 2021 16:47:02 -0700
Subject: [PATCH] quodlibet: patch for python 3.10
---
.../quodlibet/patches/collections_abc.patch | 103 ++++++++++++++++++
srcpkgs/quodlibet/template | 4 +-
2 files changed, 105 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/quodlibet/patches/collections_abc.patch
diff --git a/srcpkgs/quodlibet/patches/collections_abc.patch b/srcpkgs/quodlibet/patches/collections_abc.patch
new file mode 100644
index 000000000000..60cf01bb04b4
--- /dev/null
+++ b/srcpkgs/quodlibet/patches/collections_abc.patch
@@ -0,0 +1,103 @@
+Upstream: yes
+
+commit d4e05aef03fe9775de9c00f2730d89815450022e
+Author: LuK1337 <priv.luk@gmail.com>
+Date: Sat Sep 11 11:46:46 2021 +0200
+
+ Finish up collections -> collections.abc migration
+
+ This lets us start QuodLibet on Python 3.10 ^.^
+
+diff --git a/quodlibet/packages/raven/context.py b/quodlibet/packages/raven/context.py
+index 272259a3b..2a3eab4a7 100644
+--- a/quodlibet/packages/raven/context.py
++++ b/quodlibet/packages/raven/context.py
+@@ -7,7 +7,10 @@ raven.context
+ """
+ from __future__ import absolute_import
+
+-from collections import Mapping, Iterable
++try:
++ from collections import abc
++except ImportError:
++ import collections as abc # type: ignore
+ from threading import local
+ from weakref import ref as weakref
+
+@@ -30,7 +33,7 @@ def get_active_contexts():
+ return []
+
+
+-class Context(local, Mapping, Iterable):
++class Context(local, abc.Mapping, abc.Iterable):
+ """
+ Stores context until cleared.
+
+diff --git a/quodlibet/player/gstbe/util.py b/quodlibet/player/gstbe/util.py
+index 2611f8120..7439b716a 100644
+--- a/quodlibet/player/gstbe/util.py
++++ b/quodlibet/player/gstbe/util.py
+@@ -6,7 +6,10 @@
+ # the Free Software Foundation; either version 2 of the License, or
+ # (at your option) any later version.
+
+-import collections
++try:
++ from collections import abc
++except ImportError:
++ import collections as abc # type: ignore
+ import subprocess
+ from enum import Enum
+ from typing import Iterable, Tuple
+@@ -183,7 +186,7 @@ def GStreamerSink(pipeline_desc):
+ return pipe, pipeline_desc
+
+
+-class TagListWrapper(collections.Mapping):
++class TagListWrapper(abc.Mapping):
+ def __init__(self, taglist, merge=False):
+ self._list = taglist
+ self._merge = merge
+diff --git a/quodlibet/util/collection.py b/quodlibet/util/collection.py
+index b726f98e9..83646b8af 100644
+--- a/quodlibet/util/collection.py
++++ b/quodlibet/util/collection.py
+@@ -24,7 +24,10 @@ from quodlibet.formats._audio import (TAG_TO_SORT, NUMERIC_ZERO_DEFAULT,
+ AudioFile)
+ from quodlibet.formats._audio import PEOPLE as _PEOPLE
+ from quodlibet.pattern import Pattern
+-from collections import Iterable
++try:
++ from collections import abc
++except ImportError:
++ import collections as abc # type: ignore
+
+ from quodlibet.util import is_windows
+ from quodlibet.util.path import escape_filename, unescape_filename, limit_path
+@@ -332,7 +335,7 @@ class Album(Collection):
+
+ @hashable
+ @total_ordering
+-class Playlist(Collection, Iterable):
++class Playlist(Collection, abc.Iterable):
+ """A Playlist is a `Collection` that has list-like features
+ Songs can appear more than once.
+ """
+diff --git a/quodlibet/util/collections.py b/quodlibet/util/collections.py
+index ba9d5c1a4..f0b83b5e9 100644
+--- a/quodlibet/util/collections.py
++++ b/quodlibet/util/collections.py
+@@ -9,7 +9,12 @@
+
+ from __future__ import absolute_import
+
+-from collections import MutableSequence, defaultdict
++try:
++ from collections.abc import MutableSequence
++except ImportError:
++ from collections import MutableSequence
++from collections import defaultdict
++from typing import Any
+
+ from .misc import total_ordering
+
diff --git a/srcpkgs/quodlibet/template b/srcpkgs/quodlibet/template
index 0253eb320bfe..e37fb6dd9057 100644
--- a/srcpkgs/quodlibet/template
+++ b/srcpkgs/quodlibet/template
@@ -1,9 +1,8 @@
# Template file for 'quodlibet'
pkgname=quodlibet
version=4.4.0
-revision=2
+revision=3
build_style=python3-module
-pycompile_module="quodlibet"
hostmakedepends="intltool python3-devel"
depends="desktop-file-utils gst-plugins-bad1 gst-plugins-base1 gst-plugins-good1
gst-plugins-ugly1 gtk+3 hicolor-icon-theme python3-dbus python3-feedparser
@@ -14,3 +13,4 @@ license="GPL-2.0-or-later"
homepage="https://quodlibet.readthedocs.io/en/latest/"
distfiles="https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz"
checksum=a03318d2767e4959551763d0a87fad977387af712608fe572714176a24bbf367
+make_check=no # requires X server
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: quodlibet: patch for python 3.10
2021-10-15 23:47 [PR PATCH] quodlibet: patch for python 3.10 CameronNemo
2021-10-15 23:48 ` [PR PATCH] [Updated] " CameronNemo
@ 2021-10-15 23:52 ` ahesford
1 sibling, 0 replies; 3+ messages in thread
From: ahesford @ 2021-10-15 23:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1417 bytes --]
There's a merged pull request on the void-packages repository
quodlibet: patch for python 3.10
https://github.com/void-linux/void-packages/pull/33580
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-15 23:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 23:47 [PR PATCH] quodlibet: patch for python 3.10 CameronNemo
2021-10-15 23:48 ` [PR PATCH] [Updated] " CameronNemo
2021-10-15 23:52 ` [PR PATCH] [Merged]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).