Re: [Lazarus] Request for merge to 2.0

2020-11-03 Thread Martok via lazarus
> There was an attempt to merge it to 2.0.10 but conflicts prevented it. I did > not > study deeply how to solve them. > There will be no more patch releases for 2.0.x series. The next release will > be 2.2. Ah, right, well that also solves the issue :-) > For now I would recommend Lazarus trun

Re: [Lazarus] Request for merge to 2.0

2020-11-03 Thread Juha Manninen via lazarus
On Tue, Nov 3, 2020 at 6:02 PM Martok via lazarus < lazarus@lists.lazarus-ide.org> wrote: > may I ask to merge rev 62042 into fixes_2_0 for the next patch release? > There was an attempt to merge it to 2.0.10 but conflicts prevented it. I did not study deeply how to solve them. There will be no m

[Lazarus] Request for merge to 2.0

2020-11-03 Thread Martok via lazarus
Dear maintainers, may I ask to merge rev 62042 into fixes_2_0 for the next patch release? This change from 2019 fixed building Lazarus with sparta_DockedFormEditor (see #34899), which is still broken in 2.0.10. Juha mentioned in #37968 that the sparta_Generics package will go away once 3.2 is th

[Lazarus] Request for merge to 2.0

2020-11-03 Thread Martok via lazarus
Dear maintainers, may I ask to merge rev 62042 into fixes_2_0 for the next patch release? This change from 2019 fixed building Lazarus with sparta_DockedFormEditor (see #34899), which is still broken in 2.0.10. Juha mentioned in #37968 that the sparta_Generics package will go away once 3.2 is th