Attachment #247280 for bug #275959




PORTNAME=	sublime-music
DISTVERSION=	0.12.0
CATEGORIES=	audio

MAINTAINER=	lexi.freebsd@le-fay.org
COMMENT=	GTK3 desktop client for Subsonic-compatible music streaming servers
WWW=		https://sublimemusic.app/
LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE

USE_GITHUB=     yes
GH_ACCOUNT=     sublime-music
GH_PROJECT=     sublime-music
GH_TAGNAME=	v${DISTVERSION}

BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR}

RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR}			\
		${PYTHON_PKGNAMEPREFIX}dataclasses-json>0:devel/py-dataclasses-json@${PY_FLAVOR}	\
		${PYTHON_PKGNAMEPREFIX}deepdiff>0:devel/py-deepdiff@${PY_FLAVOR}			\
		${PYTHON_PKGNAMEPREFIX}Levenshtein>0:devel/py-Levenshtein@${PY_FLAVOR}			\
		${PYTHON_PKGNAMEPREFIX}peewee>0:databases/py-peewee@${PY_FLAVOR}			\
		${PYTHON_PKGNAMEPREFIX}semver>0:devel/py-semver@${PY_FLAVOR}				\
		${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR}			\
		${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR}				\
		${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR}				\
		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR}				\
		${PYTHON_PKGNAMEPREFIX}thefuzz>0:devel/py-thefuzz@${PY_FLAVOR}				\
		${PYTHON_PKGNAMEPREFIX}PyChromecast>0:devel/py-pychromecast@${PY_FLAVOR}		\
		${PYTHON_PKGNAMEPREFIX}python-mpv>0:multimedia/py-python-mpv@${PY_FLAVOR}

USES=		python:3.10+
USE_PYTHON=	autoplist pep517

.include <bsd.port.mk>

Added Link Here

(-)b/audio/sublime-music/distinfo (+3 lines)
1	TIMESTAMP = 1703579989
2	SHA256 (sublime-music-sublime-music-0.12.0-v0.12.0_GH0.tar.gz) = faaf102fd790ecea3d966c9d6e305567c734a1df30eaa6bbdedf93d863bc7435
3	SIZE (sublime-music-sublime-music-0.12.0-v0.12.0_GH0.tar.gz) = 21041534




commit f3bb5ca3383c5adb3ff666f2bb241926fd113b4a
Author: Lexi Winter <lexi@le-fay.org>
Date:   Wed Dec 27 07:53:38 2023 +0000

    diff_model_store: improve exclude regexp
    
    this fixes RecursionError when diffing GObjects, since root[N].g_type_instance
    is a recursive type.

diff --git a/sublime_music/ui/util.py b/sublime_music/ui/util.py
index 4c6b697..0a55502 100644
--- sublime_music/ui/util.py.orig
+++ sublime_music/ui/util.py
@@ -10,7 +10,7 @@ from ..adapters import AdapterManager, CacheMissError, Result, SongCacheStatus
 from ..adapters.api_objects import Playlist, Song
 from ..config import AppConfiguration
 
-deep_diff_exclude_regexp = re.compile(r"root\[\d+\]\.props")
+deep_diff_exclude_regexp = [re.compile(path) for path in [r"root\[\d+\]\.props", r"root\[\d+\]\.g_type_instance"]]
 
 
 def format_song_duration(duration_secs: Union[int, timedelta, None]) -> str:

Added Link Here

(-)b/audio/sublime-music/pkg-descr (-1 / +5 lines)
0	-	1	Sublime Music is a feature-packed native GTK client for Subsonic-compatible
		2	music streaming servers, including Subsonic, Navidrome, Airsonic and Gonic.
		3
		4	In addition to streaming, it allows music to be downloaded for offline
		5	playback.

Return to bug 275959

Added Link Here

(-)b/audio/sublime-music/Makefile (+35 lines)
1	PORTNAME= sublime-music
2	DISTVERSION= 0.12.0
3	CATEGORIES= audio
4
5	MAINTAINER= lexi.freebsd@le-fay.org
6	COMMENT= GTK3 desktop client for Subsonic-compatible music streaming servers
7	WWW= https://sublimemusic.app/
8	LICENSE= GPLv3
9	LICENSE_FILE= ${WRKSRC}/LICENSE
10
11	USE_GITHUB= yes
12	GH_ACCOUNT= sublime-music
13	GH_PROJECT= sublime-music
14	GH_TAGNAME= v${DISTVERSION}
15
16	BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}flit-core>0:devel/py-flit-core@${PY_FLAVOR}
17
18	RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}dataclasses-json>0:devel/py-dataclasses-json@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}deepdiff>0:devel/py-deepdiff@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}Levenshtein>0:devel/py-Levenshtein@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}peewee>0:databases/py-peewee@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}semver>0:devel/py-semver@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}dateutil>0:devel/py-dateutil@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}bleach>0:www/py-bleach@${PY_FLAVOR} \
26	${PYTHON_PKGNAMEPREFIX}bottle>0:www/py-bottle@${PY_FLAVOR} \
27	${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}thefuzz>0:devel/py-thefuzz@${PY_FLAVOR} \
29	${PYTHON_PKGNAMEPREFIX}PyChromecast>0:devel/py-pychromecast@${PY_FLAVOR} \
30	${PYTHON_PKGNAMEPREFIX}python-mpv>0:multimedia/py-python-mpv@${PY_FLAVOR}
31
32	USES= python:3.10+
33	USE_PYTHON= autoplist pep517
34
35	.include <bsd.port.mk>

Added Link Here

(-)b/audio/sublime-music/files/patch-sublime__music_ui_util.py (+22 lines)
1	commit f3bb5ca3383c5adb3ff666f2bb241926fd113b4a
2	Author: Lexi Winter <lexi@le-fay.org>
3	Date: Wed Dec 27 07:53:38 2023 +0000
4
5	diff_model_store: improve exclude regexp
6
7	this fixes RecursionError when diffing GObjects, since root[N].g_type_instance
8	is a recursive type.
9
10	diff --git a/sublime_music/ui/util.py b/sublime_music/ui/util.py
11	index 4c6b697..0a55502 100644
12	--- sublime_music/ui/util.py.orig
13	+++ sublime_music/ui/util.py
14	@@ -10,7 +10,7 @@ from ..adapters import AdapterManager, CacheMissError, Result, SongCacheStatus
15	from ..adapters.api_objects import Playlist, Song
16	from ..config import AppConfiguration
17
18	-deep_diff_exclude_regexp = re.compile(r"root\[\d+\]\.props")
19	+deep_diff_exclude_regexp = [re.compile(path) for path in [r"root\[\d+\]\.props", r"root\[\d+\]\.g_type_instance"]]
20
21
22	def format_song_duration(duration_secs: Union[int, timedelta, None]) -> str: