From 9c70b2f2c5ea958d4e15fe2283cbde18dcf8fc3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 23 Oct 2022 11:18:17 +0200 Subject: [PATCH 1/8] Remove obsolete install and gitignore files --- .gitignore | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .gitignore 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 - -*/ From 324a4b01db49b4475de062af1a38869b48924c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 10 Nov 2022 17:53:37 +0100 Subject: [PATCH 2/8] Remove redundant editorconfigs --- .editorconfig | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .editorconfig 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 From d7218a0c5f3de25212a6ea6fb9ec99de28fe29ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 8 Dec 2022 21:56:17 +0100 Subject: [PATCH 3/8] upgpkg: spot-client 0.3.3-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 9 +++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3562867..3641cda 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.3.2 + pkgver = 0.3.3 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.2-1.tar.gz::https://github.com/xou816/spot/archive/0.3.2.tar.gz + source = https://github.com/xou816/spot/archive/0.3.3/spot-0.3.3.tar.gz source = disable-clippy.patch - sha512sums = fd8b1f372b5c06d65c0d40465aff018573e913200460b48339a9e106d17a372289b67855877d8642427367fc18e5eac31f2e765e54f4889149a8b5a69cd4638d + sha512sums = 8b116e5e9a79efbbb6aef21b89ca93d3ea6083fb02b245662a4e222f85feef76dbc5abcdacfb0a29bf8ee0d8062137b3f0a1648a47537b26a9c16dd7bf525a8a sha512sums = 1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 2bfde9c..7ee7105 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,9 +1,10 @@ # Maintainer: Manuel Hüsers # Contributor: Daniel Peukert # Contributor: NicoHood + _projectname='spot' pkgname="$_projectname-client" -pkgver='0.3.2' +pkgver='0.3.3' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -13,12 +14,12 @@ 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) +options=('!lto') source=( - "$pkgname-$pkgver-$pkgrel.tar.gz::$url/archive/$pkgver.tar.gz" + "https://github.com/xou816/$_projectname/archive/$pkgver/$_projectname-$pkgver.tar.gz" 'disable-clippy.patch' ) -sha512sums=('fd8b1f372b5c06d65c0d40465aff018573e913200460b48339a9e106d17a372289b67855877d8642427367fc18e5eac31f2e765e54f4889149a8b5a69cd4638d' +sha512sums=('8b116e5e9a79efbbb6aef21b89ca93d3ea6083fb02b245662a4e222f85feef76dbc5abcdacfb0a29bf8ee0d8062137b3f0a1648a47537b26a9c16dd7bf525a8a' '1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 From 8e14d10866822eb2ae9fbaa7aabad854791aca6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 8 Dec 2022 22:06:38 +0100 Subject: [PATCH 4/8] spot-client: Revert removal of comment --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 7ee7105..2fa5149 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,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') +options=('!lto') # Disable clippy tests, as they don't realy make sense for user builds (https://gitlab.com/dpeukert/pkgbuilds/-/issues/37) source=( "https://github.com/xou816/$_projectname/archive/$pkgver/$_projectname-$pkgver.tar.gz" 'disable-clippy.patch' From 53cf84c171b1d266c1cd5e6e4bdde3a7054517af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Thu, 8 Dec 2022 22:10:45 +0100 Subject: [PATCH 5/8] spot-client: Use correct comment this time --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 2fa5149..6ad2678 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -14,7 +14,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') # Disable clippy tests, as they don't realy make sense for user builds (https://gitlab.com/dpeukert/pkgbuilds/-/issues/37) +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' From cfca7e7c2ccc1a219914e4e81072aebd4d9b443f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Fri, 24 Feb 2023 23:24:08 +0100 Subject: [PATCH 6/8] upgpkg: spot-client 0.4.0-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3641cda..150dd22 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.3.3 + pkgver = 0.4.0 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 = https://github.com/xou816/spot/archive/0.3.3/spot-0.3.3.tar.gz + source = https://github.com/xou816/spot/archive/0.4.0/spot-0.4.0.tar.gz source = disable-clippy.patch - sha512sums = 8b116e5e9a79efbbb6aef21b89ca93d3ea6083fb02b245662a4e222f85feef76dbc5abcdacfb0a29bf8ee0d8062137b3f0a1648a47537b26a9c16dd7bf525a8a + sha512sums = 45b7b28250d6a3ccfd829984d5ee2f94fc8f052467cfa94403171d7c9fe803c65567759b3b01b86b8cc7a1d8cbdff64d99c82a72c34997192386ff9f51531d1d sha512sums = 1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 6ad2678..2d3e1af 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ _projectname='spot' pkgname="$_projectname-client" -pkgver='0.3.3' +pkgver='0.4.0' pkgrel='1' pkgdesc='Gtk/Rust native Spotify client' arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64') @@ -19,7 +19,7 @@ source=( "https://github.com/xou816/$_projectname/archive/$pkgver/$_projectname-$pkgver.tar.gz" 'disable-clippy.patch' ) -sha512sums=('8b116e5e9a79efbbb6aef21b89ca93d3ea6083fb02b245662a4e222f85feef76dbc5abcdacfb0a29bf8ee0d8062137b3f0a1648a47537b26a9c16dd7bf525a8a' +sha512sums=('45b7b28250d6a3ccfd829984d5ee2f94fc8f052467cfa94403171d7c9fe803c65567759b3b01b86b8cc7a1d8cbdff64d99c82a72c34997192386ff9f51531d1d' '1cb0faced2e6801cb994e9af7b81411355837b2efcd9c82b82751508e0bfcc967c50b3d6296bfdb8c017bbf2e7a503a3920d36cb896e44c896c23f5b9e1d13f1') validpgpkeys=() # waiting for https://github.com/xou816/spot/issues/283 @@ -30,7 +30,7 @@ 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' + patch -Np1 < '../disable-clippy.patch' } build() { From 556f100aae97ddc5b747ed938d9bf4fd8c4aa595 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Tue, 7 May 2024 18:58:27 +0200 Subject: [PATCH 7/8] 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 -) From e9edb52471ce5694c419b5d2fee22549135ead5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Fri, 29 Nov 2024 07:20:53 +0100 Subject: [PATCH 8/8] upgpkg: spot-client 0.5.0-1 upstream release --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7d9f2b3..7cd862e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = spot-client pkgdesc = Gtk/Rust native Spotify client - pkgver = 0.4.1 + pkgver = 0.5.0 pkgrel = 1 url = https://github.com/xou816/spot arch = x86_64 @@ -26,9 +26,9 @@ pkgbase = spot-client depends = pango optdepends = org.freedesktop.secrets options = !lto - source = https://github.com/xou816/spot/archive/0.4.1/spot-0.4.1.tar.gz + source = https://github.com/xou816/spot/archive/0.5.0/spot-0.5.0.tar.gz source = disable-clippy.patch - sha512sums = 05ee8ce9277230a0f6c25411b41788a508551a61cd436bdd6bb0d8245030b0523232c0e30c7d2f98977382e687ec0f502cb6eb9b95a7dbaae97042ec596f407e + sha512sums = a2acbc2666c3acea86562227b490373bdeff67831bef7275b47e759db366cacbeb2411578f56be824cca6cd72c833e5830db89c203af1c8165e06927eabcf3ec sha512sums = 4e38fff2a5867c46749959ceb0fb16372f12c8f8038b6a33d43e126e741f43e524e1499bb9b514e56b036097aaa0ac5dd149823c2c9eba277ab0ea4f58d5fb55 pkgname = spot-client diff --git a/PKGBUILD b/PKGBUILD index 72a90dc..0b50251 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ _projectname='spot' pkgname="$_projectname-client" -pkgver='0.4.1' -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" @@ -17,7 +17,7 @@ checkdepends=('appstream-glib') options=('!lto') # Build breaks with LTO enabled source=("https://github.com/xou816/$_projectname/archive/$pkgver/$_projectname-$pkgver.tar.gz" 'disable-clippy.patch') -sha512sums=('05ee8ce9277230a0f6c25411b41788a508551a61cd436bdd6bb0d8245030b0523232c0e30c7d2f98977382e687ec0f502cb6eb9b95a7dbaae97042ec596f407e' +sha512sums=('a2acbc2666c3acea86562227b490373bdeff67831bef7275b47e759db366cacbeb2411578f56be824cca6cd72c833e5830db89c203af1c8165e06927eabcf3ec' '4e38fff2a5867c46749959ceb0fb16372f12c8f8038b6a33d43e126e741f43e524e1499bb9b514e56b036097aaa0ac5dd149823c2c9eba277ab0ea4f58d5fb55') validpgpkeys=() # Waiting for https://github.com/xou816/spot/issues/283