Merge a couple of fixes from upstream:

- Remove the "lyricswiki" plugin, as the website shutdown last year
- Adjust the "default" version string
This commit is contained in:
ajacoutot 2022-11-24 08:32:32 +00:00
parent 271457ddcf
commit 01bc900771
3 changed files with 32 additions and 11 deletions

View File

@ -6,7 +6,7 @@ GH_ACCOUNT= multani
GH_PROJECT= sonata
DISTNAME= sonata-${MODPY_EGG_VERSION}
EPOCH= 1
REVISION= 3
REVISION= 4
CATEGORIES= audio
@ -31,6 +31,13 @@ RUN_DEPENDS= audio/py-mpd2${MODPY_FLAVOR} \
# pygobject GTK3 introspection (not provided by indirect dependencies)
RUN_DEPENDS += x11/gtk+3
# From c4ed69eed8dfdea3f958b2c0d93b79e70522009a Mon Sep 17 00:00:00 2001
# From: Jonathan Ballet <jon@multani.info>
# Date: Sun, 11 Apr 2021 17:03:09 +0200
# Subject: [PATCH] Remove the "lyricswiki" plugin, as the website shutdown last year (#119)
post-extract:
rm ${WRKSRC}/sonata/plugins/lyricwiki.py
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/sonata/pixmaps/sonata.png \

View File

@ -0,0 +1,17 @@
From ae4a1dd01055a7a0664d30cb93be919ed753bf8c Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 31 Mar 2021 19:19:20 -0400
Subject: [PATCH] Adjust the "default" version string.
Index: sonata/version.py
--- sonata/version.py.orig
+++ sonata/version.py
@@ -26,7 +26,7 @@ except ImportError:
build_ver = None
# Should be the most recent release
-default_version = "v1.7b1"
+default_version = "v1.7.0"
def _version():
'''Get the version number of the sources

View File

@ -1,11 +1,11 @@
bin/sonata
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/COPYING
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/Sonata-1.7b1.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/COPYING
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
lib/python${MODPY_VERSION}/site-packages/Sonata-${MODPY_EGG_VERSION}.dist-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/sonata/
lib/python${MODPY_VERSION}/site-packages/sonata/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sonata/${MODPY_PYCACHE}/
@ -108,14 +108,11 @@ lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}gajim_tu
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}gajim_tune.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}localmpd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}localmpd.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}lyricwiki.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}lyricwiki.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/covers_lastfm.py
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/gajim_tune.py
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/localmpd.py
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/lyricwiki.py
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/test.py
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/ui/
lib/python${MODPY_VERSION}/site-packages/sonata/plugins/ui/localmpd.glade