Merge ~gunnarhj/ubuntu-release-upgrader:mate-font into ubuntu-release-upgrader:ubuntu/main

Proposed by Gunnar Hjalmarsson
Status: Merged
Merge reported by: Nick Rosbrook
Merged at revision: c5e19e9cbbcbbd7a02e2d255c5df5e1e9930ff84
Proposed branch: ~gunnarhj/ubuntu-release-upgrader:mate-font
Merge into: ubuntu-release-upgrader:ubuntu/main
Diff against target: 86 lines (+32/-3) (has conflicts)
2 files modified
DistUpgrade/DistUpgradeQuirks.py (+29/-3)
debian/changelog (+3/-0)
Conflict in debian/changelog
Reviewer Review Type Date Requested Status
Nick Rosbrook Approve
Martin Wimpress  Pending
Ubuntu Core Development Team Pending
Review via email: mp+453086@code.staging.launchpad.net

Description of the change

This is an attempt to make the font workaround apply to Ubuntu MATE too. But there are two caveats:

1. Unlike Ubuntu, in MATE the changed font is not used by menu titles etc. I don't know if that is because they use some other dconf value in that context, or if the font family is hardcoded. It's still a significant improvement, though.

2. The systemd service for resetting the font didn't run when I tested (in a VirtualBox VM). Can that be a limitation in MATE's systemd configuration?

Maybe we need input from some MATE dev.

To post a comment you must log in.
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

On 2023-10-08 03:21, Gunnar Hjalmarsson wrote:
> 1. Unlike Ubuntu, in MATE the changed font is not used by menu titles
> etc. I don't know if that is because they use some other dconf value
> in that context, or if the font family is hardcoded. It's still a
> significant improvement, though.

MATE apparently uses multiple dconf font values, and I think my observation was due to this one:

gsettings get org.mate.Marco.general titlebar-font
'Ubuntu Medium 11'

So to wipe out all instances of unreadable letters in MATE, we would need to change the font value for multiple schemas and keys. I can think that would be to overdo it, and that the achieved improvement with the proposed change is sufficient.

But we still need to figure out why the systemd service does not reset the changed font as expected.

Revision history for this message
Martin Wimpress  (flexiondotorg) wrote :

MATE Desktop has several schema/keys for configuring fonts in MATE itself, but here are the main scheme/keys using in Ubuntu MATE.

```
[org.mate.interface]
font-name='Ubuntu 11'
document-font-name='Ubuntu 11'
monospace-font-name='Ubuntu Mono 13'
```

Some non-MATE apps reference the org.gnome.desktop.interface namespace for font configuration, so we override those too in Ubuntu MATE:

```
[org.gnome.desktop.interface:MATE]
document-font-name='Ubuntu 11'
font-name='Ubuntu 11'
monospace-font-name='Ubuntu Mono 13'
```

MATE Desktop has other schemas/keys where fonts are configured for the window manager (Marco) and Desktop shell (Caja).

```
[org.gnome.desktop.wm.preferences:MATE]
titlebar-font='Ubuntu Bold 11'

[org.mate.caja.desktop]
font='Ubuntu 11'

[org.mate.Marco.general]
titlebar-font='Ubuntu Medium 11'
```

MATE Desktop uses desktop autostart mechanisms for bringing up the phases of the desktop, there is no systemd integration.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote (last edit ):

Ok, Martin, how do you suggest we address complaints like these:

https://ubuntu-mate.community/t/ubuntu-mate-23-10-testing/26876/11

given the approach already in place for standard Ubuntu? Any chance the systemd feature in question can be enabled in MATE? Or should we let the MATE users live with the unreadable letters due to the changes to the Ubuntu font?

@Nick: I suppose that switching to autostart instead of systemd would be possible. Your thoughts on that?

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

I have adjusted the MP so it now creates an autostart file in case of MATE instead of a systemd service. With that I think we have a decent solution also for MATE. The text related to the upgrade keeps being readable, after all.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Remember that when testing the "sudo ./mantic" way, use this command:

sudo env XDG_SESSION_TYPE=x11 ./mantic

Normally XDG_SESSION_TYPE is set in do-release-upgrade, but when testing this way it needs to be set explicitly or else it hits a "return" statement since it thinks you run on a server or something.

Revision history for this message
Nick Rosbrook (enr0n) wrote (last edit ):

Thanks for this Gunnar, the code LGTM. I have tested it out, and while not all fonts are fixed by this (e.g. title bar remained messed up), the main dialog was preserved which I believe is the important part. I will wait for Brian to confirm that this is sufficient, though.

review: Approve
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Thanks Nick.

In the meantime I tried to rebase the MP, but there is something weird with d/changelog...

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Probably somebody made a push -f after I had cloned latest ubuntu/main. :/

Revision history for this message
Nick Rosbrook (enr0n) wrote :

Yes, it appears that way unfortunately. I will rebase your branch when I merge it now.

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches