commit: 1703adf70ee6aa9f3e802ac514cb6eb6a8d7259f Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Mar 5 22:13:27 2025 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Mar 6 21:55:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1703adf7
games-util/sc-controller: Drop old 0.4.8.17 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> games-util/sc-controller/Manifest | 1 - .../files/sc-controller-0.4.8.17-log-warning.patch | 109 --------------------- .../files/sc-controller-0.4.8.17-tray-icon.patch | 60 ------------ .../sc-controller/sc-controller-0.4.8.17.ebuild | 60 ------------ 4 files changed, 230 deletions(-) diff --git a/games-util/sc-controller/Manifest b/games-util/sc-controller/Manifest index 412d9eb1ad5d..0283e223cb19 100644 --- a/games-util/sc-controller/Manifest +++ b/games-util/sc-controller/Manifest @@ -1,2 +1 @@ -DIST sc-controller-0.4.8.17.tar.gz 1843813 BLAKE2B 77925152086d516be2b67eee70c36fad7fc6ccfb829196cf433331cce7a5ac43e22a466a7929c2ba2504fcb8ac73a62458be9be77162e138e4abad238e9cf2c1 SHA512 5121a802a719357027e1e850250182b2ace77966938f4add6f2f4a5b91fa768e2ef9064c8bb087c2df0979f34f68b5054e3d8d359ceff71f7ecadc3a51f92dae DIST sc-controller-0.4.8.21.tar.gz 1846682 BLAKE2B 83892aa73ca2b729b205455b2c094f57538487976f8744170e381ff49f9e7e2d23b274b3b43c887ee8b945793cb6a9e9d0ab03778d47d732d35b8599f65e58ac SHA512 874a180cdac3a0f6a592e507abda572e69dcc4061874512292de2c4f9db0f5739a370d43de4f11031f5c02ff4e1f11237a4720f890a1ae8220940a2d5e03d0a1 diff --git a/games-util/sc-controller/files/sc-controller-0.4.8.17-log-warning.patch b/games-util/sc-controller/files/sc-controller-0.4.8.17-log-warning.patch deleted file mode 100644 index 124a6df427d5..000000000000 --- a/games-util/sc-controller/files/sc-controller-0.4.8.17-log-warning.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 5c6b850f4ffe45427492d8b28bbf42b4ee5dd3e0 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -Date: Thu, 15 Aug 2024 21:25:42 +0100 -Subject: [PATCH] logging.warn was dropped in favour of logging.warning in - Python 3.13 - -We already using logging.warning in many places. ---- - scc/actions.py | 12 ++++++------ - scc/gui/app.py | 2 +- - scc/sccdaemon.py | 4 ++-- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/scc/actions.py b/scc/actions.py -index ae43db4b..4f4f5848 100644 ---- a/scc/actions.py -+++ b/scc/actions.py -@@ -256,7 +256,7 @@ class Action(object): - Called when action is executed by pressing physical gamepad button. - 'button_release' will be called later. - """ -- log.warn("Action %s can't handle button press event", self.__class__.__name__) -+ log.warning("Action %s can't handle button press event", self.__class__.__name__) - - - def button_release(self, mapper): -@@ -264,7 +264,7 @@ class Action(object): - Called when action executed by pressing physical gamepad button is - expected to stop. - """ -- log.warn("Action %s can't handle button release event", self.__class__.__name__) -+ log.warning("Action %s can't handle button release event", self.__class__.__name__) - - - def axis(self, mapper, position, what): -@@ -276,7 +276,7 @@ class Action(object): - 'what' is one of LEFT, RIGHT or STICK (from scc.constants), - describing what is being updated - """ -- log.warn("Action %s can't handle axis event", self.__class__.__name__) -+ log.warning("Action %s can't handle axis event", self.__class__.__name__) - - - def pad(self, mapper, position, what): -@@ -310,7 +310,7 @@ class Action(object): - 'what' is one of LEFT, RIGHT, STICK (from scc.constants), describing what is - being updated - """ -- log.warn("Action %s can't handle whole stick event", self.__class__.__name__) -+ log.warning("Action %s can't handle whole stick event", self.__class__.__name__) - - - def whole_blocked(self, mapper, x, y, what): -@@ -337,7 +337,7 @@ class Action(object): - - 'what' can be None. - """ -- log.warn("Action %s can't handle incremental changes", self.__class__.__name__) -+ log.warning("Action %s can't handle incremental changes", self.__class__.__name__) - - - def cancel(self, mapper): -@@ -397,7 +397,7 @@ class Action(object): - 'position' contains current trigger position. - 'old_position' contains last known trigger position. - """ -- log.warn("Action %s can't handle trigger event", self.__class__.__name__) -+ log.warning("Action %s can't handle trigger event", self.__class__.__name__) - - - class RangeOP(object): -diff --git a/scc/gui/app.py b/scc/gui/app.py -index fc6110f0..a537f831 100644 ---- a/scc/gui/app.py -+++ b/scc/gui/app.py -@@ -633,7 +633,7 @@ class App(Gtk.Application, UserDataManager, BindingEditor): - - - def on_unknown_profile(self, ps, name): -- log.warn("Daemon reported unknown profile: '%s'; Overriding.", name) -+ log.warning("Daemon reported unknown profile: '%s'; Overriding.", name) - if self.current_file is not None and ps.get_controller() is not None: - ps.get_controller().set_profile(self.current_file.get_path()) - -diff --git a/scc/sccdaemon.py b/scc/sccdaemon.py -index cc140222..4a99b333 100644 ---- a/scc/sccdaemon.py -+++ b/scc/sccdaemon.py -@@ -90,7 +90,7 @@ class SCCDaemon(Daemon): - if hasattr(mod, "init"): - to_init.append(mod) - else: -- log.warn("Skipping disabled driver '%s'", modname) -+ log.warning("Skipping disabled driver '%s'", modname) - - from scc.drivers import MOD_INIT_ORDER as order - index_fn = lambda n: order.index(n) if n in order else 1024 -@@ -500,7 +500,7 @@ class SCCDaemon(Daemon): - d.float() - except OSError as e: - # Most likely 'xinput' executable not found -- log.warn("Failed to deatach gamepad from xinput master: %s", e) -+ log.warning("Failed to deatach gamepad from xinput master: %s", e) - - - def load_default_profile(self, mapper=None): --- -2.45.2 - diff --git a/games-util/sc-controller/files/sc-controller-0.4.8.17-tray-icon.patch b/games-util/sc-controller/files/sc-controller-0.4.8.17-tray-icon.patch deleted file mode 100644 index 575ec67eb9d2..000000000000 --- a/games-util/sc-controller/files/sc-controller-0.4.8.17-tray-icon.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 828a4fa17a6cc1df1a149411c3f3ede52ec5a199 Mon Sep 17 00:00:00 2001 -From: angrylinuxuser <[email protected]> -Date: Sun, 23 Jun 2024 18:24:43 +0200 -Subject: [PATCH] Fix tray icon not showing up - ---- - scc/gui/statusicon.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/scc/gui/statusicon.py b/scc/gui/statusicon.py -index f5257270..713c56ba 100644 ---- a/scc/gui/statusicon.py -+++ b/scc/gui/statusicon.py -@@ -350,8 +350,8 @@ def _load_fallback(self): - for StatusIconBackend in status_icon_backends: - try: - self._status_fb = StatusIconBackend(*self._arguments[0], **self._arguments[1]) -- self._status_fb.connect(b"clicked", self._on_click) -- self._status_fb.connect(b"notify::active", self._on_notify_active_fb) -+ self._status_fb.connect("clicked", self._on_click) -+ self._status_fb.connect("notify::active", self._on_notify_active_fb) - self._on_notify_active_fb() - - log.warning("StatusIcon: Using backend %s (fallback)" % StatusIconBackend.__name__) - -From a9ebf39749e885114bfec8a3b0ec6b9e62d213c7 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <[email protected]> -Date: Thu, 15 Aug 2024 21:13:26 +0100 -Subject: [PATCH] Support libayatana-appindicator as libappindicator is now - dead - -It seems to be a drop-in replacement. ---- - scc/gui/statusicon.py | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/scc/gui/statusicon.py b/scc/gui/statusicon.py -index f5257270..317b1aa3 100644 ---- a/scc/gui/statusicon.py -+++ b/scc/gui/statusicon.py -@@ -263,8 +263,14 @@ class StatusIconAppIndicator(StatusIconDBus): - StatusIcon.__init__(self, *args, **kwargs) - - try: -- from gi.repository import AppIndicator3 as appindicator -- -+ import gi -+ try: -+ gi.require_version("AyatanaAppIndicator3", "0.1") -+ from gi.repository import AyatanaAppIndicator3 as appindicator -+ except ImportError: -+ gi.require_version("AppIndicator3", "0.1") -+ from gi.repository import AppIndicator3 as appindicator -+ - self._status_active = appindicator.IndicatorStatus.ACTIVE - self._status_passive = appindicator.IndicatorStatus.PASSIVE - except ImportError: --- -2.45.2 - diff --git a/games-util/sc-controller/sc-controller-0.4.8.17.ebuild b/games-util/sc-controller/sc-controller-0.4.8.17.ebuild deleted file mode 100644 index e61c2e6455f9..000000000000 --- a/games-util/sc-controller/sc-controller-0.4.8.17.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_SINGLE_IMPL=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) -inherit distutils-r1 linux-info xdg - -DESCRIPTION="User-mode driver and GTK-based GUI for Steam Controllers and others" -HOMEPAGE="https://github.com/C0rn3j/sc-controller/"; -SRC_URI="https://github.com/C0rn3j/sc-controller/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2 BSD CC-BY-3.0 CC0-1.0 LGPL-2.1 MIT PSF-2 ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+trayicon +udev wayland" - -RDEPEND=" - $(python_gen_cond_dep ' - dev-python/evdev[${PYTHON_USEDEP}] - dev-python/pygobject[${PYTHON_USEDEP},cairo] - dev-python/pylibacl[${PYTHON_USEDEP}] - dev-python/vdf[${PYTHON_USEDEP}] - ') - gnome-base/librsvg[introspection] - virtual/libusb - x11-libs/gtk+:3[introspection] - trayicon? ( dev-libs/libayatana-appindicator ) - udev? ( games-util/game-device-udev-rules ) - wayland? ( gui-libs/gtk-layer-shell[introspection(+)] ) -" - -distutils_enable_tests pytest - -PATCHES=( - "${FILESDIR}"/${P}-tray-icon.patch - "${FILESDIR}"/${P}-log-warning.patch -) - -pkg_setup() { - local CONFIG_CHECK="~INPUT_UINPUT" - - linux-info_pkg_setup - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # This test fails. Don't know why but seems unimportant. - rm -v tests/test_glade.py || die -} - -src_install() { - distutils-r1_src_install - rm -r "${ED}"/usr/lib/udev/ || die -}
