mini: update to 1.6.1

2026-08-10 21:20:53 +02:00
parent e4ee3065e2
commit e587446b49
2 changed files with 2 additions and 94 deletions
@@ -1,88 +0,0 @@
-From 2aea542c27d067ce2fb089ece0cf6f418c4e2d47 Mon Sep 17 00:00:00 2001
-From: Janne Grunau <j@jannau.net>
-Date: Fri, 26 Jun 2026 18:27:11 +0200
-Subject: [PATCH] rust: Switch fatfs to a git dependency
-
-There is no reason to vendor fatfs so declare as cargo git dependency
-using the same revision as the git submodule.
-
-Signed-off-by: Janne Grunau <j@jannau.net>
---
- .gitmodules            |  3 ---
- rust/Cargo.lock        | 13 +++++++------
- rust/Cargo.toml        |  4 ++--
- rust/vendor/rust-fatfs |  1 -
- 4 files changed, 9 insertions(+), 12 deletions(-)
- delete mode 160000 rust/vendor/rust-fatfs
-
-diff --git a/.gitmodules b/.gitmodules
-index 70d6ed04e..fbf3eff84 100644
--- a/.gitmodules
-+++ b/.gitmodules
-@@ -1,6 +1,3 @@
- [submodule "artwork"]
- 	path = artwork
- 	url = https://github.com/AsahiLinux/artwork.git
-[submodule "rust/vendor/rust-fatfs"]
-	path = rust/vendor/rust-fatfs
-	url = https://github.com/rafalh/rust-fatfs
-diff --git a/rust/Cargo.lock b/rust/Cargo.lock
-index 7d1876db9..6fd16fc79 100644
--- a/rust/Cargo.lock
-+++ b/rust/Cargo.lock
-@@ -4,13 +4,14 @@ version = 4
- 
- [[package]]
- name = "bitflags"
-version = "2.9.2"
-+version = "2.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a65b545ab31d687cff52899d4890855fec459eb6afe0da6417b8a18da87aa29"
-+checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
- 
- [[package]]
- name = "fatfs"
- version = "0.4.0"
-+source = "git+https://github.com/rafalh/rust-fatfs?rev=4eccb50d011146fbed20e133d33b22f3c27292e7#4eccb50d011146fbed20e133d33b22f3c27292e7"
- dependencies = [
-  "bitflags",
-  "log",
-@@ -18,9 +19,9 @@ dependencies = [
- 
- [[package]]
- name = "log"
-version = "0.4.27"
-+version = "0.4.33"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-+checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
- 
- [[package]]
- name = "rust"
-@@ -33,9 +34,9 @@ dependencies = [
- 
- [[package]]
- name = "uuid"
-version = "1.23.1"
-+version = "1.23.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
-+checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
- 
- [[package]]
- name = "versions"
-diff --git a/rust/Cargo.toml b/rust/Cargo.toml
-index edfaed3d7..86bce1671 100644
--- a/rust/Cargo.toml
-+++ b/rust/Cargo.toml
-@@ -11,8 +11,8 @@ 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.23", default-features = false, optional = true }
-+fatfs = { git = "https://github.com/rafalh/rust-fatfs", rev = "4eccb50d011146fbed20e133d33b22f3c27292e7", default-features = false, features = ["lfn", "alloc"], optional = true }
-+uuid = {  version = "1.23", default-features = false, optional = true }
- versions = { path = "./versions" }
- 
- [features]
@@ -1,6 +1,6 @@
 # Template file for 'm1n1'
 pkgname=m1n1
-version=1.6.0
+version=1.6.1
 revision=1
 archs="aarch64*"
 hostmakedepends="ImageMagick void-artwork cargo rust-src"
@@ -9,13 +9,9 @@ maintainer="dkwo <npiazza@disroot.org>, Will Springer <skirmisher@protonmail.com
 license="MIT"
 homepage="https://asahilinux.org"
 distfiles="https://github.com/AsahiLinux/m1n1/archive/refs/tags/v${version}.tar.gz"
-checksum=4ef1f89116aedce60f5886bd37feef7fba294e2f44ef136d4547e54d09c15b8b
+checksum=7099fcf6e94b6a6a8e57f8a3d434e7a66dbe476737f0f02f7bb3349586aa3b85
 conf_files="/etc/m1n1.conf /etc/default/m1n1-kernel-hook"

-pre_patch() {
-	rm -rf rust/vendor/rust-fatfs
-}
-
 pre_build() {
 	for size in 128 256; do
 		cp /usr/share/icons/hicolor/${size}x${size}/apps/void-logo.png data/custom_${size}.png