This thread contains a patchset. You're looking at the original emails,
but you may wish to use the patch review UI.
Review patch
[PATCH sublime-music-git AUR] Fix PKGBUILD for recent Python package rename
Sublime's setuptools package was recently renamed to "sublime_music" [0, 1].
This adjusts the PKGBUILD to account for this.
[0]: https://git.sr.ht/~sumner/sublime-music/commit/aec54f8a1d1f6d91ca9e87f2428984beb14fca14
[1]: https://git.sr.ht/~sumner/sublime-music/commit/74e792c270d32bab32f0e7ba82c527fb15e63e35
---
This was tested locally with makepkg(8).
PKGBUILD | 2 + -
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/PKGBUILD b/PKGBUILD
index 2d6c461..d623ad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,7 +59,7 @@ package() {
# Move all of the package data resources to ${pkgdir}/usr/share/sublime-music
data_dir=${pkgdir}/usr/share/sublime-music
mkdir -p $data_dir/adapters/subsonic $data_dir/dbus $data_dir/ui
- pushd ${pkgdir}/usr/lib/python3.8/site-packages/sublime+ pushd ${pkgdir}/usr/lib/python3.8/site-packages/sublime_music mv adapters/icons $data_dir/adapters
mv adapters/images $data_dir/adapters
mv adapters/subsonic/icons $data_dir/adapters/subsonic
--
2.28.0
Note: I did not increment the pkgrel because no one should've been able
to install this AUR package since commit d454b90 in the sublime-music
repo (which corresponds to the current pkgver, v0.11.9.r0.gd454b90).
I'd be happy to send a v2 of the patch, though, if you disagree.
--
David
On Tue, Sep 29, 2020 at 12:00:00AM -0400, David Florness wrote:
> Note: I did not increment the pkgrel because no one should've been able
> to install this AUR package since commit d454b90 in the sublime-music
> repo (which corresponds to the current pkgver, v0.11.9.r0.gd454b90).
> I'd be happy to send a v2 of the patch, though, if you disagree.
I don't think that the AUR registers changes unless you increment either
pkgver or pkgrel, so please update the pkgrel version.
[PATCH sublime-music-git AUR v2] Fix PKGBUILD for recent Python package rename
Sublime's setuptools package was recently renamed to "sublime_music" [0, 1].
This adjusts the PKGBUILD to account for this.
[0]: https://git.sr.ht/~sumner/sublime-music/commit/aec54f8a1d1f6d91ca9e87f2428984beb14fca14
[1]: https://git.sr.ht/~sumner/sublime-music/commit/74e792c270d32bab32f0e7ba82c527fb15e63e35
---
v1 -> v2: bump pkgrel
.SRCINFO | 2 + -
PKGBUILD | 4 ++ --
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.SRCINFO b/.SRCINFO
index 36167b2..0f00751 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sublime-music-git
pkgdesc = A native Subsonic/Airsonic/*sonic client for Linux. Build using Python and GTK+.
pkgver = v0.11.9.r0.gd454b90
- pkgrel = 1+ pkgrel = 2 url = https://sublimemusic.app
arch = any
license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 2d6c461..267b7a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase='sublime-music-git'
pkgname=('sublime-music-git')
_module='sublime-music'
pkgver=v0.11.9.r0.gd454b90
- pkgrel=1+ pkgrel=2 pkgdesc='A native Subsonic/Airsonic/*sonic client for Linux. Build using Python and GTK+.'
url='https://sublimemusic.app'
provides=('sublime-music')
@@ -59,7 +59,7 @@ package() {
# Move all of the package data resources to ${pkgdir}/usr/share/sublime-music
data_dir=${pkgdir}/usr/share/sublime-music
mkdir -p $data_dir/adapters/subsonic $data_dir/dbus $data_dir/ui
- pushd ${pkgdir}/usr/lib/python3.8/site-packages/sublime+ pushd ${pkgdir}/usr/lib/python3.8/site-packages/sublime_music mv adapters/icons $data_dir/adapters
mv adapters/images $data_dir/adapters
mv adapters/subsonic/icons $data_dir/adapters/subsonic
--
2.28.0