From 556f100aae97ddc5b747ed938d9bf4fd8c4aa595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Tue, 7 May 2024 18:58:27 +0200
Subject: [PATCH] upgpkg: spot-client 0.4.1-1

upstream release
---
 .SRCINFO             | 11 ++++++-----
 PKGBUILD             | 21 +++++++++------------
 disable-clippy.patch | 25 +++++++++++++++----------
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 150dd22..7d9f2b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = spot-client
 	pkgdesc = Gtk/Rust native Spotify client
-	pkgver = 0.4.0
+	pkgver = 0.4.1
 	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 = https://github.com/xou816/spot/archive/0.4.0/spot-0.4.0.tar.gz
+	source = https://github.com/xou816/spot/archive/0.4.1/spot-0.4.1.tar.gz
 	source = disable-clippy.patch
-	sha512sums = 45b7b28250d6a3ccfd829984d5ee2f94fc8f052467cfa94403171d7c9fe803c65567759b3b01b86b8cc7a1d8cbdff64d99c82a72c34997192386ff9f51531d1d
-	sha512sums = 1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1
+	sha512sums = 05ee8ce9277230a0f6c25411b41788a508551a61cd436bdd6bb0d8245030b0523232c0e30c7d2f98977382e687ec0f502cb6eb9b95a7dbaae97042ec596f407e
+	sha512sums = 4e38fff2a5867c46749959ceb0fb16372f12c8f8038b6a33d43e126e741f43e524e1499bb9b514e56b036097aaa0ac5dd149823c2c9eba277ab0ea4f58d5fb55
 
 pkgname = spot-client
diff --git a/PKGBUILD b/PKGBUILD
index 2d3e1af..72a90dc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 _projectname='spot'
 pkgname="$_projectname-client"
-pkgver='0.4.0'
+pkgver='0.4.1'
 pkgrel='1'
 pkgdesc='Gtk/Rust native Spotify client'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -12,24 +12,21 @@ 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=(
-	"https://github.com/xou816/$_projectname/archive/$pkgver/$_projectname-$pkgver.tar.gz"
-	'disable-clippy.patch'
-)
-sha512sums=('45b7b28250d6a3ccfd829984d5ee2f94fc8f052467cfa94403171d7c9fe803c65567759b3b01b86b8cc7a1d8cbdff64d99c82a72c34997192386ff9f51531d1d'
-            '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=('05ee8ce9277230a0f6c25411b41788a508551a61cd436bdd6bb0d8245030b0523232c0e30c7d2f98977382e687ec0f502cb6eb9b95a7dbaae97042ec596f407e'
+            '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)
+	# Disable failing clippy tests
 	patch -Np1 < '../disable-clippy.patch'
 }
 
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
 -)