Skip to content

Commit 532b672

Browse files
committed
codex 0.132.0
1 parent 4c4c7f1 commit 532b672

7 files changed

Lines changed: 374 additions & 189 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ build/install/codex/bin/codex --version
6161
- The wrapper uses the official Solaris Rust standalone installer target
6262
`x86_64-pc-solaris`.
6363
- The pinned Codex source is the upstream `openai/codex` release tag
64-
`rust-v0.130.0`, built from its `codex-rs/` workspace.
64+
`rust-v0.132.0`, built from its `codex-rs/` workspace.
6565
- Set `SOLARIS_CODEX_PROXY_SETUP=/path/to/proxy.sh` if your host needs an
6666
environment hook before downloads.
6767
- The codex build clears inherited Solaris `LD_*` hardening variables because

common.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ vendor_rust_sources() {
276276
local vendor_dir=$2
277277
local extra_file=${3:-}
278278
local cargo_dir=${src_dir}/.cargo
279+
local config=${cargo_dir}/config.toml
279280
local raw=${vendor_dir}.config.raw
280281
local generated=${vendor_dir}.config.toml
281282
local stamp=${vendor_dir}/.solaris-codex-vendored
@@ -284,7 +285,9 @@ vendor_rust_sources() {
284285
[[ -d "${src_dir}" ]] || die "source tree not found: ${src_dir}"
285286
[[ -f "${src_dir}/Cargo.lock" ]] || die "missing Cargo.lock in ${src_dir}"
286287

287-
if [[ -d "${vendor_dir}" && -f "${cargo_dir}/config.toml" && -f "${stamp}" ]]; then
288+
if [[ -d "${vendor_dir}" && -f "${config}" && -f "${stamp}" ]] &&
289+
grep -q 'replace-with = "vendored-sources"' "${config}" &&
290+
grep -q '^\[source\.vendored-sources\]' "${config}"; then
288291
return 0
289292
fi
290293

patches/codex/0002-tui-disable-unsupported-clipboard-backends-on-solaris.patch

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Why it is needed:
1111
at runtime when clipboard actions are attempted on Solaris
1212

1313
diff --git a/codex-rs/tui/Cargo.toml b/codex-rs/tui/Cargo.toml
14-
index d3d2846..8602eca 100644
14+
index c213e92..5c49e38 100644
1515
--- a/codex-rs/tui/Cargo.toml
1616
+++ b/codex-rs/tui/Cargo.toml
17-
@@ -142,9 +142,9 @@ windows-sys = { version = "0.52", features = [
17+
@@ -145,9 +145,9 @@ windows-sys = { version = "0.52", features = [
1818
] }
1919
winsplit = "0.1"
2020

@@ -28,19 +28,23 @@ index d3d2846..8602eca 100644
2828

2929

3030
diff --git a/codex-rs/tui/src/clipboard_copy.rs b/codex-rs/tui/src/clipboard_copy.rs
31-
index 1ad369d..9515deb 100644
31+
index 1ad369d..8781d42 100644
3232
--- a/codex-rs/tui/src/clipboard_copy.rs
3333
+++ b/codex-rs/tui/src/clipboard_copy.rs
34-
@@ -222,7 +222,7 @@ fn is_wsl_session() -> bool {
34+
@@ -222,7 +222,11 @@ fn is_wsl_session() -> bool {
3535
/// triggers `os_log` / `NSLog` output on stderr. Because the TUI owns the
3636
/// terminal, that stray output corrupts the display. We temporarily redirect
3737
/// fd 2 to `/dev/null` around the call to keep the screen clean.
3838
-#[cfg(all(not(target_os = "android"), not(target_os = "linux")))]
39-
+#[cfg(all(not(target_os = "android"), not(target_os = "linux"), not(target_os = "solaris")))]
39+
+#[cfg(all(
40+
+ not(target_os = "android"),
41+
+ not(target_os = "linux"),
42+
+ not(target_os = "solaris")
43+
+))]
4044
fn arboard_copy(text: &str) -> Result<Option<ClipboardLease>, String> {
4145
#[cfg(target_os = "macos")]
4246
let _stderr_lock = STDERR_SUPPRESSION_MUTEX
43-
@@ -259,6 +259,11 @@ fn arboard_copy(_text: &str) -> Result<Option<ClipboardLease>, String> {
47+
@@ -259,6 +263,11 @@ fn arboard_copy(_text: &str) -> Result<Option<ClipboardLease>, String> {
4448
Err("native clipboard unavailable on Android".to_string())
4549
}
4650

0 commit comments

Comments
 (0)