From 4624b68b7108a17d1deee64a1abcc4bdeb166c7e Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 09:33:55 +0300 Subject: [PATCH 1/7] up: bump SpacemandDMM and other rust deps --- .github/workflows/ci.yml | 14 +++++++------- go.mod | 10 +++++----- go.sum | 16 ++++++++-------- internal/rsc/txt/about.txt | 2 +- third_party/sdmmparser/src/Cargo.lock | 26 +++++++++++++------------- third_party/sdmmparser/src/Cargo.toml | 12 ++++++------ third_party/sdmmparser/src/lib.rs | 2 +- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f38ed9d5..8abbddfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,7 @@ on: [ push, pull_request ] jobs: lint-source-code: name: Lint Source Code - runs-on: macos-11 # use macOS to avoid installation of desktop deps + runs-on: macos-latest # use macOS to avoid installation of desktop deps steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -23,14 +23,14 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-22.04, windows-2019, macos-11 ] + os: [ ubuntu-latest, windows-latest, macos-latest ] include: - - os: ubuntu-22.04 - rust-target: 1.69-x86_64-unknown-linux-gnu + - os: ubuntu-latest + rust-target: 1.79-x86_64-unknown-linux-gnu - os: windows-2019 - rust-target: 1.69-x86_64-pc-windows-gnu + rust-target: 1.79-x86_64-pc-windows-gnu - os: macos-11 - rust-target: 1.69-x86_64-apple-darwin + rust-target: 1.79-x86_64-apple-darwin runs-on: ${{ matrix.os }} name: Build - ${{ matrix.os }} steps: @@ -81,7 +81,7 @@ jobs: release: name: Release - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest needs: build if: startsWith(github.ref, 'refs/tags/v') # if tag starts with "v" steps: diff --git a/go.mod b/go.mod index b4a42959..28a8eab4 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,18 @@ module sdmm -go 1.20 +go 1.22 require ( github.com/SpaiR/imgui-go v1.12.1-0.20220214190844-a0bad21e1c5d - github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b + github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a github.com/go-gl/mathgl v1.1.0 github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f github.com/mazznoer/csscolorparser v0.1.3 github.com/minio/selfupdate v0.6.0 - github.com/rs/zerolog v1.32.0 + github.com/rs/zerolog v1.33.0 github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 - github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf + github.com/sqweek/dialog v0.0.0-20240226140203-065105509627 github.com/stretchr/testify v1.9.0 golang.design/x/clipboard v0.7.0 ) diff --git a/go.sum b/go.sum index fdc87c4f..f7541c0f 100644 --- a/go.sum +++ b/go.sum @@ -10,10 +10,10 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= -github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b h1:GgabKamyOYguHqHjSkDACcgoPIz3w0Dis/zJ1wyHHHU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20221017161538-93cebf72946b/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA= +github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/mathgl v1.1.0 h1:0lzZ+rntPX3/oGrDzYGdowSLC2ky8Osirvf5uAwfIEA= github.com/go-gl/mathgl v1.1.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -32,12 +32,12 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0= -github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= +github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= +github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA= github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= -github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf h1:pCxn3BCfu8n8VUhYl4zS1BftoZoYY0J4qVF3dqAQ4aU= -github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw= +github.com/sqweek/dialog v0.0.0-20240226140203-065105509627 h1:2JL2wmHXWIAxDofCK+AdkFi1KEg3dgkefCsm7isADzQ= +github.com/sqweek/dialog v0.0.0-20240226140203-065105509627/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= diff --git a/internal/rsc/txt/about.txt b/internal/rsc/txt/about.txt index 5f4be845..ebebefa4 100644 --- a/internal/rsc/txt/about.txt +++ b/internal/rsc/txt/about.txt @@ -1,5 +1,5 @@ StrongDMM %VERSION% -Copyright (C) 2019-2023, SpaiR +Copyright (C) 2019-2024, SpaiR This program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under the conditions of the GNU diff --git a/third_party/sdmmparser/src/Cargo.lock b/third_party/sdmmparser/src/Cargo.lock index f6b1b3da..f1a3d62f 100644 --- a/third_party/sdmmparser/src/Cargo.lock +++ b/third_party/sdmmparser/src/Cargo.lock @@ -63,7 +63,7 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "builtins-proc-macro" version = "0.0.0" -source = "git+https://github.com/SpaiR/SpacemanDMM?rev=7dc22d522bdda6370516c8de9092d446fe5017a5#7dc22d522bdda6370516c8de9092d446fe5017a5" +source = "git+https://github.com/SpaiR/SpacemanDMM?rev=367bcdd75f736a91ab046d616ce56f61fb835a94#367bcdd75f736a91ab046d616ce56f61fb835a94" dependencies = [ "proc-macro2", "quote", @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "dreammaker" version = "0.1.0" -source = "git+https://github.com/SpaiR/SpacemanDMM?rev=7dc22d522bdda6370516c8de9092d446fe5017a5#7dc22d522bdda6370516c8de9092d446fe5017a5" +source = "git+https://github.com/SpaiR/SpacemanDMM?rev=367bcdd75f736a91ab046d616ce56f61fb835a94#367bcdd75f736a91ab046d616ce56f61fb835a94" dependencies = [ "ahash", "bitflags", @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "fdeflate" -version = "0.3.0" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" dependencies = [ "simd-adler32", ] @@ -238,7 +238,7 @@ checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8" [[package]] name = "interval-tree" version = "0.8.0" -source = "git+https://github.com/SpaiR/SpacemanDMM?rev=7dc22d522bdda6370516c8de9092d446fe5017a5#7dc22d522bdda6370516c8de9092d446fe5017a5" +source = "git+https://github.com/SpaiR/SpacemanDMM?rev=367bcdd75f736a91ab046d616ce56f61fb835a94#367bcdd75f736a91ab046d616ce56f61fb835a94" [[package]] name = "itoa" @@ -343,9 +343,9 @@ dependencies = [ [[package]] name = "png" -version = "0.17.9" +version = "0.17.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59871cc5b6cce7eaccca5a802b4173377a1c2ba90654246789a8fa2334426d11" +checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" dependencies = [ "bitflags", "crc32fast", @@ -473,18 +473,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -493,9 +493,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", diff --git a/third_party/sdmmparser/src/Cargo.toml b/third_party/sdmmparser/src/Cargo.toml index fdc49603..6e398dd0 100644 --- a/third_party/sdmmparser/src/Cargo.toml +++ b/third_party/sdmmparser/src/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sdmmparser" version = "2.0.0" -rust-version = "1.69.0" +rust-version = "1.79.0" [lib] name = "sdmmparser" @@ -9,14 +9,14 @@ path = "lib.rs" crate-type = ["staticlib"] [dependencies] -serde = "1.0.197" -serde_derive = "1.0.137" -serde_json = "1.0.109" -png = "0.17.9" +serde = "1.0.203" +serde_derive = "1.0.203" +serde_json = "1.0.120" +png = "0.17.13" [dependencies.dreammaker] git = "https://github.com/SpaiR/SpacemanDMM" -rev = "7dc22d522bdda6370516c8de9092d446fe5017a5" +rev = "367bcdd75f736a91ab046d616ce56f61fb835a94" package = "dreammaker" [profile.release] diff --git a/third_party/sdmmparser/src/lib.rs b/third_party/sdmmparser/src/lib.rs index 0f71619c..e04ebb25 100644 --- a/third_party/sdmmparser/src/lib.rs +++ b/third_party/sdmmparser/src/lib.rs @@ -31,7 +31,7 @@ pub extern fn SdmmParseIconMetadata(native_path: *const c_char) -> *const c_char #[no_mangle] #[allow(non_snake_case)] pub extern fn SdmmFreeStr(native_str: *mut c_char) { - unsafe { CString::from_raw(native_str) }; + unsafe { let _ = CString::from_raw(native_str); }; } /// Convert a native string to a Rust string From 4b56a879f8fe5c225e5297bd33d5683244ff1747 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 10:13:06 +0300 Subject: [PATCH 2/7] fix macos build --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8abbddfd..6be72f04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,7 @@ jobs: rust-target: 1.79-x86_64-unknown-linux-gnu - os: windows-2019 rust-target: 1.79-x86_64-pc-windows-gnu - - os: macos-11 + - os: macos-latest rust-target: 1.79-x86_64-apple-darwin runs-on: ${{ matrix.os }} name: Build - ${{ matrix.os }} From c174e86f25d23b74ff6f3f116e569d460dec2774 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 10:20:22 +0300 Subject: [PATCH 3/7] fix golang arch --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6be72f04..8af94f9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,6 +12,7 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go.mod + architecture: x64 cache: false - name: Lint @@ -27,7 +28,7 @@ jobs: include: - os: ubuntu-latest rust-target: 1.79-x86_64-unknown-linux-gnu - - os: windows-2019 + - os: windows-latest rust-target: 1.79-x86_64-pc-windows-gnu - os: macos-latest rust-target: 1.79-x86_64-apple-darwin @@ -48,6 +49,7 @@ jobs: uses: actions/setup-go@v5 with: go-version-file: go.mod + architecture: x64 cache: true - name: Setup Rust From b0f098ce2e196875cc0b56978492b35f65442aa6 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 10:28:00 +0300 Subject: [PATCH 4/7] move linter to use ubuntu --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8af94f9e..32f2bcc9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,16 +3,21 @@ on: [ push, pull_request ] jobs: lint-source-code: name: Lint Source Code - runs-on: macos-latest # use macOS to avoid installation of desktop deps + runs-on: ubuntu-latest steps: - name: Checkout Repository uses: actions/checkout@v4 + - name: Dependencies + run: | + sudo apt clean + sudo apt update + sudo apt install xorg-dev libgtk-3-dev + - name: Setup Golang uses: actions/setup-go@v5 with: go-version-file: go.mod - architecture: x64 cache: false - name: Lint From 02727074755f01b7173e16bbd30530b66d7df648 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 10:33:24 +0300 Subject: [PATCH 5/7] use windows 2019 instead of latest Seems that windows latest is slower and have some libs errors --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32f2bcc9..70519c1b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,11 +29,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, windows-latest, macos-latest ] + os: [ ubuntu-latest, windows-2019, macos-latest ] include: - os: ubuntu-latest rust-target: 1.79-x86_64-unknown-linux-gnu - - os: windows-latest + - os: windows-2019 rust-target: 1.79-x86_64-pc-windows-gnu - os: macos-latest rust-target: 1.79-x86_64-apple-darwin From bedabe086c25f89a2f7858a813239c0c53a38ee5 Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 10:51:50 +0300 Subject: [PATCH 6/7] add -lntdll to windows rust builds --- go.mod | 6 +++--- go.sum | 12 +++++------- third_party/sdmmparser/sdmmparser.go | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 28a8eab4..1396b3a9 100644 --- a/go.mod +++ b/go.mod @@ -19,14 +19,14 @@ require ( require ( aead.dev/minisign v0.2.0 // indirect - github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d // indirect + github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - golang.org/x/crypto v0.8.0 // indirect + golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b // indirect golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 // indirect - golang.org/x/image v0.7.0 // indirect + golang.org/x/image v0.6.0 // indirect golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c // indirect golang.org/x/sys v0.12.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index f7541c0f..9faa6f64 100644 --- a/go.sum +++ b/go.sum @@ -3,9 +3,8 @@ aead.dev/minisign v0.2.0/go.mod h1:zdq6LdSd9TbuSxchxwhpA9zEb9YXcVGoE8JakuiGaIQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/SpaiR/imgui-go v1.12.1-0.20220214190844-a0bad21e1c5d h1:QajPUffv+BBqNu54DrL/YrO8RP1BGTfGhPNnoPt1ERk= github.com/SpaiR/imgui-go v1.12.1-0.20220214190844-a0bad21e1c5d/go.mod h1:bzOQqDbRE58xRB4EGTlUrIhCTWxNvU7YtJckrFf+HpM= +github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf h1:FPsprx82rdrX2jiKyS17BH6IrTmUBYqZa/CXT4uvb+I= github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I= -github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d h1:2xp1BQbqcDDaikHnASWpVZRjibOxu7y9LhAv04whugI= -github.com/TheTitanrain/w32 v0.0.0-20200114052255-2654d97dbd3d/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -49,15 +48,14 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b h1:QAqMVf3pSa6eeTsuklijukjXBlj7Es2QQplab+/RbQ4= golang.org/x/crypto v0.0.0-20211209193657-4570a0811e8b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= -golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56 h1:estk1glOnSVeJ9tdEZZc5mAMDZk5lNJNyJ6DvrBkTEU= golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.7.0 h1:gzS29xtG1J5ybQlv0PuyfE3nmc6R4qB73m6LUUmvFuw= -golang.org/x/image v0.7.0/go.mod h1:nd/q4ef1AKKYl/4kft7g+6UyGbdiqWqTP1ZAbRoV7Rg= +golang.org/x/image v0.6.0 h1:bR8b5okrPI3g/gyZakLZHeWxAR8Dn5CyxXv1hLH5g/4= +golang.org/x/image v0.6.0/go.mod h1:MXLdDR43H7cDJq5GEGXEVeeNhPgi+YYEQ2pC1byI1x0= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c h1:Gk61ECugwEHL6IiyyNLXNzmu8XslmRP2dS0xjIYhbb4= golang.org/x/mobile v0.0.0-20230301163155-e0f57694e12c/go.mod h1:aAjjkJNdrh3PMckS4B10TGS2nag27cbKR1y2BpUxsiY= @@ -97,7 +95,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= diff --git a/third_party/sdmmparser/sdmmparser.go b/third_party/sdmmparser/sdmmparser.go index eff2940c..2e9c8660 100644 --- a/third_party/sdmmparser/sdmmparser.go +++ b/third_party/sdmmparser/sdmmparser.go @@ -3,7 +3,7 @@ package sdmmparser /* #cgo CFLAGS: -I./lib #cgo LDFLAGS: -L./src/target/release -lsdmmparser -#cgo windows LDFLAGS: -lbcrypt +#cgo windows LDFLAGS: -lbcrypt -lntdll #cgo linux LDFLAGS: -ldl -lm #include #include "lib/sdmmparser.h" From fd921beed65777ead0a6eb08977e66f5adb7078f Mon Sep 17 00:00:00 2001 From: SpaiR Date: Fri, 5 Jul 2024 11:02:26 +0300 Subject: [PATCH 7/7] fix linter --- .golangci.yml | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.golangci.yml b/.golangci.yml index 0a333b4c..c5a5b190 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,7 @@ run: timeout: 5m linters: + disable-all: true enable: - asasalint - errchkjson diff --git a/README.md b/README.md index 97009ec5..c4f2173e 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ It can be found at `internal/third_party/sdmmparser/src`. ### Prerequisites * [Go](https://go.dev/): version **1.20** or higher. -* [Rust](https://www.rust-lang.org/): version **1.69.0**. +* [Rust](https://www.rust-lang.org/): version **1.79.0**. * (Optional) [Task](https://taskfile.dev): for running build scripts. #### For Windows