From 565d287b7502ef9435b2fba38622d0a8f458677b Mon Sep 17 00:00:00 2001
From: Jonathan Brielmaier <jonathan.brielmaier@web.de>
Date: Sat, 11 Jan 2025 17:56:01 +0100
Subject: [PATCH] nongnu: broadcom-sta: Fix build for linux@6.12.

We do not need to rename the patches as Software Heritage keeps the old
ones from nixpkgs repo available.

* nongnu/packages/linux.scm (broadcom-sta-patch): Use rpmfusion repo as
nixpkgs no longer maintains those patches.
(broadcom-sta-x86_64-source): Add patch for linux@6.12 and update a
comment.
---
 nongnu/packages/linux.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nongnu/packages/linux.scm b/nongnu/packages/linux.scm
index 7fa21f1..8b74ca2 100644
--- a/nongnu/packages/linux.scm
+++ b/nongnu/packages/linux.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
 ;;; Copyright © 2019 Timotej Lazar <timotej.lazar@araneo.si>
 ;;; Copyright © 2020, 2021 James Smith <jsubuntuxp@disroot.org>
-;;; Copyright © 2020-2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
+;;; Copyright © 2020-2025 Jonathan Brielmaier <jonathan.brielmaier@web.de>
 ;;; Copyright © 2020, 2022 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020, 2021, 2022 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020, 2021, 2022 Zhu Zihao <all_but_last@163.com>
@@ -1095,9 +1095,9 @@ giving you trouble, you can try this module.")
 (define (broadcom-sta-patch name commit hash)
   (origin
     (method url-fetch)
-    (uri (string-append "https://raw.githubusercontent.com/NixOS/nixpkgs/"
+    (uri (string-append "https://raw.githubusercontent.com/rpmfusion/wl-kmod/"
                         commit
-                        "/pkgs/os-specific/linux/broadcom-sta/"
+                        "wl-kmod-"
                         name
                         ".patch"))
     (sha256
@@ -1112,12 +1112,12 @@ giving you trouble, you can try this module.")
                         (string-replace-substring broadcom-sta-version "." "_")
                         ".tar.gz"))
     (patches
-     ;; Keep these in sync with the list at
-     ;; https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/broadcom-sta.
-     ;; Nixpkgs is good about keeping broadcom patches up to date so updating
+     ;; Keep these in sync with the patches at
+     ;; https://github.com/rpmfusion/wl-kmod
+     ;; They seem to be good about keeping broadcom patches up to date so updating
      ;; for a new kernel release should be as simple as chaging the commit to
      ;; the newest available and adding any new patches.
-     (let ((commit "355042e2ff5933b245e804c5eaff4ec3f340e71b"))
+     (let ((commit "cb67598cbf5d8c5260b750d6f7e5c6a6599b7b85"))
        (list
         (broadcom-sta-patch "i686-build-failure" commit "1522w2gb698svlkb2b4lijbd740agvs2ibpz4g0jlv8v31cybkf4")
         (broadcom-sta-patch "license" commit "0rwlhafcmpp97cknqwv8gwf8sbxgqavgci1ywfkdxiylh4mhcvhr")
@@ -1135,7 +1135,9 @@ giving you trouble, you can try this module.")
         (broadcom-sta-patch "linux-6.1" commit "1pvx1h7iimcbfqdc13n1980ngxk9q6iyip8svn293x4h7jn472kf")
         (broadcom-sta-patch "pedantic-fix" commit "1kxmw1iyxnfwad75h981sak5qk16p81xy1f2qxss2d0v97vkfkl5")
         (broadcom-sta-patch "null-pointer-fix" commit "15c2vxgf7v5wy4s8w9jk7irf3fxxghy05gxmav1ss73a2azajdx7")
-        (broadcom-sta-patch "gcc" commit "0jcqk2vapyy2pbsjv9n8b3qp6vqz17d6s07cr04cx7075q7yhz5h"))))
+        (broadcom-sta-patch "gcc" commit "0jcqk2vapyy2pbsjv9n8b3qp6vqz17d6s07cr04cx7075q7yhz5h")
+        (broadcom-sta-patch "028_kernel_6.12_adaption" commit
+                            "154dhlb3vyq8bnx7f371scsrhp9cszvmqlswqg5vi6gfgbqnrq08"))))
     (sha256
      (base32
       "1gj485qqr190idilacpxwgqyw21il03zph2rddizgj7fbd6pfyaz"))))