search

flathub / eu.betterbird.Betterbird

https://flathub.org/apps/details/eu.betterbird.Betterbird
9 stars 1 forks source link

Multiple things wrong here #1

Closed Betterbird closed 2 years ago

Betterbird commented 2 years ago
  1. Weren't eu.betterbird.Betterbird.appdata.xml and eu.betterbird.Betterbird.desktop going to be removed (or at least refreshed from https://github.com/Betterbird/thunderbird-patches/tree/main/metadata? The version number is wrong in the XML file.
  2. The screenshots are out of date, see https://github.com/Betterbird/thunderbird-patches/tree/main/metadata
hfiguiere commented 2 years ago

It failed to build anyway https://buildbot.flathub.org/#/builders/32/builds/106974

hfiguiere commented 2 years ago

There is no .desktop file or appdata file in the binary tarball, so no change here.

Betterbird commented 2 years ago

Sorry for the ignorance, but allow me some questions: We have two copies of the appdata XML and desktop files, here and in the Betterbird repo. Is that intentional? So for new releases, the version needs to be changed in two places? Or can one copy be deleted now?

hfiguiere commented 2 years ago

Sorry for the ignorance, but allow me some questions: We have two copies of the appdata XML and desktop files,

That's because you don't ship them in the tarball so they can't be found. Getting them form your repo separatly is a possiblity but I didn't bother I was here to fix the failed build. And just resynched at the same time.

What you should do is SHIP and INSTALL the files in the proper location part of your improvement over Thunderbird so that these repo only contain the manifest.

We do prefer everything (but the manifest managed upstream) just that it is not right now.

Betterbird commented 2 years ago

Sorry, all this is beyond me. We spend our time making a better version of TB, so I really don't know how to implement what you're suggesting. I don't even understand what "manifest" refers to. There is a .json and a .xml.

I really don't want to update two .xml's with each release :-(

Can someone please "do the right thing"(TM) and let us know which file to update in the future. @mfschumann kindly created this flatpak, but that can't mean committing us to updating more than one file. For example, the ARCH packages are maintained by @Posi81 and that's no additional work for us.

hfiguiere commented 2 years ago

Here the expectation is that @mfschumann maintain this here. AUR don't care about the appdata file. Howerver they ship their own .desktop file.

mfschumann commented 2 years ago

I have been working on a separate branch trying to build from source. On that branch I have updated the screenshots. I will merge the update here.

Regarding responsibilities for maintaining stuff I suggest the following:

@Betterbird Is that ok with you?

On the branch building Betterbird from source I am already using .desktop and .appdata.xml from upstream, so there is no two copies anymore. I don't think we need to port this fix to the main branch, because I'm optimistic we can switch to building from source soon.

Betterbird commented 2 years ago

Hmm, the screenshot just got deleted in https://github.com/flathub/eu.betterbird.Betterbird/commit/658f8bedea004125982939dc6225c8e47672a65f.

As for "You maintain the .appdata.xml, meaning that you update the version number on every release." --> In which repo, this one or mine? Looking at "I am already using .desktop and .appdata.xml from upstream", I conclude that you want me to update the version in my (the upstream copy)? I'm fine with that.

mfschumann commented 2 years ago

Don't worry about the deleted screenshots - we are taking the ones right from your Betterbird repo, so there is no need to save a copy here.

As for "You maintain the .appdata.xml, meaning that you update the version number on every release." --> In which repo, this one or mine?

I meant your repo Betterbird/thunderbird-patches. Thanks a lot for keeping that file up to date.

Betterbird commented 2 years ago

I'm not worried about the screenshots. But if they were deleted here and (quote) "on that branch I have updated the screenshots" you will get a conflict. I don't want a copy to return here.

I meant your repo Betterbird/thunderbird-patches. Thanks a lot for keeping that file up to date. --> No problem.

hfiguiere commented 2 years ago

Hmm, the screenshot just got deleted in 658f8be.

As my last commit, that actually fixed the build, said, I synced the appdata from your version, because this is a change that was easy and worth it, since this was a requested change that didn't get done before the merge. That mean the sceenshot were no longer needed and it's better like that.

Note that missing screenshot is a fatal build error, so it wasn't "just done".