diff --git a/testing/meowdict/APKBUILD b/testing/meowdict/APKBUILD new file mode 100644 index 00000000000..97211639a93 --- /dev/null +++ b/testing/meowdict/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Celeste +# Maintainer: Celeste +pkgname=meowdict +pkgver=0.10.5 +pkgrel=0 +pkgdesc="CLI web client for moedict.tw" +url="https://github.com/eatradish/meowdict" +arch="all" +license="MIT" +depends="opencc" +makedepends=" + cargo + cargo-auditable + opencc-dev + openssl-dev + " +source="https://github.com/eatradish/meowdict/archive/v$pkgver/meowdict-$pkgver.tar.gz + getrandom-0.2.14.patch + nix-0.28.0.patch + update-test_wordshk_api_result.patch + " + +prepare() { + default_prepare + + cargo fetch --target="$CTARGET" --locked +} + +build() { + cargo auditable build --frozen --release +} + +check() { + cargo test --frozen +} + +package() { + install -Dvm755 target/release/meowdict -t "$pkgdir"/usr/bin/ + + install -Dvm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname/ +} + +sha512sums=" +2af8e39e6fa6c3dc54a38993f59bef4b893255b9dc05c47af6bd3fd2f61654f8768b748c33f9f623a255e73e0d06f9301d15390cfeee09466015daaaab457698 meowdict-0.10.5.tar.gz +d1eadfb6b000be2a020b5430793a81bd880ec0be4de2604aa96fa74757e16c9dff22c0c46b87ef417f33d03c22ec3d1a784f20c71ec0d31a58fafafe9194408e getrandom-0.2.14.patch +a4ecda37f88cc2ea6bcf799ec76246ad9b7fa680c4c92431494bd371859386a3b26b95e10ddda85702796f050212e4e2124380948813b8539fea19c701ab4fc8 nix-0.28.0.patch +8ba5e8e9be32009a55813cb9d891374bbcc8267fd06bd727f228b03e4d3da754d7ecf7b3b412b8b9a0601437bc980021867d7432caa33011220f3cd0849643d3 update-test_wordshk_api_result.patch +" diff --git a/testing/meowdict/getrandom-0.2.14.patch b/testing/meowdict/getrandom-0.2.14.patch new file mode 100644 index 00000000000..318cf13433c --- /dev/null +++ b/testing/meowdict/getrandom-0.2.14.patch @@ -0,0 +1,26 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -332,9 +332,9 @@ + + [[package]] + name = "getrandom" +-version = "0.2.8" ++version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" ++checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" + dependencies = [ + "cfg-if", + "libc", +@@ -558,9 +558,9 @@ + + [[package]] + name = "libc" +-version = "0.2.140" ++version = "0.2.153" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" ++checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + + [[package]] + name = "linux-raw-sys" diff --git a/testing/meowdict/nix-0.28.0.patch b/testing/meowdict/nix-0.28.0.patch new file mode 100644 index 00000000000..5e0ca58c3e1 --- /dev/null +++ b/testing/meowdict/nix-0.28.0.patch @@ -0,0 +1,439 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -28,9 +28,9 @@ + + [[package]] + name = "bitflags" +-version = "2.0.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" ++checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" + + [[package]] + name = "bumpalo" +@@ -57,12 +57,18 @@ + checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] ++name = "cfg_aliases" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" ++ ++[[package]] + name = "clap" + version = "4.1.11" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "42dfd32784433290c51d92c438bb72ea5063797fc3cc9a21a8c4346bebbb2098" + dependencies = [ +- "bitflags 2.0.2", ++ "bitflags 2.5.0", + "clap_lex", + "is-terminal", + "strsim", +@@ -80,13 +86,11 @@ + + [[package]] + name = "clipboard-win" +-version = "4.5.0" ++version = "5.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" ++checksum = "79f4473f5144e20d9aceaf2972478f06ddf687831eafeeb434fbaf0acc4144ad" + dependencies = [ + "error-code", +- "str-buf", +- "winapi", + ] + + [[package]] +@@ -172,6 +176,16 @@ + ] + + [[package]] ++name = "errno" ++version = "0.3.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" ++dependencies = [ ++ "libc", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] + name = "errno-dragonfly" + version = "0.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -183,13 +197,9 @@ + + [[package]] + name = "error-code" +-version = "2.3.1" ++version = "3.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" +-dependencies = [ +- "libc", +- "str-buf", +-] ++checksum = "a0474425d51df81997e2f90a21591180b38eccf27292d755f3e30750225c175b" + + [[package]] + name = "fastrand" +@@ -202,13 +212,13 @@ + + [[package]] + name = "fd-lock" +-version = "3.0.10" ++version = "4.0.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ef1a30ae415c3a691a4f41afddc2dbcd6d70baf338368d85ebc1e8ed92cedb9" ++checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947" + dependencies = [ + "cfg-if", +- "rustix", +- "windows-sys 0.45.0", ++ "rustix 0.38.34", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -382,6 +392,15 @@ + checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + + [[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 = "http" + version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -520,7 +539,7 @@ + dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", +- "rustix", ++ "rustix 0.36.10", + "windows-sys 0.45.0", + ] + +@@ -569,6 +588,12 @@ + checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" + + [[package]] ++name = "linux-raw-sys" ++version = "0.4.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" ++ ++[[package]] + name = "log" + version = "0.4.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -665,14 +690,14 @@ + + [[package]] + name = "nix" +-version = "0.26.2" ++version = "0.28.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" ++checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.5.0", + "cfg-if", ++ "cfg_aliases", + "libc", +- "static_assertions", + ] + + [[package]] +@@ -932,14 +957,27 @@ + checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" + dependencies = [ + "bitflags 1.3.2", +- "errno", ++ "errno 0.2.8", + "io-lifetimes", + "libc", +- "linux-raw-sys", ++ "linux-raw-sys 0.1.4", + "windows-sys 0.45.0", + ] + + [[package]] ++name = "rustix" ++version = "0.38.34" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" ++dependencies = [ ++ "bitflags 2.5.0", ++ "errno 0.3.8", ++ "libc", ++ "linux-raw-sys 0.4.13", ++ "windows-sys 0.52.0", ++] ++ ++[[package]] + name = "rustls" + version = "0.20.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -962,25 +1000,24 @@ + + [[package]] + name = "rustyline" +-version = "11.0.0" ++version = "14.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" ++checksum = "7803e8936da37efd9b6d4478277f4b2b9bb5cdb37a113e8d63222e58da647e63" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.5.0", + "cfg-if", + "clipboard-win", +- "dirs-next", + "fd-lock", ++ "home", + "libc", + "log", + "memchr", + "nix", + "radix_trie", +- "scopeguard", + "unicode-segmentation", + "unicode-width", + "utf8parse", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -999,12 +1036,6 @@ + ] + + [[package]] +-name = "scopeguard" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +- +-[[package]] + name = "sct" + version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1121,18 +1152,6 @@ + checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" + + [[package]] +-name = "static_assertions" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +- +-[[package]] +-name = "str-buf" +-version = "1.0.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" +- +-[[package]] + name = "strsim" + version = "0.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +@@ -1169,7 +1188,7 @@ + "cfg-if", + "fastrand", + "redox_syscall", +- "rustix", ++ "rustix 0.36.10", + "windows-sys 0.42.0", + ] + +@@ -1557,13 +1576,13 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", + ] + + [[package]] +@@ -1572,65 +1591,138 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" + dependencies = [ +- "windows-targets", ++ "windows-targets 0.42.2", + ] + + [[package]] ++name = "windows-sys" ++version = "0.52.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++dependencies = [ ++ "windows-targets 0.52.5", ++] ++ ++[[package]] + name = "windows-targets" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" + dependencies = [ +- "windows_aarch64_gnullvm", +- "windows_aarch64_msvc", +- "windows_i686_gnu", +- "windows_i686_msvc", +- "windows_x86_64_gnu", +- "windows_x86_64_gnullvm", +- "windows_x86_64_msvc", ++ "windows_aarch64_gnullvm 0.42.2", ++ "windows_aarch64_msvc 0.42.2", ++ "windows_i686_gnu 0.42.2", ++ "windows_i686_msvc 0.42.2", ++ "windows_x86_64_gnu 0.42.2", ++ "windows_x86_64_gnullvm 0.42.2", ++ "windows_x86_64_msvc 0.42.2", + ] + + [[package]] ++name = "windows-targets" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" ++dependencies = [ ++ "windows_aarch64_gnullvm 0.52.5", ++ "windows_aarch64_msvc 0.52.5", ++ "windows_i686_gnu 0.52.5", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc 0.52.5", ++ "windows_x86_64_gnu 0.52.5", ++ "windows_x86_64_gnullvm 0.52.5", ++ "windows_x86_64_msvc 0.52.5", ++] ++ ++[[package]] + name = "windows_aarch64_gnullvm" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + + [[package]] ++name = "windows_aarch64_gnullvm" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" ++ ++[[package]] + name = "windows_aarch64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + + [[package]] ++name = "windows_aarch64_msvc" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" ++ ++[[package]] + name = "windows_i686_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + + [[package]] ++name = "windows_i686_gnu" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" ++ ++[[package]] ++name = "windows_i686_gnullvm" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" ++ ++[[package]] + name = "windows_i686_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + + [[package]] ++name = "windows_i686_msvc" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" ++ ++[[package]] + name = "windows_x86_64_gnu" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + + [[package]] ++name = "windows_x86_64_gnu" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" ++ ++[[package]] + name = "windows_x86_64_gnullvm" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + + [[package]] ++name = "windows_x86_64_gnullvm" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" ++ ++[[package]] + name = "windows_x86_64_msvc" + version = "0.42.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" ++ ++[[package]] ++name = "windows_x86_64_msvc" ++version = "0.52.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + + [[package]] + name = "winnow" +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -15,7 +15,7 @@ + owo-colors = "3" + console = "0.15" + indexmap = { version = "1.9", features = ["serde-1"] } +-rustyline = "11.0" ++rustyline = "14.0" + opencc-rust = "1.1.14" + tokio = {version = "1.26", features = ["rt-multi-thread", "rt", "time", "macros"]} + futures = "0.3" diff --git a/testing/meowdict/update-test_wordshk_api_result.patch b/testing/meowdict/update-test_wordshk_api_result.patch new file mode 100644 index 00000000000..0fb08da68c1 --- /dev/null +++ b/testing/meowdict/update-test_wordshk_api_result.patch @@ -0,0 +1,11 @@ +--- a/src/api.rs ++++ b/src/api.rs +@@ -332,7 +332,7 @@ + let word_2 = "我哋"; + let (wordshk_charlist, wordshk_wordlist) = request_wordshk(&client).await.unwrap(); + let mut result_1 = HashMap::new(); +- result_1.insert("ngo5".to_string(), 41usize); ++ result_1.insert("ngo5".to_string(), 51usize); + let result_2 = vec!["ngo5 dei6".to_string()]; + + assert_eq!(wordshk_charlist[word_1], result_1);