Request for merging "gnome-team" branch

Done

Details

2 participants

Liliana Marie Prikler
Christopher Baines

Owner: unassigned

Submitted by: Liliana Marie Prikler

Severity: normal

Liliana Marie Prikler wrote on 4 May 08:41 +0200

Request to merge "gnome-team" branch

Recipients:(address . guix-patches@gnu.org)

Message-ID:b74ec1cb8dbe26e0108c2cdbd476d827a638df38.camel@gmail.com

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

Liliana Marie Prikler wrote on 7 May 19:34 +0200

Request for merging "gnome-team" branch

Recipients:(address . 70766@debbugs.gnu.org)(address . control@debbugs.gnu.org)

Message-ID:8158d0e0c7556e04f8356b213900f673c1b90442.camel@gmail.com

retitle 70766 Request for merging "gnome-team" branch

thanks

Am Samstag, dem 04.05.2024 um 08:41 +0200 schrieb Liliana Marie

Prikler:

Toggle quote (5 lines)> 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

Christopher Baines wrote on 8 May 13:56 +0200

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 70766@debbugs.gnu.org)

Message-ID:87v83ofrez.fsf@cbaines.net

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

Toggle quote (11 lines)> 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

Christopher Baines wrote on 8 May 14:03 +0200

Process gnome-team before core-updates

Recipients:(address . control@debbugs.gnu.org)

Message-ID:87pltwfr3i.fsf@cbaines.net

block 70456 by 70766

thanks

I think being able to merge core-updates is still a few weeks away, so I

think there's time to build and merge gnome-team without delaying

core-updates.

If it does become a problem, we can always switch approach and wait

until after core-updates is merged to look at gnome-team.

Christopher Baines wrote on 13 May 11:27 +0200

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

Recipients:(address . 70766@debbugs.gnu.org)

Message-ID:877cfy3vut.fsf@cbaines.net

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.

Christopher Baines wrote on 17 May 10:11 +0200

Recipients:

Message-ID:87frugn9ig.fsf@cbaines.net

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.

Liliana Marie Prikler wrote on 19 May 11:37 +0200

Recipients:

Message-ID:86d3d2f83df1f6480f24c4e37d1eefa9bfe92665.camel@gmail.com

Am Freitag, dem 17.05.2024 um 09:11 +0100 schrieb Christopher Baines:

Toggle quote (3 lines)

> 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

Christopher Baines wrote on 24 May 16:14 +0200

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 70766@debbugs.gnu.org)

Message-ID:87a5kfguup.fsf@cbaines.net

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

Toggle quote (9 lines)

> 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.

Liliana Marie Prikler wrote on 25 May 16:58 +0200

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 70766@debbugs.gnu.org)

Message-ID:2ed5b2af9eda9eb0d558608640d65e8f91af6bf2.camel@gmail.com

Am Freitag, dem 24.05.2024 um 15:14 +0100 schrieb Christopher Baines:

Toggle quote (14 lines)> 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

Christopher Baines wrote on 26 May 18:51 +0200

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 70766@debbugs.gnu.org)

Message-ID:87h6ekfrev.fsf@cbaines.net

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

Toggle quote (18 lines)> 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

Toggle quote (3 lines)

> 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).

Christopher Baines wrote on 4 Jun 22:45 +0200

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 70766@debbugs.gnu.org)

Message-ID:871q5ce8sm.fsf@cbaines.net

Christopher Baines <mail@cbaines.net> writes:

Toggle quote (39 lines)> 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?

Liliana Marie Prikler wrote on 5 Jun 06:26 +0200

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 70766@debbugs.gnu.org)

Message-ID:856fc08aee69eb9e44f62fff9d021bbdc3ad4e13.camel@gmail.com

Am Dienstag, dem 04.06.2024 um 21:45 +0100 schrieb Christopher Baines:

Toggle quote (4 lines)

> […]

> 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

Christopher Baines wrote on 6 Jun 21:59 +0200

Recipients:(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 70766@debbugs.gnu.org)

Message-ID:87a5jx3kqt.fsf@cbaines.net

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

Toggle quote (11 lines)> 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

Liliana Marie Prikler wrote on 6 Jun 23:10 +0200

Recipients:(name . Christopher Baines)(address . mail@cbaines.net)(address . 70766-done@debbugs.gnu.org)

Message-ID:b4cafe8b03da4f17c281ac8f2ad93eb6108ad831.camel@gmail.com

Am Donnerstag, dem 06.06.2024 um 20:59 +0100 schrieb Christopher

Baines:

Toggle quote (20 lines)> 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

Closed

Your comment

This issue is archived.

To comment on this conversation send an email to 70766@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it

mumi current 70766

Then, you may apply the latest patchset in this issue (with sign off)

mumi am -- -s

Or, compose a reply to this issue

mumi compose

Or, send patches to this issue

mumi send-email *.patch

is:open	open issues
is:done	closed issues
submitter:<who>	search issue submitter
author:<who>	search by message author
date:yesterday..now	search by issue date
mdate:3m..2d	search by message date