millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-09 00:10:21 +03:00
Code Packages Projects Releases Wiki Activity

sys-apps/usb_modeswitch: fix build w/ C23

Browse Source 
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2025-03-10 03:33:06 +00:00
parent 58c8c500c5
commit dde66c941d
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sys-apps/usb_modeswitch/files/c23.patch Normal file
View File

@@ -0,0 +1,23 @@
get_current_config_value doesn't take any arguments, dev is a global variable.
Bug: https://bugs.gentoo.org/944427
--- a/usb_modeswitch.c
+++ b/usb_modeswitch.c
@@ -570,7 +570,7 @@ int main(int argc, char **argv)
/* Get current configuration of default device, note value if Configuration
* parameter is set. Also sets active_config
*/
- currentConfigVal = get_current_config_value(dev);
+ currentConfigVal = get_current_config_value();
if (Configuration > -1) {
SHOW_PROGRESS(output,"Current configuration number is %d\n", currentConfigVal);
} else
@@ -772,7 +772,7 @@ int main(int argc, char **argv)
if (Configuration > 0) {
if (currentConfigVal != Configuration) {
if (switchConfiguration()) {
- currentConfigVal = get_current_config_value(dev);
+ currentConfigVal = get_current_config_value();
if (currentConfigVal == Configuration) {
SHOW_PROGRESS(output,"The configuration was set successfully\n");
} else {

7
sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild → sys-apps/usb_modeswitch/usb_modeswitch-2.6.1-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2022 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -30,7 +30,10 @@ BDEPEND="virtual/pkgconfig"
CONFIG_CHECK="~USB_SERIAL"
PATCHES=( "${FILESDIR}/usb_modeswitch.sh-tmpdir.patch" )
PATCHES=(
"${FILESDIR}/usb_modeswitch.sh-tmpdir.patch"
"${FILESDIR}/c23.patch"
)
src_prepare() {
default