[PR PATCH] spotify-adblock: Fix .desktop file

[PR PATCH] spotify-adblock: Fix .desktop file

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1252 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/42128

spotify-adblock: Fix .desktop file
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 7fa08e3f2f070c709c9710ba7892aa782cb55e86 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 7 Feb 2023 20:14:48 +0530
Subject: [PATCH] spotify-adblock: Fix .desktop file

---
 srcpkgs/spotify-adblock/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
index ee363eab2c70..ad03b6141f1b 100644
--- a/srcpkgs/spotify-adblock/template
+++ b/srcpkgs/spotify-adblock/template
@@ -1,7 +1,7 @@
 # Template file for 'spotify-adblock'
 pkgname=spotify-adblock
 version=1.0.2
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/spotify-adblock/config.toml"
 short_desc="Adblocker for Spotify"
@@ -14,7 +14,8 @@ checksum=a0b5124573b95548e2f5ae36fc74fdab4fab9282d755affba754641e561aeac6
 pre_install() {
 	{ sed -n '/<summary>Debian/q'
 	  sed -n '/^```$/q'
-	  sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+	  sed -n '/^```$/q;/^Exec/s/^.*$/Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so LD_LIBRARY_PATH=/usr/libexec/spotify /usr/libexec/spotify/spotify spotify %U/;p'
+	  # The above Exec= line is taken directly from the spotify package ${FILESDIR}/spotify with only LD_PRELOAD=/usr/lib/spotify-adblock.so added
 	} <README.md >spotify-adblock.desktop
 }
 

Re: [PR PATCH] [Updated] spotify-adblock: Fix .desktop file

[subnut]

[-- Attachment #1: Type: text/plain, Size: 1257 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/42128

spotify-adblock: Fix .desktop file
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From e53933e29cce26205e0e0ab335f01619b325f595 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Tue, 7 Feb 2023 20:14:48 +0530
Subject: [PATCH] spotify-adblock: Fix .desktop file

---
 srcpkgs/spotify-adblock/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/spotify-adblock/template b/srcpkgs/spotify-adblock/template
index ee363eab2c70..bb6fc5cf222e 100644
--- a/srcpkgs/spotify-adblock/template
+++ b/srcpkgs/spotify-adblock/template
@@ -1,7 +1,7 @@
 # Template file for 'spotify-adblock'
 pkgname=spotify-adblock
 version=1.0.2
-revision=1
+revision=2
 build_style=cargo
 conf_files="/etc/spotify-adblock/config.toml"
 short_desc="Adblocker for Spotify"
@@ -14,7 +14,8 @@ checksum=a0b5124573b95548e2f5ae36fc74fdab4fab9282d755affba754641e561aeac6
 pre_install() {
 	{ sed -n '/<summary>Debian/q'
 	  sed -n '/^```$/q'
-	  sed -n '/^```$/q;s-/usr/local/lib/-/usr/lib/-;p'
+	  sed -n '/^```$/q;/^Exec/s|^.*$|Exec=env LD_PRELOAD=/usr/lib/spotify-adblock.so LD_LIBRARY_PATH=/usr/libexec/spotify /usr/libexec/spotify/spotify spotify %U|;p'
+	  # The above Exec= line is taken directly from the spotify package ${FILESDIR}/spotify with only LD_PRELOAD=/usr/lib/spotify-adblock.so added
 	} <README.md >spotify-adblock.desktop
 }
 

Re: spotify-adblock: Fix .desktop file

[subnut]

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

New comment by subnut on void-packages repository

https://github.com/void-linux/void-packages/pull/42128#issuecomment-1420901455

Comment:
xlint is failing erroneously. Backticks are NOT being used.

Re: spotify-adblock: Fix .desktop file

[github-actions]

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

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/42128#issuecomment-1539278374

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: spotify-adblock: Fix .desktop file

[github-actions]

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

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

spotify-adblock: Fix .desktop file
https://github.com/void-linux/void-packages/pull/42128

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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->