From 2ca31eebd5b7496656193e0aa6ae39200d69a017 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Aug 2024 12:22:56 +0100 Subject: gentoo auto-resync : 16:08:2024 - 12:22:56 --- games-util/Manifest.gz | Bin 7894 -> 7894 bytes games-util/sc-controller/Manifest | 8 +- .../files/sc-controller-0.4.8.17-log-warning.patch | 109 +++++++++++++++++++++ .../files/sc-controller-0.4.8.17-tray-icon.patch | 60 ++++++++++++ games-util/sc-controller/metadata.xml | 3 + .../sc-controller/sc-controller-0.4.8.16.ebuild | 54 ---------- .../sc-controller/sc-controller-0.4.8.17.ebuild | 60 ++++++++++++ 7 files changed, 237 insertions(+), 57 deletions(-) create mode 100644 games-util/sc-controller/files/sc-controller-0.4.8.17-log-warning.patch create mode 100644 games-util/sc-controller/files/sc-controller-0.4.8.17-tray-icon.patch delete mode 100644 games-util/sc-controller/sc-controller-0.4.8.16.ebuild create mode 100644 games-util/sc-controller/sc-controller-0.4.8.17.ebuild (limited to 'games-util') diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz index 5d2528e8c55f..c811273b02de 100644 Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ diff --git a/games-util/sc-controller/Manifest b/games-util/sc-controller/Manifest index 651e61700a66..9c70b5c731bb 100644 --- a/games-util/sc-controller/Manifest +++ b/games-util/sc-controller/Manifest @@ -1,3 +1,5 @@ -DIST sc-controller-0.4.8.16.tar.gz 2570556 BLAKE2B 2aafad5eeb05d0525646bc1c5c08659dc09eba764bca84c0bb25524883b40d9dc8aa26981c6aeab834e429f0211bb97da902e15433876187a3c5b22d61fe8391 SHA512 3e37049b91ff927f047b3518b0c8382875d6faf748fac842c6b3276fb327953e4b1c20ce83ec80baa2b5338d6262aa32ac7dcf6b924c886984564de97e1d8177 -EBUILD sc-controller-0.4.8.16.ebuild 1317 BLAKE2B 1ff216988046d39315693506f3d593562f6c6513d43a5c5c62cb7b624c0cbce17610ce2e04cd0181a9f057a9df4246a14ce906503929586d83fc585f5138c079 SHA512 2bb530ed61ccb74d368ce2a318de7c45194f798b428d08f2a5c81b6334cf8d9347e15a671c5aeb4cb2ef06278d14c6e733cba90be888d6356af4ba931f7745fe -MISC metadata.xml 339 BLAKE2B 14e01513234a188ccdaee57a97ca43ab0d268d6a13655b63b7fa883e6982c5d9ed71743a7d5dedb04118a399840ace25ed92d6a1760aef0a31aaf05b0ab28625 SHA512 d64452dccaddcfd96e4c9f3767ced1741e66a59cf782b4b5fadcf425d62998aad99379988739e773fc1da0b4e8e6a7c5c5e9d9194d13fb47128f6f1aef947885 +AUX sc-controller-0.4.8.17-log-warning.patch 3959 BLAKE2B 57dec098c7803d70f218bdb31ba01b8c63fcea19432dc1fc4bf5c18e5e57f6ba1d5b3845189f57c66a49c8483ad99b919e99d407e19986fb673d30831b7f8d34 SHA512 4a1fd08a643ecba8309babd37d6c37e022837a4b7439e38427911dcf8e6455819923cc11dd29240e4dba3b123d4b8a3339526be5804e15347c2cbe6348744216 +AUX sc-controller-0.4.8.17-tray-icon.patch 2184 BLAKE2B be057195ea626ba941d4dbc9ca5fc9847ac778e96730771768f0f26bec5b3d690a6adac065ea627acac0421be2ad946e838cea9face78e2411556f412dc7ef14 SHA512 56b72b2ec6518ba52a4509a12971c4af0221112b5c8582205d4806a44ae8f4363ddd33482e660f9ba1653555ac9bf23b2d27463ad667239581b002d0c2367d47 +DIST sc-controller-0.4.8.17.tar.gz 1843813 BLAKE2B 77925152086d516be2b67eee70c36fad7fc6ccfb829196cf433331cce7a5ac43e22a466a7929c2ba2504fcb8ac73a62458be9be77162e138e4abad238e9cf2c1 SHA512 5121a802a719357027e1e850250182b2ace77966938f4add6f2f4a5b91fa768e2ef9064c8bb087c2df0979f34f68b5054e3d8d359ceff71f7ecadc3a51f92dae +EBUILD sc-controller-0.4.8.17.ebuild 1462 BLAKE2B b50d9f9239ebc60b9035503a5cbd7de1f9c1a7172a28aa35ca14f0b944ac539453e6674a8368ca907ba1a3e55ad62529702087736a15c4e9f953cb2cff3170bb SHA512 52e81b29996e8022b3d9233ae69a6c8c0a0d53f418e66a0ed012115d32800bed2e0c966019e27f5273f92674e714e476ee4a9c522551475fbdd09ed345696579 +MISC metadata.xml 409 BLAKE2B 4e8c6c1cadcd9a67ec61a7944639e698fcd1207a6650a6134f07cf3ec0a3224f8d22895c1bc01600057b764d2faa77cd924261b3fddc7d43d25f435b27e497a3 SHA512 88f2774a6453bb9afe2e2efcc20961e1994ed60dd95c0d68357574f4933590056f9b4469b134bcc3b7c51f2b5aa19e82118987893a04e021bdacc52160aefffd 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 new file mode 100644 index 000000000000..124a6df427d5 --- /dev/null +++ b/games-util/sc-controller/files/sc-controller-0.4.8.17-log-warning.patch @@ -0,0 +1,109 @@ +From 5c6b850f4ffe45427492d8b28bbf42b4ee5dd3e0 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +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 new file mode 100644 index 000000000000..575ec67eb9d2 --- /dev/null +++ b/games-util/sc-controller/files/sc-controller-0.4.8.17-tray-icon.patch @@ -0,0 +1,60 @@ +From 828a4fa17a6cc1df1a149411c3f3ede52ec5a199 Mon Sep 17 00:00:00 2001 +From: angrylinuxuser +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 +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/metadata.xml b/games-util/sc-controller/metadata.xml index 20f13f973f8f..92ff06782e0e 100644 --- a/games-util/sc-controller/metadata.xml +++ b/games-util/sc-controller/metadata.xml @@ -8,4 +8,7 @@ C0rn3j/sc-controller + + Enable system tray icon + diff --git a/games-util/sc-controller/sc-controller-0.4.8.16.ebuild b/games-util/sc-controller/sc-controller-0.4.8.16.ebuild deleted file mode 100644 index 05c53bdb4a47..000000000000 --- a/games-util/sc-controller/sc-controller-0.4.8.16.ebuild +++ /dev/null @@ -1,54 +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..12} ) -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="+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] - udev? ( games-util/game-device-udev-rules ) - wayland? ( gui-libs/gtk-layer-shell[introspection(+)] ) -" - -distutils_enable_tests pytest - -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 -} 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 new file mode 100644 index 000000000000..e61c2e6455f9 --- /dev/null +++ b/games-util/sc-controller/sc-controller-0.4.8.17.ebuild @@ -0,0 +1,60 @@ +# 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 +} -- cgit v1.2.3