From ae4f9cc272ee222a59342825c70abf41432d3040 Mon Sep 17 00:00:00 2001 From: ymote <151983+ymote@users.noreply.github.com> Date: Mon, 28 Sep 2026 13:22:55 -0700 Subject: [PATCH] Repin the runtime to makepad f08eec53 (terminal draws Chinese text) makepad main f08eec53 adds #48: the terminal's font family falls back to LXGW WenKai, so CJK text no longer draws as tofu. Octoscript-Makepad#53 releases it as 5fc36810. Both runtime patches (settings, then system-back) reapply unchanged on the new base (same sha256); runtime-patches.lock.json records the new base and the stacked tree. App Hub and Rinx pins are unchanged. Co-Authored-By: Claude Opus 5.5 --- Cargo.toml | 30 +++++++++++++-------------- apps/appcard/native-runtime.lock.json | 2 +- native-runtime.lock.json | 2 +- phone/docs/build-tool.md | 4 ++-- phone/docs/makepad-fork.md | 6 +++--- rom/docs/home-build.md | 2 +- runtime-patches.lock.json | 4 ++-- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index df882a08..ba2189fc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,19 +59,19 @@ authors = ["octos-app contributors"] [workspace.dependencies] # --- 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 = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-map-nav = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897" } -makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897", default-features = false } -makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "75e3e24dbfb37381edb2745f62eba3615b335897", default-features = false } +makepad-widgets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-code-editor = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-ai = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-studio-protocol = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-network = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-wm-api = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-ai-services = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-strict-json = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-app-module = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-wm-theme = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-map-nav = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0" } +makepad-sheets = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0", default-features = false } +makepad-aichat = { git = "https://github.com/OctoSense-org/makepad.git", rev = "f08eec5378fa3f83902a2794dacda03e829a0ef0", 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" } @@ -80,8 +80,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 = "83b2f8c010c6fc74d331c79d5cde0c25b0c38ff0" } -octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "83b2f8c010c6fc74d331c79d5cde0c25b0c38ff0" } +octoscript-makepad = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "5fc3681026247761d2e2e16e15b0c4dff3a1c521" } +octoscript-node = { git = "https://github.com/OctoSense-org/Octoscript-Makepad.git", rev = "5fc3681026247761d2e2e16e15b0c4dff3a1c521" } # --- App Hub: the shells' store/Card runner/system apps crate and the host # service registry the Mail and llm services register into. One revision. octosense-app-hub-app = { 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 d4329576..2030f4e4 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": "83b2f8c010c6fc74d331c79d5cde0c25b0c38ff0" + "revision": "5fc3681026247761d2e2e16e15b0c4dff3a1c521" } diff --git a/native-runtime.lock.json b/native-runtime.lock.json index d4329576..2030f4e4 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": "83b2f8c010c6fc74d331c79d5cde0c25b0c38ff0" + "revision": "5fc3681026247761d2e2e16e15b0c4dff3a1c521" } diff --git a/phone/docs/build-tool.md b/phone/docs/build-tool.md index 45fa49e0..5d88372a 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 `75e3e24d`, which includes App Hub's +The shared release selects Makepad main `f08eec53`, 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) and gestures (#46), and WebReader's close ending the page (#43); 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) and Chinese text (#48), and WebReader's close ending the page (#43); 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 397b92fd..0e7bcc25 100644 --- a/phone/docs/makepad-fork.md +++ b/phone/docs/makepad-fork.md @@ -20,15 +20,15 @@ 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` (`83b2f8c0`, its main). + `OctoSense-org/Octoscript-Makepad` (`5fc36810`, its main). 2. That repo's `runtime.json` names the Makepad fork revision - (`75e3e24d`, Makepad main: the enforced isolate policy of PR #22, module + (`f08eec53`, 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 Slug, cursor and glass shaders of PRs #37 and #39 the terminal module of PRs #40 and #41 and the terminal's trackpad scrolling of PR #42, WebReader's close - ending the page of PR #43 and the terminal gestures of PR #46) and the Octoscript revision + ending the page of PR #43 and the terminal gestures of PR #46 and the terminal's CJK font of PR #48) 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 0bd574a4..2443a444 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 `75e3e24d`, OctoScript-Makepad `83b2f8c0`) +The runtime's Makepad (main `f08eec53`, OctoScript-Makepad `5fc36810`) 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 2a64dc4e..933d11e8 100644 --- a/runtime-patches.lock.json +++ b/runtime-patches.lock.json @@ -1,10 +1,10 @@ { "schema_version": 1, "makepad": { - "base_revision": "75e3e24dbfb37381edb2745f62eba3615b335897", + "base_revision": "f08eec5378fa3f83902a2794dacda03e829a0ef0", "patch": "tools/runtime-patches/makepad-settings.patch", "sha256": "ba59081fb600b022844db5882f969712275be7a7976be8cb5ced7eac1bfa26a5", - "tree": "286dc79b96b15e605f0b2a40382c7b6d6fd47ae4", + "tree": "563e5b4b7fa0aa1b9c790c495603beea1342b158", "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.",