diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2020-02-12 20:18:27 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2020-02-12 20:22:43 +0000 |
| commit | 2ab9be54fb34c61eedbbb89b78ce9db23ba81e8a (patch) | |
| tree | 67be4d07c490feaded55aced72e9e5ad8f3a3d7b /gtk/gen-gtk-gresources-xml.py | |
| parent | 4247bf0fb64f5d9e65ac83f7cc48555c43e07cfd (diff) | |
| download | gtk+-2ab9be54fb34c61eedbbb89b78ce9db23ba81e8a.tar.gz | |
Rename the SCSS files for our themes
It seems that Meson's gnome.compile_resources() cannot deal with two
files with the same name under different directories, which breaks the
build parallelism because the GResource file ends up not depending on
either the Adwaita or the HighContrast gtk-contained.css file.
This commit only changes the on-disk names of the Adwaita and
HighContrast SCSS files, and the corresponding generated CSS files; the
files in the GResource are going to be aliased to the old file names, to
minimise the breakage. We might want to change the theme entry points at
some later date, if we decide to commit to this naming scheme.
Fixes: #2423
See Meson bug: https://github.com/mesonbuild/meson/issues/6615
Diffstat (limited to 'gtk/gen-gtk-gresources-xml.py')
| -rw-r--r-- | gtk/gen-gtk-gresources-xml.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py index 95bccf9268..9f3ea374ef 100644 --- a/gtk/gen-gtk-gresources-xml.py +++ b/gtk/gen-gtk-gresources-xml.py @@ -20,8 +20,8 @@ xml += ''' <file>theme/Empty/gtk.css</file> <file>theme/Adwaita/gtk.css</file> <file>theme/Adwaita/gtk-dark.css</file> - <file>theme/Adwaita/gtk-contained.css</file> - <file>theme/Adwaita/gtk-contained-dark.css</file> + <file alias='theme/Adwaita/gtk-contained.css'>theme/Adwaita/Adwaita.css</file> + <file alias='theme/Adwaita/gtk-contained-dark.css'>theme/Adwaita/Adwaita-dark.css</file> ''' for f in get_files('theme/Adwaita/assets', '.png'): @@ -35,8 +35,8 @@ for f in get_files('theme/Adwaita/assets', '.svg'): xml += ''' <file>theme/HighContrast/gtk.css</file> <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file> - <file>theme/HighContrast/gtk-contained.css</file> - <file>theme/HighContrast/gtk-contained-inverse.css</file> + <file alias='theme/HighContrast/gtk-contained.css'>theme/HighContrast/HighContrast.css</file> + <file alias='theme/HighContrast/gtk-contained-inverse.css'>theme/HighContrast/HighContrast-inverse.css</file> ''' for f in get_files('theme/HighContrast/assets', '.png'): |