public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/
@ 2021-05-24  7:18 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-05-24  7:18 UTC (permalink / raw
  To: gentoo-commits

commit:     4b63abcc491b96018389cc9bda6683f06b7eaaf7
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Mon May 24 07:16:47 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Mon May 24 07:17:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b63abcc

media-sound/spotify-tray: import from ::guru

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-sound/spotify-tray/Manifest                  |  1 +
 media-sound/spotify-tray/metadata.xml              | 12 ++++++++++
 media-sound/spotify-tray/spotify-tray-1.3.1.ebuild | 28 ++++++++++++++++++++++
 3 files changed, 41 insertions(+)

diff --git a/media-sound/spotify-tray/Manifest b/media-sound/spotify-tray/Manifest
new file mode 100644
index 00000000000..3bfe4a05e03
--- /dev/null
+++ b/media-sound/spotify-tray/Manifest
@@ -0,0 +1 @@
+DIST spotify-tray-1.3.1.tar.gz 22084 BLAKE2B ee8f269d1ac618794eee8a67b814f689f3a65f18433a1e3c2382465a2b9b247e70e16fb43f061d1c7cef9188f116d0c7e8478fe3ffe2ab5f2de54dc8ccb40808 SHA512 c1fd533e3879f2d9e451264969bc797c6b8ca35f191460d40822728fc6b637ec7487154b0794871f25cbd6e01b16c7ff5eb33806a1235ac09e45e49580d1337a

diff --git a/media-sound/spotify-tray/metadata.xml b/media-sound/spotify-tray/metadata.xml
new file mode 100644
index 00000000000..5b36c64896b
--- /dev/null
+++ b/media-sound/spotify-tray/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tsmetana/spotify-tray</remote-id>
+		<bugs-to>https://github.com/tsmetana/spotify-tray/issues</bugs-to>
+	</upstream>
+</pkgmetadata>

diff --git a/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild
new file mode 100644
index 00000000000..28d534d9a35
--- /dev/null
+++ b/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Wrapper around the Spotify client that adds a tray icon"
+HOMEPAGE="https://github.com/tsmetana/spotify-tray"
+SRC_URI="https://github.com/tsmetana/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	x11-libs/gtk+:3[X]
+"
+RDEPEND="${DEPEND}
+	media-sound/spotify
+"
+
+src_prepare() {
+	default
+	# Fix the name of the icon
+	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
+	eautoreconf
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/
@ 2021-09-16 18:04 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-09-16 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     e909ad01e3804f0717bc8b7dc27c378eb47bb385
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 18:04:14 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 18:04:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e909ad01

media-sound/spotify-tray: drop version 1.3.1

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-sound/spotify-tray/Manifest                  |  1 -
 media-sound/spotify-tray/spotify-tray-1.3.1.ebuild | 28 ----------------------
 2 files changed, 29 deletions(-)

diff --git a/media-sound/spotify-tray/Manifest b/media-sound/spotify-tray/Manifest
index 334c376f03c..601df41d906 100644
--- a/media-sound/spotify-tray/Manifest
+++ b/media-sound/spotify-tray/Manifest
@@ -1,2 +1 @@
-DIST spotify-tray-1.3.1.tar.gz 22084 BLAKE2B ee8f269d1ac618794eee8a67b814f689f3a65f18433a1e3c2382465a2b9b247e70e16fb43f061d1c7cef9188f116d0c7e8478fe3ffe2ab5f2de54dc8ccb40808 SHA512 c1fd533e3879f2d9e451264969bc797c6b8ca35f191460d40822728fc6b637ec7487154b0794871f25cbd6e01b16c7ff5eb33806a1235ac09e45e49580d1337a
 DIST spotify-tray-1.3.2.tar.gz 22298 BLAKE2B da1399db3d42d969d983b9bae695ff55dbdff47ef49ac79e10e2681df45489505028901a0946dd70495a6a74b9eef979f9ef07a722a08cb93a2ba6749c106f4a SHA512 74ae5ebaa61497a0274646dad04d408bb4176bbbacbb0e80211bec9218d09e293c8abf4c9424de8123ba4440d63adb58c5b68ca53690d2e348d52efbbc3f88c1

diff --git a/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild
deleted file mode 100644
index 28d534d9a35..00000000000
--- a/media-sound/spotify-tray/spotify-tray-1.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg
-
-DESCRIPTION="Wrapper around the Spotify client that adds a tray icon"
-HOMEPAGE="https://github.com/tsmetana/spotify-tray"
-SRC_URI="https://github.com/tsmetana/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64"
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	x11-libs/gtk+:3[X]
-"
-RDEPEND="${DEPEND}
-	media-sound/spotify
-"
-
-src_prepare() {
-	default
-	# Fix the name of the icon
-	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
-	eautoreconf
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/
@ 2021-09-16 18:04 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-09-16 18:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8828233cfe93238bc49eda2f83a9d9ea2da7b592
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 18:03:58 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 18:03:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8828233c

media-sound/spotify-tray: add version 1.3.2

Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-sound/spotify-tray/Manifest                  |  1 +
 media-sound/spotify-tray/spotify-tray-1.3.2.ebuild | 28 ++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/media-sound/spotify-tray/Manifest b/media-sound/spotify-tray/Manifest
index 3bfe4a05e03..334c376f03c 100644
--- a/media-sound/spotify-tray/Manifest
+++ b/media-sound/spotify-tray/Manifest
@@ -1 +1,2 @@
 DIST spotify-tray-1.3.1.tar.gz 22084 BLAKE2B ee8f269d1ac618794eee8a67b814f689f3a65f18433a1e3c2382465a2b9b247e70e16fb43f061d1c7cef9188f116d0c7e8478fe3ffe2ab5f2de54dc8ccb40808 SHA512 c1fd533e3879f2d9e451264969bc797c6b8ca35f191460d40822728fc6b637ec7487154b0794871f25cbd6e01b16c7ff5eb33806a1235ac09e45e49580d1337a
+DIST spotify-tray-1.3.2.tar.gz 22298 BLAKE2B da1399db3d42d969d983b9bae695ff55dbdff47ef49ac79e10e2681df45489505028901a0946dd70495a6a74b9eef979f9ef07a722a08cb93a2ba6749c106f4a SHA512 74ae5ebaa61497a0274646dad04d408bb4176bbbacbb0e80211bec9218d09e293c8abf4c9424de8123ba4440d63adb58c5b68ca53690d2e348d52efbbc3f88c1

diff --git a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
new file mode 100644
index 00000000000..28d534d9a35
--- /dev/null
+++ b/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg
+
+DESCRIPTION="Wrapper around the Spotify client that adds a tray icon"
+HOMEPAGE="https://github.com/tsmetana/spotify-tray"
+SRC_URI="https://github.com/tsmetana/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-3"
+SLOT="0"
+
+DEPEND="
+	x11-libs/gtk+:3[X]
+"
+RDEPEND="${DEPEND}
+	media-sound/spotify
+"
+
+src_prepare() {
+	default
+	# Fix the name of the icon
+	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
+	eautoreconf
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/
@ 2021-10-07 10:58 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2021-10-07 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     4906b9beb1cdadb61eb1788f7442a008c368b689
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  7 10:57:42 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Oct  7 10:58:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4906b9be

media-sound/spotify-tray: fix error with newer autoconf versions

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-sound/spotify-tray/spotify-tray-1.3.2.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
index 28d534d9a35..5de180e44e4 100644
--- a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
+++ b/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
@@ -22,6 +22,9 @@ RDEPEND="${DEPEND}
 
 src_prepare() {
 	default
+	# Fix error: AM_INIT_AUTOMAKE expanded multiple times
+	sed -i -e '/^AM_INIT_AUTOMAKE$/d' configure.ac || die
+
 	# Fix the name of the icon
 	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
 	eautoreconf


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/
@ 2022-01-05 16:42 Matthew Thode
  0 siblings, 0 replies; 6+ messages in thread
From: Matthew Thode @ 2022-01-05 16:42 UTC (permalink / raw
  To: gentoo-commits

commit:     ee5a8dacc289e957c9ef6f1a0cb224b4ef1b07dc
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 12:50:53 2021 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jan  5 16:42:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5a8dac

media-sound/spotify-tray: drop desktop file

launching is now handled in spotify launch script from spotify ebuild

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 .../{spotify-tray-1.3.2.ebuild => spotify-tray-1.3.2-r1.ebuild}   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.2-r1.ebuild
similarity index 81%
rename from media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
rename to media-sound/spotify-tray/spotify-tray-1.3.2-r1.ebuild
index 5de180e44e4e..dc3be566510a 100644
--- a/media-sound/spotify-tray/spotify-tray-1.3.2.ebuild
+++ b/media-sound/spotify-tray/spotify-tray-1.3.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools xdg
 
@@ -29,3 +29,9 @@ src_prepare() {
 	sed -i -e 's/Icon=spotify/Icon=spotify-client/g' spotify-tray.desktop.in || die
 	eautoreconf
 }
+
+src_install() {
+	default
+	# remove desktop file, launching is handled in spotify ebuild
+	rm "${ED}/usr/share/applications/spotify-tray.desktop" || die
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/
@ 2023-04-25 10:33 Andrew Ammerlaan
  0 siblings, 0 replies; 6+ messages in thread
From: Andrew Ammerlaan @ 2023-04-25 10:33 UTC (permalink / raw
  To: gentoo-commits

commit:     cc5093682a6b275be29515f8c229bdb9602073fa
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 10:25:20 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 10:33:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc509368

media-sound/spotify-tray: move spotify-tray executable

This avoids launching in a loop, i.e. launching spotify-tray
from command line by default launches /usr/bin/spotify but
we customized this script to launch spotify-tray if available.
Avoid the problem by moving the executable out of PATH so
it is not used by accident and causing confusion.

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../{spotify-tray-1.3.2-r1.ebuild => spotify-tray-1.3.2-r2.ebuild}  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/media-sound/spotify-tray/spotify-tray-1.3.2-r1.ebuild b/media-sound/spotify-tray/spotify-tray-1.3.2-r2.ebuild
similarity index 76%
rename from media-sound/spotify-tray/spotify-tray-1.3.2-r1.ebuild
rename to media-sound/spotify-tray/spotify-tray-1.3.2-r2.ebuild
index dc3be566510a..6630dbac467e 100644
--- a/media-sound/spotify-tray/spotify-tray-1.3.2-r1.ebuild
+++ b/media-sound/spotify-tray/spotify-tray-1.3.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -34,4 +34,8 @@ src_install() {
 	default
 	# remove desktop file, launching is handled in spotify ebuild
 	rm "${ED}/usr/share/applications/spotify-tray.desktop" || die
+
+	# move executable outside of PATH to avoid accidentally launching it in a loop
+	mkdir -p "${ED}/opt/spotify/spotify-client" || die
+	mv "${ED}/usr/bin/spotify-tray" "${ED}/opt/spotify/spotify-client/spotify-tray" || die
 }


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2023-04-25 10:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-25 10:33 [gentoo-commits] repo/gentoo:master commit in: media-sound/spotify-tray/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2022-01-05 16:42 Matthew Thode
2021-10-07 10:58 Andrew Ammerlaan
2021-09-16 18:04 Andrew Ammerlaan
2021-09-16 18:04 Andrew Ammerlaan
2021-05-24  7:18 Andrew Ammerlaan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox