From 6bdd58d9b52b23f69250856fd9c2b596811f1451 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Orhun=20Parmaks=C4=B1z?= Date: Mon, 16 Sep 2024 00:19:29 +0200 Subject: [PATCH] testing/tere: upgrade to 1.6.0 --- testing/tere/APKBUILD | 20 +- testing/tere/deps.patch | 415 ---------------------------------------- 2 files changed, 8 insertions(+), 427 deletions(-) delete mode 100644 testing/tere/deps.patch diff --git a/testing/tere/APKBUILD b/testing/tere/APKBUILD index db7ffa145ea..94b991ab597 100644 --- a/testing/tere/APKBUILD +++ b/testing/tere/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Orhun Parmaksız # Maintainer: Orhun Parmaksız pkgname=tere -pkgver=1.5.1 +pkgver=1.6.0 pkgrel=0 pkgdesc="Terminal file explorer" url="https://github.com/mgunyho/tere" @@ -15,9 +15,7 @@ makedepends=" subpackages=" $pkgname-doc " -source="$pkgname-$pkgver.tar.gz::https://github.com/mgunyho/tere/archive/v$pkgver.tar.gz - deps.patch - " +source="$pkgname-$pkgver.tar.gz::https://github.com/mgunyho/tere/archive/v$pkgver.tar.gz" options="net" prepare() { @@ -34,12 +32,11 @@ check() { # https://github.com/mgunyho/tere/issues/90 # https://github.com/mgunyho/tere/issues/93 cargo test --frozen -- \ - --skip "test_case_sensitive_mode_change" \ - --skip "panic_guard" \ - --skip "first_run_prompt_accept" \ - --skip "output_on_exit_without_cd" \ - --skip "first_run_prompt_cancel" \ - --skip "basic_run" + --skip "skip_first_run_prompt" \ + --skip "first_run_prompt_accept" \ + --skip "first_run_prompt_cancel" \ + --skip "output_on_exit_without_cd" \ + --skip "basic_run" } package() { @@ -50,6 +47,5 @@ package() { } sha512sums=" -e9ede9284ba2b8ed3749dbbaaa96a3d3963bca6cf4ba7ad03e3df42bb2130a0a8348367cbaa1798ec958145fd54fb3c7aa69354ab1e4c0fbe037e3b1717e717f tere-1.5.1.tar.gz -97acb6af2944baaac15c9b2f67944e0f2b571fa912009467824a1f9701198e7072e0edaf2411be8c05baa760ff83363179de2e0620a50c51fa8d3e7a1ca56549 deps.patch +28673bb7b75ec0db51c6ebc59522690f6a81c2105d7d0bf0e574f772fc51f888f568f4ced23e0ec461fcc8d50433800448efe71ea40bd7c9cf8f15bbd14fa756 tere-1.6.0.tar.gz " diff --git a/testing/tere/deps.patch b/testing/tere/deps.patch deleted file mode 100644 index 33ca49d9a8a..00000000000 --- a/testing/tere/deps.patch +++ /dev/null @@ -1,415 +0,0 @@ -existing deps are ancient -diff --git a/Cargo.lock b/Cargo.lock -index f6d370e..6e4f303 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2,31 +2,20 @@ - # It is not intended for manual editing. - version = 3 - --[[package]] --name = "ahash" --version = "0.7.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" --dependencies = [ -- "getrandom", -- "once_cell", -- "version_check", --] -- - [[package]] - name = "aho-corasick" --version = "1.0.2" -+version = "1.0.4" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -+checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" - dependencies = [ - "memchr", - ] - - [[package]] - name = "anstyle" --version = "1.0.1" -+version = "1.0.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd" -+checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" - - [[package]] - name = "autocfg" -@@ -42,15 +31,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "bitflags" --version = "2.3.3" -+version = "2.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" -+checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" - - [[package]] - name = "cc" --version = "1.0.79" -+version = "1.0.83" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -+dependencies = [ -+ "libc", -+] - - [[package]] - name = "cfg-if" -@@ -60,9 +52,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - - [[package]] - name = "clap" --version = "4.3.19" -+version = "4.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" -+checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" - dependencies = [ - "clap_builder", - "clap_derive", -@@ -71,9 +63,9 @@ dependencies = [ - - [[package]] - name = "clap_builder" --version = "4.3.19" -+version = "4.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" -+checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" - dependencies = [ - "anstyle", - "clap_lex", -@@ -83,21 +75,21 @@ dependencies = [ - - [[package]] - name = "clap_derive" --version = "4.3.12" -+version = "4.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" -+checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" - dependencies = [ - "heck", - "proc-macro2", - "quote", -- "syn 2.0.27", -+ "syn 2.0.29", - ] - - [[package]] - name = "clap_lex" --version = "0.5.0" -+version = "0.5.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b" -+checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" - - [[package]] - name = "comma" -@@ -175,9 +167,9 @@ dependencies = [ - - [[package]] - name = "errno" --version = "0.3.1" -+version = "0.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a" -+checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" - dependencies = [ - "errno-dragonfly", - "libc", -@@ -211,15 +203,6 @@ dependencies = [ - "wasi", - ] - --[[package]] --name = "hashbrown" --version = "0.12.3" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" --dependencies = [ -- "ahash", --] -- - [[package]] - name = "heck" - version = "0.4.1" -@@ -263,9 +246,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - - [[package]] - name = "linux-raw-sys" --version = "0.4.3" -+version = "0.4.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0" -+checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - - [[package]] - name = "lock_api" -@@ -279,9 +262,9 @@ dependencies = [ - - [[package]] - name = "log" --version = "0.4.19" -+version = "0.4.20" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" -+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" - - [[package]] - name = "memchr" -@@ -370,9 +353,9 @@ dependencies = [ - - [[package]] - name = "quote" --version = "1.0.32" -+version = "1.0.33" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" -+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" - dependencies = [ - "proc-macro2", - ] -@@ -408,9 +391,9 @@ dependencies = [ - - [[package]] - name = "regex" --version = "1.9.1" -+version = "1.9.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575" -+checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" - dependencies = [ - "aho-corasick", - "memchr", -@@ -420,9 +403,9 @@ dependencies = [ - - [[package]] - name = "regex-automata" --version = "0.3.3" -+version = "0.3.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "39354c10dd07468c2e73926b23bb9c2caca74c5501e38a35da70406f1d923310" -+checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" - dependencies = [ - "aho-corasick", - "memchr", -@@ -464,14 +447,14 @@ dependencies = [ - - [[package]] - name = "rustix" --version = "0.38.4" -+version = "0.38.9" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5" -+checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" - dependencies = [ -- "bitflags 2.3.3", -+ "bitflags 2.4.0", - "errno", - "libc", -- "linux-raw-sys 0.4.3", -+ "linux-raw-sys 0.4.5", - "windows-sys", - ] - -@@ -495,29 +478,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - - [[package]] - name = "serde" --version = "1.0.175" -+version = "1.0.188" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5d25439cd7397d044e2748a6fe2432b5e85db703d6d097bd014b3c0ad1ebff0b" -+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" - dependencies = [ - "serde_derive", - ] - - [[package]] - name = "serde_derive" --version = "1.0.175" -+version = "1.0.188" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b23f7ade6f110613c0d63858ddb8b94c1041f550eab58a16b371bdf2c9c80ab4" -+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.27", -+ "syn 2.0.29", - ] - - [[package]] - name = "serde_json" --version = "1.0.103" -+version = "1.0.105" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d03b412469450d4404fe8499a268edd7f8b79fecb074b0d812ad64ca21f4031b" -+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" - dependencies = [ - "itoa", - "ryu", -@@ -607,9 +590,9 @@ dependencies = [ - - [[package]] - name = "syn" --version = "2.0.27" -+version = "2.0.29" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" -+checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" - dependencies = [ - "proc-macro2", - "quote", -@@ -618,14 +601,14 @@ dependencies = [ - - [[package]] - name = "tempfile" --version = "3.7.0" -+version = "3.8.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5486094ee78b2e5038a6382ed7645bc084dc2ec433426ca4c3cb61e2007b8998" -+checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" - dependencies = [ - "cfg-if", - "fastrand", - "redox_syscall 0.3.5", -- "rustix 0.38.4", -+ "rustix 0.38.9", - "windows-sys", - ] - -@@ -671,22 +654,22 @@ dependencies = [ - - [[package]] - name = "thiserror" --version = "1.0.44" -+version = "1.0.47" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90" -+checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" - dependencies = [ - "thiserror-impl", - ] - - [[package]] - name = "thiserror-impl" --version = "1.0.44" -+version = "1.0.47" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96" -+checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.27", -+ "syn 2.0.29", - ] - - [[package]] -@@ -697,13 +680,9 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" - - [[package]] - name = "unicode-linebreak" --version = "0.1.4" -+version = "0.1.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c5faade31a542b8b35855fff6e8def199853b2da8da256da52f52f1316ee3137" --dependencies = [ -- "hashbrown", -- "regex", --] -+checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" - - [[package]] - name = "unicode-segmentation" -@@ -717,12 +696,6 @@ version = "0.1.10" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - --[[package]] --name = "version_check" --version = "0.9.4" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" -- - [[package]] - name = "wasi" - version = "0.11.0+wasi-snapshot-preview1" -@@ -762,9 +735,9 @@ dependencies = [ - - [[package]] - name = "windows-targets" --version = "0.48.1" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" - dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", -@@ -777,42 +750,42 @@ dependencies = [ - - [[package]] - name = "windows_aarch64_gnullvm" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - - [[package]] - name = "windows_aarch64_msvc" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - - [[package]] - name = "windows_i686_gnu" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - - [[package]] - name = "windows_i686_msvc" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - - [[package]] - name = "windows_x86_64_gnu" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - - [[package]] - name = "windows_x86_64_gnullvm" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - - [[package]] - name = "windows_x86_64_msvc" --version = "0.48.0" -+version = "0.48.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"