Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions guest/patches/omarchy/keyboard-us-acentos.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/install/provisioning/setup-form.sh b/install/provisioning/setup-form.sh
--- a/install/provisioning/setup-form.sh
+++ b/install/provisioning/setup-form.sh
@@ -33,6 +33,7 @@
English (UK)|uk
English (US, Dvorak)|dvorak
English (US, Colemak)|colemak
+English (US, International with dead keys)|us-acentos
Azerbaijani|azerty
Belarusian|by
Belgian|be-latin1
@@ -65,7 +66,7 @@
Norwegian|no-latin1
Polish|pl
Portuguese|pt-latin1
-Portuguese (Brazil)|br-abnt2
+Portuguese (Brazil, ABNT2)|br-abnt2
Romanian|ro
Russian|ru
Serbian|sr-latin
14 changes: 14 additions & 0 deletions guest/spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,20 @@
"afterSha256": "22062e6fc14f8405d3da23f2edc892fc22dcaf51ed4c944ee5d7c0fc3b0992bd"
}
]
},
{
"id": "keyboard-us-acentos",
"description": "Add US International with dead keys and distinguish the Brazilian ABNT2 keyboard option.",
"reference": "https://github.com/omacom/try-omarchy/issues/194",
"patch": "patches/omarchy/keyboard-us-acentos.patch",
"patchSha256": "e81e1bd6b23816ecc2d2360b446e29c27947314d3cc5b3181d38982b8c16ec0d",
"targets": [
{
"path": "install/provisioning/setup-form.sh",
"beforeSha256": "0fbb8c3c8b151e5ff884c16d381e12fda53cc16adfd08a684d41e7327250665d",
"afterSha256": "5e2288809a3d9cc2cf91ca955be97b5fdcf6e786b7e8e3be6ea1a1b19abda15c"
}
]
}
],
"postBuildUserInstallers": [
Expand Down
7 changes: 7 additions & 0 deletions guest/tests/verify.py
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ def main() -> None:
"geforce-now-aarch64-unavailable",
"battlenet-aarch64-unavailable",
"lutris-aarch64-unavailable",
"keyboard-us-acentos",
],
"Omarchy backports are explicitly ordered and identified",
)
Expand Down Expand Up @@ -291,6 +292,12 @@ def main() -> None:
"exec omarchy-pkg-unavailable-arm Lutris" in lutris_unavailable_patch,
"Lutris aarch64 backport fails via the shared unavailable helper",
)
keyboard_patch = read(GUEST / "patches/omarchy/keyboard-us-acentos.patch")
check(
"+English (US, International with dead keys)|us-acentos" in keyboard_patch
and "+Portuguese (Brazil, ABNT2)|br-abnt2" in keyboard_patch,
"keyboard backport distinguishes US International from Brazilian ABNT2",
)
dropbox_unavailable_patch = read(GUEST / "patches/omarchy/dropbox-aarch64-unavailable.patch")
check(
"exec omarchy-pkg-unavailable-arm Dropbox" in dropbox_unavailable_patch
Expand Down
Loading