From 2d12250a6e81183c2cd57b2996f114427668b1b9 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Thu, 18 Feb 2021 14:07:27 +0100 Subject: [PATCH 01/25] Add spot-client and spot-client-git --- .SRCINFO | 24 ++++++++++++++++++++++++ .editorconfig | 8 ++++++++ .gitignore | 14 ++++++++++++++ PKGBUILD | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 79 insertions(+) create mode 100644 .SRCINFO create mode 100644 .editorconfig create mode 100644 .gitignore create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..1a32659 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,24 @@ +pkgbase = spot-client + pkgdesc = Gtk/Rust native Spotify client + pkgver = 0.1.7 + pkgrel = 1 + url = https://github.com/xou816/spot + arch = x86_64 + arch = i686 + arch = arm + arch = armv6h + arch = armv7h + arch = aarch64 + license = MIT + makedepends = cargo + makedepends = meson + depends = alsa-lib + depends = glib2 + depends = gtk3 + depends = libhandy + depends = libpulse + depends = openssl + source = spot-client-0.1.7-1.tar.gz::https://github.com/xou816/spot/archive/0.1.7.tar.gz + sha256sums = 755c11a2e79e575442db4b85a9b44c9f821b048515ecc4d14a6fe335df3ca4ed + +pkgname = spot-client diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..a467ee9 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,8 @@ +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 new file mode 100644 index 0000000..82b3c18 --- /dev/null +++ b/.gitignore @@ -0,0 +1,14 @@ +# 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 new file mode 100644 index 0000000..be6b9d1 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Daniel Peukert +_projectname='spot' +pkgname="$_projectname-client" +pkgver='0.1.7' +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' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') +makedepends=('cargo' 'meson') +source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") +sha256sums=('755c11a2e79e575442db4b85a9b44c9f821b048515ecc4d14a6fe335df3ca4ed') + +_sourcedirectory="$_projectname-$pkgver" +_builddirectory='build' + +build() { + cd "$srcdir/" + arch-meson "$_sourcedirectory" "$_builddirectory" -Doffline=false + meson compile -C "$_builddirectory" +} + +check() { + cd "$srcdir/" + meson test -C "$_builddirectory" +} + +package() { + cd "$srcdir/" + DESTDIR="$pkgdir" meson install -C "$_builddirectory" + install -Dm644 "$_sourcedirectory/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} From 10a697af025fe47ae305662cacfcb955e8ba589c Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Mon, 22 Feb 2021 17:32:13 +0100 Subject: [PATCH 02/25] Update spot-client to 0.1.8 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1a32659..7edb2d3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.7 + pkgver = 0.1.8 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -11,14 +11,14 @@ pkgbase = spot-client arch = aarch64 license = MIT makedepends = cargo - makedepends = meson + makedepends = meson>=0.50.0 depends = alsa-lib depends = glib2 depends = gtk3 depends = libhandy depends = libpulse depends = openssl - source = spot-client-0.1.7-1.tar.gz::https://github.com/xou816/spot/archive/0.1.7.tar.gz - sha256sums = 755c11a2e79e575442db4b85a9b44c9f821b048515ecc4d14a6fe335df3ca4ed + source = spot-client-0.1.8-1.tar.gz::https://github.com/xou816/spot/archive/0.1.8.tar.gz + sha256sums = 61a14eff406f18e397cf99bee810b60acc34129e1310c239ceee7b2501edfeb0 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index be6b9d1..e3139db 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.7' +pkgver='0.1.8' 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' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') -makedepends=('cargo' 'meson') +makedepends=('cargo' 'meson>=0.50.0') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('755c11a2e79e575442db4b85a9b44c9f821b048515ecc4d14a6fe335df3ca4ed') +sha256sums=('61a14eff406f18e397cf99bee810b60acc34129e1310c239ceee7b2501edfeb0') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' From 6494e8db56e2eae85d5586baea88bae149c4d02c Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Thu, 4 Mar 2021 00:00:50 +0100 Subject: [PATCH 03/25] Update spot-client to 0.1.9 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7edb2d3..39eab4d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.8 + pkgver = 0.1.9 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = spot-client depends = libhandy depends = libpulse depends = openssl - source = spot-client-0.1.8-1.tar.gz::https://github.com/xou816/spot/archive/0.1.8.tar.gz - sha256sums = 61a14eff406f18e397cf99bee810b60acc34129e1310c239ceee7b2501edfeb0 + source = spot-client-0.1.9-1.tar.gz::https://github.com/xou816/spot/archive/0.1.9.tar.gz + sha256sums = 39499aa48cffb5d1f1352affa362c014f9c29570648cc59ff2ba1dde5d2372cd pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index e3139db..6ecb0f5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.8' +pkgver='0.1.9' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -10,7 +10,7 @@ license=('MIT') depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') makedepends=('cargo' 'meson>=0.50.0') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('61a14eff406f18e397cf99bee810b60acc34129e1310c239ceee7b2501edfeb0') +sha256sums=('39499aa48cffb5d1f1352affa362c014f9c29570648cc59ff2ba1dde5d2372cd') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' From 0ce33852639c4ff39267bce3bf80ea9e30468dce Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sun, 14 Mar 2021 09:34:04 +0100 Subject: [PATCH 04/25] Update spot-client to 0.1.10 --- .SRCINFO | 7 ++++--- PKGBUILD | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 39eab4d..2b9b1e3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.9 + pkgver = 0.1.10 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -18,7 +18,8 @@ pkgbase = spot-client depends = libhandy depends = libpulse depends = openssl - source = spot-client-0.1.9-1.tar.gz::https://github.com/xou816/spot/archive/0.1.9.tar.gz - sha256sums = 39499aa48cffb5d1f1352affa362c014f9c29570648cc59ff2ba1dde5d2372cd + optdepends = org.freedesktop.secrets + source = spot-client-0.1.10-1.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + sha256sums = 9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 6ecb0f5..31a3561 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.9' +pkgver='0.1.10' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -9,15 +9,16 @@ url="https://github.com/xou816/$_projectname" license=('MIT') depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') makedepends=('cargo' 'meson>=0.50.0') +optdepends=('org.freedesktop.secrets') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('39499aa48cffb5d1f1352affa362c014f9c29570648cc59ff2ba1dde5d2372cd') +sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' build() { cd "$srcdir/" - arch-meson "$_sourcedirectory" "$_builddirectory" -Doffline=false + arch-meson "$_sourcedirectory" "$_builddirectory" -Doffline=false -Dbuildtype=release meson compile -C "$_builddirectory" } From 6cc22001531b77784766934349c88c0dd42b0252 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sun, 14 Mar 2021 17:40:24 +0100 Subject: [PATCH 05/25] Fix up meson & cargo arguments for spot-client --- .SRCINFO | 6 ++++-- PKGBUILD | 18 ++++++++++++++---- meson-test-release.diff | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 6 deletions(-) create mode 100644 meson-test-release.diff diff --git a/.SRCINFO b/.SRCINFO index 2b9b1e3..cf01231 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.1.10 - pkgrel = 1 + pkgrel = 2 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -19,7 +19,9 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.10-1.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + source = spot-client-0.1.10-2.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + source = meson-test-release.diff sha256sums = 9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979 + sha256sums = 4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 31a3561..d54da1e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.1.10' -pkgrel='1' +pkgrel='2' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -10,15 +10,25 @@ license=('MIT') depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') makedepends=('cargo' 'meson>=0.50.0') optdepends=('org.freedesktop.secrets') -source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979') +source=( + "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" + 'meson-test-release.diff' +) +sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979' + '4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' +prepare() { + cd "$srcdir/$_sourcedirectory/" + patch --forward -p1 < '../meson-test-release.diff' +} + build() { cd "$srcdir/" - arch-meson "$_sourcedirectory" "$_builddirectory" -Doffline=false -Dbuildtype=release + meson setup --prefix '/usr' --libexecdir 'lib' --sbindir 'bin' --buildtype 'release' --wrap-mode 'nodownload' \ + -Db_lto='true' -Db_pie='true' -Doffline='false' -Dfeatures='warn-cache' "$_sourcedirectory" "$_builddirectory" meson compile -C "$_builddirectory" } diff --git a/meson-test-release.diff b/meson-test-release.diff new file mode 100644 index 0000000..59b6bfb --- /dev/null +++ b/meson-test-release.diff @@ -0,0 +1,40 @@ +diff --git a/build-aux/test.sh b/build-aux/test.sh +index f8ca912..f3b9e8f 100644 +--- a/build-aux/test.sh ++++ b/build-aux/test.sh +@@ -2,10 +2,19 @@ + + export SRC="$1" + export CARGO_TARGET_DIR="$2"/target +-export OFFLINE="$3" ++export BUILDTYPE="$3" ++export OFFLINE="$4" ++ ++echo $BUILDTYPE ++ ++if [[ $BUILDTYPE = "release" ]]; then ++ PROFILE_ARG="--release" ++else ++ PROFILE_ARG="--verbose" ++fi + + if [[ $OFFLINE = "true" ]]; then + export CARGO_HOME="$SRC"/cargo + fi + +-cargo test --manifest-path "$SRC"/Cargo.toml +\ No newline at end of file ++cargo test --manifest-path "$SRC"/Cargo.toml "$PROFILE_ARG" +\ No newline at end of file +diff --git a/src/meson.build b/src/meson.build +index 93d7387..909e9d6 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -140,6 +140,7 @@ test('Unit tests', + args: [ + meson.source_root(), + meson.build_root(), ++ get_option('buildtype'), + get_option('offline') ? 'true' : 'false' + ] + ) From 9d395f24daf2e67e99ec19ef3ca6ac22f9020144 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sun, 14 Mar 2021 18:09:38 +0100 Subject: [PATCH 06/25] Add missing checkdepends to spot-client --- .SRCINFO | 5 +++-- PKGBUILD | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cf01231..51bb6cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.1.10 - pkgrel = 2 + pkgrel = 3 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -10,6 +10,7 @@ pkgbase = spot-client arch = armv7h arch = aarch64 license = MIT + checkdepends = appstream-glib makedepends = cargo makedepends = meson>=0.50.0 depends = alsa-lib @@ -19,7 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.10-2.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + source = spot-client-0.1.10-3.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz source = meson-test-release.diff sha256sums = 9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979 sha256sums = 4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95 diff --git a/PKGBUILD b/PKGBUILD index d54da1e..895a60a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,14 +2,15 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.1.10' -pkgrel='2' +pkgrel='3' 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' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') -makedepends=('cargo' 'meson>=0.50.0') optdepends=('org.freedesktop.secrets') +makedepends=('cargo' 'meson>=0.50.0') +checkdepends=('appstream-glib') source=( "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" 'meson-test-release.diff' From 6bb034a5282bbfc3e6edfbd9fcc53c4b8cb7dd53 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sun, 14 Mar 2021 20:49:16 +0100 Subject: [PATCH 07/25] Use merged meson test fix commit for spot-client --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 51bb6cd..d63e219 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.1.10 - pkgrel = 3 + pkgrel = 4 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -20,8 +20,8 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.10-3.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz - source = meson-test-release.diff + source = spot-client-0.1.10-4.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz + source = spot-client-0.1.10-4-meson-test-release.diff::https://github.com/xou816/spot/commit/2dc722595e6bf716e46b779db6c8d3e239052ff2.diff sha256sums = 9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979 sha256sums = 4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95 diff --git a/PKGBUILD b/PKGBUILD index 895a60a..9f0b12e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.1.10' -pkgrel='3' +pkgrel='4' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -13,7 +13,7 @@ makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=( "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" - 'meson-test-release.diff' + "$pkgname-$pkgver-$pkgrel-meson-test-release.diff::$url/commit/2dc722595e6bf716e46b779db6c8d3e239052ff2.diff" ) sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979' '4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95') @@ -23,7 +23,7 @@ _builddirectory='build' prepare() { cd "$srcdir/$_sourcedirectory/" - patch --forward -p1 < '../meson-test-release.diff' + patch --forward -p1 < "../$pkgname-$pkgver-$pkgrel-meson-test-release.diff" } build() { From 71cec33e7ddb1edb489fe9507296e8d03dd1f300 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Wed, 17 Mar 2021 23:03:00 +0100 Subject: [PATCH 08/25] Update spot-client to 0.1.11 --- .SRCINFO | 10 ++++------ PKGBUILD | 17 ++++------------- meson-test-release.diff | 40 ---------------------------------------- 3 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 meson-test-release.diff diff --git a/.SRCINFO b/.SRCINFO index d63e219..cb26038 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.10 - pkgrel = 4 + pkgver = 0.1.11 + pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -20,9 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.10-4.tar.gz::https://github.com/xou816/spot/archive/0.1.10.tar.gz - source = spot-client-0.1.10-4-meson-test-release.diff::https://github.com/xou816/spot/commit/2dc722595e6bf716e46b779db6c8d3e239052ff2.diff - sha256sums = 9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979 - sha256sums = 4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95 + source = spot-client-0.1.11-1.tar.gz::https://github.com/xou816/spot/archive/0.1.11.tar.gz + sha256sums = 7f35be66edc2391ca80b9b870239b136d5c67997dfb2ad7af8e3025e19e72f53 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 9f0b12e..2e013d7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.10' -pkgrel='4' +pkgver='0.1.11' +pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -11,21 +11,12 @@ depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') -source=( - "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" - "$pkgname-$pkgver-$pkgrel-meson-test-release.diff::$url/commit/2dc722595e6bf716e46b779db6c8d3e239052ff2.diff" -) -sha256sums=('9399ba0673ad32a9e6220eaa220c08fba8d6464adab5018130e5cad8818b0979' - '4366433646f05f74cb9cdc23079ad37655e06589cd28ecd3cd156223ff213a95') +source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") +sha256sums=('7f35be66edc2391ca80b9b870239b136d5c67997dfb2ad7af8e3025e19e72f53') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' -prepare() { - cd "$srcdir/$_sourcedirectory/" - patch --forward -p1 < "../$pkgname-$pkgver-$pkgrel-meson-test-release.diff" -} - build() { cd "$srcdir/" meson setup --prefix '/usr' --libexecdir 'lib' --sbindir 'bin' --buildtype 'release' --wrap-mode 'nodownload' \ diff --git a/meson-test-release.diff b/meson-test-release.diff deleted file mode 100644 index 59b6bfb..0000000 --- a/meson-test-release.diff +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/build-aux/test.sh b/build-aux/test.sh -index f8ca912..f3b9e8f 100644 ---- a/build-aux/test.sh -+++ b/build-aux/test.sh -@@ -2,10 +2,19 @@ - - export SRC="$1" - export CARGO_TARGET_DIR="$2"/target --export OFFLINE="$3" -+export BUILDTYPE="$3" -+export OFFLINE="$4" -+ -+echo $BUILDTYPE -+ -+if [[ $BUILDTYPE = "release" ]]; then -+ PROFILE_ARG="--release" -+else -+ PROFILE_ARG="--verbose" -+fi - - if [[ $OFFLINE = "true" ]]; then - export CARGO_HOME="$SRC"/cargo - fi - --cargo test --manifest-path "$SRC"/Cargo.toml -\ No newline at end of file -+cargo test --manifest-path "$SRC"/Cargo.toml "$PROFILE_ARG" -\ No newline at end of file -diff --git a/src/meson.build b/src/meson.build -index 93d7387..909e9d6 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -140,6 +140,7 @@ test('Unit tests', - args: [ - meson.source_root(), - meson.build_root(), -+ get_option('buildtype'), - get_option('offline') ? 'true' : 'false' - ] - ) From f6b81c11a6d2d784714bb2570984ab71c9b73f24 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Wed, 24 Mar 2021 18:10:37 +0100 Subject: [PATCH 09/25] Update spot-client to 0.1.12 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cb26038..6e1d7bd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.11 + pkgver = 0.1.12 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -20,7 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.11-1.tar.gz::https://github.com/xou816/spot/archive/0.1.11.tar.gz - sha256sums = 7f35be66edc2391ca80b9b870239b136d5c67997dfb2ad7af8e3025e19e72f53 + source = spot-client-0.1.12-1.tar.gz::https://github.com/xou816/spot/archive/0.1.12.tar.gz + sha256sums = a3d57e92f8152370b7fa0c482904eb0418bc04a59d3ec6e9ee7847c68bd08c40 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 2e013d7..074e93f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.11' +pkgver='0.1.12' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -12,7 +12,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('7f35be66edc2391ca80b9b870239b136d5c67997dfb2ad7af8e3025e19e72f53') +sha256sums=('a3d57e92f8152370b7fa0c482904eb0418bc04a59d3ec6e9ee7847c68bd08c40') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' From c112e14c5b212d46e5cd47f8b572649c7c1ce12d Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 13 Apr 2021 10:24:16 +0200 Subject: [PATCH 10/25] Update spot-client to 0.1.13 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6e1d7bd..d764994 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.12 + pkgver = 0.1.13 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -20,7 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.12-1.tar.gz::https://github.com/xou816/spot/archive/0.1.12.tar.gz - sha256sums = a3d57e92f8152370b7fa0c482904eb0418bc04a59d3ec6e9ee7847c68bd08c40 + source = spot-client-0.1.13-1.tar.gz::https://github.com/xou816/spot/archive/0.1.13.tar.gz + sha256sums = 9c4397fd6b4c000fbd35705ce09e15947131350fd72ccaa6ee2b5510f07aba29 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 074e93f..24a19c0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.12' +pkgver='0.1.13' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -12,7 +12,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('a3d57e92f8152370b7fa0c482904eb0418bc04a59d3ec6e9ee7847c68bd08c40') +sha256sums=('9c4397fd6b4c000fbd35705ce09e15947131350fd72ccaa6ee2b5510f07aba29') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' From 37d87444b34233a4aa30657978c09e492970bcd7 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 11 May 2021 01:45:09 +0200 Subject: [PATCH 11/25] Update spot-client to 0.1.14 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d764994..42bc62c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.13 + pkgver = 0.1.14 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -20,7 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.13-1.tar.gz::https://github.com/xou816/spot/archive/0.1.13.tar.gz - sha256sums = 9c4397fd6b4c000fbd35705ce09e15947131350fd72ccaa6ee2b5510f07aba29 + source = spot-client-0.1.14-1.tar.gz::https://github.com/xou816/spot/archive/0.1.14.tar.gz + sha256sums = e568a3b11fdb3b68082a934ca82b68f05390136bd567ba8ec3c84768721b68bd pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 24a19c0..a3bc77b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.13' +pkgver='0.1.14' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -12,7 +12,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('9c4397fd6b4c000fbd35705ce09e15947131350fd72ccaa6ee2b5510f07aba29') +sha256sums=('e568a3b11fdb3b68082a934ca82b68f05390136bd567ba8ec3c84768721b68bd') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' From 98c971d08a47a005d28e10e2f30ab2696ef781fa Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Mon, 31 May 2021 15:27:33 +0200 Subject: [PATCH 12/25] Disable spot-client test timeout --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 42bc62c..82e3359 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.1.14 - pkgrel = 1 + pkgrel = 2 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -20,7 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.14-1.tar.gz::https://github.com/xou816/spot/archive/0.1.14.tar.gz + source = spot-client-0.1.14-2.tar.gz::https://github.com/xou816/spot/archive/0.1.14.tar.gz sha256sums = e568a3b11fdb3b68082a934ca82b68f05390136bd567ba8ec3c84768721b68bd pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index a3bc77b..14e2c0d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.1.14' -pkgrel='1' +pkgrel='2' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -26,7 +26,7 @@ build() { check() { cd "$srcdir/" - meson test -C "$_builddirectory" + meson test -C "$_builddirectory" --timeout-multiplier -1 } package() { From af3398d9f68d22d87b20958c034fb175cb3bb8e0 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Wed, 30 Jun 2021 22:36:24 +0200 Subject: [PATCH 13/25] Update spot-client to 0.1.15 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 82e3359..334c8a9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.14 - pkgrel = 2 + pkgver = 0.1.15 + pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -20,7 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.14-2.tar.gz::https://github.com/xou816/spot/archive/0.1.14.tar.gz - sha256sums = e568a3b11fdb3b68082a934ca82b68f05390136bd567ba8ec3c84768721b68bd + source = spot-client-0.1.15-1.tar.gz::https://github.com/xou816/spot/archive/0.1.15.tar.gz + sha256sums = 55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 14e2c0d..03a205c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.14' -pkgrel='2' +pkgver='0.1.15' +pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -12,7 +12,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('e568a3b11fdb3b68082a934ca82b68f05390136bd567ba8ec3c84768721b68bd') +sha256sums=('55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' From a66e905ac913c1eacdd3e49414b1b94822022d76 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sat, 31 Jul 2021 13:57:42 +0200 Subject: [PATCH 14/25] Disable the spot-client Clippy test --- .SRCINFO | 6 ++++-- PKGBUILD | 17 ++++++++++++++--- disable-clippy-test.diff | 20 ++++++++++++++++++++ 3 files changed, 38 insertions(+), 5 deletions(-) create mode 100644 disable-clippy-test.diff diff --git a/.SRCINFO b/.SRCINFO index 334c8a9..11b4c45 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.1.15 - pkgrel = 1 + pkgrel = 2 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -20,7 +20,9 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.15-1.tar.gz::https://github.com/xou816/spot/archive/0.1.15.tar.gz + source = spot-client-0.1.15-2.tar.gz::https://github.com/xou816/spot/archive/0.1.15.tar.gz + source = disable-clippy-test.diff sha256sums = 55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121 + sha256sums = ebf64746a9fff1242bdbf47736c78aaf7c3c94ef6423002662dbbb74db685004 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 03a205c..ca20432 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.1.15' -pkgrel='1' +pkgrel='2' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -11,12 +11,23 @@ depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') -source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121') +source=( + "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" + 'disable-clippy-test.diff' +) +sha256sums=('55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121' + 'ebf64746a9fff1242bdbf47736c78aaf7c3c94ef6423002662dbbb74db685004') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' +prepare() { + cd "$srcdir/$_sourcedirectory/" + # Disable Clippy test for now, as it still complains about some errors not yet fixed by upstream + # When reenabling, don't forget to use a patch to explicitly specify the Cargo.toml path (https://github.com/xou816/spot/issues/252#issuecomment-880941157) + patch --forward -p1 < '../disable-clippy-test.diff' +} + build() { cd "$srcdir/" meson setup --prefix '/usr' --libexecdir 'lib' --sbindir 'bin' --buildtype 'release' --wrap-mode 'nodownload' \ diff --git a/disable-clippy-test.diff b/disable-clippy-test.diff new file mode 100644 index 0000000..f76738e --- /dev/null +++ b/disable-clippy-test.diff @@ -0,0 +1,20 @@ +diff --git a/src/meson.build b/src/meson.build +index 114c965..cbdfeff 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -185,14 +185,3 @@ test('Unit tests', + ], + timeout: 60 + ) +- +-cargo_clippy = find_program(meson.source_root() / 'build-aux/clippy.sh') +-test('Clippy', +- cargo_clippy, +- args: [ +- meson.source_root(), +- meson.build_root(), +- get_option('offline') ? 'true' : 'false' +- ], +- timeout: 120 +-) +\ No newline at end of file From bfccd96e886fffafaaddb1510dca3d6a15f793ca Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 17 Aug 2021 23:23:48 +0200 Subject: [PATCH 15/25] Update spot-client to 0.1.16 --- .SRCINFO | 10 ++++------ PKGBUILD | 19 ++++--------------- disable-clippy-test.diff | 20 -------------------- 3 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 disable-clippy-test.diff diff --git a/.SRCINFO b/.SRCINFO index 11b4c45..e9d585b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.15 - pkgrel = 2 + pkgver = 0.1.16 + pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -20,9 +20,7 @@ pkgbase = spot-client depends = libpulse depends = openssl optdepends = org.freedesktop.secrets - source = spot-client-0.1.15-2.tar.gz::https://github.com/xou816/spot/archive/0.1.15.tar.gz - source = disable-clippy-test.diff - sha256sums = 55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121 - sha256sums = ebf64746a9fff1242bdbf47736c78aaf7c3c94ef6423002662dbbb74db685004 + source = spot-client-0.1.16-1.tar.gz::https://github.com/xou816/spot/archive/0.1.16.tar.gz + sha256sums = da9ca8d1c29d8e88bac630e25a07c9682d61ebf8ac61db77ee50db3f4adc3a40 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index ca20432..b136dcf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Daniel Peukert _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.15' -pkgrel='2' +pkgver='0.1.16' +pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -11,23 +11,12 @@ depends=('alsa-lib' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') -source=( - "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" - 'disable-clippy-test.diff' -) -sha256sums=('55fa29d3627b8e6218b6a0f927391887fbb1a496b597a74a3af70b75207f4121' - 'ebf64746a9fff1242bdbf47736c78aaf7c3c94ef6423002662dbbb74db685004') +source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") +sha256sums=('da9ca8d1c29d8e88bac630e25a07c9682d61ebf8ac61db77ee50db3f4adc3a40') _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' -prepare() { - cd "$srcdir/$_sourcedirectory/" - # Disable Clippy test for now, as it still complains about some errors not yet fixed by upstream - # When reenabling, don't forget to use a patch to explicitly specify the Cargo.toml path (https://github.com/xou816/spot/issues/252#issuecomment-880941157) - patch --forward -p1 < '../disable-clippy-test.diff' -} - build() { cd "$srcdir/" meson setup --prefix '/usr' --libexecdir 'lib' --sbindir 'bin' --buildtype 'release' --wrap-mode 'nodownload' \ diff --git a/disable-clippy-test.diff b/disable-clippy-test.diff deleted file mode 100644 index f76738e..0000000 --- a/disable-clippy-test.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index 114c965..cbdfeff 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -185,14 +185,3 @@ test('Unit tests', - ], - timeout: 60 - ) -- --cargo_clippy = find_program(meson.source_root() / 'build-aux/clippy.sh') --test('Clippy', -- cargo_clippy, -- args: [ -- meson.source_root(), -- meson.build_root(), -- get_option('offline') ? 'true' : 'false' -- ], -- timeout: 120 --) -\ No newline at end of file From bf314710db20c3ab93320c86577997d2f0596f28 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Fri, 10 Sep 2021 02:10:25 +0200 Subject: [PATCH 16/25] Update spot-client to 0.2.0 --- .SRCINFO | 14 +++++++++----- PKGBUILD | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e9d585b..99a8bbb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.1.16 + pkgver = 0.2.0 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -14,13 +14,17 @@ pkgbase = spot-client makedepends = cargo makedepends = meson>=0.50.0 depends = alsa-lib + depends = cairo depends = glib2 - depends = gtk3 - depends = libhandy + depends = glibc + depends = graphene + depends = gtk4 + depends = libadwaita depends = libpulse depends = openssl + depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.1.16-1.tar.gz::https://github.com/xou816/spot/archive/0.1.16.tar.gz - sha256sums = da9ca8d1c29d8e88bac630e25a07c9682d61ebf8ac61db77ee50db3f4adc3a40 + source = spot-client-0.2.0-1.tar.gz::https://github.com/xou816/spot/archive/0.2.0.tar.gz + sha512sums = 04930c3be37b45ad9dcac3448d6e3154f597a3caa945fc22f82e552d46960ec869e67d43b7c8117e2ecc6e97e2bfd6d7d0a8a43926467d72c10a706bc137daf7 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index b136dcf..711dbb3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,26 +1,30 @@ # Maintainer: Daniel Peukert +# Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.1.16' +pkgver='0.2.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' 'glib2' 'gtk3' 'libhandy' 'libpulse' 'openssl') +depends=('alsa-lib' 'cairo' 'glib2' 'glibc' 'graphene' 'gtk4' 'libadwaita' 'libpulse' 'openssl' 'pango') optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha256sums=('da9ca8d1c29d8e88bac630e25a07c9682d61ebf8ac61db77ee50db3f4adc3a40') +sha512sums=('04930c3be37b45ad9dcac3448d6e3154f597a3caa945fc22f82e552d46960ec869e67d43b7c8117e2ecc6e97e2bfd6d7d0a8a43926467d72c10a706bc137daf7') +validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' build() { cd "$srcdir/" + # We're not using arch-meson, because upstream recommends using --buildtype 'release' + # The offline build flag is turned off, as we're not predownloading rust dependencies meson setup --prefix '/usr' --libexecdir 'lib' --sbindir 'bin' --buildtype 'release' --wrap-mode 'nodownload' \ - -Db_lto='true' -Db_pie='true' -Doffline='false' -Dfeatures='warn-cache' "$_sourcedirectory" "$_builddirectory" + -Db_lto='true' -Db_pie='true' -Doffline='false' "$_sourcedirectory" "$_builddirectory" meson compile -C "$_builddirectory" } @@ -31,6 +35,6 @@ check() { package() { cd "$srcdir/" - DESTDIR="$pkgdir" meson install -C "$_builddirectory" + meson install -C "$_builddirectory" --destdir "$pkgdir" install -Dm644 "$_sourcedirectory/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } From 9ed48b38d9159de9fd717af2def14bc02cb9a551 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sat, 9 Oct 2021 00:01:40 +0200 Subject: [PATCH 17/25] Update spot-client to 0.2.0.1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 99a8bbb..3c7f11e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.2.0 + pkgver = 0.2.0.1 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -24,7 +24,7 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.2.0-1.tar.gz::https://github.com/xou816/spot/archive/0.2.0.tar.gz - sha512sums = 04930c3be37b45ad9dcac3448d6e3154f597a3caa945fc22f82e552d46960ec869e67d43b7c8117e2ecc6e97e2bfd6d7d0a8a43926467d72c10a706bc137daf7 + source = spot-client-0.2.0.1-1.tar.gz::https://github.com/xou816/spot/archive/0.2.0.1.tar.gz + sha512sums = 2e0dd5b68d8f46fbf59d25fe37726f657d74d785b4c557b7665604dbc1b68bd288db003fa100b631f58aaa7f4a4f8aea361793c68ae9c52b6356fedbfe8a6296 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 711dbb3..fbf6a4a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.2.0' +pkgver='0.2.0.1' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -13,7 +13,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('04930c3be37b45ad9dcac3448d6e3154f597a3caa945fc22f82e552d46960ec869e67d43b7c8117e2ecc6e97e2bfd6d7d0a8a43926467d72c10a706bc137daf7') +sha512sums=('2e0dd5b68d8f46fbf59d25fe37726f657d74d785b4c557b7665604dbc1b68bd288db003fa100b631f58aaa7f4a4f8aea361793c68ae9c52b6356fedbfe8a6296') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" From 3e9025506dd3d0e127aff87b2562b3e854bd03d1 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 19 Oct 2021 07:43:10 +0200 Subject: [PATCH 18/25] Update spot-client to 0.2.1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3c7f11e..d0eff05 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.2.0.1 + pkgver = 0.2.1 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -24,7 +24,7 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.2.0.1-1.tar.gz::https://github.com/xou816/spot/archive/0.2.0.1.tar.gz - sha512sums = 2e0dd5b68d8f46fbf59d25fe37726f657d74d785b4c557b7665604dbc1b68bd288db003fa100b631f58aaa7f4a4f8aea361793c68ae9c52b6356fedbfe8a6296 + source = spot-client-0.2.1-1.tar.gz::https://github.com/xou816/spot/archive/0.2.1.tar.gz + sha512sums = 11230a686a70e3719ddc29e3442efeafdb2e56f074e4c2f8c7595b9cd1e05f0c7874f046662cc5b36ba1adc8476814090c1232038be4a2d91e8dc75478b725ab pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index fbf6a4a..ed6a5e7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.2.0.1' +pkgver='0.2.1' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -13,7 +13,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('2e0dd5b68d8f46fbf59d25fe37726f657d74d785b4c557b7665604dbc1b68bd288db003fa100b631f58aaa7f4a4f8aea361793c68ae9c52b6356fedbfe8a6296') +sha512sums=('11230a686a70e3719ddc29e3442efeafdb2e56f074e4c2f8c7595b9cd1e05f0c7874f046662cc5b36ba1adc8476814090c1232038be4a2d91e8dc75478b725ab') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" From ddfec238c33c20f318c80bc47e4546963dba57fd Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Wed, 10 Nov 2021 18:26:46 +0100 Subject: [PATCH 19/25] Update spot-client to 0.2.2 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d0eff05..d9509a7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.2.1 + pkgver = 0.2.2 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -24,7 +24,7 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.2.1-1.tar.gz::https://github.com/xou816/spot/archive/0.2.1.tar.gz - sha512sums = 11230a686a70e3719ddc29e3442efeafdb2e56f074e4c2f8c7595b9cd1e05f0c7874f046662cc5b36ba1adc8476814090c1232038be4a2d91e8dc75478b725ab + source = spot-client-0.2.2-1.tar.gz::https://github.com/xou816/spot/archive/0.2.2.tar.gz + sha512sums = 997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index ed6a5e7..0509d42 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.2.1' +pkgver='0.2.2' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -13,7 +13,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('11230a686a70e3719ddc29e3442efeafdb2e56f074e4c2f8c7595b9cd1e05f0c7874f046662cc5b36ba1adc8476814090c1232038be4a2d91e8dc75478b725ab') +sha512sums=('997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" From f37597e6738d77a0845a2950a7a34d6b3738db29 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Wed, 22 Dec 2021 01:37:32 +0100 Subject: [PATCH 20/25] Fix failing Clippy tests for spot-client --- .SRCINFO | 6 ++++-- PKGBUILD | 17 ++++++++++++++--- clippy.diff | 10 ++++++++++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 clippy.diff diff --git a/.SRCINFO b/.SRCINFO index d9509a7..d73873d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client pkgver = 0.2.2 - pkgrel = 1 + pkgrel = 2 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -24,7 +24,9 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.2.2-1.tar.gz::https://github.com/xou816/spot/archive/0.2.2.tar.gz + source = spot-client-0.2.2-2.tar.gz::https://github.com/xou816/spot/archive/0.2.2.tar.gz + source = clippy.diff sha512sums = 997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a + sha512sums = 8051c21a00c981eef8f0b08f30b369f28cd08d9d8d13b9f05df61b8365fc8ea91534aea7f21fcad6f14b41577fdfc9eaaf64dbd720d051e302fc7222d8aaf599 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 0509d42..fb213d7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ _projectname='spot' pkgname="$_projectname-client" pkgver='0.2.2' -pkgrel='1' +pkgrel='2' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -12,13 +12,24 @@ depends=('alsa-lib' 'cairo' 'glib2' 'glibc' 'graphene' 'gtk4' 'libadwaita' 'libp optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') -source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a') +source=( + "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" + 'clippy.diff' +) +sha512sums=('997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a' + '8051c21a00c981eef8f0b08f30b369f28cd08d9d8d13b9f05df61b8365fc8ea91534aea7f21fcad6f14b41577fdfc9eaaf64dbd720d051e302fc7222d8aaf599') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' +prepare() { + cd "$srcdir/$_sourcedirectory/" + + # Until they're fixed upstream, ignore some newly thrown errors from clippy 1.57 + patch --forward -p1 < "$srcdir/clippy.diff" +} + build() { cd "$srcdir/" # We're not using arch-meson, because upstream recommends using --buildtype 'release' diff --git a/clippy.diff b/clippy.diff new file mode 100644 index 0000000..26b403f --- /dev/null +++ b/clippy.diff @@ -0,0 +1,10 @@ +diff --git a/build-aux/clippy.sh b/build-aux/clippy.sh +index f60004b..22bdf6a 100644 +--- a/build-aux/clippy.sh ++++ b/build-aux/clippy.sh +@@ -8,4 +8,4 @@ if [[ $OFFLINE = "true" ]]; then + export CARGO_HOME="$SRC"/cargo + fi + +-cargo clippy --manifest-path "$SRC"/Cargo.toml -- -D warnings -A clippy::module_inception -A clippy::new_without_default ++cargo clippy --manifest-path "$SRC"/Cargo.toml -- -D warnings -A clippy::module_inception -A clippy::new_without_default -A dead-code -A clippy::large-enum-variant -A clippy::redundant-closure -A clippy::derivable-impls From 0de59833aaea2868742775ffb723779ccf4b5a23 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Sun, 16 Jan 2022 16:36:22 +0100 Subject: [PATCH 21/25] Update spot-client to 0.3.0 --- .SRCINFO | 10 ++++------ PKGBUILD | 19 ++++--------------- clippy.diff | 10 ---------- 3 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 clippy.diff diff --git a/.SRCINFO b/.SRCINFO index d73873d..fc4e23c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.2.2 - pkgrel = 2 + pkgver = 0.3.0 + pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 arch = i686 @@ -24,9 +24,7 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.2.2-2.tar.gz::https://github.com/xou816/spot/archive/0.2.2.tar.gz - source = clippy.diff - sha512sums = 997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a - sha512sums = 8051c21a00c981eef8f0b08f30b369f28cd08d9d8d13b9f05df61b8365fc8ea91534aea7f21fcad6f14b41577fdfc9eaaf64dbd720d051e302fc7222d8aaf599 + source = spot-client-0.3.0-1.tar.gz::https://github.com/xou816/spot/archive/0.3.0.tar.gz + sha512sums = 8d90379db5e8317a2816c0f0057cb0a00dd30d41e046e5b1e011e353bb1f1318dc7e6d7faad9fca5204655c8b96d25a15bc46427c370b19f557a36fa79b20467 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index fb213d7..52ed14b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.2.2' -pkgrel='2' +pkgver='0.3.0' +pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') url="https://github.com/xou816/$_projectname" @@ -12,24 +12,13 @@ depends=('alsa-lib' 'cairo' 'glib2' 'glibc' 'graphene' 'gtk4' 'libadwaita' 'libp optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') -source=( - "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" - 'clippy.diff' -) -sha512sums=('997db5a651deb3290048a7283ee9f3b49387c51d6128a03ed3cf35b03df4db206d2502923df7ab45a0ef9fc45522c452edc74d4f16ccced8ca264a00e151887a' - '8051c21a00c981eef8f0b08f30b369f28cd08d9d8d13b9f05df61b8365fc8ea91534aea7f21fcad6f14b41577fdfc9eaaf64dbd720d051e302fc7222d8aaf599') +source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") +sha512sums=('8d90379db5e8317a2816c0f0057cb0a00dd30d41e046e5b1e011e353bb1f1318dc7e6d7faad9fca5204655c8b96d25a15bc46427c370b19f557a36fa79b20467') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" _builddirectory='build' -prepare() { - cd "$srcdir/$_sourcedirectory/" - - # Until they're fixed upstream, ignore some newly thrown errors from clippy 1.57 - patch --forward -p1 < "$srcdir/clippy.diff" -} - build() { cd "$srcdir/" # We're not using arch-meson, because upstream recommends using --buildtype 'release' diff --git a/clippy.diff b/clippy.diff deleted file mode 100644 index 26b403f..0000000 --- a/clippy.diff +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/build-aux/clippy.sh b/build-aux/clippy.sh -index f60004b..22bdf6a 100644 ---- a/build-aux/clippy.sh -+++ b/build-aux/clippy.sh -@@ -8,4 +8,4 @@ if [[ $OFFLINE = "true" ]]; then - export CARGO_HOME="$SRC"/cargo - fi - --cargo clippy --manifest-path "$SRC"/Cargo.toml -- -D warnings -A clippy::module_inception -A clippy::new_without_default -+cargo clippy --manifest-path "$SRC"/Cargo.toml -- -D warnings -A clippy::module_inception -A clippy::new_without_default -A dead-code -A clippy::large-enum-variant -A clippy::redundant-closure -A clippy::derivable-impls From eab9b3c628e3a374d93e6c68384197b3a8dc0830 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Mon, 24 Jan 2022 10:03:46 +0100 Subject: [PATCH 22/25] Update spot-client to 0.3.1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fc4e23c..58a1b67 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.3.0 + pkgver = 0.3.1 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -24,7 +24,7 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets - source = spot-client-0.3.0-1.tar.gz::https://github.com/xou816/spot/archive/0.3.0.tar.gz - sha512sums = 8d90379db5e8317a2816c0f0057cb0a00dd30d41e046e5b1e011e353bb1f1318dc7e6d7faad9fca5204655c8b96d25a15bc46427c370b19f557a36fa79b20467 + source = spot-client-0.3.1-1.tar.gz::https://github.com/xou816/spot/archive/0.3.1.tar.gz + sha512sums = b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 52ed14b..30adf29 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.3.0' +pkgver='0.3.1' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -13,7 +13,7 @@ optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('8d90379db5e8317a2816c0f0057cb0a00dd30d41e046e5b1e011e353bb1f1318dc7e6d7faad9fca5204655c8b96d25a15bc46427c370b19f557a36fa79b20467') +sha512sums=('b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 _sourcedirectory="$_projectname-$pkgver" From f8f951853547ecb3c99ea38694dca71d62060cc5 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 8 Mar 2022 12:08:50 +0100 Subject: [PATCH 23/25] Disable clippy tests for spot-client --- .SRCINFO | 2 ++ PKGBUILD | 15 +++++++++++++-- disable-clippy.patch | 19 +++++++++++++++++++ 3 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 disable-clippy.patch diff --git a/.SRCINFO b/.SRCINFO index 58a1b67..ebe4dc3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -25,6 +25,8 @@ pkgbase = spot-client depends = pango optdepends = org.freedesktop.secrets source = spot-client-0.3.1-1.tar.gz::https://github.com/xou816/spot/archive/0.3.1.tar.gz + source = disable-clippy.patch sha512sums = b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873 + sha512sums = 1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 30adf29..d0d9542 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,13 +12,24 @@ depends=('alsa-lib' 'cairo' 'glib2' 'glibc' 'graphene' 'gtk4' 'libadwaita' 'libp optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') checkdepends=('appstream-glib') -source=("$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz") -sha512sums=('b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873') +source=( + "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" + 'disable-clippy.patch' +) +sha512sums=('b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873' + '1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1') 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' +} + build() { cd "$srcdir/" # We're not using arch-meson, because upstream recommends using --buildtype 'release' diff --git a/disable-clippy.patch b/disable-clippy.patch new file mode 100644 index 0000000..25b9544 --- /dev/null +++ b/disable-clippy.patch @@ -0,0 +1,19 @@ +diff --git a/src/meson.build b/src/meson.build +index 755d870..fac1b77 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -208,14 +208,3 @@ test('Unit tests', + ], + timeout: 180 + ) +- +-cargo_clippy = find_program(meson.source_root() / 'build-aux/clippy.sh') +-test('Clippy', +- cargo_clippy, +- args: [ +- meson.source_root(), +- meson.build_root(), +- get_option('offline') ? 'true' : 'false' +- ], +- timeout: 180 +-) From 8e6f5105380835e8f1f38b3ebc1be45f04e1c061 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Tue, 8 Mar 2022 12:33:04 +0100 Subject: [PATCH 24/25] Disable LTO for spot-client --- .SRCINFO | 1 + PKGBUILD | 1 + 2 files changed, 2 insertions(+) diff --git a/.SRCINFO b/.SRCINFO index ebe4dc3..51edd13 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -24,6 +24,7 @@ pkgbase = spot-client depends = openssl depends = pango optdepends = org.freedesktop.secrets + options = !lto source = spot-client-0.3.1-1.tar.gz::https://github.com/xou816/spot/archive/0.3.1.tar.gz source = disable-clippy.patch sha512sums = b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873 diff --git a/PKGBUILD b/PKGBUILD index d0d9542..a967594 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,6 +12,7 @@ depends=('alsa-lib' 'cairo' 'glib2' 'glibc' 'graphene' 'gtk4' 'libadwaita' 'libp optdepends=('org.freedesktop.secrets') makedepends=('cargo' 'meson>=0.50.0') 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' From 4ae0a00e99fd63640acbcb3084feb8db9a950d40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 28 Mar 2022 21:58:37 +0200 Subject: [PATCH 25/25] Update spot-client to 0.3.2 --- .SRCINFO | 6 +++--- PKGBUILD | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 51edd13..3562867 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.3.1 + pkgver = 0.3.2 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -25,9 +25,9 @@ pkgbase = spot-client depends = pango optdepends = org.freedesktop.secrets options = !lto - source = spot-client-0.3.1-1.tar.gz::https://github.com/xou816/spot/archive/0.3.1.tar.gz + source = spot-client-0.3.2-1.tar.gz::https://github.com/xou816/spot/archive/0.3.2.tar.gz source = disable-clippy.patch - sha512sums = b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873 + sha512sums = fd8b1f372b5c06d65c0d40465aff018573e913200460b48339a9e106d17a372289b67855877d8642427367fc18e5eac31f2e765e54f4889149a8b5a69cd4638d sha512sums = 1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index a967594..2bfde9c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,9 @@ -# Maintainer: Daniel Peukert +# Maintainer: Manuel Hüsers +# Contributor: Daniel Peukert # Contributor: NicoHood _projectname='spot' pkgname="$_projectname-client" -pkgver='0.3.1' +pkgver='0.3.2' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -17,7 +18,7 @@ source=( "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" 'disable-clippy.patch' ) -sha512sums=('b0127dbe2a1430dcc288c9ef6bd61f0afa92e4ca6316d4e84c7e6bf7051cffc90a8778312e04991f91a2090728a7ce3e288249d1c8562106f7851dc701e97873' +sha512sums=('fd8b1f372b5c06d65c0d40465aff018573e913200460b48339a9e106d17a372289b67855877d8642427367fc18e5eac31f2e765e54f4889149a8b5a69cd4638d' '1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283