Created attachment 361156 [details] [review]
Rename the icons, appdata and desktop files

This is good practice, and it helps a lot with Flatpak.

Created attachment 361157 [details] [review]
flatpak: Add a manifest to build d-feet master

Once this is in, I'm happy to setup the gnome-apps-nightly stuff so that d-feet gets built automatically. :)

https://git.gnome.org//browse/gnome-apps-nightly

Hi, is there anything I can do to get this reviewed/merged faster?

Hm. I applied the patches and tried to build a flatpak but it failed with:

$ flatpak-builder foo org.gnome.d-feet.json
[...]
Rewriting contents of org.gnome.d-feet.desktop
Error: Can't load desktop file /home/tom/devel/gnome/src/d-feet/.flatpak-builder/rofiles/rofiles-5laQWi/files/share/applications/org.gnome.d-feet.desktop: Error opening file /home/tom/devel/gnome/src/d-feet/.flatpak-builder/rofiles/rofiles-5laQWi/files/share/applications/org.gnome.d-feet.desktop: No such file or directory

I assume you only applied the patches locally but didn't push them?

If so, that's normal.

The first patch renames the desktop file from d-feet.desktop to org.gnome.d-feet.desktop.

But the second patch adds the Flatpak manifest which points to:

            "sources": [
                {
                    "type": "git",
                    "url": "https://git.gnome.org/browse/d-feet"
                }
            ]

So if you didn't push the patches, then the .desktop file hasn't been renamed upstream. :)

If you want to test without pushing, simply replace the url in the Flatpak manifest by a file:// url pointing to the local clone where you applied the patches.

Alternatively, we could push those patches to a branch, then you can use:

            "sources": [
                {
                    "type": "git",
                    "url": "https://git.gnome.org/browse/d-feet",
                    "branch": "the-branch-you-pushed-to"
                }
            ]

I'm attaching new versions of the patches, rebased on the latest master.

Created attachment 364363 [details] [review]
Rename the icons, appdata and desktop files

This is good practice, and it helps a lot with Flatpak.

Created attachment 364364 [details] [review]
flatpak: Add a manifest to build d-feet master

Created attachment 364365 [details] [review]
Rename the icons, appdata and desktop files

This is good practice, and it helps a lot with Flatpak.

Created attachment 364366 [details] [review]
flatpak: Add a manifest to build d-feet master

And I just found two small issues with the first patch, which I now fixed. Sorry for all the mails. :)

Applied and pushed. Thanks Mathieu!

FYI I added d-feet to the gnome-apps-nightly repository:

  https://git.gnome.org/browse/gnome-apps-nightly/commit/?id=d72098e7adee2af009b0cf43f14a15f294ba4377

It built successfully:

  http://sdkbuilder.gnome.org/logs/build-2017-11-25-185003/build-gnome-apps-nightly-master-org.gnome.d-feet-i386.txt
  http://sdkbuilder.gnome.org/logs/build-2017-11-25-190003/build-gnome-apps-nightly-master-org.gnome.d-feet-x86_64.txt

So it should soon land in the nightly repo, and be installable with:

  $ flatpak remote-add --if-not-exists gnome-nightly https://sdk.gnome.org/gnome-nightly.flatpakrepo
  $ flatpak remote-add --if-not-exists gnome-apps-nightly https://sdk.gnome.org/gnome-apps-nightly.flatpakrepo
  $ flatpak install gnome-apps-nightly org.gnome.d-feet