From df83a2f3da4aacd79ced7d0a2f674dcce694cc1a Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Tue, 29 Sep 2026 00:41:58 -0700 Subject: [PATCH] Repin makepad to main bf318136, Octoscript-Makepad 019e6bf0 [skip ci] makepad #55 (MapView archive_url) and #56 (HTTPS on OpenHarmony through rustls; Cargo.lock gains the rustls and webpki-roots edges already locked). Both runtime patches apply unchanged; the stacked tree is now 169a5a47. Co-Authored-By: Claude Opus 5.5 --- Cargo.lock | 2 ++ Cargo.toml | 30 +++++++++++++-------------- apps/appcard/native-runtime.lock.json | 2 +- native-apps.json | 4 ++-- native-runtime.lock.json | 2 +- phone/docs/build-tool.md | 4 ++-- phone/docs/makepad-fork.md | 8 ++++--- rom/docs/home-build.md | 2 +- runtime-patches.lock.json | 4 ++-- 9 files changed, 31 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 137ccb6b..8e5b0b34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5406,6 +5406,8 @@ dependencies = [ "makepad-live-id", "makepad-micro-serde", "makepad-script", + "rustls", + "webpki-roots 1.0.9", "windows 0.62.2", ] diff --git a/Cargo.toml b/Cargo.toml index fe4036cd..3463be9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,24 +63,24 @@ authors = ["octos-app contributors"] # BEGIN native-apps: pins (generated by tools/native_apps.py from native-apps.json; do not edit) rinx = { git = "https://github.com/hagency-org/Rinx.git", rev = "68afcf796d303aaf646eeb832d65c450a56c92b5", default-features = false, features = ["octosense-module"] } octosense-reference = { path = "apps/reference" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da", default-features = false } -makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744", default-features = false } +makepad-terminal = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } octosense-appcard = { path = "apps/appcard/module" } octosense-app-hub-app = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "e8601b80ce104db2e48208094714bdcffdce6b5a" } # END native-apps: pins # --- Makepad (OctoSense-org/makepad), the revision Octoscript-Makepad's # runtime.json pins (native-runtime.lock.json); resolved to .sources/makepad. -makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da" } -makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "953d9fa380c17e0b9b21eaea782b4b86048213da", default-features = false } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744" } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "bf318136a375c4d1fb7ee10e13e27336b6d98744", default-features = false } # --- OctoScript (Octoscript 68f6a9df) and its Makepad runtime # (Octoscript-Makepad 65d30a09, native-runtime.lock.json). octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } @@ -89,8 +89,8 @@ octoscript-ui-l0 = { git = "https://github.com/OctoSense-org/Octoscript.git", re octoscript-core = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } octoscript-capabilities = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } octoscript-schema = { git = "https://github.com/OctoSense-org/Octoscript.git", rev = "68f6a9df55692b5d8ef8873a12721e279a3f40d6" } -octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "c259881059aa9c90f250063ca0df7b36df3714c4" } -octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "c259881059aa9c90f250063ca0df7b36df3714c4" } +octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "019e6bf043b484676ff39d6ff5be58a1e94abed8" } +octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "019e6bf043b484676ff39d6ff5be58a1e94abed8" } # --- App Hub's host service registry the Mail and llm services register # into; the same revision as App Hub's app crate (a native app, above). octosense-appstore = { git = "https://github.com/OctoSense-org/OctoSense-App-Hub", rev = "e8601b80ce104db2e48208094714bdcffdce6b5a" } diff --git a/apps/appcard/native-runtime.lock.json b/apps/appcard/native-runtime.lock.json index ee796d2d..f5c76e34 100644 --- a/apps/appcard/native-runtime.lock.json +++ b/apps/appcard/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "c259881059aa9c90f250063ca0df7b36df3714c4" + "revision": "019e6bf043b484676ff39d6ff5be58a1e94abed8" } diff --git a/native-apps.json b/native-apps.json index 3da4cc6f..26ab7026 100644 --- a/native-apps.json +++ b/native-apps.json @@ -41,7 +41,7 @@ { "id": "sheets", "crate": "makepad-sheets", - "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "953d9fa380c17e0b9b21eaea782b4b86048213da", "local": ".sources/makepad/apps/sheets" }, + "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "bf318136a375c4d1fb7ee10e13e27336b6d98744", "local": ".sources/makepad/apps/sheets" }, "module": "makepad_sheets::SHEETS_MODULE", "bin": "sheets", "default_features": false, @@ -57,7 +57,7 @@ { "id": "terminal", "crate": "makepad-terminal", - "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "953d9fa380c17e0b9b21eaea782b4b86048213da", "local": ".sources/makepad/apps/terminal" }, + "source": { "git": "https://github.com/OctoSense-org/makepad.git", "rev": "bf318136a375c4d1fb7ee10e13e27336b6d98744", "local": ".sources/makepad/apps/terminal" }, "module": "makepad_terminal::TERMINAL_MODULE", "bin": "terminal", "default_features": true, diff --git a/native-runtime.lock.json b/native-runtime.lock.json index ee796d2d..f5c76e34 100644 --- a/native-runtime.lock.json +++ b/native-runtime.lock.json @@ -1,5 +1,5 @@ { "schema_version": 1, "url": "https://github.com/OctoSense-org/Octoscript-Makepad.git", - "revision": "c259881059aa9c90f250063ca0df7b36df3714c4" + "revision": "019e6bf043b484676ff39d6ff5be58a1e94abed8" } diff --git a/phone/docs/build-tool.md b/phone/docs/build-tool.md index 42c46b88..e0a2051a 100644 --- a/phone/docs/build-tool.md +++ b/phone/docs/build-tool.md @@ -73,9 +73,9 @@ move that touches `tools/cargo_makepad` is the usual trigger): cargo install --path .sources/makepad/tools/cargo_makepad --force ``` -The shared release selects Makepad main `953d9fa3`, which includes App Hub's +The shared release selects Makepad main `bf318136`, which includes App Hub's isolate containment (#22), contained script apps (#30), the QR scanner -(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) and the peer-link client (#54); the consumer lock +(#31), Splash `reapply_text` (#35) self-confirmed assistant tools (#36) and the one-call-site Slug, cursor and glass shaders (#37, #39), the terminal's confirmed runs (#41), trackpad scrolling (#42), gestures (#46), Chinese text (#48), tabs and installed fonts (#47), and every app's system-font fallback (#49, #51), WebReader's close ending the page (#43), the OpenHarmony packager's workspace target dir (#52), the `sys.dataset` and `sys.news_digest` helpers (#53) the peer-link client (#54), the Linux Vulkan build (#45), the map's hosted-archive source (#55) and HTTPS on OpenHarmony (#56); the consumer lock needs no `makepad_override`. To see which checkout an installed tool reads its Java from: diff --git a/phone/docs/makepad-fork.md b/phone/docs/makepad-fork.md index f4b6fb1d..a82302de 100644 --- a/phone/docs/makepad-fork.md +++ b/phone/docs/makepad-fork.md @@ -20,9 +20,9 @@ Makepad and that no fork is required do not. The revision is pinned as a chain, not in one place: 1. `native-runtime.lock.json` here names one revision of - `OctoSense-org/Octoscript-Makepad` (`c2598810`, its main). + `OctoSense-org/Octoscript-Makepad` (`019e6bf0`, its main). 2. That repo's `runtime.json` names the Makepad fork revision - (`953d9fa3`, Makepad main: the enforced isolate policy of PR #22, module + (`bf318136`, Makepad main: the enforced isolate policy of PR #22, module windows, the ROM's Splash fixes, the contained script apps and host services of PR #30, the QR scanner of PR #31, Splash `reapply_text` of PR #35, the self-confirmed assistant tools of PR #36, the one-call-site @@ -31,7 +31,9 @@ The revision is pinned as a chain, not in one place: ending the page of PR #43 and the terminal gestures of PR #46 and the terminal's CJK font of PR #48, the terminal's tabs and installed fonts of PR #47 and the system-font fallback for every app of PRs #49 and #51, the OpenHarmony packager's workspace target dir of PR #52, the `sys.dataset` and - `sys.news_digest` helpers of PR #53 and the peer-link client of PR #54) and the Octoscript revision + `sys.news_digest` helpers of PR #53, the peer-link client of PR #54, the Linux + Vulkan build of PR #45, the map's hosted-archive source of PR #55 and HTTPS on + OpenHarmony of PR #56) and the Octoscript revision (`68f6a9d`). OctoSense, AppCard, Rinx and the ROM lock the same release. 3. The manifests repeat the Makepad revision as `rev = "…"`: here in `Cargo.toml` and `apps/*/Cargo.toml`. Octoscript-Makepad's unmodified diff --git a/rom/docs/home-build.md b/rom/docs/home-build.md index 21f04df0..353a4c53 100644 --- a/rom/docs/home-build.md +++ b/rom/docs/home-build.md @@ -29,7 +29,7 @@ assistant (`octos-app`, `apps/appcard/app/app`) is built only with `--features app-appcard`: it is not shipped for now, so default, `mobile-apps` and native mobile builds leave its UI out. -The runtime's Makepad (main `953d9fa3`, OctoScript-Makepad `c2598810`) +The runtime's Makepad (main `bf318136`, OctoScript-Makepad `019e6bf0`) includes the contained-app and isolate controls from makepad#30, the camera QR scanner AI providers uses (makepad#31), Splash `reapply_text` (makepad#35) with stateful mini-app inputs (OctoScript-Makepad#46) for Rinx, diff --git a/runtime-patches.lock.json b/runtime-patches.lock.json index df65821d..8735e044 100644 --- a/runtime-patches.lock.json +++ b/runtime-patches.lock.json @@ -1,10 +1,10 @@ { "schema_version": 1, "makepad": { - "base_revision": "953d9fa380c17e0b9b21eaea782b4b86048213da", + "base_revision": "bf318136a375c4d1fb7ee10e13e27336b6d98744", "patch": "tools/runtime-patches/makepad-settings.patch", "sha256": "ba59081fb600b022844db5882f969712275be7a7976be8cb5ced7eac1bfa26a5", - "tree": "85ecceb675e11e387f674e0e4f518a0231496bdb", + "tree": "169a5a47183cef08fc7aa7db3c662a5512e6f6b0", "product_fixes": [ "Settings integration: Android IME synchronization, accessibility and reduced motion, GLES program-cache validation, obscured-gesture cancellation and scroll-position observation.", "Contained-app isolation and secret-input restrictions come from the pinned upstream runtime; the Settings overlay preserves those gates.",