Make elementary themes the default fallback #30
Conversation
| "buildsystem": "meson", | ||
| "config-opts": [ | ||
| "-Dbroadway_backend=true", | ||
| "-Dinstalled_tests=true", |
There was a problem hiding this comment.
we don't need the tests in the runtime
There was a problem hiding this comment.
I took the options from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/master/elements/sdk/gtk+-3.bst
There was a problem hiding this comment.
Yes, gnome-build-meta acts as project wide CI too so we want to make sure they are built there. We filter the produced binaries out from the runtime afterwards.
io.elementary.Sdk.json
Outdated
| } | ||
| ], | ||
| "build-commands": [ | ||
| "install -Dm644 gtk/settings.ini /etc/gtk-3.0/settings.ini" |
There was a problem hiding this comment.
I think it would be better if it was installed /usr/etc instead. I'd be surprised if /etc made it to the compose.
| "install -Dm644 gtk/settings.ini /etc/gtk-3.0/settings.ini" | |
| "install -Dm644 gtk/settings.ini /usr/etc/gtk-3.0/settings.ini" |
| @@ -41,6 +41,32 @@ | |||
| } | |||
| }, | |||
| "modules": [ | |||
| { | |||
| "name": "gtk", | |||
There was a problem hiding this comment.
Not sure exactly what's going on but when trying to build locally it fails like this:
Running custom install script '/usr/bin/python3 /run/build-runtime/gtk/build-aux/meson/post-install.py 3.0 3.0.0 /usr/bin /usr/lib/x86_64-linux-gnu /usr/share'
--- stdout ---
Compiling GSettings schemas...
Updating icon cache...
Updating module cache for input methods...
--- stderr ---
Warning: Schema “org.gnome.crypto.pgp” has path “/desktop/gnome/crypto/pgp/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Warning: Schema “org.gnome.system.locale” has path “/system/locale/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Warning: Schema “org.gnome.system.proxy” has path “/system/proxy/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Warning: Schema “org.gnome.system.proxy.http” has path “/system/proxy/http/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Warning: Schema “org.gnome.system.proxy.https” has path “/system/proxy/https/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Warning: Schema “org.gnome.system.proxy.ftp” has path “/system/proxy/ftp/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Warning: Schema “org.gnome.system.proxy.socks” has path “/system/proxy/socks/”. Paths starting with “/apps/”, “/desktop/” or “/system/” are deprecated.
Traceback (most recent call last):
File "/run/build-runtime/gtk/build-aux/meson/post-install.py", line 45, in <module>
immodule_cache_file = open(os.path.join(gtk_moduledir, 'immodules.cache'), 'w')
OSError: [Errno 30] Read-only file system: '/usr/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules.cache'
FAILED: install script '/usr/bin/python3 /run/build-runtime/gtk/build-aux/meson/post-install.py 3.0 3.0.0 /usr/bin /usr/lib/x86_64-linux-gnu /usr/share' exit code 1, stopped
FAILED: meson-install
/usr/bin/meson install --no-rebuild
ninja: build stopped: subcommand failed.
Error: module gtk: Child process exited with code 1
There was a problem hiding this comment.
@alatiera I guess this is rofiles-fuse preventing modifications to already-existing file. One way to fix this would be adding the path to ensure-writable property of the gtk module, like this:
"ensure-writable": [
"/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules.cache"
]Or just running flatpak-builder with --disable-rofiles-fuse.
Or patching the post-install.py script to replace the file instead of editing it in-place.
io.elementary.Sdk.json
Outdated
| } | ||
| ], | ||
| "build-commands": [ | ||
| "ln -S /usr/share/themes/io.elementary.stylesheet.blueberry /usr/share/themes/elementary" |
There was a problem hiding this comment.
Where does this help, an app will either be built against eos5 or eos6 right? at which point will it a eos6 app be expecting elementary as the name?
There was a problem hiding this comment.
If the user is on eOS 5 then its theme name will be elementary and might be exported, that helps with the fallback
There was a problem hiding this comment.
do we want make the same with Adwaita? or is better to remove them from the Sdk and let the fallback manage it?
| -#define DEFAULT_THEME_NAME "Adwaita" | ||
| -#define DEFAULT_ICON_THEME "Adwaita" | ||
| +#define DEFAULT_THEME_NAME "io.elementary.stylesheet.blueberry" | ||
| +#define DEFAULT_ICON_THEME "elementary" |
There was a problem hiding this comment.
i don't think there's a non-intentional way to use the icon fallback on flatpak, the host icons folder is mounted on the sandbox, so the selected theme is always found.
There was a problem hiding this comment.
I mean, given the fact Dippi for instance automatically overrides even the icon theme, I wonder if Dippi's strategy can be incorporated directly into the platform.
|
We probably want to solve this sooner than later, as we've started advertising the .flatpakref files on the AppCenter website. |
|
Any progress on this? Looks like it was targeting 6.1 release, but AppCenter apps built on the 6.1 platform are still using Adwaita theme on my GNOME 41 machine. |
|
Triargers: Given elementary/granite@6f035b7, is this merge request now technically redundant? |
No it's still required |
This comment was marked as spam.
This comment was marked as spam.
Fixes #72