From 4ad187d13b6ca98c9c97a81bbfd6cda49616f775 Mon Sep 17 00:00:00 2001 From: Matthias Ahouansou Date: Mon, 9 Sep 2024 10:23:28 +0100 Subject: [PATCH] testing/yazi: upgrade to 0.3.3 --- testing/yazi/APKBUILD | 6 +- testing/yazi/system-lua.patch | 190 ++++------------------------------ 2 files changed, 23 insertions(+), 173 deletions(-) diff --git a/testing/yazi/APKBUILD b/testing/yazi/APKBUILD index 5753e2ff3ec..58e1ef20809 100644 --- a/testing/yazi/APKBUILD +++ b/testing/yazi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Matthias Ahouansou # Maintainer: Matthias Ahouansou pkgname=yazi -pkgver=0.3.2 +pkgver=0.3.3 pkgrel=0 pkgdesc="Blazing fast terminal file manager written in Rust, based on async I/O" url="https://yazi-rs.github.io" @@ -54,6 +54,6 @@ cli() { } sha512sums=" -2059b7292be35565b2df506f3bd8a489cb0fed072cfba49cea0d39fcd05f9892082e1ffc3e9f58ce0930b79493178f6dfd8031e38c9a882e8627888446ee7419 yazi-0.3.2.tar.gz -0d662c1b758dc719eea9f35964ef8d306cf0b9f0851ddf9881caa8efac5c56ad679c6c5e430f396d1eece65583f73d4453667a9df9705d19a23055b68ab15e6e system-lua.patch +57eaf4d4df80c077d03cd46270e3355164ae54534ad845e99459704411080aa75039ba61e7f5bf700ee9f519babe31d8973efd6f221cfe0bb20185a5b0e7a187 yazi-0.3.3.tar.gz +5cf84acc7441691b6c2acfe4e2361c52463d90755b295738b9afa9c0453f60e0464eeef3d028abb208fa814a4972f1bcd4850c5c13c1b8cd73651fc1a72805fa system-lua.patch " diff --git a/testing/yazi/system-lua.patch b/testing/yazi/system-lua.patch index 1c9b2d26a76..6b1119434be 100644 --- a/testing/yazi/system-lua.patch +++ b/testing/yazi/system-lua.patch @@ -1,198 +1,48 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 253e98d..f213ac1 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -729,16 +729,6 @@ dependencies = [ - "typeid", - ] - --[[package]] --name = "errno" --version = "0.3.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" --dependencies = [ -- "libc", -- "windows-sys 0.52.0", --] -- - [[package]] - name = "error-code" - version = "3.2.0" -@@ -1040,15 +1030,6 @@ version = "0.3.9" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" - --[[package]] --name = "home" --version = "0.5.9" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" --dependencies = [ -- "windows-sys 0.52.0", --] -- - [[package]] - name = "iana-time-zone" - version = "0.1.60" -@@ -1311,12 +1292,6 @@ version = "0.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e" - --[[package]] --name = "linux-raw-sys" --version = "0.4.14" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -- - [[package]] - name = "lock_api" - version = "0.4.12" -@@ -1351,25 +1326,6 @@ dependencies = [ - "hashbrown", - ] - --[[package]] --name = "lua-src" --version = "546.0.2" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2da0daa7eee611a4c30c8f5ee31af55266e26e573971ba9336d2993e2da129b2" --dependencies = [ -- "cc", --] -- --[[package]] --name = "luajit-src" --version = "210.5.8+5790d25" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "441f18d9ad792e871fc2f7f2cb8902c386f6f56fdbddef3b835b61475e375346" --dependencies = [ -- "cc", -- "which", --] -- - [[package]] - name = "maybe-rayon" - version = "0.1.1" -@@ -1461,8 +1417,6 @@ checksum = "a088ed0723df7567f569ba018c5d48c23c501f3878b190b04144dfa5ebfa8abc" - dependencies = [ - "cc", - "cfg-if", -- "lua-src", -- "luajit-src", - "pkg-config", - ] - -@@ -2084,19 +2038,6 @@ version = "2.0.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152" - --[[package]] --name = "rustix" --version = "0.38.34" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" --dependencies = [ -- "bitflags 2.6.0", -- "errno", -- "libc", -- "linux-raw-sys", -- "windows-sys 0.52.0", --] -- - [[package]] - name = "rustversion" - version = "1.0.17" -@@ -2933,18 +2874,6 @@ version = "0.1.8" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" - --[[package]] --name = "which" --version = "6.0.1" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" --dependencies = [ -- "either", -- "home", -- "rustix", -- "winsafe", --] -- - [[package]] - name = "winapi" - version = "0.3.9" -@@ -3195,12 +3124,6 @@ dependencies = [ - "memchr", - ] - --[[package]] --name = "winsafe" --version = "0.0.19" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" -- - [[package]] - name = "yazi-adapter" - version = "0.3.0" diff --git a/yazi-dds/Cargo.toml b/yazi-dds/Cargo.toml -index f9e5f06..5e17516 100644 +index d31f894..aa2a2a3 100644 --- a/yazi-dds/Cargo.toml +++ b/yazi-dds/Cargo.toml -@@ -8,10 +8,6 @@ description = "Yazi data distribution service" - homepage = "https://yazi-rs.github.io" +@@ -9,7 +9,6 @@ homepage = "https://yazi-rs.github.io" repository = "https://github.com/sxyazi/yazi" --[features] + [features] -default = [ "vendored-lua" ] --vendored-lua = [ "mlua/vendored" ] -- + vendored-lua = [ "mlua/vendored" ] + [dependencies] - yazi-boot = { path = "../yazi-boot", version = "0.3.0" } - yazi-shared = { path = "../yazi-shared", version = "0.3.0" } diff --git a/yazi-fm/Cargo.toml b/yazi-fm/Cargo.toml -index f58688a..7b2affb 100644 +index cd2da25..4d63a59 100644 --- a/yazi-fm/Cargo.toml +++ b/yazi-fm/Cargo.toml -@@ -8,10 +8,6 @@ description = "Yazi File Manager" - homepage = "https://yazi-rs.github.io" +@@ -9,7 +9,6 @@ homepage = "https://yazi-rs.github.io" repository = "https://github.com/sxyazi/yazi" --[features] + [features] -default = [ "vendored-lua" ] --vendored-lua = [ "mlua/vendored" ] -- + vendored-lua = [ "mlua/vendored" ] + [dependencies] - yazi-adapter = { path = "../yazi-adapter", version = "0.3.0" } - yazi-boot = { path = "../yazi-boot", version = "0.3.0" } diff --git a/yazi-plugin/Cargo.toml b/yazi-plugin/Cargo.toml -index 47ec884..c8788af 100644 +index cf326d6..60dde88 100644 --- a/yazi-plugin/Cargo.toml +++ b/yazi-plugin/Cargo.toml -@@ -8,10 +8,6 @@ description = "Yazi plugin system" - homepage = "https://yazi-rs.github.io" +@@ -9,7 +9,6 @@ homepage = "https://yazi-rs.github.io" repository = "https://github.com/sxyazi/yazi" --[features] + [features] -default = [ "vendored-lua" ] --vendored-lua = [ "mlua/vendored" ] -- + vendored-lua = [ "mlua/vendored" ] + [dependencies] - yazi-adapter = { path = "../yazi-adapter", version = "0.3.0" } - yazi-boot = { path = "../yazi-boot", version = "0.3.0" } diff --git a/yazi-proxy/Cargo.toml b/yazi-proxy/Cargo.toml -index 1266ade..f811dde 100644 +index 72c4833..8f6ae8d 100644 --- a/yazi-proxy/Cargo.toml +++ b/yazi-proxy/Cargo.toml -@@ -8,10 +8,6 @@ description = "Yazi event proxy" - homepage = "https://yazi-rs.github.io" +@@ -9,7 +9,6 @@ homepage = "https://yazi-rs.github.io" repository = "https://github.com/sxyazi/yazi" --[features] + [features] -default = [ "vendored-lua" ] --vendored-lua = [ "mlua/vendored" ] -- + vendored-lua = [ "mlua/vendored" ] + [dependencies] - yazi-config = { path = "../yazi-config", version = "0.3.0" } - yazi-shared = { path = "../yazi-shared", version = "0.3.0" } -