Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt 5.15.3 version bump #24628

Merged
merged 75 commits into from Mar 21, 2022
Merged

Qt 5.15.3 version bump #24628

merged 75 commits into from Mar 21, 2022

Conversation

a17r
Copy link
Member

@a17r a17r commented Mar 17, 2022

No description provided.

@gentoo-bot gentoo-bot added new package The PR is adding a new package. assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Mar 17, 2022
@a17r a17r self-assigned this Mar 17, 2022
@a17r a17r added the do not merge Please DO NOT MERGE this PR. It will not be assigned but it will be scanned by CI. label Mar 17, 2022
@thesamesam
Copy link
Member

thesamesam commented Mar 17, 2022

Some iwdevtools results, not verified them (based on VDB vs ELF metadata):

dev-qt:qtbluetooth-5.15.3:20220317-230020.log:35:VDB: detected possibly incorrect RDEPEND (dev-qt/qtbluetooth-5.15.3)
dev-qt:qtbluetooth-5.15.3:20220317-230020.log-36-dev-qt/qtconcurrent  <
dev-qt:qtbluetooth-5.15.3:20220317-230020.log-37-dev-qt/qtdbus        | dev-qt/qtdbus:5
dev-qt:qtbluetooth-5.15.3:20220317-230020.log-38-dev-qt/qtdeclarative | dev-qt/qtdeclarative:5
dev-qt:qtbluetooth-5.15.3:20220317-230020.log-39-                     > dev-qt/qtnetwork:5
dev-qt:qthelp-5.15.3:20220317-232601.log:36:VDB: detected possibly incorrect RDEPEND (dev-qt/qthelp-5.15.3)
dev-qt:qthelp-5.15.3:20220317-232601.log-37-dev-qt/qtgui     | dev-qt/qtgui:5
dev-qt:qthelp-5.15.3:20220317-232601.log-38-dev-qt/qtnetwork <
dev-qt:qthelp-5.15.3:20220317-232601.log-39-dev-qt/qtsql     | dev-qt/qtsql:5
dev-qt:qthelp-5.15.3:20220317-232601.log-40-dev-qt/qtwidgets | dev-qt/qtwidgets:5
dev-qt:qtwayland-5.15.3:20220317-230954.log:70:VDB: detected possibly incorrect RDEPEND (dev-qt/qtwayland-5.15.3)
dev-qt:qtwayland-5.15.3:20220317-230954.log-71- > dev-libs/glib:2
dev-qt:qtwayland-5.15.3:20220317-230954.log-72- > dev-qt/qtdbus:5
dev-qt:qtwayland-5.15.3:20220317-230954.log-73- > media-libs/fontconfig
dev-qt:qtwayland-5.15.3:20220317-230954.log-74- > media-libs/freetype
dev-qt:qtwayland-5.15.3:20220317-230954.log-75- > x11-libs/libxkbcommon

The rest were exclusively just missing :5 or solely dropping a dep they likely need in reality (runtime only or similar) so not bothered mentioning them.

@ionenwks
Copy link
Contributor

ionenwks commented Mar 18, 2022

Yeah the missing :5 aren't really important if it's =QT5_PV (Edit: if don't want to add them, can use QA_VDB_ARGS=--no-slot if want to skip that noise while checking these, can configure exceptions too, and can run after emerging too, e.g. qa-vdb --no-slot qthelp).

I tend to be careful with qt and "possibly" unnecessary < deps, they're often checked anyway or used in some other way, but maybe really unnecessary. The missing > deps tend to be a no-brainer addition, may need to check if USE-specific or automagic at most.

Edit: on a side-note, using qtwebengine-5.15.3_p20220310 with qutebrowser right now, no issues and qb tests passed 👍

@Pesa
Copy link
Contributor

Pesa commented Mar 18, 2022

Some iwdevtools results, not verified them (based on VDB vs ELF metadata): [...]

  • qtbluetooth
    • qtconcurrent is a weird one (in Qt land) because it's almost header-only. I guess qtbluetooth is using just those parts, so it doesn't need libQt5Concurrent.so at runtime. That being said, I don't think Qt makes any promise regarding what's header-only and what is not, so things can change at any time. I would recommend keeping the RDEPEND here. Moreover qtconcurrent is only ~300 KB on disk.
    • qtnetwork is indeed used at runtime since Qt 5.12, nice catch!
  • qthelp
    • The build system does require qtnetwork, but I can't see where it's actually used... so it could be bogus. We can move it to DEPEND. Or we can patch the build system to stop looking for qtnetwork and drop the dependency altogether.
  • qtwayland
    • I'm not sure what's going on here...
    • I believe libxkbcommon is inherited via libQt5XkbCommonSupport.a (qtgui), but do we need to add an explicit dep in qtwayland as well?
    • The rest I have no idea where they're coming from... they're not directly referenced by qtwayland AFAICS.

@a17r
Copy link
Member Author

a17r commented Mar 18, 2022

  • qthelp

    • The build system does require qtnetwork, but I can't see where it's actually used... so it could be bogus. We can move it to DEPEND. Or we can patch the build system to stop looking for qtnetwork and drop the dependency altogether.

https://invent.kde.org/qt/qt/qttools/-/merge_requests/2

@a17r a17r changed the title Qt 5.15.3 version bump [WIP] Qt 5.15.3 version bump [WIP] [please reassign] Mar 18, 2022
@gentoo-bot gentoo-bot changed the title Qt 5.15.3 version bump [WIP] [please reassign] Qt 5.15.3 version bump [WIP] Mar 18, 2022
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @a17r
Areas affected: ebuilds, eclasses
Packages affected: dev-qt/assistant, dev-qt/designer, dev-qt/linguist, dev-qt/linguist-tools, dev-qt/pixeltool...

dev-qt/assistant: @gentoo/qt
dev-qt/designer: @gentoo/qt
dev-qt/linguist: @gentoo/qt
dev-qt/linguist-tools: @gentoo/qt
dev-qt/pixeltool: @gentoo/qt
dev-qt/qdbus: @gentoo/qt
dev-qt/qdbusviewer: @gentoo/qt
dev-qt/qdoc: @gentoo/qt
dev-qt/qt3d: @gentoo/qt
dev-qt/qtbluetooth: @gentoo/qt
dev-qt/qtcharts: @gentoo/qt
dev-qt/qtchooser: @gentoo/qt
dev-qt/qtconcurrent: @gentoo/qt
dev-qt/qtcore: @gentoo/qt
dev-qt/qtdatavis3d: @gentoo/qt
dev-qt/qtdbus: @gentoo/qt
dev-qt/qtdeclarative: @gentoo/qt
dev-qt/qtdiag: @gentoo/qt
dev-qt/qtgamepad: @gentoo/qt
dev-qt/qtgraphicaleffects: @gentoo/qt
dev-qt/qtgui: @gentoo/qt
dev-qt/qthelp: @gentoo/qt
dev-qt/qtimageformats: @gentoo/qt
dev-qt/qtlocation: @gentoo/qt
dev-qt/qtmultimedia: @gentoo/qt
dev-qt/qtnetwork: @gentoo/qt
dev-qt/qtnetworkauth: @gentoo/qt
dev-qt/qtopengl: @gentoo/qt
dev-qt/qtpaths: @gentoo/qt
dev-qt/qtplugininfo: @gentoo/qt
dev-qt/qtpositioning: @gentoo/qt
dev-qt/qtprintsupport: @gentoo/qt
dev-qt/qtquickcontrols: @gentoo/qt
dev-qt/qtquickcontrols2: @gentoo/qt
dev-qt/qtquicktimeline: @gentoo/qt
dev-qt/qtscript: @gentoo/qt
dev-qt/qtscxml: @gentoo/qt
dev-qt/qtsensors: @gentoo/qt
dev-qt/qtserialbus: @gentoo/qt
dev-qt/qtserialport: @gentoo/qt
dev-qt/qtspeech: @gentoo/qt
dev-qt/qtsql: @gentoo/qt
dev-qt/qtsvg: @gentoo/qt
dev-qt/qttest: @gentoo/qt
dev-qt/qttranslations: @gentoo/qt
dev-qt/qtvirtualkeyboard: @gentoo/qt
dev-qt/qtwayland: @gentoo/qt
dev-qt/qtwaylandscanner: @gentoo/proxy-maint (new package)
dev-qt/qtwebchannel: @gentoo/qt
dev-qt/qtwebengine: @gentoo/qt, @gyakovlev
dev-qt/qtwebsockets: @gentoo/qt
dev-qt/qtwebview: @gentoo/qt
dev-qt/qtwidgets: @gentoo/qt
dev-qt/qtx11extras: @gentoo/qt
dev-qt/qtxml: @gentoo/qt
dev-qt/qtxmlpatterns: @gentoo/qt
dev-util/kdevelop: @gentoo/kde
kde-apps/krfb: @gentoo/kde
kde-apps/spectacle: @gentoo/kde
kde-frameworks/kguiaddons: @gentoo/kde
kde-frameworks/kwayland: @gentoo/kde
kde-plasma/kwayland-integration: @gentoo/kde
kde-plasma/kwayland-server: @gentoo/kde
kde-plasma/kwin: @gentoo/kde
kde-plasma/layer-shell-qt: @gentoo/kde
kde-plasma/libkscreen: @gentoo/kde
kde-plasma/plasma-workspace: @gentoo/kde
kde-plasma/xdg-desktop-portal-kde: @gentoo/kde
sci-visualization/scidavis: @AndrewAmmerlaan, @gentoo/sci

Linked bugs

Bugs linked: 835595


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added new package The PR is adding a new package. assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. and removed new package The PR is adding a new package. assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Mar 18, 2022
@a17r
Copy link
Member Author

a17r commented Mar 18, 2022

Some iwdevtools results, not verified them (based on VDB vs ELF metadata): [...]

Fixed dev-qt/qtbluetooth and dev-qt/qthelp, thanks.

  • qtwayland

    • I'm not sure what's going on here...
    • I believe libxkbcommon is inherited via libQt5XkbCommonSupport.a (qtgui), but do we need to add an explicit dep in qtwayland as well?
    • The rest I have no idea where they're coming from... they're not directly referenced by qtwayland AFAICS.

I don't see that either.

@AndrewAmmerlaan
Copy link
Member

ACK for Scidavis 👍

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-03-18 18:36 UTC
Newest commit scanned: 2d5b6d9
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/053d4dffed/output.html

Copy link
Member

@thesamesam thesamesam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was hoping to get time to look at the SSE2 etc bugs but I doubt I'm going to have a chance to do that before we want to get this in (I wanted to coalesce the pushes).

I suppose in theory I have a bit of time before unmasking to get some changes ready for review, but no promises. At worst we do it later.

Been daily driving this for a few days now - no issues other than those reported on IRC (minor blips) and here w/ deps.

@a17r
Copy link
Member Author

a17r commented Mar 18, 2022

Added package.mask to go together with mail https://gist.github.com/a17r/b622b0be3e1e613f1f45c0b35c5196ee

a17r added 28 commits March 21, 2022 12:03
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Split out of dev-qt/qtwayland.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Patched with security patches up to Chromium version: 98.0.4758.102

Snapshotted at:
Branch: 5.15
Commit: 9e3ad4273df3aeb16687e924c65fe451e4c03ad2

Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 1629f9b8f7f05288f17ed73f2dc328581dffce6a
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Upstream commit 2eb5da1d6fc5ea199ed2145c67def60318370c24

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Drop dev-qt/qtwayland RDEPEND.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Drop dev-qt/qtwayland RDEPEND.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
@gentoo-bot gentoo-bot merged commit de092cf into gentoo:master Mar 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. new package The PR is adding a new package. noci Skip CI for this pull request
Projects
None yet
7 participants