mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 10:37:22 -08:00
media-sound/quodlibet: add python3_12 support
Closes: https://bugs.gentoo.org/909994 Closes: https://bugs.gentoo.org/925283 Signed-off-by: Alan Swanson <reiver@improbability.net> Closes: https://github.com/gentoo/gentoo/pull/37428 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
@@ -0,0 +1,60 @@
|
||||
From a8b6f6bb34864a6821174edbf7802b689e440db3 Mon Sep 17 00:00:00 2001
|
||||
From: LuK1337 <priv.luk@gmail.com>
|
||||
Date: Wed, 23 Aug 2023 17:13:23 +0200
|
||||
Subject: [PATCH] Fix startup on Python 3.12
|
||||
|
||||
--- a/quodlibet/_import.py
|
||||
+++ b/quodlibet/_import.py
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
import sys
|
||||
import importlib
|
||||
+import importlib.util
|
||||
|
||||
|
||||
class RedirectImportHook:
|
||||
@@ -31,6 +32,11 @@ def __init__(self, name, packages):
|
||||
self._name = name
|
||||
self._packages = packages
|
||||
|
||||
+ def find_spec(self, fullname, path, target=None):
|
||||
+ loader = self.find_module(fullname, path)
|
||||
+ if loader is not None:
|
||||
+ return importlib.util.spec_from_loader(fullname, loader)
|
||||
+
|
||||
def find_module(self, fullname, path=None):
|
||||
package = fullname.split(".")[0]
|
||||
if package in self._packages:
|
||||
--- a/quodlibet/util/config.py
|
||||
+++ b/quodlibet/util/config.py
|
||||
@@ -377,7 +377,7 @@ def read(self, filename):
|
||||
with open(filename, "rb") as fileobj:
|
||||
fileobj = StringIO(
|
||||
fileobj.read().decode("utf-8", "surrogateescape"))
|
||||
- self._config.readfp(fileobj, filename)
|
||||
+ self._config.read_file(fileobj, filename)
|
||||
except (IOError, OSError):
|
||||
return
|
||||
|
||||
--- a/quodlibet/util/importhelper.py
|
||||
+++ b/quodlibet/util/importhelper.py
|
||||
@@ -92,8 +92,8 @@ def load_module(name, package, path):
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
- loader = importlib.find_loader(fullname, [path])
|
||||
- if loader is None:
|
||||
+ spec = importlib.machinery.PathFinder.find_spec(fullname, [path])
|
||||
+ if spec is None:
|
||||
return
|
||||
|
||||
# modules need a parent package
|
||||
@@ -101,7 +101,7 @@ def load_module(name, package, path):
|
||||
spec = importlib.machinery.ModuleSpec(package, None, is_package=True)
|
||||
sys.modules[package] = importlib.util.module_from_spec(spec)
|
||||
|
||||
- mod = loader.load_module(fullname)
|
||||
+ mod = spec.loader.load_module(fullname)
|
||||
|
||||
# make it accessible from the parent, like __import__ does
|
||||
vars(sys.modules[package])[name] = mod
|
||||
@@ -0,0 +1,62 @@
|
||||
# Copyright 2022-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
inherit distutils-r1 xdg
|
||||
|
||||
DESCRIPTION="audio library tagger, manager, and player for GTK+"
|
||||
HOMEPAGE="https://quodlibet.readthedocs.io/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="+dbus gstreamer +udev"
|
||||
|
||||
RDEPEND="dev-libs/keybinder:3[introspection]
|
||||
dev-python/feedparser[${PYTHON_USEDEP}]
|
||||
dev-python/pygobject:3[${PYTHON_USEDEP}]
|
||||
media-libs/mutagen[${PYTHON_USEDEP}]
|
||||
net-libs/libsoup:3.0[introspection]
|
||||
x11-libs/gtk+[introspection]
|
||||
gstreamer? (
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
media-libs/gst-plugins-good:1.0
|
||||
media-plugins/gst-plugins-meta:1.0
|
||||
)
|
||||
!gstreamer? ( media-libs/xine-lib )
|
||||
dbus? (
|
||||
app-misc/media-player-info
|
||||
dev-python/dbus-python[${PYTHON_USEDEP}]
|
||||
)
|
||||
udev? ( virtual/udev )"
|
||||
DEPEND="dev-util/intltool"
|
||||
|
||||
S="${WORKDIR}/${PN}-release-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-4.6.0-python312.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
local qlconfig=quodlibet/config.py
|
||||
|
||||
if ! use gstreamer; then
|
||||
sed -i -e '/backend/s:gstbe:xinebe:' ${qlconfig} || die
|
||||
fi
|
||||
|
||||
sed -i -e '/gst_pipeline/s:"":"alsasink":' ${qlconfig} || die
|
||||
|
||||
distutils-r1_src_prepare
|
||||
}
|
||||
|
||||
src_install() {
|
||||
distutils-r1_src_install
|
||||
dodoc README.rst
|
||||
|
||||
# fix location of desktop file
|
||||
mv "${ED}/usr/share/appdata" "${ED}/usr/share/metainfo" || die "Failed to fix desktop file location"
|
||||
}
|
||||
Reference in New Issue
Block a user