Bug 2061290

Summary: Include more backgrounds for F36
Product: [Fedora] Fedora Reporter: Allan Day <aday>
Component: gnome-backgroundsAssignee: Kalev Lember <klember>
Status: CLOSED ERRATA QA Contact: Fedora Extras Quality Assurance <extras-qa>
Severity: unspecified Docs Contact:
Priority: unspecified    
Version: 36CC: caillon+fedoraproject, dking, duffy, gnome-sig, jsteiner, klember, mattdm, mclasen, rhughes, rlerch, rstrode, sandmann
Target Milestone: ---Keywords: Reopened
Target Release: ---   
Hardware: Unspecified   
OS: Unspecified   
Whiteboard:
Fixed In Version: gnome-backgrounds-42~beta-2.fc36 Doc Type: If docs needed, set a value
Doc Text:
Story Points: ---
Clone Of: Environment:
Last Closed: 2022-03-26 15:28:42 UTC Type: Bug
Regression: --- Mount Type: ---
Documentation: --- CRM:
Verified Versions: Category: ---
oVirt Team: --- RHEL 7.3 requirements from Atomic Host:
Cloudforms Team: --- Target Upstream Version:
Embargoed:
Attachments:
Description Flags
This is the XML for the 6 Fedora wallpapers with dark versions, and all other wallpapers from the set removed
none
This is the XML with all the Fedora wallpapers in it: the 6 Fedora wallpapers with dark versions, and all other wallpapers without dark versions are still present
none
This is a tarball of individual XML files, one per Fedora wallpaper, including the non dark mode wallpapers none

Description Allan Day 2022-03-07 09:50:51 UTC
Dark mode is going to be one of the headline features in Fedora 36. This feature is able to change the background depending on whether dark mode is enabled, but this requires that each background be supplied with both a light and a dark mode variant.

In order to provide these, we've  agreed to use a mix of Fedora and GNOME backgrounds for F36 (6 of each). The GNOME backgrounds to include are:

 * adwaita
 * blobs
 * brush-strokes
 * drool
 * libadwaita
 * truchet

Note that we're going to have to include an XML file for each of these to show up correctly.

Presumably the rest of the gnome-backgrounds should continue to be split out into gnome-backgrounds-extras.

Comment 1 Fedora Update System 2022-03-10 16:31:22 UTC
FEDORA-2022-21d81706cd has been submitted as an update to Fedora 36. https://bodhi.fedoraproject.org/updates/FEDORA-2022-21d81706cd

Comment 2 Máirín Duffy 2022-03-11 03:09:16 UTC
The 6 Fedora wallpapers are: 
- calm
- cherryblossom
- corn
- dandelion
- winter-in-bohemia
- zen

The dark versions are here:
https://pagure.io/design/issue/809#comment-784984

Comment 3 Allan Day 2022-03-11 14:00:33 UTC
Jakub has kindly split up the gnome-backgrounds XML - https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/commit/f7af2d2377ea6db6b249d6fabe42b9863315ed00

My understanding for what needs doing to resolve this issue, therefore:

 - Get those gnome-background changes into Fedora
 - Change the gnome-backgrounds package to include the 6 backgrounds I listed above, along with their XML files. The others should go into gnome-backgrounds-extras.
 - In fedora-workstation-backgrounds:
   - Remove all the backgrounds except for the 6 Máirín listed above
   - Add the dark variants of the remaining 6
   - Add the necessary XML files for the remaining 6

The thing I'm still yet to figure out is how to make sure that the GNOME and Fedora backgrounds are grouped together in the Settings UI.

Comment 4 Fedora Update System 2022-03-11 19:23:26 UTC
FEDORA-2022-21d81706cd has been pushed to the Fedora 36 testing repository.
Soon you'll be able to install the update with the following command:
`sudo dnf upgrade --enablerepo=updates-testing --advisory=FEDORA-2022-21d81706cd`
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2022-21d81706cd

See also https://fedoraproject.org/wiki/QA:Updates_Testing for more information on how to test updates.

Comment 5 Fedora Update System 2022-03-14 21:00:47 UTC
FEDORA-2022-21d81706cd has been pushed to the Fedora 36 stable repository.
If problem still persists, please make note of it in this bug report.

Comment 6 Máirín Duffy 2022-03-18 13:44:01 UTC
Why is this bug closed if half the wallpapers are missing? Can we reopen it?

Comment 7 Máirín Duffy 2022-03-18 14:07:42 UTC
I am going to reopen this so I can file for a freeze exception for F36 beta - that requires having a blocker bug IIUC.

Comment 8 Máirín Duffy 2022-03-18 14:37:09 UTC
I want to summarize the situation here:

- TLDR; the 6 Fedora dark mode default extra wallpapers (beyond the main default wallpaper) are not packaged and need to be before the F36 beta freeze on Tuesday Mar 22. We need more time to get this ready.

More detail:

- Allan and I spoke about three weeks ago about having dark mode default wallpapers in F36 to help highlight this important new feature. Because it was short notice, we agreed it made the most sense to take 6 of the upstream GNOME ones with dark mode versions and 6 of the Fedora ones and I would create dark mode versions for them. The Fedora design team ticket for this including the dark mode versions is here: https://pagure.io/design/issue/809

- The 6 Fedora wallpapers are selected from https://src.fedoraproject.org/rpms/fedora-workstation-backgrounds. I do not know how to get the dark mode versions into this repo and get that packaged. It looks like that repo pulls from https://github.com/fedoradesign/backgrounds. So I think the dark wallpapers need to be submitted there, and potentially the XML to set up the dark mode functionality for them as well should probably go there.

- We do not have XML for the 6 Fedora wallpapers for the dark mode. I do not know if that can be a separate Fedora wallpaper specific XML file that would live aside the one for the 6 GNOME wallpapers, or if they all need to be in the same file. But the XML has to be written and put wherever it needs to live. (Requiring just one XML might be a problem if the wallpapers are from two separate packages maybe??) It looks like each GNOME wallpaper individually has its own XML file here, I don't know if there's some overall XML that includes all somewhere too? https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/tree/main/backgrounds

- Once the wallpapers are added to https://github.com/fedoradesign/backgrounds, a release should be made, and then they should be packaged and a new version of this package built: https://src.fedoraproject.org/rpms/fedora-workstation-backgrounds

- I do not know how to package the Fedora wallpapers such that only the 6 + their 6 dark variants land in the F36 beta package without the rest of the files there, without deleting them from the upstream which I don't think we want to do. I do not know what logistics need to happen there. But the wallpapers that aren't used shouldn't be taking up space in the F36 package nor should they be displayed in the wallpaper selection dialog. (Maybe the spec file can be used to exclude those outside the set of 6?)

- We wanted the 6 Fedora wallpapers and the 6 GNOME wallpapers to appear as a single set in the background chooser.

We need help :( This is what I see needing to be done and that we need help with:

- Generate an XML file for the dark mode versions of the Fedora wallpapers? I think the format follows the xml.in files in this directory: https://gitlab.gnome.org/GNOME/gnome-backgrounds/-/tree/main/backgrounds
- Figure out where that XML file has to live and get it there? (maybe in https://github.com/fedoradesign/backgrounds?)
- Figure out if it's ok if that XML file is separate from the GNOME one? Figure out how to get that XML included by default so those wallpapers show up in the background chooser? 

After that is figured out:
- Getting the dark mode wallpapers and their XML here https://pagure.io/design/issue/809#comment-784984 into the repo here https://github.com/fedoradesign/backgrounds? 
- Make a new "upstream" release of https://github.com/fedoradesign/backgrounds?
- Do a new build of https://src.fedoraproject.org/rpms/fedora-workstation-backgrounds

Comment 9 Matthew Miller 2022-03-18 15:42:54 UTC
Does this need a FE or is it okay as a beta "zero day"?

Comment 10 Máirín Duffy 2022-03-18 17:03:27 UTC
Ray took a look at control center and how this is set up, he said that it appears to support multiple XML files so we don't need to merge all the wallpapers into one XML file. We can just use the same xml the fedora-workstation-backgrounds package ships and installs to /usr/share/gnome-background-properties/fedora-workstation-backgrounds.xml, and add a <file-dark> </file-dark> item to each wallpaper to point at the dark version of each wallpaper. I will attach a version I made of the fedora-workstation-backgrounds.xml here that removes all but the 6 wallpapers we selected and adds the file-dark to them. I used the same filename as the normal wallpapers and appended a "_dark" to the base filename so for example


<name>Zen</name>
        <filename>/usr/share/backgrounds/fedora-workstation/zen.jpg</filename>
        <filename-dark>/usr/share/backgrounds/fedora-workstation/zen_dark.jpg</filename-dark>

I will also attach a version that has *all* of the wallpapers, and just the 6 that we wanted displayed have the dark variants added in the xml.

I'll try to create split ones too, one per wallpaper, in case that makes the packaging easier.

Comment 13 Máirín Duffy 2022-03-18 17:17:04 UTC
Created attachment 1866651 [details]
This is a tarball of individual XML files, one per Fedora wallpaper, including the non dark mode wallpapers

Providing this in case it is a better option / alternative for packaging

Comment 14 Matthew Miller 2022-03-21 14:25:33 UTC
Just for the record, the freeze isn't tomorrow because we're already in freeze. But it would be nice if we can get this in as a freeze exception so it can be more easily tested in the beta (and appear on the live).

Comment 15 Allan Day 2022-03-21 17:01:06 UTC
This issue has got a bit confused. Sorry about that - it's my fault. The original issue was to add additional wallpapers to gnome-backgrounds, which happened with this commit:

https://src.fedoraproject.org/rpms/gnome-backgrounds/c/22f6b8f8d9eaa9856626ba2ebc753634fb3e9f54?branch=rawhide

The task of adding the dark style variants to fedora-workstation-backgrounds should probably be tracked be a separate ticket, filed against the correct package.

Comment 16 Fedora Update System 2022-03-21 21:58:57 UTC
FEDORA-2022-2cf1f4ee20 has been submitted as an update to Fedora 36. https://bodhi.fedoraproject.org/updates/FEDORA-2022-2cf1f4ee20

Comment 17 Fedora Update System 2022-03-22 17:54:45 UTC
FEDORA-2022-2cf1f4ee20 has been pushed to the Fedora 36 testing repository.
Soon you'll be able to install the update with the following command:
`sudo dnf upgrade --enablerepo=updates-testing --advisory=FEDORA-2022-2cf1f4ee20`
You can provide feedback for this update here: https://bodhi.fedoraproject.org/updates/FEDORA-2022-2cf1f4ee20

See also https://fedoraproject.org/wiki/QA:Updates_Testing for more information on how to test updates.

Comment 18 Fedora Update System 2022-03-26 15:28:42 UTC
FEDORA-2022-2cf1f4ee20 has been pushed to the Fedora 36 stable repository.
If problem still persists, please make note of it in this bug report.

Comment 19 Kalev Lember 2022-08-14 09:55:48 UTC
Removing old needinfo (I was on a sabbatical).