Re: kf6 vs. kf5 conflict report
On Mon, Mar 20, 2023 at 6:21 PM Luigi Toscano wrote: > > Harald Sitter ha scritto: > > Salut, > > > > Conflict reports are now available form neon ci and can be triggered > > by yourself. They are usually lagging a day behind as automatic binary > > builds only occur once a day. > > > > Notable changes from last time are that ECM is skipped as a whole and > > locale conflicts have been resolved. Much smaller file now :) > > > > https://build.neon.kde.org/view/testy/job/test_kf6_deconflictor/ > > That's useful, thanks. > > Now, not all translation conflicts have been solved yet, but I don't see any > in the report. Is that wanted? Good catch, a bug snuck in when I moved this to the CI. It should be correctly tracking l10n again now. HS
Re: kf6 vs. kf5 conflict report
Harald Sitter ha scritto: > Salut, > > Conflict reports are now available form neon ci and can be triggered > by yourself. They are usually lagging a day behind as automatic binary > builds only occur once a day. > > Notable changes from last time are that ECM is skipped as a whole and > locale conflicts have been resolved. Much smaller file now :) > > https://build.neon.kde.org/view/testy/job/test_kf6_deconflictor/ That's useful, thanks. Now, not all translation conflicts have been solved yet, but I don't see any in the report. Is that wanted? Ciao -- Luigi
Re: kf6 vs. kf5 conflict report
Salut, Conflict reports are now available form neon ci and can be triggered by yourself. They are usually lagging a day behind as automatic binary builds only occur once a day. Notable changes from last time are that ECM is skipped as a whole and locale conflicts have been resolved. Much smaller file now :) https://build.neon.kde.org/view/testy/job/test_kf6_deconflictor/ HS
Re: kf6 vs. kf5 conflict report
Also from kxmlgui is a clash /etc/xdg/ui/ui_standards.rc Jonathan
Re: kf6 vs. kf5 conflict report
On Freitag, 10. März 2023 09:41:04 CET Ben Cooksley wrote: > On Thu, Mar 9, 2023 at 4:56 AM Aleix Pol wrote: > > On Wed, Mar 8, 2023 at 3:13 PM Nicolas Fella wrote: > > > On 3/8/23 14:02, Harald Sitter wrote: > > > > with kf6 progressing nicely here's a first conflict report of files > > > > that appear in both kf6 and kf5 under the same name. this largely > > > > affects translations and docs it seems. this list may not be entirely > > > > comprehensive, I've only thrown together a script in a couple minutes. > > > > > > Thanks Harald! > > > > > > > one question is whether ECM should be co-installable, not sure if that > > > > has been discussed > > > > > > It has come up, and the answer seems to be "No, it will not be > > > coinstallable". This implies that ECM master will continue to support > > > Qt5/KF5, but that should not be a huge burden. > > From my perspective this has been incredibly poorly communicated to the > point that it is not an actual valid decision. This isn't really a new decision, this goes back to ECM's original design in early KF5 times, and is due to ECM being largely independent of any major Qt version. It therefore never had a major version in its install path. > It is also not what was set in the branch-rules.yml files within the > metadata (which was committed by a Frameworks devel) and was not what was > confirmed by Frameworks developers when I put together the list of projects > to have KF5 master branch builds removed from the CI artifacts store. > > This state of affairs has been the source of a degree of CI breakage we > have been experiencing (things are a mess at the moment, I don't even want > to look at any of it) ECM having a kf5 branch was done precisely to avoid having to special-case it even more in the CI setup and the release automation. Yes this is messy, but the alternative was assumed to be even worse. Regards, Volker > > > > report for /usr: > > > > https://collaborate.kde.org/s/3gz2KfoGLsS4TF5 > > > > > > > > furthermore the following files outside /usr clash between kf6 and 5: > > > > '/etc/xdg/accept-languages.codes' > > > > '/etc/xdg/kshorturifilterrc' > > > > '/etc/xdg/autostart/baloo_file.desktop' > > > > '/lib/udev/rules.d/61-kde-bluetooth-rfkill.rules' > > > > > > > > HS > > > > If ECM master has to support KF5, why do we have a kf5 branch? In > > fact, I'm pretty sure I switched it eventually because there were > > regressions. > > > > Aleix > > Regards, > Ben signature.asc Description: This is a digitally signed message part.
Re: kf6 vs. kf5 conflict report
On Thu, Mar 9, 2023 at 4:56 AM Aleix Pol wrote: > On Wed, Mar 8, 2023 at 3:13 PM Nicolas Fella wrote: > > > > On 3/8/23 14:02, Harald Sitter wrote: > > > with kf6 progressing nicely here's a first conflict report of files > > > that appear in both kf6 and kf5 under the same name. this largely > > > affects translations and docs it seems. this list may not be entirely > > > comprehensive, I've only thrown together a script in a couple minutes. > > > > Thanks Harald! > > > > > one question is whether ECM should be co-installable, not sure if that > > > has been discussed > > > > It has come up, and the answer seems to be "No, it will not be > > coinstallable". This implies that ECM master will continue to support > > Qt5/KF5, but that should not be a huge burden. > >From my perspective this has been incredibly poorly communicated to the point that it is not an actual valid decision. It is also not what was set in the branch-rules.yml files within the metadata (which was committed by a Frameworks devel) and was not what was confirmed by Frameworks developers when I put together the list of projects to have KF5 master branch builds removed from the CI artifacts store. This state of affairs has been the source of a degree of CI breakage we have been experiencing (things are a mess at the moment, I don't even want to look at any of it) > > > > > report for /usr: > > > https://collaborate.kde.org/s/3gz2KfoGLsS4TF5 > > > > > > furthermore the following files outside /usr clash between kf6 and 5: > > > '/etc/xdg/accept-languages.codes' > > > '/etc/xdg/kshorturifilterrc' > > > '/etc/xdg/autostart/baloo_file.desktop' > > > '/lib/udev/rules.d/61-kde-bluetooth-rfkill.rules' > > > > > > HS > > If ECM master has to support KF5, why do we have a kf5 branch? In > fact, I'm pretty sure I switched it eventually because there were > regressions. > > Aleix > Regards, Ben
Re: kf6 vs. kf5 conflict report
On Wed, Mar 8, 2023 at 3:13 PM Nicolas Fella wrote: > > On 3/8/23 14:02, Harald Sitter wrote: > > with kf6 progressing nicely here's a first conflict report of files > > that appear in both kf6 and kf5 under the same name. this largely > > affects translations and docs it seems. this list may not be entirely > > comprehensive, I've only thrown together a script in a couple minutes. > > Thanks Harald! > > > one question is whether ECM should be co-installable, not sure if that > > has been discussed > > It has come up, and the answer seems to be "No, it will not be > coinstallable". This implies that ECM master will continue to support > Qt5/KF5, but that should not be a huge burden. > > > report for /usr: > > https://collaborate.kde.org/s/3gz2KfoGLsS4TF5 > > > > furthermore the following files outside /usr clash between kf6 and 5: > > '/etc/xdg/accept-languages.codes' > > '/etc/xdg/kshorturifilterrc' > > '/etc/xdg/autostart/baloo_file.desktop' > > '/lib/udev/rules.d/61-kde-bluetooth-rfkill.rules' > > > > HS If ECM master has to support KF5, why do we have a kf5 branch? In fact, I'm pretty sure I switched it eventually because there were regressions. Aleix
Re: kf6 vs. kf5 conflict report
On 3/8/23 14:02, Harald Sitter wrote: with kf6 progressing nicely here's a first conflict report of files that appear in both kf6 and kf5 under the same name. this largely affects translations and docs it seems. this list may not be entirely comprehensive, I've only thrown together a script in a couple minutes. Thanks Harald! one question is whether ECM should be co-installable, not sure if that has been discussed It has come up, and the answer seems to be "No, it will not be coinstallable". This implies that ECM master will continue to support Qt5/KF5, but that should not be a huge burden. report for /usr: https://collaborate.kde.org/s/3gz2KfoGLsS4TF5 furthermore the following files outside /usr clash between kf6 and 5: '/etc/xdg/accept-languages.codes' '/etc/xdg/kshorturifilterrc' '/etc/xdg/autostart/baloo_file.desktop' '/lib/udev/rules.d/61-kde-bluetooth-rfkill.rules' HS
kf6 vs. kf5 conflict report
with kf6 progressing nicely here's a first conflict report of files that appear in both kf6 and kf5 under the same name. this largely affects translations and docs it seems. this list may not be entirely comprehensive, I've only thrown together a script in a couple minutes. one question is whether ECM should be co-installable, not sure if that has been discussed report for /usr: https://collaborate.kde.org/s/3gz2KfoGLsS4TF5 furthermore the following files outside /usr clash between kf6 and 5: '/etc/xdg/accept-languages.codes' '/etc/xdg/kshorturifilterrc' '/etc/xdg/autostart/baloo_file.desktop' '/lib/udev/rules.d/61-kde-bluetooth-rfkill.rules' HS
