[rpms/m1n1] rawhide: Update to 1.6.0

[rpms/m1n1] rawhide: Update to 1.6.0

[Janne Grunau]

A new commit has been pushed.

Repo   : rpms/m1n1
Branch : rawhide
Commit : e52905dbfa154c05c1341c3664ff200afb36461f
Author : Janne Grunau <janne-fdr@jannau.net>
Date   : 2026-07-31T19:14:30+00:00
Stats  : +15/-103 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/m1n1/c/e52905dbfa154c05c1341c3664ff200afb36461f?branch=rawhide

Log:
Update to 1.6.0

---
diff --git a/.gitignore b/.gitignore
index efe3427..e4ddb50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,5 @@
 /m1n1-1.5.0.tar.gz
 /m1n1-1.5.2.tar.gz
 /m1n1-1.6.0-rc1.tar.gz
+/m1n1-1.6.0.tar.gz
 /rust-fatfs-4eccb50d011146fbed20e133d33b22f3c27292e7.tar.gz

diff --git a/42349e5e2e4a552054fc1b73c99016bd8cfa4d98.patch b/42349e5e2e4a552054fc1b73c99016bd8cfa4d98.patch
deleted file mode 100644
index 7839644..0000000
--- a/42349e5e2e4a552054fc1b73c99016bd8cfa4d98.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 42349e5e2e4a552054fc1b73c99016bd8cfa4d98 Mon Sep 17 00:00:00 2001
-From: Davide Cavalca <dcavalca@fedoraproject.org>
-Date: Mon, 4 May 2026 09:35:38 -0700
-Subject: [PATCH] convert -> magick
-
-ImageMagick 7 and later deprecate the convert command, which now prints
-a warning. Use the new magick one instead, which takes the same
-arguments.
-
-Signed-off-by: Davide Cavalca <dcavalca@fedoraproject.org>
----
- data/makelogo.sh               | 6 +++---
- font/makefont.sh               | 2 +-
- proxyclient/m1n1/agx/render.py | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/data/makelogo.sh b/data/makelogo.sh
-index 20dcffbd5..f4e36540f 100755
---- a/data/makelogo.sh
-+++ b/data/makelogo.sh
-@@ -1,4 +1,4 @@
- #!/usr/bin/env sh
--convert bootlogo_48.png -background black -flatten -depth 8 rgba:bootlogo_48.bin
--convert bootlogo_128.png -background black -flatten -depth 8 rgba:bootlogo_128.bin
--convert bootlogo_256.png -background black -flatten -depth 8 rgba:bootlogo_256.bin
-+magick bootlogo_48.png -background black -flatten -depth 8 rgba:bootlogo_48.bin
-+magick bootlogo_128.png -background black -flatten -depth 8 rgba:bootlogo_128.bin
-+magick bootlogo_256.png -background black -flatten -depth 8 rgba:bootlogo_256.bin
-diff --git a/font/makefont.sh b/font/makefont.sh
-index 37235fad5..ddadb9130 100755
---- a/font/makefont.sh
-+++ b/font/makefont.sh
-@@ -10,7 +10,7 @@ shift 5
- for ord in $(seq 32 126); do
-     printf "\\x$(printf %x $ord)\\n"
- done
--) | convert \
-+) | magick \
-     -page ${width}x$((height*95)) \
-     -background black \
-     -fill white \
-diff --git a/proxyclient/m1n1/agx/render.py b/proxyclient/m1n1/agx/render.py
-index b86f2510c..d243371b3 100644
---- a/proxyclient/m1n1/agx/render.py
-+++ b/proxyclient/m1n1/agx/render.py
-@@ -1329,7 +1329,7 @@ def wait(self):
- 
-             #unswizzle(agx, obj._paddr, work.width, work.height, 4, "fb.bin", grid=False)
-             #open("fb.bin", "wb").write(self.agx.u.iface.readmem(obj._paddr, work.width*work.height*4))
--            #os.system(f"convert -size {work.width}x{work.height} -depth 8 rgba:fb.bin -alpha off frame{self.frames}.png")
-+            #os.system(f"magick -size {work.width}x{work.height} -depth 8 rgba:fb.bin -alpha off frame{self.frames}.png")
-             self.agx.p.fb_blit(0, 0, work.width, work.height, obj._paddr, work.width, PIX_FMT.XBGR)
- 
-         if False: #work.depth is not None:
-@@ -1342,7 +1342,7 @@ def wait(self):
-             chexdump(obj.val)
- 
-             unswizzle(self.agx, obj._paddr, work.width, work.height, 4, "depth.bin", grid=False)
--            os.system(f"convert -size {work.width}x{work.height} -depth 8 rgba:depth.bin -alpha off depth.png")
-+            os.system(f"magick -size {work.width}x{work.height} -depth 8 rgba:depth.bin -alpha off depth.png")
- 
-         for i in self.work:
-             i.free()

diff --git a/569.patch b/569.patch
deleted file mode 100644
index 4d1bd5f..0000000
--- a/569.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From b41dfd2283c04a86715230ee72b1c8cb1e1d0a0a Mon Sep 17 00:00:00 2001
-From: Davide Cavalca <dcavalca@fedoraproject.org>
-Date: Tue, 5 May 2026 13:29:08 -0700
-Subject: [PATCH] proxyclient: add missing xml namespace declaration
-
-This should make the XML validate properly, which is needed for
-rpminspect to pass:
-https://artifacts.dev.testing-farm.io/90d12277-5b49-4343-aa1e-e9f8645cf997/
-
-Signed-off-by: Davide Cavalca <dcavalca@fedoraproject.org>
----
- proxyclient/m1n1/hv/gdbserver/features/target.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/proxyclient/m1n1/hv/gdbserver/features/target.xml b/proxyclient/m1n1/hv/gdbserver/features/target.xml
-index ca0454a8c..6a011041a 100644
---- a/proxyclient/m1n1/hv/gdbserver/features/target.xml
-+++ b/proxyclient/m1n1/hv/gdbserver/features/target.xml
-@@ -1,7 +1,7 @@
- <?xml version="1.0"?>
- <!-- SPDX-License-Identifier: MIT -->
- <!DOCTYPE target SYSTEM "gdb-target.dtd">
--<target version="1.0">
-+<target version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-   <architecture>aarch64</architecture>
-   <xi:include href="aarch64-core.xml" />
-   <xi:include href="aarch64-fpu.xml" />

diff --git a/m1n1-rust-deps.patch b/m1n1-rust-deps.patch
index 10f9976..4dc1af9 100644
--- a/m1n1-rust-deps.patch
+++ b/m1n1-rust-deps.patch
@@ -1,15 +1,16 @@
 diff --git a/rust/Cargo.toml b/rust/Cargo.toml
-index ced3ee0..cbad509 100644
 --- a/rust/Cargo.toml
 +++ b/rust/Cargo.toml
-@@ -12,7 +12,9 @@ crate-type = [ "staticlib" ]
+@@ -12,8 +12,11 @@ crate-type = [ "staticlib" ]
  # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
  [dependencies]
  fatfs = { path = "vendor/rust-fatfs", default-features = false, features = ["lfn", "alloc"], optional = true }
--uuid = { version = "1.7.0", default-features = false, optional = true }
-+uuid = { version = "1.23", default-features = false, optional = true }
-+log = "0.4"
-+bitflags = "2"
+ uuid = { version = "1.23", default-features = false, optional = true }
++# bitflags and log are dependencies for fatfs
++bitflags = { version = "2", default-features = false, optional = true }
++log = { version = "0.4", default-features = false, optional = true }
  versions = { path = "./versions" }
  
  [features]
+-chainload = ["dep:fatfs", "dep:uuid"]
++chainload = ["dep:bitflags", "dep:log", "dep:fatfs", "dep:uuid"]

diff --git a/m1n1.spec b/m1n1.spec
index 71919ef..d6879e0 100644
--- a/m1n1.spec
+++ b/m1n1.spec
@@ -9,7 +9,7 @@
 m1n1 is the bootloader developed by the Asahi Linux project to bridge the Apple
 (XNU) boot ecosystem to the Linux boot ecosystem.}
 
-%global srcversion 1.6.0-rc1
+%global srcversion 1.6.0
 
 Name:           m1n1
 Version:        %(echo '%{srcversion}' | tr '-' '~')
@@ -28,12 +28,7 @@ URL:            https://github.com/AsahiLinux/m1n1
 Source:         %{url}/archive/v%{srcversion}/%{name}-%{srcversion}.tar.gz
 Source:         https://github.com/rafalh/rust-fatfs/archive/%{fatfs_commit}/rust-fatfs-%{fatfs_commit}.tar.gz
 # * Ensure all required rust dependencies are pulled in
-# * Bump uuid to 1.23: https://github.com/AsahiLinux/m1n1/pull/600
 Patch:          m1n1-rust-deps.patch
-# convert -> magick
-Patch:          %{url}/commit/42349e5e2e4a552054fc1b73c99016bd8cfa4d98.patch
-# proxyclient: add missing xml namespace declaration
-Patch:          %{url}/pull/569.patch
 
 BuildRequires:  gcc
 BuildRequires:  make
@@ -105,6 +100,10 @@ This package contains various developer tools for m1n1.
 %autosetup -N -n %{name}-%{srcversion}
 tar -xf %{SOURCE1} -C rust/vendor/rust-fatfs --strip-components 1
 %autopatch -p1
+%dnl delete rust/Cargo.lock to avoid the locked versions and drop it from
+%dnl RUST_LIB's dependencies as the package build is one shot
+/usr/bin/rm -f rust/Cargo.lock
+sed -ie 's;\(^build/$(RUST_LIB):.*\) rust/Cargo.lock$;\1;' Makefile
 
 # Use our logos
 pushd data
@@ -127,6 +126,7 @@ popd
 
 # Generate rust dependencies
 %cargo_prep
+
 %generate_buildrequires
 cd rust
 %cargo_generate_buildrequires -f chainload

diff --git a/sources b/sources
index a2ea3b4..98b9ca4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (m1n1-1.6.0-rc1.tar.gz) = 2c5aed3194caa0081c38232dd2c8e6c56b89769cc46ac8d0bc54254daebdf7a43469276a9b3977ae62e095f7b9829013e89def48ec5856caa7a4817726443350
+SHA512 (m1n1-1.6.0.tar.gz) = 4f81a61b18c6632013a4220706bfcc63fea16153d04d04a44dbd2ca4030c7fad7fc6345a3a17d1e288358785b0b29b422dc775cdf863a7319a76f762ce37c381
 SHA512 (rust-fatfs-4eccb50d011146fbed20e133d33b22f3c27292e7.tar.gz) = 28539df26d715d34b5fba861c62115cd4696c4cac4c7a4eb3bafdaf32e7fece49d7b3cdd986c409323e05eab7c0596f6c7dfa63bc2572551f1107b1447cf3711