Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: broken scale-monitor-framebuffer #1847

Merged
merged 1 commit into from
Oct 28, 2024
Merged
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
9 changes: 7 additions & 2 deletions build_files/bluefin-changes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,14 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then
sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nHidden=true@g' /usr/share/applications/org.gnome.SystemMonitor.desktop
fi

# GNOME Terminal is replaced with Ptyxis in F41+
# Workarounds for versions pre F41
if [[ "${FEDORA_MAJOR_VERSION}" -lt "41" ]]; then
# GNOME Terminal is replaced with Ptyxis in F41+
sed -i 's@\[Desktop Entry\]@\[Desktop Entry\]\nNoDisplay=true@g' /usr/share/applications/org.gnome.Terminal.desktop

# Remove incompatible schema modifications
sed -i 's@accent-color="slate"@@g' /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override
sed -i 's@'", "\''xwayland-native-scaling'\''@@g' /usr/share/glib-2.0/schemas/zz0-bluefin-modifications.gschema.override
fi

# Create symlinks from old to new wallpaper names for backwards compatibility
Expand All @@ -33,7 +38,7 @@ if [[ "${BASE_IMAGE_NAME}" = "silverblue" ]]; then
echo "Running error test for bluefin gschema override. Aborting if failed."
# We are omitting "--strict" from the schema validation since GNOME <47 do not contain the accent-color keys.
# We should ideally refactor this to handle multiple GNOME version schemas better
glib-compile-schemas /tmp/bluefin-schema-test
glib-compile-schemas --strict /tmp/bluefin-schema-test
echo "Compiling gschema to include bluefin setting overrides"
glib-compile-schemas /usr/share/glib-2.0/schemas &>/dev/null
fi
Loading