diff options
Diffstat (limited to 'media-sound/picard')
| -rw-r--r-- | media-sound/picard/Manifest | 5 | ||||
| -rw-r--r-- | media-sound/picard/files/picard-2.6.3-fix-py3.10.patch | 61 | ||||
| -rw-r--r-- | media-sound/picard/picard-2.6.3.ebuild | 67 | ||||
| -rw-r--r-- | media-sound/picard/picard-9999.ebuild | 24 |
4 files changed, 139 insertions, 18 deletions
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest index 3827a879d5d8..b4118c5461b3 100644 --- a/media-sound/picard/Manifest +++ b/media-sound/picard/Manifest @@ -1,4 +1,7 @@ +AUX picard-2.6.3-fix-py3.10.patch 2720 BLAKE2B b5644f587d4ffcddeeb9594b33e75ac2b6da6c1ef613dd05183568fe8899220a021f5c2b0a58351c9670a2fdda25423da501c321cd47e5dfe88012f718bb8cba SHA512 431bb2c37322c27d04c1187828cd7b758954b83cc0078602551e3408c2f471bd6d17b1f0e1c7a2a97fd66bd6a631336615fc4ba8147b547d5ca3bce6ff58d5ac DIST picard-2.6.2.tar.gz 4318817 BLAKE2B 9b4b9837fc7703368f28f2451c230ee9cb4826b61a970c514162bf615461d942512764661295bba98499000e781662e3a001c5fc91571abbafce8d7bc7418a63 SHA512 01fc8f49b273edbd020e3c9f91d622e60a84421b6de9dfd584d086224897b81f5e7c3f94616341c56f952774af7d912a8369d8fff4e47f19e00324c4f6944225 +DIST picard-2.6.3.tar.gz 4320046 BLAKE2B ce308440ed4c6297128a5470b7bdced50fb22e62995c26670339ff71c70d610fc0c4ea8433f9dbacb197b710b8100de171817df604d76986596391d029b3c20f SHA512 71bdeb4777a0d996ac0093edefc448a348aa72e657ec639331e67257c47c389993d2715ccebf715458c3b606051154586d63b22b3cebd541d8b2da5e96a833b5 EBUILD picard-2.6.2.ebuild 1652 BLAKE2B 77a92058a85fba2fa76637a7df2caa92937b29d83663212813a670d47045b3b84b363b7f48d2f3f0147bc12965708f451cb7ce3e6167864524cee37a35633d68 SHA512 7868878920aa000779f26bbf97b30123179bda3dec0aa62e998e0b9272009c8f4ac5713414fa78f6c3900a1d99fa9877d5654044d7fee252b7e302702c10e555 -EBUILD picard-9999.ebuild 1613 BLAKE2B 4ff23b9d59442edc13fe54d2ee7458784cde55dbf26c0f6c7d9ecd4112645e012e638a1e01de6228f558a8fa8cdc1241bb7ff23b179d4f3770c719b3a7eee043 SHA512 ecf0a0ddeee0af56497477bfe47fba323e21b07cce0210f84eac335f6b87ff970347af96bebfdbf1ea9de577c15bcdf4d4cb6c8cf2244ca2ff62325102fe8c52 +EBUILD picard-2.6.3.ebuild 1513 BLAKE2B 1d080555f69c40e026f13bd5373f0c7d916f8de725fb42bff41f7beee7c86a402d738c757453c39f24f7d241df662da4acd5f22132fb16687166b9b76027b2ab SHA512 25e7d5eab89bd32e5baf06e6c1a3a8ab893da291e3752316655ba21d2a0a44f0c3497abe6baa16cfffbbec36c58dd1475aa24f81b412e8b33ba689d633d47339 +EBUILD picard-9999.ebuild 1375 BLAKE2B 531caf97f4ba0cbc7d9e8ef8b0da462b451254ec418922a9e3826025142e51092e2fc55ab78680f5ba375ae68751947508b8dd4cc38013cc2ad02d45e446476b SHA512 85f2e34de295c821a2e8d2acd332543e806a2d0070179cc0c61f1e7bf510a9fb8ec953698ade9a39354f2a21027e4d19f5d9adc1ad081e9b80e350d89d26e372 MISC metadata.xml 739 BLAKE2B 1b941561bb90cc463005e0e706bf53c9d8973aa1961a93e30ffda627922dfc4f05840392893c44767363588d729f7bdd6bea77a7540bead1b3a77a2306006f1c SHA512 94e546f23ab99e5a75e15e18d3f4b1aff2c02099b2202c1d566f92fe6043891c9c2609832bf8fdb48c330fd954555e574dd84be50591a6cfb571ea81e7c20fc5 diff --git a/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch b/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch new file mode 100644 index 000000000000..772cbda3868d --- /dev/null +++ b/media-sound/picard/files/picard-2.6.3-fix-py3.10.patch @@ -0,0 +1,61 @@ +From 452bba954c30d5a642f03c02411529f511bda786 Mon Sep 17 00:00:00 2001 +From: Louis Sautier <sautier.louis@gmail.com> +Date: Fri, 27 Aug 2021 00:43:48 +0200 +Subject: [PATCH] Fix TypeErrors with Python 3.10 + +Without these changes, running Picard with Python 3.10 results in errors +such as: + File "./picard/ui/coverartbox.py", line 74, in __init__ + self.shadow = self.shadow.scaled(w, h, QtCore.Qt.KeepAspectRatio, QtCore.Qt.SmoothTransformation) +TypeError: arguments did not match any overloaded call: + scaled(self, int, int, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float' + scaled(self, QSize, aspectRatioMode: Qt.AspectRatioMode = Qt.IgnoreAspectRatio, transformMode: Qt.TransformationMode = Qt.FastTransformation): argument 1 has unexpected type 'float' +--- + picard/ui/coverartbox.py | 2 +- + picard/ui/itemviews.py | 6 +++--- + picard/util/__init__.py | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/picard/ui/coverartbox.py b/picard/ui/coverartbox.py +index c3eb4ddb74..f3a174664b 100644 +--- a/picard/ui/coverartbox.py ++++ b/picard/ui/coverartbox.py +@@ -135,7 +135,7 @@ def dropEvent(self, event): + event.acceptProposedAction() + + def scaled(self, *dimensions): +- return (self.pixel_ratio * dimension for dimension in dimensions) ++ return (round(self.pixel_ratio * dimension) for dimension in dimensions) + + def show(self): + self.set_data(self.data, True) +diff --git a/picard/ui/itemviews.py b/picard/ui/itemviews.py +index cffab6d70d..d1101b340f 100644 +--- a/picard/ui/itemviews.py ++++ b/picard/ui/itemviews.py +@@ -141,9 +141,9 @@ def get_match_color(similarity, basecolor): + c1 = (basecolor.red(), basecolor.green(), basecolor.blue()) + c2 = (223, 125, 125) + return QtGui.QColor( +- c2[0] + (c1[0] - c2[0]) * similarity, +- c2[1] + (c1[1] - c2[1]) * similarity, +- c2[2] + (c1[2] - c2[2]) * similarity) ++ int(c2[0] + (c1[0] - c2[0]) * similarity), ++ int(c2[1] + (c1[1] - c2[1]) * similarity), ++ int(c2[2] + (c1[2] - c2[2]) * similarity)) + + + class MainPanel(QtWidgets.QSplitter): +diff --git a/picard/util/__init__.py b/picard/util/__init__.py +index 3a4765f7cd..26f7576f56 100644 +--- a/picard/util/__init__.py ++++ b/picard/util/__init__.py +@@ -400,7 +400,7 @@ def throttled_func(*args, **kwargs): + else: + decorator.args = args + decorator.kwargs = kwargs +- QtCore.QTimer.singleShot(r, later) ++ QtCore.QTimer.singleShot(int(r), later) + decorator.is_ticking = True + mutex.unlock() + diff --git a/media-sound/picard/picard-2.6.3.ebuild b/media-sound/picard/picard-2.6.3.ebuild new file mode 100644 index 000000000000..2c7f465e7441 --- /dev/null +++ b/media-sound/picard/picard-2.6.3.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +DISTUTILS_SINGLE_IMPL=1 + +inherit distutils-r1 xdg + +if [[ ${PV} = *9999* ]]; then + EGIT_REPO_URI="https://github.com/metabrainz/picard" + inherit git-r3 +else + SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/${PN}-release-${PV}" +fi + +DESCRIPTION="Cross-platform music tagger" +HOMEPAGE="https://picard.musicbrainz.org" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="discid fingerprints nls" + +BDEPEND=" + nls? ( dev-qt/linguist-tools:5 ) +" +RDEPEND=" + $(python_gen_cond_dep ' + dev-python/fasteners[${PYTHON_USEDEP}] + dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] + dev-python/python-dateutil[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + discid? ( dev-python/python-discid[${PYTHON_USEDEP}] ) + ') + fingerprints? ( media-libs/chromaprint[tools] ) +" + +distutils_enable_tests pytest + +PATCHES=( + # https://github.com/metabrainz/picard/commit/452bba954c30d5a642f03c02411529f511bda786 + "${FILESDIR}/${P}-fix-py3.10.patch" +) + +python_compile() { + local build_args=( + --disable-autoupdate + ) + if ! use nls; then + build_args+=( --disable-locales ) + fi + distutils-r1_python_compile ${build_args[@]} +} + +python_install() { + local install_args=( + --disable-autoupdate + --skip-build + ) + if ! use nls; then + install_args+=( --disable-locales ) + fi + distutils-r1_python_install ${install_args[@]} +} diff --git a/media-sound/picard/picard-9999.ebuild b/media-sound/picard/picard-9999.ebuild index 7592c9ab3a2e..3b869df3541b 100644 --- a/media-sound/picard/picard-9999.ebuild +++ b/media-sound/picard/picard-9999.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) DISTUTILS_SINGLE_IMPL=1 -DISABLE_AUTOFORMATTING=true + inherit distutils-r1 xdg if [[ ${PV} = *9999* ]]; then @@ -29,16 +29,16 @@ BDEPEND=" " RDEPEND=" $(python_gen_cond_dep ' + dev-python/fasteners[${PYTHON_USEDEP}] dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}] dev-python/python-dateutil[${PYTHON_USEDEP}] + media-libs/mutagen[${PYTHON_USEDEP}] + discid? ( dev-python/python-discid[${PYTHON_USEDEP}] ) ') - dev-qt/qtgui:5 - media-libs/mutagen - discid? ( dev-python/python-discid ) fingerprints? ( media-libs/chromaprint[tools] ) " -RESTRICT="test" # doesn't work with ebuilds +distutils_enable_tests pytest python_compile() { local build_args=( @@ -60,13 +60,3 @@ python_install() { fi distutils-r1_python_install ${install_args[@]} } - -python_install_all() { - distutils-r1_python_install_all - - if [[ -n "${REPLACING_VERSIONS}" ]]; then - elog "If you are upgrading Picard and it does not start, try removing" - elog "Picard's settings:" - elog " rm ~/.config/MusicBrainz/Picard.conf" - fi -} |