Re: kf6 vs. kf5 conflict report

2023-03-08 Thread Aleix Pol
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

2023-03-08 Thread Nicolas Fella

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


Achieving translations coinstallability for KF6

2023-03-08 Thread Luigi Toscano
(I had this ready from yesterday and then I've seen Harald's email which
touches the topic, so it's time to go)

Hi,

the extraction of translations for the Qt6-based branches has been stable for
a few days now.

Now it's probably time to to address the co-installability of KF5 and KF6
translations, which means replacing 5 with 6 in the names of the translation
catalogs.

I would like for this renaming to happen in a coordinate way, so that we
(transalation coordinators) can rename the existing translation files at the
right time after the renaming, and without having to process just (say) one
translation catalog a day and drag this task forever.

My idea is to send batches of merge requests which, for a certain repository,
change a translation catalog, both its usage and its generation. When a
certain amount of MRs passes the pipeline, merge them and work on renaming the
catalogs at the same time.
The amount of rename MR opened at the same time is most likely going to be
linked to the time slot I can allocate from time to time.
Should you need to expedite the renaming of a specific translation catalog,
that would still be possible with a bit of coordination, as it usually
happened so far with catalog renaming.

Do you think it could be acceptable, or do you have want to move differently?

Ciao
-- 
Luigi


kf6 vs. kf5 conflict report

2023-03-08 Thread Harald Sitter
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