Bug 806797 – dev-qt: KDE Qt5PatchCollection snapshot (-r10/r11) bumps stabilisation

• Product: Gentoo Linux
• Status: RESOLVED FIXED

[Description Sam James 2021-08-06 12:32:30 UTC]

We'll either need to stabilise various dev-qt/* packages for GCC 11 or revbump to ensure everybody has the fixes (due to possible errors in installed files - see bug 764977).

Filing after chatting with asturm in -kde as a placeholder.

[Comment 1 Davide Pesavento (RETIRED) 2021-08-07 16:16:21 UTC]

(In reply to Sam James from comment #0)
> We'll either need to stabilise various dev-qt/* packages for GCC 11 or
> revbump to ensure everybody has the fixes
Sorry, I'm not following. Why either stabilize *or* revbump? Don't we need to do both (first revbump then stabilize the new revision)? Or are you talking about a straight-to-stable revbump?

[Comment 2 Andreas Sturmlechner 2021-08-12 18:47:04 UTC]

The idea was to either

- Finally roll KDE Qt5PatchCollection snapshots and file stabilisation

or

- Stable-revbump those dev-qt/ packages that got missing header patches for GCC-11 w/o revbumps (because GCC-11 was still masked at the time and Qt5 support a work in progress) to ensure users don't get broken revdep builds

[Comment 3 Davide Pesavento (RETIRED) 2021-08-15 23:39:44 UTC]

I think we should do both. Stable-revbump whatever's needed as an urgent short-term fix while we move ~arch packages to the Qt5PatchCollection, which has a higher risk of regressions.

[Comment 4 Sam James 2021-08-16 00:05:59 UTC]

(In reply to Davide Pesavento from comment #3)
> I think we should do both. Stable-revbump whatever's needed as an urgent
> short-term fix while we move ~arch packages to the Qt5PatchCollection, which
> has a higher risk of regressions.

That sounds good to me (and sorry for the unclear description!). Let's use this bug for revbumping-then-stabling the stuff already in tree which is patched for GCC 11.

[Comment 5 Andreas Sturmlechner 2021-08-20 08:08:56 UTC]

ebuilds that need revbumps after patching for GCC-11 happened in place:

dev-qt/qtbluetooth-5.15.2
dev-qt/qtconcurrent-5.15.2 # incomplete, see bug 764977
dev-qt/qtcore-5.15.2-r2
dev-qt/qtdbus-5.15.2
dev-qt/qtdeclarative-5.15.2
dev-qt/qtgui-5.15.2-r1
dev-qt/qtopengl-5.15.2
dev-qt/qtprintsupport-5.15.2
dev-qt/qtsql-5.15.2
dev-qt/qttest-5.15.2
dev-qt/qtwidgets-5.15.2
dev-qt/qtxml-5.15.2


All of those will get -r10 snapshot bumps in the linked PR except dev-qt/qtbluetooth. Maybe I should already add that w/ EAPI-8 bump.

[Comment 6 Davide Pesavento (RETIRED) 2021-08-20 19:08:18 UTC]

The qtbluetooth patch affects only a .cpp file, no installed headers. Am I missing something? Why does it need a revbump?

[Comment 7 Andreas Sturmlechner 2021-08-21 12:11:25 UTC]

You're absolutely right, I just didn't look close enough.

[Comment 8 Andreas Sturmlechner 2021-08-21 12:56:43 UTC]

Amending dev-qt/qtgui snapshot with fix for CVE-2021-38593.

[Comment 9 Andreas Sturmlechner 2021-08-21 13:20:47 UTC]

Adding two pending upstream MRs worth waiting for - fixing upcoming dev-db/mariadb-10.6 breakage.

[Comment 10 Larry the Git Cow 2021-08-23 02:06:42 UTC]

The bug has been closed via the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea84cd97e034ca9654c3f2ac547693f3d636841f

commit ea84cd97e034ca9654c3f2ac547693f3d636841f
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:03:20 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:03:20 +0000

    dev-qt/qtxml: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtxml/{qtxml-5.15.2.ebuild => qtxml-5.15.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8901fbeca8823e366cda123210d77aed57182cd2

commit 8901fbeca8823e366cda123210d77aed57182cd2
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:03:12 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:03:12 +0000

    dev-qt/qtwidgets: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtwidgets/{qtwidgets-5.15.2.ebuild => qtwidgets-5.15.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4a5c906338bc3d6a00dd14487d6b9c4d1b1f6a5

commit b4a5c906338bc3d6a00dd14487d6b9c4d1b1f6a5
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:03:03 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:03:03 +0000

    dev-qt/qttest: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qttest/{qttest-5.15.2.ebuild => qttest-5.15.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0eb5cecf322b6ccb9e22c44cf2bbbe750b52a7

commit ef0eb5cecf322b6ccb9e22c44cf2bbbe750b52a7
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:02:55 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:02:55 +0000

    dev-qt/qtsql: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtsql/{qtsql-5.15.2.ebuild => qtsql-5.15.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf4adaf91c7e886a1ead26ef0b719d22f9715df

commit 0cf4adaf91c7e886a1ead26ef0b719d22f9715df
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:02:45 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:02:45 +0000

    dev-qt/qtprintsupport: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 .../{qtprintsupport-5.15.2.ebuild => qtprintsupport-5.15.2-r1.ebuild}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35aeed57bbf8b7f39baadb6d0679f294e5f52f08

commit 35aeed57bbf8b7f39baadb6d0679f294e5f52f08
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:02:34 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:02:34 +0000

    dev-qt/qtopengl: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtopengl/{qtopengl-5.15.2.ebuild => qtopengl-5.15.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb3a51aa5c544a1a89e4195c0b3e80bcbeb12ea

commit 0cb3a51aa5c544a1a89e4195c0b3e80bcbeb12ea
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:02:24 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:02:24 +0000

    dev-qt/qtgui: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtgui/{qtgui-5.15.2-r1.ebuild => qtgui-5.15.2-r2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd3c99ecedf11c7f7651e47251cd90775708d781

commit dd3c99ecedf11c7f7651e47251cd90775708d781
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:02:11 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:02:11 +0000

    dev-qt/qtdeclarative: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 .../{qtdeclarative-5.15.2.ebuild => qtdeclarative-5.15.2-r1.ebuild}       | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18b7b1769c37239509a2e9b378c53321f47ffe28

commit 18b7b1769c37239509a2e9b378c53321f47ffe28
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:02:00 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:02:00 +0000

    dev-qt/qtdbus: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtdbus/{qtdbus-5.15.2.ebuild => qtdbus-5.15.2-r1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2084cf76fa5c8b83388e8ded7531ee766557e3be

commit 2084cf76fa5c8b83388e8ded7531ee766557e3be
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:01:44 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:01:44 +0000

    dev-qt/qtcore: revbump to propagate GCC 11 fixes
    
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 dev-qt/qtcore/{qtcore-5.15.2-r2.ebuild => qtcore-5.15.2-r3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9d13c50ef08300d32a2f463cb69ece1fdaae838

commit e9d13c50ef08300d32a2f463cb69ece1fdaae838
Author:     Sam James <[e-mail]>
AuthorDate: 2021-08-23 02:00:47 +0000
Commit:     Sam James <[e-mail]>
CommitDate: 2021-08-23 02:01:04 +0000

    dev-qt/qtconcurrent: revbump for GCC 11 fix, with additional patch
    
    Closes: https://bugs.gentoo.org/764977
    Closes: https://bugs.gentoo.org/806797
    Signed-off-by: Sam James <[e-mail]>

 .../files/qtconcurrent-5.15.2-gcc11.patch          | 45 ++++++++++++++++++++++
 dev-qt/qtconcurrent/qtconcurrent-5.15.2-r1.ebuild  | 30 +++++++++++++++
 2 files changed, 75 insertions(+)

[Comment 11 Sam James 2021-08-23 02:07:37 UTC]

OK, done as discussed with asturm. We'll now turn focus to making sure the Qt5PatchCollection PR is ready for ~arch.

[Comment 12 Andreas Sturmlechner 2021-08-25 06:41:13 UTC]

Reusing for -r10 snapshot revbumps.

[addCollapseLink(13, 1, 'Toggle comment display'); Comment 13 NATTkA bot 2021-08-26 18:40:24 UTC Comment hidden (obsolete)]

Unable to check for sanity:

> no match for package: dev-qt/qtgui-5.15.2-r10

[addCollapseLink(14, 1, 'Toggle comment display'); Comment 14 NATTkA bot 2021-08-26 18:44:32 UTC Comment hidden (obsolete)]

Unable to check for sanity:

> no match for package: dev-qt/qtwayland-5.15.2-r10

[addCollapseLink(15, 1, 'Toggle comment display'); Comment 15 NATTkA bot 2021-09-08 16:56:28 UTC Comment hidden (obsolete)]

Unable to check for sanity:

> no match for package: dev-qt/qdoc-5.15.2-r1

[Comment 16 Andreas Sturmlechner 2021-09-12 19:39:36 UTC]

Adding:

- QT5_MODULE="qttools" 5.15.2-r10 version bump at KDE 33693a92
- dev-qt/qttranslations-5.15.2-r10 version bump at KDE 68f420eb

Including:
- EAPI-8 bump
- drop dev-qt/qtchooser (where present)
- switch from ~PV to =QT5_PV* version dependencies

[addCollapseLink(17, 1, 'Toggle comment display'); Comment 17 NATTkA bot 2021-09-12 19:45:06 UTC Comment hidden (obsolete)]

All sanity-check issues have been resolved

[Comment 18 Andreas Sturmlechner 2021-09-23 09:07:49 UTC]

Two more upstream MRs to watch and maybe backport before we proceed with stabilisation.

[Comment 19 Larry the Git Cow 2021-09-24 10:52:26 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fea8300b22d644bee689c4700e0941eaddde9ec

commit 7fea8300b22d644bee689c4700e0941eaddde9ec
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2021-09-24 10:41:24 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2021-09-24 10:51:18 +0000

    dev-qt/qtgui: 5.15.2-r13 version bump at KDE a4f9e569
    
    Fix reading gamma from PNGs without ICC profile
    
    KDE-bug: https://bugs.kde.org/show_bug.cgi?id=420357
    Bug: https://bugs.gentoo.org/806797
    Package-Manager: Portage-3.0.23, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 dev-qt/qtgui/Manifest                                             | 2 +-
 dev-qt/qtgui/{qtgui-5.15.2-r12.ebuild => qtgui-5.15.2-r13.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

[Comment 20 Larry the Git Cow 2021-09-28 14:58:56 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b77233d485dc1960d0c24ab7148867c838d9b05

commit 2b77233d485dc1960d0c24ab7148867c838d9b05
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2021-09-28 14:45:20 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2021-09-28 14:58:41 +0000

    dev-qt/qtwayland: 5.15.2-r13 version bump at KDE efe6edca
    
    "Client: Don't always recreate frame callbacks"
    See also: https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/16
    QTBUG: https://bugreports-test.qt.io/browse/QTBUG-81504
    
    "Wayland client: Fix crash when windows are shown/hidden during drag"
    See also: https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/17
    QTBUG: https://bugreports-test.qt.io/browse/QTBUG-87624
    
    Bug: https://bugs.gentoo.org/806797
    Package-Manager: Portage-3.0.24, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 dev-qt/qtwayland/Manifest                    |  1 +
 dev-qt/qtwayland/qtwayland-5.15.2-r13.ebuild | 41 ++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

[Comment 21 Andreas Sturmlechner 2021-09-29 17:32:33 UTC]

dev-qt/qtdeclarative-5.15.2-r12 revbump at KDE 1c33a9d0 for:
QQuickLoader: Do not incubate if the source arrives after setActive(false)
See also: https://invent.kde.org/qt/qt/qtdeclarative/-/merge_requests/6

I think that was the last one for now.

[addCollapseLink(22, 1, 'Toggle comment display'); Comment 22 NATTkA bot 2021-09-29 17:32:38 UTC Comment hidden (obsolete)]

Unable to check for sanity:

> no match for package: dev-qt/qtdeclarative-5.15.2-r11

[addCollapseLink(23, 1, 'Toggle comment display'); Comment 23 NATTkA bot 2021-09-29 17:36:59 UTC Comment hidden (obsolete)]

All sanity-check issues have been resolved

[Comment 24 Sam James 2021-09-29 21:13:50 UTC]

OK, let's proceed (asturm is happy and I've had no issues running these on a stable machine).

[addCollapseLink(25, 1, 'Toggle comment display'); Comment 25 Sam James 2021-09-30 01:19:51 UTC Comment hidden (obsolete)]

arm done

[Comment 26 Sam James 2021-09-30 18:15:16 UTC]

x86 done

[Comment 27 Sam James 2021-09-30 18:15:18 UTC]

amd64 done

[Comment 28 Sam James 2021-09-30 18:20:43 UTC]

arm done

[Comment 29 Sam James 2021-09-30 18:20:44 UTC]

arm64 done

[Comment 30 Larry the Git Cow 2021-10-03 12:34:04 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625596f03e4cc692d8a813968074aa4964ecbd93

commit 625596f03e4cc692d8a813968074aa4964ecbd93
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2021-10-02 14:09:03 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2021-10-03 12:33:13 +0000

    dev-qt/qtwayland: More fine-grained subslot
    
    Bug: https://bugs.gentoo.org/806797
    Bug: https://bugs.gentoo.org/815646
    Package-Manager: Portage-3.0.26, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 .../{qtwayland-5.15.2-r13.ebuild => qtwayland-5.15.2-r14.ebuild}         | 1 +
 1 file changed, 1 insertion(+)

[Comment 31 Larry the Git Cow 2021-10-03 12:40:42 UTC]

The bug has been referenced in the following commit(s):

https://gitweb.gentoo.org/proj/qt.git/commit/?id=4d770b30a57b8f36bdd4c1e7851b427f642ac3e6

commit 4d770b30a57b8f36bdd4c1e7851b427f642ac3e6
Author:     Andreas Sturmlechner <[e-mail]>
AuthorDate: 2021-10-02 14:09:03 +0000
Commit:     Andreas Sturmlechner <[e-mail]>
CommitDate: 2021-10-03 12:39:14 +0000

    dev-qt/qtwayland: More fine-grained subslot
    
    Bug: https://bugs.gentoo.org/806797
    Bug: https://bugs.gentoo.org/815646
    Package-Manager: Portage-3.0.26, Repoman-3.0.3
    Signed-off-by: Andreas Sturmlechner <[e-mail]>

 dev-qt/qtwayland/qtwayland-5.15.2.9999.ebuild | 1 +
 1 file changed, 1 insertion(+)

[Comment 32 Andreas Sturmlechner 2021-10-16 16:02:26 UTC]

Ping ppc/ppc64.

[Comment 33 Sam James 2021-10-17 00:27:24 UTC]

ppc64 done

[Comment 34 Sam James 2021-10-17 00:29:44 UTC]

ppc done

all arches done