diff --git a/gnu/local.mk b/gnu/local.mk index b66ab6b263..25ac77b706 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -42,7 +42,7 @@ # Copyright © 2021 Björn Höfling # Copyright © 2021 Greg Hogan # Copyright © 2021-2024 Philip McGrath -# Copyright © 2021 Arun Isaac +# Copyright © 2021, 2026 Arun Isaac # Copyright © 2021 Sharlatan Hellseher # Copyright © 2021 Dmitry Polyakov # Copyright © 2021 Andrew Tropin @@ -1721,6 +1721,7 @@ dist_patch_DATA = \ %D%/packages/patches/linphone-desktop-cmake-belcard.patch \ %D%/packages/patches/linphone-desktop-cmake-find-modules.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ + %D%/packages/patches/lufa-fix-incompatible-cast.patch \ %D%/packages/patches/kaldi-ignore-failing-test.patch \ %D%/packages/patches/kaldi-openblas-0.3.29-compatibility.patch \ %D%/packages/patches/kcontacts-incorrect-country-name.patch \ diff --git a/gnu/packages/avr-xyz.scm b/gnu/packages/avr-xyz.scm index 0e5fff46aa..03dec7e981 100644 --- a/gnu/packages/avr-xyz.scm +++ b/gnu/packages/avr-xyz.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2022, 2025 Artyom V. Poptsov ;;; Copyright © 2023 Maxim Cournoyer +;;; Copyright © 2026 Arun Isaac ;;; ;;; This file is part of GNU Guix. ;;; @@ -123,7 +124,8 @@ multipart HEX files.") (file-name (git-file-name name version)) (sha256 (base32 - "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g")))) + "0ylr7qsiikcy827k18zj1vdzf0kb8hb0gjmifd75y8krkhhar49g")) + (patches (search-patches "lufa-fix-incompatible-cast.patch")))) (outputs '("bootloaders" "demos" "projects" "doc")) (build-system gnu-build-system) (arguments diff --git a/gnu/packages/patches/lufa-fix-incompatible-cast.patch b/gnu/packages/patches/lufa-fix-incompatible-cast.patch new file mode 100644 index 0000000000..81d54de43e --- /dev/null +++ b/gnu/packages/patches/lufa-fix-incompatible-cast.patch @@ -0,0 +1,40 @@ +From a13ca118d3987890b749a2a96a92f74771821f8a Mon Sep 17 00:00:00 2001 +From: Dean Camera +Date: Sun, 30 Jun 2024 13:44:17 +1000 +Subject: [PATCH] Webserver: Fix incompatible cast warning. + +--- + Projects/Webserver/Lib/DHCPServerApp.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Projects/Webserver/Lib/DHCPServerApp.c b/Projects/Webserver/Lib/DHCPServerApp.c +index 610d9bb6a..dfc579059 100644 +--- a/Projects/Webserver/Lib/DHCPServerApp.c ++++ b/Projects/Webserver/Lib/DHCPServerApp.c +@@ -39,7 +39,7 @@ + + #if defined(ENABLE_DHCP_SERVER) || defined(__DOXYGEN__) + +-struct uip_conn* BroadcastConnection; ++struct uip_udp_conn* BroadcastConnection; + + uint8_t LeasedIPs[255 / 8]; + +@@ -107,7 +107,7 @@ void DHCPServerApp_Callback(void) + sizeof(uip_ipaddr_t), &GatewayIPAddress); + + /* Send the DHCP OFFER packet */ +- uip_poll_conn(BroadcastConnection); ++ uip_udp_periodic_conn(BroadcastConnection); + memcpy(&uip_udp_conn->ripaddr, &uip_broadcast_addr, sizeof(uip_ipaddr_t)); + uip_udp_send(AppDataSize); + +@@ -135,7 +135,7 @@ void DHCPServerApp_Callback(void) + } + + /* Send the DHCP ACK or NAK packet */ +- uip_poll_conn(BroadcastConnection); ++ uip_udp_periodic_conn(BroadcastConnection); + memcpy(&uip_udp_conn->ripaddr, &uip_broadcast_addr, sizeof(uip_ipaddr_t)); + uip_udp_send(AppDataSize); +