[bug#70766] Request to merge "gnome-team" branch

[bug#70766] Request to merge "gnome-team" branch

[Liliana Marie Prikler]

Hi Guix,

gnome-team currently has some important updates to gtk and webkitgtk
that I'd like to see on master.  Unfortunately, CI has yet to rebuild
some Java stuff that is ultimately needed by the gnome metapackage.  In
the meantime, I'd like y'all to try out some smaller packages –
substitutes for all webkit variants are available.

Cheers

[bug#70766] Request for merging "gnome-team" branch

[Liliana Marie Prikler]

retitle 70766 Request for merging "gnome-team" branch
thanks

Am Samstag, dem 04.05.2024 um 08:41 +0200 schrieb Liliana Marie
Prikler:
> Hi Guix,
> 
> gnome-team currently has some important updates to gtk and webkitgtk
> that I'd like to see on master.  Unfortunately, CI has yet to rebuild
> some Java stuff that is ultimately needed by the gnome metapackage.
I locally built gnome and it builds fine; I haven't tested it yet,
however.

Cheers

[bug#70766] Request for merging "gnome-team" branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1258 bytes --]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Samstag, dem 04.05.2024 um 08:41 +0200 schrieb Liliana Marie
> Prikler:
>> Hi Guix,
>>
>> gnome-team currently has some important updates to gtk and webkitgtk
>> that I'd like to see on master.  Unfortunately, CI has yet to rebuild
>> some Java stuff that is ultimately needed by the gnome metapackage.
>
> I locally built gnome and it builds fine; I haven't tested it yet,
> however.

Sounds good, there is the open merge request for core-updates, but I
think it's sensible to not block these changes until after core-updates
is dealt with as I think that is realistically still several weeks away
at least. If anyone thinks differently, we can wait instead, but I'll
mark the request to merge core-updates as being blocked by this issue to
signal this.

This might be getting ahead of ourselves as well, but would you be able
to rebase the branch, ideally on the most recently processed master
commit here [1], as that'll enable QA to work out what has changed on
the branch. This should also get rid of the merge commit on the
gnome-team branch, which I think is something to avoid.

1: https://data.qa.guix.gnu.org/repository/2/branch/master

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70766] Request to merge "gnome-team" branch

[Christopher Baines]

Looks like there's some single test failure affecting qtbase. This might
not be because of the changes of this branch, it might just be a flaky
test.


406/507 Test #389: tst_qsqlthread ........................................***Failed   12.82 sec
********* Start testing of tst_QSqlThread *********
Config: Using QtTest library 6.6.3, Qt 6.6.3 (x86_64-little_endian-lp64 shared (dynamic) release build; by GCC 11.3.0), unknown unknown
QINFO  : tst_QSqlThread::initTestCase() SQLite will use the database located at /tmp/guix-build-qtbase-6.6.3.drv-0/tst_qsqlthread-KyeuJe/sqlite.db
QDEBUG : tst_QSqlThread::initTestCase() Opening: "SQLite"
PASS   : tst_QSqlThread::initTestCase()
QDEBUG : tst_QSqlThread::simpleThreading(SQLite) Thread finished, total finished: 1
QDEBUG : tst_QSqlThread::simpleThreading(SQLite) Thread finished, total finished: 2
PASS   : tst_QSqlThread::simpleThreading(SQLite)
FAIL!  : tst_QSqlThread::readWriteThreading(SQLite) '(q2).exec()' returned FALSE. (QSQLITE@: (5) 'Unable to fetch row' || 'database is locked')
   Loc: [/tmp/guix-build-qtbase-6.6.3.drv-0/qtbase-everywhere-src-6.6.3/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp(157)]
QDEBUG : tst_QSqlThread::readWriteThreading(SQLite) Thread finished, total finished: 1
FAIL!  : tst_QSqlThread::readWriteThreading(SQLite) 'threadFinishedCount >= 2' returned FALSE. ()
   Loc: [/tmp/guix-build-qtbase-6.6.3.drv-0/qtbase-everywhere-src-6.6.3/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp(376)]
QFATAL : tst_QSqlThread::readWriteThreading(SQLite) QThread: Destroyed while thread is still running
FAIL!  : tst_QSqlThread::readWriteThreading(SQLite) Received a fatal error.
Totals: 2 passed, 1 failed, 0 skipped, 0 blacklisted, 10561ms
********* Finished testing of tst_QSqlThread *********
Received signal 6 (SIGABRT)
         readWriteThreading function time: 5048ms, total time: 10561ms
CMake Error at tst_qsqlthreadWrapperRelWithDebInfo.cmake:18 (message):
  
  /tmp/guix-build-qtbase-6.6.3.drv-0/build/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread
  execution failed with exit code Subprocess aborted.

[bug#70766] Request to merge "gnome-team" branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

I'm looking again at the blocked packages, there looks to be a flaky
test in python-scikit-image so I've sent a patch to disable it (#70997).

gtk is failing to build on aarch64-linux which is blocking lots of
packages, and the failure looks familiar but I haven't made any progress
looking at it.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70766] Request to merge "gnome-team" branch

[Liliana Marie Prikler]

Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher Baines:
> gtk is failing to build on aarch64-linux which is blocking lots of
> packages, and the failure looks familiar but I haven't made any
> progress looking at it.
That looks like trouble.  I've fixed up some breaking builds on x86,
but I think we might have to block the merge for now if aarch can't be
fixed.

Feel free to prioritize the other pending merges if that makes more
sense.

Cheers

[bug#70766] Request to merge "gnome-team" branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 567 bytes --]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher Baines:
>> gtk is failing to build on aarch64-linux which is blocking lots of
>> packages, and the failure looks familiar but I haven't made any
>> progress looking at it.
>
> That looks like trouble.  I've fixed up some breaking builds on x86,
> but I think we might have to block the merge for now if aarch can't be
> fixed.

I've now pushed 36e49999227e4f621c211ed5f1a506a3046052df to gnome-team
which I hope will fix gtk where it's broken.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70766] Request to merge "gnome-team" branch

[Liliana Marie Prikler]

Am Freitag, dem 24.05.2024 um 15:14 +0100 schrieb Christopher Baines:
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher
> > Baines:
> > > gtk is failing to build on aarch64-linux which is blocking lots
> > > of packages, and the failure looks familiar but I haven't made
> > > any progress looking at it.
> > 
> > That looks like trouble.  I've fixed up some breaking builds on
> > x86, but I think we might have to block the merge for now if aarch
> > can't be fixed.
> 
> I've now pushed 36e49999227e4f621c211ed5f1a506a3046052df to gnome-
> team which I hope will fix gtk where it's broken.
QA looks good[1].
How do we proceed with the merge?  Just `git merge`?  Or should we
rebase on gnome-team and then merge?

Cheers

[1] https://qa.guix.gnu.org/branch/gnome-team

[bug#70766] Request to merge "gnome-team" branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1475 bytes --]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Freitag, dem 24.05.2024 um 15:14 +0100 schrieb Christopher Baines:
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher
>> > Baines:
>> > > gtk is failing to build on aarch64-linux which is blocking lots
>> > > of packages, and the failure looks familiar but I haven't made
>> > > any progress looking at it.
>> > 
>> > That looks like trouble.  I've fixed up some breaking builds on
>> > x86, but I think we might have to block the merge for now if aarch
>> > can't be fixed.
>> 
>> I've now pushed 36e49999227e4f621c211ed5f1a506a3046052df to gnome-
>> team which I hope will fix gtk where it's broken.
>
> QA looks good[1].

Things had flipped to unknown rather than blocked, but I think there
were still some blocked builds, but mostly due to a flaky
python-scikit-image test.

I've now pushed a fix for that to master [1] and rebased
gnome-team. I've also squashed my gtk change in to the gtk update
commit.

2: https://issues.guix.gnu.org/70997

> How do we proceed with the merge?  Just `git merge`?  Or should we
> rebase on gnome-team and then merge?

Now that I've rebased the branch, it'll take a little while for QA to
check things again, but I don't know of any problems.

To merge it to master, you can either just merge, or rebase and merge
(so that it's a fast forward rebase).

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70766] Request to merge "gnome-team" branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1684 bytes --]

Christopher Baines <mail@cbaines.net> writes:

> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
>> Am Freitag, dem 24.05.2024 um 15:14 +0100 schrieb Christopher Baines:
>>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>> 
>>> > Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher
>>> > Baines:
>>> > > gtk is failing to build on aarch64-linux which is blocking lots
>>> > > of packages, and the failure looks familiar but I haven't made
>>> > > any progress looking at it.
>>> > 
>>> > That looks like trouble.  I've fixed up some breaking builds on
>>> > x86, but I think we might have to block the merge for now if aarch
>>> > can't be fixed.
>>> 
>>> I've now pushed 36e49999227e4f621c211ed5f1a506a3046052df to gnome-
>>> team which I hope will fix gtk where it's broken.
>>
>> QA looks good[1].
>
> Things had flipped to unknown rather than blocked, but I think there
> were still some blocked builds, but mostly due to a flaky
> python-scikit-image test.
>
> I've now pushed a fix for that to master [1] and rebased
> gnome-team. I've also squashed my gtk change in to the gtk update
> commit.
>
> 2: https://issues.guix.gnu.org/70997
>
>> How do we proceed with the merge?  Just `git merge`?  Or should we
>> rebase on gnome-team and then merge?
>
> Now that I've rebased the branch, it'll take a little while for QA to
> check things again, but I don't know of any problems.
>
> To merge it to master, you can either just merge, or rebase and merge
> (so that it's a fast forward rebase).

I've just looked at QA again and the numbers look really good, is
gnome-team now ready to push to master?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70766] Request to merge "gnome-team" branch

[Liliana Marie Prikler]

Am Dienstag, dem 04.06.2024 um 21:45 +0100 schrieb Christopher Baines:
> […]
> 
> I've just looked at QA again and the numbers look really good, is
> gnome-team now ready to push to master?
If it looks good to you, it's good for me.  Featurewise, we more or
less got what we want – there is a newer WebkitGTK, but we shouldn't
let that delay upgrading our already out-of-date WebkitGTK.  Shall I go
ahead and push?

Cheers

[bug#70766] Request to merge "gnome-team" branch

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 646 bytes --]

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

> Am Dienstag, dem 04.06.2024 um 21:45 +0100 schrieb Christopher Baines:
>> […]
>> 
>> I've just looked at QA again and the numbers look really good, is
>> gnome-team now ready to push to master?
>
> If it looks good to you, it's good for me.  Featurewise, we more or
> less got what we want – there is a newer WebkitGTK, but we shouldn't
> let that delay upgrading our already out-of-date WebkitGTK.  Shall I go
> ahead and push?

Yes, please push :)

I've just reconfigured my laptop with the gnome-team changes, and I
haven't seen any issues.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

bug#70766: Request to merge "gnome-team" branch

[Liliana Marie Prikler]

Am Donnerstag, dem 06.06.2024 um 20:59 +0100 schrieb Christopher
Baines:
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Am Dienstag, dem 04.06.2024 um 21:45 +0100 schrieb Christopher
> > Baines:
> > > […]
> > > 
> > > I've just looked at QA again and the numbers look really good, is
> > > gnome-team now ready to push to master?
> > 
> > If it looks good to you, it's good for me.  Featurewise, we more or
> > less got what we want – there is a newer WebkitGTK, but we
> > shouldn't
> > let that delay upgrading our already out-of-date WebkitGTK.  Shall
> > I go
> > ahead and push?
> 
> Yes, please push :)
> 
> I've just reconfigured my laptop with the gnome-team changes, and I
> haven't seen any issues.
Pushed as b8780f7397dd46b5e382e48db87b8648f769d738.

Thanks for the reviews