From 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Apr 2021 20:21:43 +0100 Subject: gentoo resync : 28.04.2021 --- gnome-extra/gnome-integration-spotify/Manifest | 5 +- ...-integration-spotify-command-line-parsing.patch | 11 +++++ ...ome-integration-spotify-correct-interface.patch | 23 +++++++++ .../files/gnome-integration-spotify-use-glib.patch | 40 ++++++++++++++++ .../gnome-integration-spotify-20140907-r1.ebuild | 48 ------------------- .../gnome-integration-spotify-20140907-r2.ebuild | 54 ++++++++++++++++++++++ 6 files changed, 132 insertions(+), 49 deletions(-) create mode 100644 gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-command-line-parsing.patch create mode 100644 gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-correct-interface.patch create mode 100644 gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-use-glib.patch delete mode 100644 gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild create mode 100644 gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild (limited to 'gnome-extra/gnome-integration-spotify') diff --git a/gnome-extra/gnome-integration-spotify/Manifest b/gnome-extra/gnome-integration-spotify/Manifest index 91bcd77af3cb..f199a5e909c9 100644 --- a/gnome-extra/gnome-integration-spotify/Manifest +++ b/gnome-extra/gnome-integration-spotify/Manifest @@ -1,3 +1,6 @@ +AUX gnome-integration-spotify-command-line-parsing.patch 357 BLAKE2B b1e823c847768077c02e9c432cc817861360b6f5e80aaa7af1fd14d04da2e8a53fd2df96a2a33806ccca949a7daa3d3858d09697582d63681fac58e453de1e53 SHA512 a7becf3a56545e0990499701a339566906374e07460df856b6a9f34607f98bb0fb9f7c945c62b7a0772e968a16e1cb499f3990e30e42287745e2c20371667649 +AUX gnome-integration-spotify-correct-interface.patch 797 BLAKE2B fab74ff1202d47b60acb4350fe542116d9eae8abc4efff748713f6026e8adebb33a48ff89f76375510951f27a9c1c93a8bf9dbf6c6403a0d8745b660a027f0e7 SHA512 d875db53ea7eae23a1280534278ac17fd12a75673162029a86d9b232bd6cc27ea71287f5d904a0fa9328b2716d3e115675a72e5729748491ee1482ff0522f9b2 +AUX gnome-integration-spotify-use-glib.patch 1209 BLAKE2B 1cc5ca0d145dd73d2ad78b43d291034ee291e1974b110291560c8d952afe0e2170f205f78bb477a06bc0153583a0cc2bc02150701baa170b8466825665730bad SHA512 daaa2ba1f3484946c916e1cac821d9d09b54c2ca1da0cdbd0db58d6b576d54a68cdb285d9e424fa070ebf1074f32a4cf43305741314ae49026eaa9bf2fde6a37 DIST gnome-integration-spotify-20140907.tar.gz 6709 BLAKE2B b66018e5d0e5da4ee2a63b4f2fe1622d1c09c63fc3f69a13a353dbec0ae862d7188d2f83016d1d12892cc69f69dc8f2d4930de494e5cfaf377cdb28af377b5ff SHA512 51e0e7fdb0912e230b0965ca05740b01633b3bc0219dd6e8c31ad5a9378b15c1b44ce1f99098900af7a478f0d6180c3ee015c1717603b6c2fb4c54769dddb874 -EBUILD gnome-integration-spotify-20140907-r1.ebuild 1081 BLAKE2B 224655597745799a8dcbf6ae077435447962ec1e79e78d322650840b576522d29c8066157de6d2c50857614a4c1f73bbf6c04921400f3fcd6dee6c8d93ace92d SHA512 5500ad01d6c68234b29138095b7598a733e34e32313d8e3eec49992998371155efbb88a3fb814d36351638b21a10af2b0389e38dcb4e345c1dafaf1db29c4350 +EBUILD gnome-integration-spotify-20140907-r2.ebuild 1283 BLAKE2B c325ab9144a0858188d3b11f5f2685d2679e50f11ea4339aa0ae98180de2a587af95127e26d58bac2c5ed21949a232adfc289af06eff6965aa6da0b5ee4ba4f2 SHA512 2920b7230673fabd509473e0ec23046ef910e8735f3df18245edeb85eda7930521925680c4548e9f714d12a5646d198aa452549d7adf025213e3349e42c1254a MISC metadata.xml 354 BLAKE2B c924a3ff76f3b4722a0a97c8b74ee7d6dc22d45a7f968eae3c79917f3d44d2296f2747f8150ab2f320432e7428e88f369457da082873beac161369098593f00c SHA512 8c3b0f5ae534f97b3a5ba81cc5e48280b48a864ca7f161876546ba14d4733fc09e960be75741b2a97f895a46228ddd5d787e685dc83fae8943d12341418a23e9 diff --git a/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-command-line-parsing.patch b/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-command-line-parsing.patch new file mode 100644 index 000000000000..52e3d15481cc --- /dev/null +++ b/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-command-line-parsing.patch @@ -0,0 +1,11 @@ +--- a/spotify-dbus.py 2021-04-12 11:11:00.710360694 +0200 ++++ b/spotify-dbus.py 2021-04-12 11:53:06.208197383 +0200 +@@ -632,7 +636,7 @@ + self.action_trigger('play') + + # Play/pause (0.6) +- elif '--playpause' or 'playpause' in sys.argv: ++ elif '--playpause' in sys.argv or 'playpause' in sys.argv: + self.action_trigger('playpause') + + # Stop diff --git a/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-correct-interface.patch b/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-correct-interface.patch new file mode 100644 index 000000000000..d6cb838de2c5 --- /dev/null +++ b/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-correct-interface.patch @@ -0,0 +1,23 @@ +--- a/spotify-dbus.py 2021-04-12 11:11:00.710360694 +0200 ++++ b/spotify-dbus.py 2021-04-12 11:50:55.946631871 +0200 +@@ -227,8 +227,7 @@ + if self.debug == True: + print("Opening " + param + "...") + +- window = self.get_window() +- window._openLink(param) ++ self.player.OpenUri(param) + + # Action listener + def action_listener(self, id = 0, action = ''): +@@ -322,8 +321,8 @@ + # Get the player object + def get_player(self): + try: +- proxyobj = self.bus.get_object('org.mpris.MediaPlayer2.spotify', '/') +- pl = dbus.Interface(proxyobj, 'org.freedesktop.MediaPlayer2') ++ proxyobj = self.bus.get_object('org.mpris.MediaPlayer2.spotify', '/org/mpris/MediaPlayer2') ++ pl = dbus.Interface(proxyobj, 'org.mpris.MediaPlayer2.Player') + except dbus.DBusException: + pl = False + diff --git a/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-use-glib.patch b/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-use-glib.patch new file mode 100644 index 000000000000..b590b304e92a --- /dev/null +++ b/gnome-extra/gnome-integration-spotify/files/gnome-integration-spotify-use-glib.patch @@ -0,0 +1,40 @@ +--- a/spotify-dbus.py 2021-04-12 11:11:00.710360694 +0200 ++++ b/spotify-dbus.py 2021-04-12 11:23:16.895644502 +0200 +@@ -39,7 +39,7 @@ + import sys + import dbus + import time +-from gi.repository import GObject ++from gi.repository import GLib + import hashlib + import sys + if (sys.version_info) < (3, 0): +@@ -146,8 +146,8 @@ + interface.connect_to_signal('ActionInvoked', self.action_listener) + + interface.connect_to_signal('NotificationClosed', self.action_dismisser) +- GObject.threads_init() +- GObject.timeout_add(self.timeout * 10, self.action_listener) ++ GLib.threads_init() ++ GLib.timeout_add(self.timeout * 10, self.action_listener) + + return self.nid + +@@ -532,7 +532,7 @@ + self.locale = locale + + # loop must be global to can quit from listener +- self.loop = GObject.MainLoop() ++ self.loop = GLib.MainLoop() + + # Prepare loop for interactive notifications or daemon mode + self.dloop = DBusGMainLoop() +@@ -606,7 +606,7 @@ + + # Start loop listening for track changes + try: +- GObject.timeout_add(100, self.change_listener) ++ GLib.timeout_add(100, self.change_listener) + self.loop.run() + except KeyboardInterrupt: + print('Stopping daemon...') diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild deleted file mode 100644 index f574ffecc962..000000000000 --- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_7 python3_8 ) - -inherit gnome2-utils python-r1 - -DESCRIPTION="GNOME integration for Spotify" -HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify" -#SRC_URI="https://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz" -SRC_URI="https://github.com/mrpdaemon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -#S="${WORKDIR}/mrpdaemon-${PN}-df9124d" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DEPEND="${PYTHON_DEPS}" -RDEPEND="${DEPEND} - dev-python/dbus-python[${PYTHON_USEDEP}] - media-gfx/imagemagick - x11-misc/wmctrl - x11-misc/xautomation - x11-misc/xdotool - x11-apps/xwininfo" - -src_install() { - dobin spotify-dbus.py - python_replicate_script "${ED}"/usr/bin/spotify-dbus.py - mkdir -p "${D}/etc/gconf/schemas" - cp spotify.schemas "${D}/etc/gconf/schemas" -} - -pkg_preinst() { - gnome2_gconf_savelist -} - -pkg_postinst() { - gnome2_gconf_install -} - -pkg_prerm() { - gnome2_gconf_uninstall -} diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild new file mode 100644 index 000000000000..049a2479a33b --- /dev/null +++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_7 python3_8 ) + +inherit gnome2-utils python-r1 + +DESCRIPTION="GNOME integration for Spotify" +HOMEPAGE="https://github.com/mrpdaemon/gnome-integration-spotify" +#SRC_URI="https://github.com/mrpdaemon/${PN}/tarball/${PV} -> ${PN}-git-${PV}.tgz" +SRC_URI="https://github.com/mrpdaemon/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +#S="${WORKDIR}/mrpdaemon-${PN}-df9124d" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="${PYTHON_DEPS}" +RDEPEND="${DEPEND} + dev-python/dbus-python[${PYTHON_USEDEP}] + media-gfx/imagemagick + x11-misc/wmctrl + x11-misc/xautomation + x11-misc/xdotool + x11-apps/xwininfo" + +PATCHES=( + "${FILESDIR}/gnome-integration-spotify-command-line-parsing.patch" + "${FILESDIR}/gnome-integration-spotify-correct-interface.patch" + "${FILESDIR}/gnome-integration-spotify-use-glib.patch" +) + +src_install() { + dobin spotify-dbus.py + python_replicate_script "${ED}"/usr/bin/spotify-dbus.py + mkdir -p "${D}/etc/gconf/schemas" + cp spotify.schemas "${D}/etc/gconf/schemas" +} + +pkg_preinst() { + gnome2_gconf_savelist +} + +pkg_postinst() { + gnome2_gconf_install +} + +pkg_prerm() { + gnome2_gconf_uninstall +} -- cgit v1.2.3