diff --git a/.SRCINFO b/.SRCINFO index 3562867..7cd862e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.3.2 + pkgver = 0.5.0 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -12,7 +12,8 @@ pkgbase = spot-client license = MIT checkdepends = appstream-glib makedepends = cargo - makedepends = meson>=0.50.0 + makedepends = meson>=0.59.0 + makedepends = blueprint-compiler>=0.8.1 depends = alsa-lib depends = cairo depends = glib2 @@ -25,9 +26,9 @@ pkgbase = spot-client depends = pango optdepends = org.freedesktop.secrets options = !lto - source = spot-client-0.3.2-1.tar.gz::https://github.com/xou816/spot/archive/0.3.2.tar.gz + source = https://github.com/xou816/spot/archive/0.5.0/spot-0.5.0.tar.gz source = disable-clippy.patch - sha512sums = fd8b1f372b5c06d65c0d40465aff018573e913200460b48339a9e106d17a372289b67855877d8642427367fc18e5eac31f2e765e54f4889149a8b5a69cd4638d - sha512sums = 1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1 + sha512sums = a2acbc2666c3acea86562227b490373bdeff67831bef7275b47e759db366cacbeb2411578f56be824cca6cd72c833e5830db89c203af1c8165e06927eabcf3ec + sha512sums = 4e38fff2a5867c46749959ceb0fb16372f12c8f8038b6a33d43e126e741f43e524e1499bb9b514e56b036097aaa0ac5dd149823c2c9eba277ab0ea4f58d5fb55 pkgname = spot-client diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index a467ee9..0000000 --- a/.editorconfig +++ /dev/null @@ -1,8 +0,0 @@ -root = true - -[*] -charset = utf-8 -end_of_line = lf -insert_final_newline = true -indent_style = tab -tab_width = 4 diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 82b3c18..0000000 --- a/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# from https://github.com/github/gitignore/blob/master/ArchLinuxPackages.gitignore -*.tar -*.tar.* -*.rpm -*.jar -*.exe -*.msi -*.zip -*.tgz -*.log -*.log.* -*.sig - -*/ diff --git a/PKGBUILD b/PKGBUILD index 2bfde9c..0b50251 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,35 +1,33 @@ # Maintainer: Manuel Hüsers # Contributor: Daniel Peukert # Contributor: NicoHood + _projectname='spot' pkgname="$_projectname-client" -pkgver='0.3.2' -pkgrel='1' +pkgver=0.5.0 +pkgrel=1 pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" license=('MIT') depends=('alsa-lib' 'cairo' 'glib2' 'glibc' 'graphene' 'gtk4' 'libadwaita' 'libpulse' 'openssl' 'pango') optdepends=('org.freedesktop.secrets') -makedepends=('cargo' 'meson>=0.50.0') +makedepends=('cargo' 'meson>=0.59.0' 'blueprint-compiler>=0.8.1') checkdepends=('appstream-glib') -options=('!lto') # build breaks with LTO enabled (https://gitlab.com/dpeukert/pkgbuilds/-/issues/38) -source=( - "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" - 'disable-clippy.patch' -) -sha512sums=('fd8b1f372b5c06d65c0d40465aff018573e913200460b48339a9e106d17a372289b67855877d8642427367fc18e5eac31f2e765e54f4889149a8b5a69cd4638d' - '1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1') -validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 +options=('!lto') # Build breaks with LTO enabled +source=("https://github.com/xou816/$_projectname/archive/$pkgver/$_projectname-$pkgver.tar.gz" + 'disable-clippy.patch') +sha512sums=('a2acbc2666c3acea86562227b490373bdeff67831bef7275b47e759db366cacbeb2411578f56be824cca6cd72c833e5830db89c203af1c8165e06927eabcf3ec' + '4e38fff2a5867c46749959ceb0fb16372f12c8f8038b6a33d43e126e741f43e524e1499bb9b514e56b036097aaa0ac5dd149823c2c9eba277ab0ea4f58d5fb55') +validpgpkeys=() # Waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' prepare() { cd "$srcdir/$_sourcedirectory/" - - # Disable clippy tests, as they don't realy make sense for user builds (https://gitlab.com/dpeukert/pkgbuilds/-/issues/37) - patch --forward -p1 < '../disable-clippy.patch' + # Disable failing clippy tests + patch -Np1 < '../disable-clippy.patch' } build() { diff --git a/disable-clippy.patch b/disable-clippy.patch index 25b9544..a845936 100644 --- a/disable-clippy.patch +++ b/disable-clippy.patch @@ -1,19 +1,24 @@ diff --git a/src/meson.build b/src/meson.build -index 755d870..fac1b77 100644 +index 900f3fa..e08b062 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -208,14 +208,3 @@ test('Unit tests', - ], - timeout: 180 +@@ -149,19 +149,3 @@ test('Unit tests', + timeout: 180, + env: env ) - --cargo_clippy = find_program(meson.source_root() / 'build-aux/clippy.sh') -test('Clippy', -- cargo_clippy, +- cargo, - args: [ -- meson.source_root(), -- meson.build_root(), -- get_option('offline') ? 'true' : 'false' +- 'clippy', +- '--manifest-path', cargo_manifest, +- '--target-dir', meson.project_build_root() / 'src', +- '--', +- '-D', 'warnings', +- '-A', 'clippy::module_inception', +- '-A', 'clippy::new_without_default', +- '-A', 'clippy::enum-variant-names' - ], -- timeout: 180 +- timeout: 180, +- env: env -)