Merge upstream quattro for the Qt 6.12 palette fix (#14553)
Qt 6.12 shadows the bare Color singleton, so the bar and every Color role read undefined on fresh installs. Keep our I18n text in the four conflicting files, qualify #14433's notification button color, give the new dictation menu rows and notifications Chinese, and drop table entries for the removed Voxtype and FIDO2 texts.
This commit is contained in:
commit
fcd681c099
239 files changed
+3996
-616
No files matched your search
@@ -131,6 +131,7 @@ sddm
|
||||
slurp
|
||||
socat
|
||||
starship
|
||||
superwhisper-bin
|
||||
sushi
|
||||
system-config-printer
|
||||
tesseract
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
set -e
|
||||
|
||||
if omarchy-done ensure voxtype-install-invitation; then
|
||||
omarchy-notification-send -u critical -g "$(omarchy-text "Install Dictation with Voxtype")" \
|
||||
"$(omarchy-text "Click to install voice dictation for Omarchy.")" \
|
||||
--exec omarchy-launch-floating-terminal-with-presentation omarchy-voxtype-install
|
||||
fi
|
||||
@@ -12,7 +12,12 @@ case ${OMARCHY_SETUP_CONTEXT:-runtime} in
|
||||
esac
|
||||
|
||||
if [[ -n $NODE_PACKAGE_DIR ]]; then
|
||||
NODE_TARBALL=$(find "$NODE_PACKAGE_DIR" -name "node-v*-linux-x64.tar.gz" -type f 2>/dev/null | head -n1)
|
||||
# The ISO bundles the tarball for its own architecture.
|
||||
case $(uname -m) in
|
||||
aarch64) NODE_PLATFORM=linux-arm64 ;;
|
||||
*) NODE_PLATFORM=linux-x64 ;;
|
||||
esac
|
||||
NODE_TARBALL=$(find "$NODE_PACKAGE_DIR" -name "node-v*-$NODE_PLATFORM.tar.gz" -type f 2>/dev/null | head -n1)
|
||||
if [[ -z $NODE_TARBALL ]]; then
|
||||
if [[ ${OMARCHY_SETUP_CONTEXT:-} == "provision-owner" ]]; then
|
||||
# A factory snapshot predating the bundled tarball may not have it staged.
|
||||
@@ -24,7 +29,7 @@ if [[ -n $NODE_PACKAGE_DIR ]]; then
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
NODE_VERSION=$(basename "$NODE_TARBALL" | sed 's/node-v\(.*\)-linux-x64.tar.gz/\1/')
|
||||
NODE_VERSION=$(basename "$NODE_TARBALL" | sed "s/node-v\(.*\)-$NODE_PLATFORM.tar.gz/\1/")
|
||||
NODE_INSTALL_DIR="$HOME/.local/share/mise/installs/node/$NODE_VERSION"
|
||||
|
||||
mkdir -p "$NODE_INSTALL_DIR"
|
||||
|
||||
Reference in new issue
Block a user