From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8CD751582EF for ; Mon, 10 Mar 2025 03:41:12 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 782203430FE for ; Mon, 10 Mar 2025 03:41:12 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C43A211037D; Mon, 10 Mar 2025 03:41:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id B812911037D for ; Mon, 10 Mar 2025 03:41:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6936134310C for ; Mon, 10 Mar 2025 03:41:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB57D129F for ; Mon, 10 Mar 2025 03:41:06 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1741577586.dde66c941d335b7b47fbd92e1f61aab7155422fd.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/usb_modeswitch/, sys-apps/usb_modeswitch/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/usb_modeswitch/files/c23.patch sys-apps/usb_modeswitch/usb_modeswitch-2.6.1-r1.ebuild sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild X-VCS-Directories: sys-apps/usb_modeswitch/files/ sys-apps/usb_modeswitch/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: dde66c941d335b7b47fbd92e1f61aab7155422fd X-VCS-Branch: master Date: Mon, 10 Mar 2025 03:41:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6638f1e8-1781-4fa3-9075-c4f7397e9692 X-Archives-Hash: 8c2ff3d3d0449a195fb5fba898773e0e commit: dde66c941d335b7b47fbd92e1f61aab7155422fd Author: Sam James gentoo org> AuthorDate: Mon Mar 10 03:33:06 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 10 03:33:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dde66c94 sys-apps/usb_modeswitch: fix build w/ C23 Signed-off-by: Sam James gentoo.org> sys-apps/usb_modeswitch/files/c23.patch | 23 ++++++++++++++++++++++ ...2.6.1.ebuild => usb_modeswitch-2.6.1-r1.ebuild} | 7 +++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/sys-apps/usb_modeswitch/files/c23.patch b/sys-apps/usb_modeswitch/files/c23.patch new file mode 100644 index 000000000000..de91abdad721 --- /dev/null +++ b/sys-apps/usb_modeswitch/files/c23.patch @@ -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 { diff --git a/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1-r1.ebuild similarity index 92% rename from sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild rename to sys-apps/usb_modeswitch/usb_modeswitch-2.6.1-r1.ebuild index d20c200a940a..bac271999447 100644 --- a/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1.ebuild +++ b/sys-apps/usb_modeswitch/usb_modeswitch-2.6.1-r1.ebuild @@ -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