From dd22e61f5e1c3ac191269cc7f54e8b86bad38223 Mon Sep 17 00:00:00 2001 From: Raphiiko Date: Tue, 1 Oct 2024 20:53:44 +0200 Subject: [PATCH 1/4] Switch to ipgeolocate fork --- src-core/Cargo.lock | 3 +-- src-core/Cargo.toml | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src-core/Cargo.lock b/src-core/Cargo.lock index ee2887a8..dfd6623b 100644 --- a/src-core/Cargo.lock +++ b/src-core/Cargo.lock @@ -3012,8 +3012,7 @@ dependencies = [ [[package]] name = "ipgeolocate" version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03ef02a710095765c2af4fe51101c5177c17f910bb1d0d51aae1589e6da6d6cc" +source = "git+https://github.com/Raphiiko/ipgeolocate_oyasumi.git?rev=5f24925#5f24925b56d5645d5160facfb51f3197826b3b96" dependencies = [ "futures", "reqwest", diff --git a/src-core/Cargo.toml b/src-core/Cargo.toml index 72776d96..41ecff96 100644 --- a/src-core/Cargo.toml +++ b/src-core/Cargo.toml @@ -92,10 +92,13 @@ regex = "1.10.2" hidapi = "2.6.0" steamlocate = "1.2.1" discord-sdk = "0.3.6" -ipgeolocate = "0.3.6" public-ip = "0.2.2" suncalc = "0.4.0" +[dependencies.ipgeolocate] +git = "https://github.com/Raphiiko/ipgeolocate_oyasumi.git" +rev = "5f24925" + [dependencies.oyasumivr_oscquery] git = "https://github.com/Raphiiko/oyasumivr_oscquery.git" rev = "2949a3f" From be5de59afd5395d0579ac8071aaa9da601b920b5 Mon Sep 17 00:00:00 2001 From: Raphiiko Date: Tue, 1 Oct 2024 21:29:55 +0200 Subject: [PATCH 2/4] Fix ipgeolocate crashing OyasumiVR when location service is not reachable. --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53bee63d..299dbe01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- A dependency crashing OyasumiVR when attempting to calculate the sunrise/sunset times. + ## [1.14.0] ### Added From 508d7d667434cebed41be0cce360bf7121ce48ab Mon Sep 17 00:00:00 2001 From: Raphiiko Date: Tue, 1 Oct 2024 21:32:24 +0200 Subject: [PATCH 3/4] Bump patch version --- package.json | 4 ++-- src-core/Cargo.lock | 4 ++-- src-core/Cargo.toml | 2 +- src-core/tauri.conf.json | 6 +++--- src-elevated-sidecar/Cargo.toml | 2 +- src-overlay-ui/package.json | 4 ++-- src-shared-rust/Cargo.toml | 2 +- src-shared-ts/package.json | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 59265cb7..7d3de2b7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oyasumi", - "version": "1.14.0", + "version": "1.14.1", "author": "Raphiiko", "license": "MIT", "type": "module", @@ -148,4 +148,4 @@ "git add" ] } -} +} \ No newline at end of file diff --git a/src-core/Cargo.lock b/src-core/Cargo.lock index dfd6623b..4a005d99 100644 --- a/src-core/Cargo.lock +++ b/src-core/Cargo.lock @@ -4197,7 +4197,7 @@ dependencies = [ [[package]] name = "oyasumivr" -version = "1.14.0" +version = "1.14.1" dependencies = [ "async-recursion", "bluest", @@ -4270,7 +4270,7 @@ dependencies = [ [[package]] name = "oyasumivr-shared" -version = "1.14.0" +version = "1.14.1" dependencies = [ "winapi", ] diff --git a/src-core/Cargo.toml b/src-core/Cargo.toml index 41ecff96..32fd3d54 100644 --- a/src-core/Cargo.toml +++ b/src-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oyasumivr" -version = "1.14.0" +version = "1.14.1" description = "" authors = ["Raphiiko"] license = "MIT" diff --git a/src-core/tauri.conf.json b/src-core/tauri.conf.json index 985e2d17..4cf98d4e 100644 --- a/src-core/tauri.conf.json +++ b/src-core/tauri.conf.json @@ -9,7 +9,7 @@ }, "package": { "productName": "OyasumiVR", - "version": "1.14.0" + "version": "1.14.1" }, "tauri": { "allowlist": { @@ -201,7 +201,7 @@ "center": true, "theme": "Dark", "transparent": true, - "userAgent": "OyasumiVR/1.14.0 (https://github.com/Raphiiko/OyasumiVR)" + "userAgent": "OyasumiVR/1.14.1 (https://github.com/Raphiiko/OyasumiVR)" }, { "width": 700, @@ -216,7 +216,7 @@ "skipTaskbar": true, "minimizable": false, "alwaysOnTop": true, - "userAgent": "OyasumiVR/1.14.0 (https://github.com/Raphiiko/OyasumiVR)" + "userAgent": "OyasumiVR/1.14.1 (https://github.com/Raphiiko/OyasumiVR)" } ] } diff --git a/src-elevated-sidecar/Cargo.toml b/src-elevated-sidecar/Cargo.toml index 2247298c..4ef12dd1 100644 --- a/src-elevated-sidecar/Cargo.toml +++ b/src-elevated-sidecar/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oyasumivr-elevated-sidecar" -version = "1.14.0" +version = "1.14.1" authors = ["Raphiiko"] license = "MIT" edition = "2021" diff --git a/src-overlay-ui/package.json b/src-overlay-ui/package.json index 07b30494..d0b586dc 100644 --- a/src-overlay-ui/package.json +++ b/src-overlay-ui/package.json @@ -1,6 +1,6 @@ { "name": "oyasumivr-overlay-ui", - "version": "1.14.0", + "version": "1.14.1", "private": true, "scripts": { "dev": "vite dev", @@ -45,4 +45,4 @@ "rxjs": "^7.8.1", "tailwindcss-multi": "^0.4.6" } -} +} \ No newline at end of file diff --git a/src-shared-rust/Cargo.toml b/src-shared-rust/Cargo.toml index e86ca250..0d012195 100644 --- a/src-shared-rust/Cargo.toml +++ b/src-shared-rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oyasumivr-shared" -version = "1.14.0" +version = "1.14.1" authors = ["Raphiiko"] edition = "2021" license = "MIT" diff --git a/src-shared-ts/package.json b/src-shared-ts/package.json index 70465b8a..b8875a92 100644 --- a/src-shared-ts/package.json +++ b/src-shared-ts/package.json @@ -2,7 +2,7 @@ "name": "src-shared-ts", "description": "Shared typescript code for Oyasumi modules", "scripts": {}, - "version": "1.14.0", + "version": "1.14.1", "author": "Raphiiko", "license": "MIT", "type": "module", From cb283b6c5272b2499a3a57b97caabf92065bad08 Mon Sep 17 00:00:00 2001 From: Raphiiko Date: Tue, 1 Oct 2024 21:37:25 +0200 Subject: [PATCH 4/4] Updated changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 299dbe01..eff98000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [1.14.1] ### Fixed