Control: tags -1 pending

Hi Ángel, hello Михаил,

Am 06.01.22 um 20:07 schrieb Ángel:
This patch was changed on 30d1d481:

https://salsa.debian.org/mozilla-team/thunderbird/-/commit/30d1d481403f6fadd363da6796839582fa4750e0#533b8cf491d78f20026b4b74e666a86d89407ab8

On thunderbird 78 toolkit/xre/nsXREDirProvider.cpp had no
MOZ_BACKGROUNDTASKS blocks, and it wasn't an issue.
(note that looking just at the patch is slightly misleading, since it
shows a #ifdef and a #endif which are not paired)

Both patches apply to nsXREDirProvider::GetFilesInternal() but after
30d1d481 the LoadDirIntoArray(mXULAppDir, kAppendSysPrefDir...) appears
inside the MOZ_BACKGROUNDTASKS.
The patch by Михаил seems the right way to solve it, by moving that
line just above #ifdef MOZ_BACKGROUNDTASKS.

The patch itself is not consistent since, even if MOZ_BACKGROUNDTASKS
was defined, kAppendSysPrefDir is only used if MOZ_BACKGROUNDTASKS  but
declared always (I expect this would cause a compiler warning).

the analysis from both from you is correct, thanks for figuring out this!
I've compared the used patch with the one from firefox and they differ slightly.

https://salsa.debian.org/mozilla-team/thunderbird/-/blob/debian/sid/debian/patches/debian-hacks/Add-another-preferences-directory-for-applications-p.patch

https://salsa.debian.org/mozilla-team/firefox/-/commit/286df5563f1c52e56c44918da01643add87fb3c6?view=inline

The wrong adjustment of patch was obviously happen while the the first pre version for TB 91 was merged in. As mostly only a small amount of people do using experimental to test newer package versions nobody detected this problem early.

I've adjusted the patch in question locally, but need to do some more testing before pushing to the tree.

--
Regards
Carsten

Reply via email to