From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B5CC21582EF for ; Mon, 24 Feb 2025 10:34:28 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A0E0834319A for ; Mon, 24 Feb 2025 10:34:28 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C0FBF110479; Mon, 24 Feb 2025 10:34:04 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B7B1E110479 for ; Mon, 24 Feb 2025 10:34:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 685AB343182 for ; Mon, 24 Feb 2025 10:34:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A658927F0 for ; Mon, 24 Feb 2025 10:34:01 +0000 (UTC) From: "David Roman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Roman" Message-ID: <1740390517.42031807c24b84648789d9cf91c76dd6b8feae73.davidroman@gentoo> Subject: [gentoo-commits] repo/proj/guru:master commit in: media-sound/TauonMusicBox/files/, media-sound/TauonMusicBox/ X-VCS-Repository: repo/proj/guru X-VCS-Files: media-sound/TauonMusicBox/Manifest media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch X-VCS-Directories: media-sound/TauonMusicBox/ media-sound/TauonMusicBox/files/ X-VCS-Committer: davidroman X-VCS-Committer-Name: David Roman X-VCS-Revision: 42031807c24b84648789d9cf91c76dd6b8feae73 X-VCS-Branch: master Date: Mon, 24 Feb 2025 10:34:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b4781592-458a-4487-879c-3f0bcb299689 X-Archives-Hash: d5d93b46f226d6cbbc9bc026e0037d23 Message-ID: <20250224103401.fzkRqjiz7guWNmXTvwabPNt9U98u-FrkBp0W0IxjOb0@z> commit: 42031807c24b84648789d9cf91c76dd6b8feae73 Author: David Roman gmail com> AuthorDate: Mon Feb 24 09:46:53 2025 +0000 Commit: David Roman gmail com> CommitDate: Mon Feb 24 09:48:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=42031807 media-sound/TauonMusicBox: drop 7.8.0-r1, update 9999 Signed-off-by: David Roman gmail.com> media-sound/TauonMusicBox/Manifest | 1 - .../TauonMusicBox/TauonMusicBox-9999.ebuild | 35 ++----- .../TauonMusicBox-7.8.0-unidecode-compat.patch | 102 --------------------- .../files/TauonMusicBox-fix-desktop.patch | 22 ----- 4 files changed, 9 insertions(+), 151 deletions(-) diff --git a/media-sound/TauonMusicBox/Manifest b/media-sound/TauonMusicBox/Manifest index 29994b0f8..0246a82e0 100644 --- a/media-sound/TauonMusicBox/Manifest +++ b/media-sound/TauonMusicBox/Manifest @@ -1,3 +1,2 @@ -DIST TauonMusicBox-7.8.0.tar.gz 1080654 BLAKE2B 6c671efc10f0e7340bb2db0ebcc59f25784a665a9a2e85ab5132a10362d9d0f7041affedc763ed5acde19c529c742e127eb1493578f9f79ca7f3b1dfd4439784 SHA512 0896e185314037e23d76776ce96b227ede8a96651958df7ca0acc0d37c431169aeb72395116d8887d37c1360c15f436f7488c751866e60fa5ba3a5082b9acef8 DIST TauonMusicBox-7.8.3.tar.gz 1085686 BLAKE2B 92014544bc45c92ca8170ae88c56eb2a767b0dff2dcd1086cb73d22a4287b6a82be7b3134a41329940ccc6080377d82b71c2d9ef891975d62756068c8a97f867 SHA512 f1679326a49c1d341ea773b5f402fa4ad00ac2c79549fc04b2959bdf2dfad045e6e88add5b9075e660016a4d94d15e43e5d5c93e6f413e727d30f5aaa8fbdc1d DIST TauonMusicBox-7.9.0.tar.gz 1354787 BLAKE2B 2116c84ec687ec337e712aefa5da54b08e572b917c3a41d94687a95bfefd8d7a3276422b4e68cda8ed5f27f92a32bf491d41f1f4476e193f19ce927d6f6d02b4 SHA512 17b26b296385f3c2b6006a6a33453e5a277c8bc901f717bac3751bddc1691116e0bf116db9457e425d61d300200b5ca487f5b4949ca2be2993657be4fa9d87cf diff --git a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild index 3d53a8974..7c7e65a87 100644 --- a/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild +++ b/media-sound/TauonMusicBox/TauonMusicBox-9999.ebuild @@ -5,9 +5,10 @@ EAPI=8 PLOCALES="cs de es fr_FR hu id it ja_JP nb_NO pl pt pt_BR pt_PT ru sv tr zh_CN" PYTHON_COMPAT=( python3_{11..12} ) +DISTUTILS_EXT=1 DISTUTILS_USE_PEP517=setuptools -inherit cmake desktop distutils-r1 optfeature plocale xdg +inherit desktop distutils-r1 optfeature plocale xdg DESCRIPTION="The desktop music player of today!" HOMEPAGE="https://tauonmusicbox.rocks/" @@ -21,12 +22,15 @@ else KEYWORDS="~amd64" fi +S="${WORKDIR}/Tauon-${PV}" + LICENSE="GPL-3" SLOT="0" PHAZOR_DEPS=" dev-libs/miniaudio media-libs/flac + media-libs/game-music-emu media-libs/libopenmpt media-libs/opus media-libs/opusfile @@ -46,6 +50,7 @@ DEPEND=" dev-python/requests[${PYTHON_USEDEP}] dev-python/setproctitle[${PYTHON_USEDEP}] dev-python/send2trash[${PYTHON_USEDEP}] + dev-python/unidecode[${PYTHON_USEDEP}] media-video/ffmpeg media-libs/mutagen[${PYTHON_USEDEP}] media-libs/sdl2-image @@ -57,27 +62,16 @@ RDEPEND=" ${DEPEND} dev-libs/libayatana-appindicator + media-sound/mpg123-base x11-libs/libnotify " BDEPEND="sys-devel/gettext" -src_prepare() { - # Workaround. If PATCHES is used it would be applied to times and fail - eapply "${FILESDIR}/${PN}-fix-desktop.patch" - - distutils-r1_src_prepare - cmake_src_prepare -} - -src_configure() { - distutils-r1_src_configure - cmake_src_configure -} +PATCHES=( "${FILESDIR}/${PN}-7.9.0-phazor-build.patch" ) src_compile() { distutils-r1_src_compile - cmake_src_compile build_locale() { msgfmt -o "locale/${1}/LC_MESSAGES/tauon.mo" "locale/${1}/LC_MESSAGES/tauon.po" || die @@ -86,14 +80,8 @@ src_compile() { plocale_for_each_locale build_locale } -src_test() { - distutils-r1_src_test - cmake_src_test -} - python_install() { - newbin tauon.py tauon - dolib.so "${WORKDIR}/${P}_build/libphazor.so" + distutils-r1_python_install install_locale() { insinto "/usr/share/locale/${1}/LC_MESSAGES" @@ -102,15 +90,10 @@ python_install() { plocale_for_each_locale install_locale - insinto "/usr/share/${PN}" - doins -r assets theme templates - doins input.txt - sed -i 's/\/opt\/tauon-music-box\/tauonmb.sh/tauon/g' extra/tauonmb.desktop || die domenu extra/tauonmb.desktop doicon -s scalable extra/tauonmb.svg - distutils-r1_python_install } pkg_postinst() { diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch deleted file mode 100644 index be66f2391..000000000 --- a/media-sound/TauonMusicBox/files/TauonMusicBox-7.8.0-unidecode-compat.patch +++ /dev/null @@ -1,102 +0,0 @@ -commit 6438345be829fa95bcaedf125cf4b29aa1d5064d -Author: David Roman -Date: Sun Jun 2 15:47:44 2024 +0200 - - replace isounidecode with unidecode - -diff --git a/extra/win-requirements.txt b/extra/win-requirements.txt -index ef2dfd42..ccb54be7 100644 ---- a/extra/win-requirements.txt -+++ b/extra/win-requirements.txt -@@ -8,7 +8,7 @@ requests - beautifulsoup4 - PlexAPI - musicbrainzngs --isounidecode -+unidecode - infi.systray - mutagen - natsort -diff --git a/requirements.txt b/requirements.txt -index 3252278f..970d3a06 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -6,7 +6,7 @@ requests - beautifulsoup4 - PlexAPI - musicbrainzngs --isounidecode -+unidecode - setproctitle - mutagen - natsort -diff --git a/t_modules/t_lyrics.py b/t_modules/t_lyrics.py -index 8e5d197a..19b91bd8 100644 ---- a/t_modules/t_lyrics.py -+++ b/t_modules/t_lyrics.py -@@ -18,7 +18,7 @@ - # along with Tauon Music Box. If not, see . - - --from isounidecode import unidecode -+from unidecode import unidecode - from bs4 import BeautifulSoup - import urllib.parse - import requests -@@ -81,7 +81,7 @@ def genius(artist, title, return_url=False): - line = line.replace("/", "-") - line = line.replace("-&-", "-and-") - line = line.replace("&", "-and-") -- line = unidecode(line).decode() -+ line = unidecode(line) - line = urllib.parse.quote(line) - line = f"https://genius.com/{line}-lyrics" - -diff --git a/t_modules/t_main.py b/t_modules/t_main.py -index c2f2ebab..4848b7b2 100644 ---- a/t_modules/t_main.py -+++ b/t_modules/t_main.py -@@ -591,7 +591,7 @@ from pathlib import Path - from xml.sax.saxutils import escape, unescape - from ctypes import * - from send2trash import send2trash --from isounidecode import unidecode -+from unidecode import unidecode - from collections import OrderedDict - - musicbrainzngs.set_useragent("TauonMusicBox", n_version, "https://github.com/Taiko2k/Tauon") -@@ -25663,14 +25663,14 @@ def worker2(): - s_text = s_cn - - if dia_mode: -- title = unidecode(title).decode() -+ title = unidecode(title) - -- artist = unidecode(artist).decode() -- album_artist = unidecode(album_artist).decode() -- composer = unidecode(composer).decode() -- album = unidecode(album).decode() -- filename = unidecode(filename).decode() -- sartist = unidecode(sartist).decode() -+ artist = unidecode(artist) -+ album_artist = unidecode(album_artist) -+ composer = unidecode(composer) -+ album = unidecode(album) -+ filename = unidecode(filename) -+ sartist = unidecode(sartist) - - if cache_string is None: - search_dia_string_cache[ -@@ -30054,9 +30054,9 @@ class Over: - click=self.click, replace="github") - - y += spacing -- ddt.text((x, y), "isounidecode", colours.box_sub_text, font) -- ddt.text((xx, y), "New BSD License", colours.box_text_label, font) -- draw_linked_text2(xxx, y, "https://github.com/redvasily/isounidecode", colours.box_sub_text, font, -+ ddt.text((x, y), "unidecode", colours.box_sub_text, font) -+ ddt.text((xx, y), "GPL-2.0+", colours.box_text_label, font) -+ draw_linked_text2(xxx, y, "https://github.com/avian2/unidecode", colours.box_sub_text, font, - click=self.click, replace="github") - - y += spacing diff --git a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch b/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch deleted file mode 100644 index 4de98dc14..000000000 --- a/media-sound/TauonMusicBox/files/TauonMusicBox-fix-desktop.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 203ed16eef31cc199853ecef9d947eb147ab4f16 Mon Sep 17 00:00:00 2001 -From: David Roman -Date: Fri, 19 Apr 2024 02:02:08 +0200 -Subject: [PATCH] tauonmb.desktop: add mising stop action (#1132) - ---- - extra/tauonmb.desktop | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extra/tauonmb.desktop b/extra/tauonmb.desktop -index 1a98fc4e2..5d049f084 100644 ---- a/extra/tauonmb.desktop -+++ b/extra/tauonmb.desktop -@@ -21,7 +21,7 @@ StartupWMClass=Tauon Music Box - Terminal=false - Type=Application - Categories=AudioVideo;Player;Audio; --Actions=PlayPause;Previous;Next -+Actions=PlayPause;Previous;Next;Stop - - [Desktop Action PlayPause] - Exec=/opt/tauon-music-box/tauonmb.sh --no-start --play-pause