As stated in the original topic, we want to start afresh, from Adwaita for GTK theme and the Shell sass files.
This enables to track better changes, ensuring the whole part of the theming styles and classes are supported (see what happened with suggested-action last cycle when I blogged about it for instance: https://didrocks.fr/2017/10/16/ubuntu-gnome-shell-in-artful-day-15/)
- Question number 0 (as not really a question): I think, as I saw you mostly all have github accounts and seem to be familiar with it that we use git Please shout if you have any issue with it.
- First question: Where do you prefer the code to be hosted? We can use https://github.com/ubuntu/ to get better visibility and external contributions or we can use launchpad.
- Second question: I think it makes sense to have 3 projects: one for GTK2/3, one for the Shell and one for the icon set (which, for this latter, may just be Sam’s branch icon).
While you are answering those questions, @merlijn-sebrechts, do you mind preparing those branches (I think start with GTK theme, and then the Shell), make a build system around it (I suggest
meson/ninja combo, as it’s what more and more upstream are using) and propose something for importing regularly the SASS files from the ubuntu packages to the branch?
I think we need to do a 3-way merge so that we can compare: old-upstream-sass/new-upstream-sass and old-upstream-sass/our-ubuntu-changes.
For instance, then, with
meld, we can do:
meld <old-upstream-version.scss> <new-upstream-version.scss> <ubuntu-modified-version.scss>. New changes are visible between the 2 first columns and can be injected and adapted appropriately into the 3rd.
I think a tool automating this to get the manual 3 way merged process would be great. The thing is that it’s not only one but multiple files that needs to be reviewed when this tool is ran. Then, the merges are manual and it will get via a normal PR proposed against master.
One last thing: it needs to import the scss version from the distribution itself, and not upstream repository. Indeed, we may have a version of GTK or Shell different than upstream, and so, it’s better to be in sync with the distro than anything else. Providing a manual path for new upstream version (like merging before upload a new version of the Shell having a theme breakage) would be sweet as well.
I’m happy to help if things are unclear and do the first merges ofc
Sounds good to everyone?