[PR PATCH] New package: spotify-adblock-1.0.1

[PR PATCH] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is a new pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages spotify-adblock
https://github.com/void-linux/void-packages/pull/36364

New package: spotify-adblock-1.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)
<!-- 
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36364.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotify-adblock-36364.patch --]
[-- Type: text/x-diff, Size: 2682 bytes --]

From 543e08e0b99ddbc178dd7275f8e22c63a9143bc2 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock-linux                 |  1 +
 .../files/spotify-adblock.desktop             | 11 ++++++
 srcpkgs/spotify-adblock/template              | 34 +++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 120000 srcpkgs/spotify-adblock-linux
 create mode 100644 srcpkgs/spotify-adblock/files/spotify-adblock.desktop
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock-linux b/srcpkgs/spotify-adblock-linux
new file mode 120000
index 000000000000..a57461b41ff6
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux
@@ -0,0 +1 @@
+spotify-adblock
\ No newline at end of file
diff --git a/srcpkgs/spotify-adblock/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
new file mode 100644
index 000000000000..074ba5775a5b
--- /dev/null
+++ b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Spotify (adblock)
+GenericName=Music Player
+Icon=spotify-client
+TryExec=spotify
+Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
+Terminal=false
+MimeType=x-scheme-handler/spotify;
+Categories=Audio;Music;Player;AudioVideo;
+StartupWMClass=spotify
diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..b36d40d933e8
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,34 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=gnu-makefile
+build_helper=rust
+conf_files="/etc/spotify-adblock/config.toml"
+hostmakedepends="make cargo"
+makedepends="rust-std"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+if [ "$CROSS_BUILD" ]; then
+	_releasedir="target/${RUST_TARGET}/release"
+else
+	_releasedir="target/release"
+fi
+
+do_install() {
+	vmkdir etc/spotify-adblock
+	vcopy config.toml etc/spotify-adblock
+	vinstall "${FILESDIR}/spotify-adblock.desktop" 644 usr/share/applications
+	vinstall "${_releasedir}/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}
+
+spotify-adblock-linux_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="spotify-adblock>=${version}_${revision}"
+}

Re: New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#issuecomment-1079732069

Comment:
I was wondering if this line should be removed, or kept as-is -
https://github.com/void-linux/void-packages/blob/9e0b0f4e74f5ac03cef9ce196037eabb0f9e3c31/srcpkgs/removed-packages/template#L372

Re: New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#issuecomment-1079732069

Comment:
I was wondering if this line should be removed, or kept as-is -
https://github.com/void-linux/void-packages/blob/9e0b0f4e74f5ac03cef9ce196037eabb0f9e3c31/srcpkgs/removed-packages/template#L372

because upstream of `spotify-adblock-linux` recommends to now use `spotify-adblock` (this package)

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 207 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835789613

Comment:
cargo buildstyle makes all these `*depends` unnecessary

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835789912

Comment:
`vinstall` works fine here

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790075

Comment:
I don't see a reason for this, `spotify-adblock-linux` is already in removed-packages

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835789886

Comment:
unnecessary with cargo buildstyle

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835789591

Comment:
the makefile literally just runs cargo build, so I see no reason to use the makefile style over the cargo style

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835789864

Comment:
expand `$homepage` here

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 176 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790508

Comment:
builds fine without this

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790634

Comment:
Why? Why is it needed to expand `$homepage`?

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790721

Comment:
also use `archive/refs/tags/`

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 328 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790774

Comment:
https://github.com/void-linux/void-packages/pull/36364#issuecomment-1079732069

> because upstream of `spotify-adblock-linux` recommends to now use `spotify-adblock` (this package)

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790829

Comment:
Does it crossbuild without this?

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790961

Comment:
if $homepage changes in the future, it means distfiles needs to change too. it's kinda seen as frowned upon by some maintainers: #27735

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 155 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835790974

Comment:
yes

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835791447

Comment:
I saw that, but `spotify-adblock-linux` is already considered a removed package, so I don't think it's necessary to create an empty package that replaces it

Re: [PR PATCH] [Updated] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages spotify-adblock
https://github.com/void-linux/void-packages/pull/36364

New package: spotify-adblock-1.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)
<!-- 
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36364.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotify-adblock-36364.patch --]
[-- Type: text/x-diff, Size: 2621 bytes --]

From 29480620e6e436959f303e08606a855b76aef686 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock-linux                 |  1 +
 .../files/spotify-adblock.desktop             | 11 +++++++
 srcpkgs/spotify-adblock/template              | 30 +++++++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 120000 srcpkgs/spotify-adblock-linux
 create mode 100644 srcpkgs/spotify-adblock/files/spotify-adblock.desktop
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock-linux b/srcpkgs/spotify-adblock-linux
new file mode 120000
index 000000000000..a57461b41ff6
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux
@@ -0,0 +1 @@
+spotify-adblock
\ No newline at end of file
diff --git a/srcpkgs/spotify-adblock/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
new file mode 100644
index 000000000000..074ba5775a5b
--- /dev/null
+++ b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Spotify (adblock)
+GenericName=Music Player
+Icon=spotify-client
+TryExec=spotify
+Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
+Terminal=false
+MimeType=x-scheme-handler/spotify;
+Categories=Audio;Music;Player;AudioVideo;
+StartupWMClass=spotify
diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..82908c0f46c5
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,30 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+if [ "$CROSS_BUILD" ]; then
+	_releasedir="target/${RUST_TARGET}/release"
+else
+	_releasedir="target/release"
+fi
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall "${FILESDIR}/spotify-adblock.desktop" 644 usr/share/applications
+	vinstall "${_releasedir}/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}
+
+spotify-adblock-linux_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="spotify-adblock>=${version}_${revision}"
+}

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 330 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835792545

Comment:
oh i should expand on this, the cargo build style should put the .so file in `target/${RUST_TARGET}/release/` regardless of cross so it can just be put in the vinstall line below

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835792776

Comment:
Are you sure?  
I just tried with cargo buildstyle, and this seems to be still needed...

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 472 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835793167

Comment:
There is a way to work around the `removed-packages` and keep using the old package.  
Also, it still exists in the repositories, so anybody who isn't aware that `spotify-adblock-linux` has been deprecated will install that one. There is no warning.

Best case? Ads aren't blocked.  
Worst case? being detected by spotify.

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 413 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835793505

Comment:
yes, I tried it myself. on x86_64 it gets put in `target/x86_64-unknown-linux-gnu/release` (or whatever the exact string is), I believe it's because of the `--target` [here](https://github.com/void-linux/void-packages/blob/master/common/build-style/cargo.sh#L8)

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835793818

Comment:
> oh i should expand on this, the cargo build style should put the .so file in `target/${RUST_TARGET}/release/` regardless of cross so it can just be put in the vinstall line below

I hadn't seen this part before making my above comment :)

(Weird... github live-reloads the commits added to a PR, but doesn't load the comments.)

Re: [PR PATCH] [Updated] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages spotify-adblock
https://github.com/void-linux/void-packages/pull/36364

New package: spotify-adblock-1.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)
<!-- 
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36364.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotify-adblock-36364.patch --]
[-- Type: text/x-diff, Size: 2520 bytes --]

From cb084cbff7a0284acba2c5c4c1a537661d883ca6 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock-linux                 |  1 +
 .../files/spotify-adblock.desktop             | 11 +++++++++
 srcpkgs/spotify-adblock/template              | 24 +++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 120000 srcpkgs/spotify-adblock-linux
 create mode 100644 srcpkgs/spotify-adblock/files/spotify-adblock.desktop
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock-linux b/srcpkgs/spotify-adblock-linux
new file mode 120000
index 000000000000..a57461b41ff6
--- /dev/null
+++ b/srcpkgs/spotify-adblock-linux
@@ -0,0 +1 @@
+spotify-adblock
\ No newline at end of file
diff --git a/srcpkgs/spotify-adblock/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
new file mode 100644
index 000000000000..074ba5775a5b
--- /dev/null
+++ b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Spotify (adblock)
+GenericName=Music Player
+Icon=spotify-client
+TryExec=spotify
+Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
+Terminal=false
+MimeType=x-scheme-handler/spotify;
+Categories=Audio;Music;Player;AudioVideo;
+StartupWMClass=spotify
diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..80547914edfa
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,24 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall "${FILESDIR}/spotify-adblock.desktop" 644 usr/share/applications
+	vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}
+
+spotify-adblock-linux_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="spotify-adblock>=${version}_${revision}"
+}

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835795736

Comment:
Removed packages should not contain packages that aren't removed.
Also this package is on version 1.0.1 while the old one is on version 1.1.

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835795736

Comment:
Removed packages should not contain packages that aren't removed.
This package is on version 1.0.1 while the old one is on version 1.1.
Thus we have `spotify-adblock-linux-1.0.1` while removed-packages replaces `spotify-adblock-linux<=1.1_1`

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 374 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835795965

Comment:
@tibequadorian So I should remove the `spotify-adblock-linux<=1.1_1` entry from removed_packages?

> Also this package is on version 1.0.1 while the old one is on version 1.1

oops. hadn't noticed that at all! :sweat_smile: 

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835795736

Comment:
Removed packages should not contain packages that aren't removed.
This package is on version 1.0.1 while the old one is on version 1.1.
Thus we have `spotify-adblock-linux-1.0.1_1` while removed-packages replaces `spotify-adblock-linux<=1.1_1`

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[tibequadorian]

[-- Attachment #1: Type: text/plain, Size: 404 bytes --]

New review comment by tibequadorian on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835795736

Comment:
Removed packages should not contain packages that aren't removed.
This package is on version 1.0.1 while the old one is on version 1.1.
Thus we would have `spotify-adblock-linux-1.0.1_1` while removed-packages replaces `spotify-adblock-linux<=1.1_1`

Re: [PR PATCH] [Updated] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages spotify-adblock
https://github.com/void-linux/void-packages/pull/36364

New package: spotify-adblock-1.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)
<!-- 
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36364.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotify-adblock-36364.patch --]
[-- Type: text/x-diff, Size: 2024 bytes --]

From 5a844f2f9ff8e390447255109610f6ebfaf7a53f Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH] New package: spotify-adblock-1.0.1

---
 .../files/spotify-adblock.desktop              | 11 +++++++++++
 srcpkgs/spotify-adblock/template               | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 srcpkgs/spotify-adblock/files/spotify-adblock.desktop
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock/files/spotify-adblock.desktop b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
new file mode 100644
index 000000000000..074ba5775a5b
--- /dev/null
+++ b/srcpkgs/spotify-adblock/files/spotify-adblock.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Name=Spotify (adblock)
+GenericName=Music Player
+Icon=spotify-client
+TryExec=spotify
+Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so spotify %U
+Terminal=false
+MimeType=x-scheme-handler/spotify;
+Categories=Audio;Music;Player;AudioVideo;
+StartupWMClass=spotify
diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..e350b317d158
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,18 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall "${FILESDIR}/spotify-adblock.desktop" 644 usr/share/applications
+	vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}

Re: [PR REVIEW] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 182 bytes --]

New review comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#discussion_r835796493

Comment:
### Removed the transitional package

Re: New package: spotify-adblock-1.0.1

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 191 bytes --]

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#issuecomment-1079987360

Comment:
Some concern about the vendored `.desktop` file

Re: New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#issuecomment-1079997170

Comment:
@Vaelatern What concerns?

Re: New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/36364#issuecomment-1079997170

Comment:
@Vaelatern What concerns?

Re: [PR PATCH] [Updated] New package: spotify-adblock-1.0.1

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1250 bytes --]

There is an updated pull request by subnut against master on the void-packages repository

https://github.com/subnut/void-packages spotify-adblock
https://github.com/void-linux/void-packages/pull/36364

New package: spotify-adblock-1.0.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)
<!-- 
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/36364.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-spotify-adblock-36364.patch --]
[-- Type: text/x-diff, Size: 1462 bytes --]

From 8e298dcec4cc851bfb1c0e32c933669c0d0347f0 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 26 Mar 2022 21:18:06 +0530
Subject: [PATCH] New package: spotify-adblock-1.0.1

---
 srcpkgs/spotify-adblock/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/spotify-adblock/template

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
new file mode 100644
index 000000000000..8d64a84df72f
--- /dev/null
+++ b/srcpkgs/spotify-adblock/template
@@ -0,0 +1,25 @@
+# Template file for 'spotify-adblock'
+pkgname=spotify-adblock
+version=1.0.1
+revision=1
+build_style=cargo
+conf_files="/etc/spotify-adblock/config.toml"
+short_desc="Adblocker for Spotify"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/abba23/spotify-adblock"
+distfiles="https://github.com/abba23/spotify-adblock/archive/refs/tags/v${version}.tar.gz"
+checksum=01edec4cc87fd0bbf77508fe6bcfdfba244771a992eca9d834df0f9399f1c360
+
+pre_install() {
+	{ sed -n '/<summary>Debian/q'
+	  sed -n '/^```$/q'
+	  sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+	} <README.md >spotify-adblock.desktop
+}
+
+do_install() {
+	vinstall config.toml 644 etc/spotify-adblock
+	vinstall spotify-adblock.desktop 644 usr/share/applications
+	vinstall "target/${RUST_TARGET}/release/libspotifyadblock.so" 644 usr/lib spotify-adblock.so
+}

Re: [PR PATCH] [Merged]: New package: spotify-adblock-1.0.1

[Vaelatern]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

There's a merged pull request on the void-packages repository

New package: spotify-adblock-1.0.1
https://github.com/void-linux/void-packages/pull/36364

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl (crossbuild)
<!-- 
  - armv7l
  - armv6l-musl
-->