diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 00000000..1c9ab5fc --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,5 @@ +# Makepad otherwise derives the macOS menu-bar name from the checkout directory. +# Keep native Cargo launches branded correctly even when the folder is "makeos". +[env] +MAKEPAD_BUNDLE_NAME = { value = "OctoSense", force = true } +MAKEPAD_BUNDLE_IDENTIFIER = { value = "dev.makepad.octosense", force = true } diff --git a/Cargo.lock b/Cargo.lock index 23d8c9b9..7440adfa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5,7 +5,7 @@ version = 4 [[package]] name = "ab_glyph_rasterizer" version = "0.1.8" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "aho-corasick" @@ -19,20 +19,20 @@ dependencies = [ [[package]] name = "arrayvec" version = "0.7.6" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "ash" version = "0.38.0+1.3.281" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "libloading 0.8.9 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", + "libloading 0.8.9 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", ] [[package]] name = "bit-set" version = "0.8.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "bit-vec", ] @@ -40,37 +40,28 @@ dependencies = [ [[package]] name = "bit-vec" version = "0.8.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "bitflags" version = "2.10.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "bitflags" -version = "2.13.1" +version = "2.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" - -[[package]] -name = "block2" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5" -dependencies = [ - "objc2", -] +checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06" [[package]] name = "bytemuck" version = "1.25.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "byteorder" version = "1.5.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "cfg-if" @@ -81,18 +72,12 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg-if" version = "1.0.4" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "cfg_aliases" version = "0.2.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" - -[[package]] -name = "cfg_aliases" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "convert_case" @@ -106,7 +91,7 @@ dependencies = [ [[package]] name = "crunchy" version = "0.2.4" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "ctor" @@ -118,48 +103,25 @@ dependencies = [ "syn", ] -[[package]] -name = "ctrlc" -version = "3.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b1fab2ae45819af2d0731d60f2afe17227ebb1a1538a236da84c93e9a60162" -dependencies = [ - "dispatch2", - "nix", - "windows-sys", -] - -[[package]] -name = "dispatch2" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" -dependencies = [ - "bitflags 2.13.1", - "block2", - "libc", - "objc2", -] - [[package]] name = "downcast-rs" version = "1.2.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "equivalent" version = "1.0.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "foldhash" version = "0.2.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "fxhash" version = "0.2.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "byteorder", ] @@ -167,7 +129,7 @@ dependencies = [ [[package]] name = "hashbrown" version = "0.16.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "foldhash", ] @@ -175,7 +137,7 @@ dependencies = [ [[package]] name = "hexf-parse" version = "0.2.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "hilog-sys" @@ -186,18 +148,12 @@ checksum = "f715f263b6e73aa2322b59057134b4daf56a765cbebc2f6b35e640ffded3361b" [[package]] name = "indexmap" version = "2.13.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "equivalent", "hashbrown", ] -[[package]] -name = "libc" -version = "0.2.189" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3eaf3ede3fee6db1a4c2ee091bf8a8b4dccdc6d17f656fb07896ee72867612f2" - [[package]] name = "libloading" version = "0.8.9" @@ -211,27 +167,16 @@ dependencies = [ [[package]] name = "libloading" version = "0.8.9" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "cfg-if 1.0.4 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", - "windows-link 0.2.1 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", + "cfg-if 1.0.4 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", + "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", ] -[[package]] -name = "log" -version = "0.4.29" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" - -[[package]] -name = "log" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" - [[package]] name = "makepad-ai-services" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-serde", "makepad-platform", @@ -241,7 +186,7 @@ dependencies = [ [[package]] name = "makepad-aichat" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-ai-services", "makepad-strict-json", @@ -262,7 +207,7 @@ dependencies = [ [[package]] name = "makepad-app-module" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-ai-services", "makepad-strict-json", @@ -272,7 +217,7 @@ dependencies = [ [[package]] name = "makepad-apple-sys" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-objc-sys", ] @@ -280,12 +225,12 @@ dependencies = [ [[package]] name = "makepad-byteorder-lite" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-derive-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-proc-macro", ] @@ -293,7 +238,7 @@ dependencies = [ [[package]] name = "makepad-derive-widget" version = "2.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-live-id", "makepad-micro-proc-macro", @@ -302,7 +247,7 @@ dependencies = [ [[package]] name = "makepad-draw" version = "2.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "ab_glyph_rasterizer", "fxhash", @@ -327,7 +272,7 @@ dependencies = [ [[package]] name = "makepad-error-log" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-serde", ] @@ -335,12 +280,12 @@ dependencies = [ [[package]] name = "makepad-fast-inflate" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-filesystem-watcher" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-git", ] @@ -348,17 +293,17 @@ dependencies = [ [[package]] name = "makepad-futures" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-futures-legacy" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-gif" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "weezl", ] @@ -366,7 +311,7 @@ dependencies = [ [[package]] name = "makepad-git" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-fast-inflate", ] @@ -374,9 +319,9 @@ dependencies = [ [[package]] name = "makepad-half" version = "2.7.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "cfg-if 1.0.4 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", + "cfg-if 1.0.4 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", "crunchy", "num-traits", "zerocopy", @@ -385,7 +330,7 @@ dependencies = [ [[package]] name = "makepad-html" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-live-id", ] @@ -393,7 +338,7 @@ dependencies = [ [[package]] name = "makepad-image-tiles" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-network", "makepad-platform-video", @@ -410,7 +355,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064" [[package]] name = "makepad-latex-math" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "ttf-parser", ] @@ -418,7 +363,7 @@ dependencies = [ [[package]] name = "makepad-live-id" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-live-id-macros", ] @@ -426,7 +371,7 @@ dependencies = [ [[package]] name = "makepad-live-id-macros" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-proc-macro", ] @@ -434,7 +379,7 @@ dependencies = [ [[package]] name = "makepad-live-reload-core" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-filesystem-watcher", ] @@ -442,7 +387,7 @@ dependencies = [ [[package]] name = "makepad-math" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-serde", ] @@ -450,12 +395,12 @@ dependencies = [ [[package]] name = "makepad-micro-proc-macro" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-micro-serde" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-live-id", "makepad-micro-serde-derive", @@ -464,7 +409,7 @@ dependencies = [ [[package]] name = "makepad-micro-serde-derive" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-proc-macro", ] @@ -472,7 +417,7 @@ dependencies = [ [[package]] name = "makepad-network" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-apple-sys", "makepad-error-log", @@ -486,12 +431,12 @@ dependencies = [ [[package]] name = "makepad-objc-sys" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-photos" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-ai-services", "makepad-app-module", @@ -504,11 +449,10 @@ dependencies = [ [[package]] name = "makepad-platform" version = "2.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "ash", "bitflags 2.10.0", - "ctrlc", "hilog-sys", "makepad-android-state", "makepad-apple-sys", @@ -542,7 +486,7 @@ dependencies = [ [[package]] name = "makepad-platform-video" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-apple-sys", "makepad-objc-sys", @@ -552,12 +496,12 @@ dependencies = [ [[package]] name = "makepad-regex" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-script" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-error-log", "makepad-html", @@ -572,7 +516,7 @@ dependencies = [ [[package]] name = "makepad-script-derive" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-proc-macro", ] @@ -580,7 +524,7 @@ dependencies = [ [[package]] name = "makepad-script-std" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-network", "makepad-script", @@ -589,12 +533,12 @@ dependencies = [ [[package]] name = "makepad-shared-bytes" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-sheets" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-ai-services", "makepad-app-module", @@ -605,22 +549,22 @@ dependencies = [ [[package]] name = "makepad-sqlite" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-stitch" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-strict-json" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "makepad-studio-protocol" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "bitflags 2.10.0", "makepad-error-log", @@ -632,7 +576,7 @@ dependencies = [ [[package]] name = "makepad-svg" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-html", "makepad-live-id", @@ -641,7 +585,7 @@ dependencies = [ [[package]] name = "makepad-tsdf" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-math", "makepad-micro-serde", @@ -650,7 +594,7 @@ dependencies = [ [[package]] name = "makepad-wasm-bridge" version = "1.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-derive-wasm-bridge", "makepad-live-id", @@ -659,7 +603,7 @@ dependencies = [ [[package]] name = "makepad-webp" version = "0.2.4" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-byteorder-lite", ] @@ -667,7 +611,7 @@ dependencies = [ [[package]] name = "makepad-widgets" version = "2.0.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-derive-widget", "makepad-draw", @@ -681,7 +625,7 @@ dependencies = [ [[package]] name = "makepad-wm-api" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-widgets", ] @@ -689,7 +633,7 @@ dependencies = [ [[package]] name = "makepad-wm-theme" version = "0.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-widgets", ] @@ -697,24 +641,24 @@ dependencies = [ [[package]] name = "makepad-zune-bmp" version = "0.5.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "log 0.4.34", + "makepad-error-log", "makepad-zune-core", ] [[package]] name = "makepad-zune-core" version = "0.5.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "log 0.4.34", + "makepad-error-log", ] [[package]] name = "makepad-zune-inflate" version = "0.2.54" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "simd-adler32", ] @@ -722,7 +666,7 @@ dependencies = [ [[package]] name = "makepad-zune-jpeg" version = "0.5.15" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-zune-core", ] @@ -730,7 +674,7 @@ dependencies = [ [[package]] name = "makepad-zune-png" version = "0.5.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-fast-inflate", "makepad-zune-core", @@ -740,7 +684,7 @@ dependencies = [ [[package]] name = "makepad-zune-qoi" version = "0.5.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-zune-core", ] @@ -748,7 +692,7 @@ dependencies = [ [[package]] name = "memchr" version = "2.7.6" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "memchr" @@ -759,13 +703,13 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "naga" version = "27.0.3" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.13.1", - "cfg-if 1.0.4 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", - "cfg_aliases 0.2.1", + "bitflags 2.10.0", + "cfg-if 1.0.4 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", + "cfg_aliases", "hashbrown", "hexf-parse", "indexmap", @@ -776,7 +720,7 @@ dependencies = [ "rustc-hash", "spirv", "thiserror", - "unicode-ident", + "unicode-ident 1.0.22", ] [[package]] @@ -813,7 +757,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad5a3bbb2ae61f345b8c11776f2e79fc2bb71d1901af9a5f81f03c9238a05d86" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.13.2", "ctor", "napi-sys-ohos", "once_cell 1.21.4", @@ -828,37 +772,10 @@ dependencies = [ "libloading 0.8.9 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nix" -version = "0.31.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" -dependencies = [ - "bitflags 2.13.1", - "cfg-if 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg_aliases 0.2.2", - "libc", -] - [[package]] name = "num-traits" version = "0.2.20" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" - -[[package]] -name = "objc2" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a12a8ed07aefc768292f076dc3ac8c48f3781c8f2d5851dd3d98950e8c5a89f" -dependencies = [ - "objc2-encode", -] - -[[package]] -name = "objc2-encode" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef25abbcd74fb2609453eb695bd2f860d389e457f67dc17cafc8b8cbc89d0c33" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "octosense" @@ -895,7 +812,7 @@ checksum = "8d380ab6c951261a0e44306245bc960b3b3367f099a7da7156bd1a3cacaf783c" [[package]] name = "once_cell" version = "1.21.3" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "once_cell" @@ -906,7 +823,7 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "pkg-config" version = "0.3.32" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "proc-macro2" @@ -914,13 +831,13 @@ version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "985e7ec9bb745e6ce6535b544d84d6cd6f7ad8bd711c398938ae983b91a766d9" dependencies = [ - "unicode-ident", + "unicode-ident 1.0.24", ] [[package]] name = "pulldown-cmark" version = "0.12.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "bitflags 2.10.0", "memchr 2.7.6", @@ -968,12 +885,12 @@ checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rustc-hash" version = "1.1.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "rustybuzz" version = "0.18.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "bitflags 2.10.0", "bytemuck", @@ -989,35 +906,35 @@ dependencies = [ [[package]] name = "scoped-tls" version = "1.0.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "sdfer" version = "0.2.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "simd-adler32" version = "0.3.9" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "smallvec" version = "1.15.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "smallvec" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9be42f50aa861c555654aa3a37f52f4b1074bacf4e48fe0ef7fa584e80f1f0f" +checksum = "ba467056f1b547ed52077911161fc86985becbc60e8e1857c8a144dab0def891" [[package]] name = "spirv" version = "0.3.0+sdk-1.3.268.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.10.0", ] [[package]] @@ -1028,13 +945,13 @@ checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", - "unicode-ident", + "unicode-ident 1.0.24", ] [[package]] name = "thiserror" version = "2.0.18" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "thiserror-impl", ] @@ -1042,7 +959,7 @@ dependencies = [ [[package]] name = "thiserror-impl" version = "2.0.18" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "makepad-micro-proc-macro", ] @@ -1050,27 +967,32 @@ dependencies = [ [[package]] name = "ttf-parser" version = "0.24.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicase" version = "2.9.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-bidi" version = "0.3.18" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-bidi-mirroring" version = "0.3.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-ccc" version = "0.3.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" + +[[package]] +name = "unicode-ident" +version = "1.0.22" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-ident" @@ -1081,22 +1003,22 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-linebreak" version = "0.1.5" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-properties" version = "0.1.4" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-script" version = "0.5.8" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-segmentation" version = "1.12.0" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "unicode-segmentation" @@ -1107,29 +1029,28 @@ checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" [[package]] name = "wayland-backend" version = "0.3.12" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "downcast-rs", - "libc", "scoped-tls", - "smallvec 1.16.0", + "smallvec 1.16.1", "wayland-sys", ] [[package]] name = "wayland-client" version = "0.31.12" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "bitflags 2.13.1", - "libc", + "bitflags 2.10.0", "wayland-backend", + "wayland-sys", ] [[package]] name = "wayland-egl" version = "0.32.9" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "wayland-backend", "wayland-sys", @@ -1138,9 +1059,9 @@ dependencies = [ [[package]] name = "wayland-protocols" version = "0.32.10" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "bitflags 2.13.1", + "bitflags 2.10.0", "wayland-backend", "wayland-client", ] @@ -1148,21 +1069,21 @@ dependencies = [ [[package]] name = "wayland-sys" version = "0.31.8" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "log 0.4.29", + "makepad-error-log", "pkg-config", ] [[package]] name = "weezl" version = "0.1.12" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "windows" version = "0.62.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "windows-collections", "windows-core", @@ -1172,7 +1093,7 @@ dependencies = [ [[package]] name = "windows-collections" version = "0.3.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "windows-core", ] @@ -1180,9 +1101,9 @@ dependencies = [ [[package]] name = "windows-core" version = "0.62.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "windows-link 0.2.1 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", + "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", "windows-result", "windows-strings", ] @@ -1190,7 +1111,7 @@ dependencies = [ [[package]] name = "windows-future" version = "0.3.2" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ "windows-core", ] @@ -1204,31 +1125,22 @@ checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" [[package]] name = "windows-link" version = "0.2.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" [[package]] name = "windows-result" version = "0.4.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "windows-link 0.2.1 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", + "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", ] [[package]] name = "windows-strings" version = "0.5.1" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" dependencies = [ - "windows-link 0.2.1 (git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833)", -] - -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "windows-link 0.2.1 (git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3)", ] [[package]] @@ -1298,4 +1210,4 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "zerocopy" version = "0.8.39" -source = "git+https://github.com/makepad/makepad.git?rev=74b63be83e101ab3a28d3604df77e9662d50a833#74b63be83e101ab3a28d3604df77e9662d50a833" +source = "git+https://github.com/OctoSense-org/makepad.git?rev=712b9f16d1992131bb99c070673faa1929fe75f3#712b9f16d1992131bb99c070673faa1929fe75f3" diff --git a/Cargo.toml b/Cargo.toml index 356be6cb..b230f7aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,31 +37,31 @@ name = "octosense" path = "src/main.rs" [dependencies] -makepad-widgets = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-studio-protocol = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-network = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-wm-api = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } # The AI services wire only: the WM relays frames between the aichat child and the apps. -makepad-ai-services = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-strict-json = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } # In-process hosting (aicontrol ยง3): the module contract, the palette applied # into each instance's isolate, and the modules this build links. -makepad-app-module = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-wm-theme = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-sheets = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833", default-features = false, optional = true } -makepad-photos = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833", default-features = false, optional = true } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3", default-features = false, optional = true } +makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3", default-features = false, optional = true } octosense-reference = { path = "apps/reference", optional = true } # The assistant as a module, seated in the pane in-process: the web build's # only chat, a desktop option. Without the engine feature: no model runtime, # NoModel and the tool console (the child process keeps the real models). -makepad-aichat = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833", default-features = false, optional = true } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3", default-features = false, optional = true } # A phone cannot spawn the desktop catalog's Cargo binaries. Link the # available modules into native mobile builds without requiring CLI flags. [target.'cfg(any(target_os = "android", target_os = "ios"))'.dependencies] octosense-reference = { path = "apps/reference" } -makepad-sheets = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833", default-features = false } -makepad-photos = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833", default-features = false } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3", default-features = false } +makepad-photos = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3", default-features = false } [features] default = [] diff --git a/README.md b/README.md index 48a29b83..d6cfcc86 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,11 @@ cargo run --release The first build downloads Makepad and other dependencies. The host and Reference app need no sibling Makepad checkout, Studio process, model download, or wallpaper download. The additional default apps use the sibling `../makepad` checkout and build on first launch; unavailable apps are hidden. Fonts and other framework resources are read from Cargo's dependency checkout during source development, so keep that cache available. +On macOS, `.cargo/config.toml` sets the native menu-bar name to **OctoSense**. +Makepad otherwise derives it from the checkout directory, which may still be +named `makeos`. Rebuild and relaunch after updating; Cargo regenerates the +development `Info.plist` automatically. + The build target selects the startup shell automatically: Android uses the Android phone layout, iOS uses the iOS phone layout, and desktop/web builds keep Omarchy. You can still switch styles from the shell's style menu. Native phone toolbars are 48 points high and respect the window's safe-area insets. The default desktop starts empty. AI assistant startup, background app prewarming, demo filesystem generation, and wallpaper downloads are off. **System โ†’ Quit OctoSense** closes the desktop and its hosted processes. diff --git a/apps/reference/Cargo.toml b/apps/reference/Cargo.toml index 21774289..8a028395 100644 --- a/apps/reference/Cargo.toml +++ b/apps/reference/Cargo.toml @@ -5,5 +5,5 @@ edition = "2021" publish = false [dependencies] -makepad-widgets = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } -makepad-app-module = { git = "https://github.com/makepad/makepad.git", rev = "74b63be83e101ab3a28d3604df77e9662d50a833" } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "712b9f16d1992131bb99c070673faa1929fe75f3" } diff --git a/build.rs b/build.rs new file mode 100644 index 00000000..dbb00aac --- /dev/null +++ b/build.rs @@ -0,0 +1,12 @@ +// Windows reserves only 1 MiB for the main thread by default. OctoSense's +// startup evaluates and constructs a large Makepad script/widget tree on that +// thread, whose bounded peak exceeds the default before the first window is +// shown. /STACK changes the PE address-space reserve; pages are still committed +// only as they are used. +fn main() { + let target_os = std::env::var("CARGO_CFG_TARGET_OS").unwrap_or_default(); + let target_env = std::env::var("CARGO_CFG_TARGET_ENV").unwrap_or_default(); + if target_os == "windows" && target_env == "msvc" { + println!("cargo:rustc-link-arg-bins=/STACK:16777216"); + } +} diff --git a/docs/validation.md b/docs/validation.md index 90a56c74..f6d4fd42 100644 --- a/docs/validation.md +++ b/docs/validation.md @@ -1,3 +1,29 @@ +# macOS application-name validation โ€” 2026-09-11 + +On `fix/macos-app-name`, `.cargo/config.toml` explicitly sets +`MAKEPAD_BUNDLE_NAME=OctoSense` and +`MAKEPAD_BUNDLE_IDENTIFIER=dev.makepad.octosense`. The pinned Makepad build script +otherwise derives its generated `Info.plist` name from the checkout folder. +Here that folder is still `makeos`, producing `Makeos` despite the correct +OctoSense window and menu strings in the application source. + +Verified with isolated native launches: + +- Before the change, the actual macOS menu bar reported `Apple, Makeos`. +- After locked debug and release workspace builds, both generated plists report + `OctoSense` for `CFBundleName` and `CFBundleDisplayName`, and + `dev.makepad.octosense` for `CFBundleIdentifier`. +- Both `cargo run --locked` and `cargo run --locked --release` reported + `Apple, OctoSense` through macOS accessibility inspection. The application + rendered without runtime errors and each test process exited normally. + +Evidence is in `target/macos-branding/`, including build logs and the captured +menu titles. `NSRunningApplication.localizedName` reports the executable name +for these bare Cargo launches, so validation reads the actual menu bar instead. +Existing legacy state-path compatibility and historical provenance remain valid. + +--- + # OctoSense light appearance validation โ€” 2026-09-11 On `feat/desktop-wallpaper`, OctoSense now supports the existing Light/Dark diff --git a/src/clients.rs b/src/clients.rs index ac9387f9..5f34a338 100644 --- a/src/clients.rs +++ b/src/clients.rs @@ -28,7 +28,10 @@ use crate::host; #[cfg(unix)] use std::os::unix::process::CommandExt; -use makepad_widgets::makepad_platform::thread::{CancellationToken, Lane, SignalToUI, TaskPool, ThreadSpawner, ThreadOptions}; +#[cfg(unix)] +use makepad_widgets::makepad_platform::thread::CancellationToken; +use makepad_widgets::makepad_platform::thread::{Lane, SignalToUI, TaskPool, ThreadSpawner, ThreadOptions}; +#[cfg(any(unix, test))] use makepad_widgets::Cx; use crate::hub::ClientId; @@ -609,7 +612,7 @@ pub fn kill_child_group(child: &mut Child, _grace: std::time::Duration, _pool: & /// Final slot teardown owns the child from here on. Signal and reap it wholly /// on a heavy pool worker; dropping a slot on the UI thread never waits for a /// process or decoder wrapper to exit. -fn reap_child_group(mut child: Child, grace: std::time::Duration, pool: &TaskPool) { +fn reap_child_group(mut child: Child, _grace: std::time::Duration, pool: &TaskPool) { #[cfg(unix)] let pid = { let pid = child.id() as i32; @@ -622,7 +625,7 @@ fn reap_child_group(mut child: Child, grace: std::time::Duration, pool: &TaskPoo #[cfg(unix)] { let wait = CancellationToken::new(); - let _ = wait.wait_until(Cx::monotonic_now() + grace.as_secs_f64()); + let _ = wait.wait_until(Cx::monotonic_now() + _grace.as_secs_f64()); if signal::alive(-pid) { signal::kill_group(pid, signal::SIGKILL); }