#1069 Replace gedit with gnome-text-editor for Silverblue
Merged 2 years ago by kevin. Opened 2 years ago by adamwill.
adamwill/pungi-fedora silverblue-gte  into  main

file modified
+2 -2
@@ -786,7 +786,7 @@ 

                  # using registry-no-cdn avoids redirects to the CDN;

                  # needed because of network restrictions on koji runroot

                  "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",

-                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f35 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.gedit/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",

+                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/x86_64/f35 app/org.gnome.baobab/x86_64/stable app/org.gnome.Calculator/x86_64/stable app/org.gnome.Calendar/x86_64/stable app/org.gnome.Characters/x86_64/stable app/org.gnome.clocks/x86_64/stable app/org.gnome.Connections/x86_64/stable app/org.gnome.Contacts/x86_64/stable app/org.gnome.eog/x86_64/stable app/org.gnome.Evince/x86_64/stable app/org.gnome.Extensions/x86_64/stable app/org.gnome.font-viewer/x86_64/stable app/org.gnome.TextEditor/x86_64/stable app/org.gnome.Logs/x86_64/stable app/org.gnome.Maps/x86_64/stable app/org.fedoraproject.MediaWriter/x86_64/stable app/org.gnome.NautilusPreviewer/x86_64/stable app/org.gnome.Screenshot/x86_64/stable app/org.gnome.Weather/x86_64/stable",

              ],

              'template_repo': 'https://pagure.io/fedora-lorax-templates.git',

              'template_branch': 'main',
@@ -838,7 +838,7 @@ 

                  # using registry-no-cdn avoids redirects to the CDN;

                  # needed because of network restrictions on koji runroot

                  "flatpak_remote_url=oci+https://registry-no-cdn.fedoraproject.org",

-                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f35 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.gedit/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Screenshot/aarch64/stable app/org.gnome.Weather/aarch64/stable",

+                 "flatpak_remote_refs=runtime/org.fedoraproject.Platform/aarch64/f35 app/org.gnome.baobab/aarch64/stable app/org.gnome.Calculator/aarch64/stable app/org.gnome.Calendar/aarch64/stable app/org.gnome.Characters/aarch64/stable app/org.gnome.clocks/aarch64/stable app/org.gnome.Connections/aarch64/stable app/org.gnome.Contacts/aarch64/stable app/org.gnome.eog/aarch64/stable app/org.gnome.Evince/aarch64/stable app/org.gnome.Extensions/aarch64/stable app/org.gnome.font-viewer/aarch64/stable app/org.gnome.TextEditor/aarch64/stable app/org.gnome.Logs/aarch64/stable app/org.gnome.Maps/aarch64/stable app/org.fedoraproject.MediaWriter/aarch64/stable app/org.gnome.NautilusPreviewer/aarch64/stable app/org.gnome.Screenshot/aarch64/stable app/org.gnome.Weather/aarch64/stable",

              ],

              'template_repo': 'https://pagure.io/fedora-lorax-templates.git',

              'template_branch': 'main',

This has been done in Workstation, but not yet in Silverblue.
This commit is a great example of why putting lots of items in
a single line of text is a bad idea!

Signed-off-by: Adam Williamson awilliam@redhat.com

This has been done in Workstation, but not yet in Silverblue.

Thanks, this was on my TODO, but we were waiting on https://bodhi.fedoraproject.org/updates/FEDORA-FLATPAK-2022-8dbf809fe5 to be pushed to stable (as I don't think that the installation will work with stuff from testing and not stable)..

Oh, thanks, didn't realize it was still waiting. I agree to wait on merging this then, it probably wouldn't work.

rebased onto 9d4368b

2 years ago

The update has been pushed stable, so this can be merged now.

@humaton can you please merge this? Thank you in advance :)

I'm not him, but I'll merge it. ;)

Pull-Request has been merged by kevin

2 years ago

Thanks! can you also re-apply it to F36 branch? It got merged too early then reverted there.

reverted the revert.

Metadata