treewide: Qt5.X -> Qt5.15 (when possible) by freezeboy · Pull Request #102840 · NixOS/nixpkgs

freezeboy · 2020-11-04T23:23:42Z

Motivation for this change

I tried to migrate the software still using Qt5.12 to a newer version, sometimes I had to update the software to make it work.

Among the reasons blocking the packages, I already spotted:

Dependency to qtwebkit which is broken with Qt5.15
Use of QPainterPath class, apparently the header definition has moved between 5.14 and 5.15
Some package build configurations forbid deprecated members use ... and there are such in Qt5.15
Other oddities in the code that is not more valid (changing, return types)
A few of them compile .. then segfault (digitalbitbox)

Things done

doronbehar

This is a tremendous work! Did you test each and every package to build and run right?

Overall I approve, but the commit messages sometimes miss some details of other changes, it might help to get this approved but I wouldn't make this a blocker.

freezeboy · 2020-11-06T10:40:05Z

Yes I built and run all the executables, just to check it starts.

For the commit messages, I can see to improve them, at least the ones where an update was needed.

doronbehar · 2020-11-06T10:43:58Z

Well done 👏.

freezeboy · 2020-11-06T11:22:57Z

Most of the effort is done by my cpu and its fan 😏

freezeboy · 2020-11-06T21:54:56Z

I force pushed with more details in the commit messages, please tell me if you need more

doronbehar · 2020-11-07T09:31:39Z

Pushed after a rebase to fix merge conflicts. Ideally I think every usage of a pinned libsForQt5.. should be accompanied with a comment. I counted 129 usages of libsForQt514.callPackage that come with no comment explaining them.

freezeboy · 2020-11-07T10:20:02Z

Thank you, I will continue to add other apps, and I think we can think to merge this PR, I will start another PR for to continue this process otherwise we will have more and more conflicts

Using a unreleased commit from upstream. Also moved the derivation to mkLibsForQt5 to let the application choose its Qt5 version. Did not put an alias as previous version was broken since ages.

* Port to Qt5.15 in the process * Cleanup the derivation to use new style

Fixes build for Qt5.15 Split output to mutilple outputs to reduce user closure size

moved the initial qtcurve package to mkLibsForQt5 function to decouple from Qt5 version added an alias qtcurve -> libsForQt5.qtcurve for backward compatibility add option to disable gtk2 support (still enabled by default)

Did not touch the dependency to python27 but may require another PR

obs-nvi was not touched but should be modified as well, it requires a custom download that I don't use, so I prefer to let official maintainer do it.

freezeboy · 2020-11-20T21:28:11Z

Rebase done

jonringer · 2020-11-20T22:09:16Z

LGTM

failures exist on master

https://github.com/NixOS/nixpkgs/pull/102840
2 packages marked as broken and skipped:
retroshare retroshare06

3 packages failed to build:
kmymoney obs-ndi xflr5

70 packages built:
amarok appcsxcad birdtray calaos_installer chiaki clipgrab communi csound-qt cutecom digitalbitbox eagle flameshot fritzing golden-cheetah herqq kdiff3 kgraphviewer krename kronometer ktorrent libsForQt5.herqq libsForQt5.kde2-decoration qcsxcad qtcurve libsForQt512.herqq libsForQt512.kde2-decoration libsForQt512.qcsxcad libsForQt512.qtcurve libsForQt514.kde2-decoration libsForQt514.qcsxcad libsForQt514.qtcurve luminanceHDR massif-visualizer minitube obs-move-transition obs-studio obs-v4l2sink obs-wlrobs openems ostinato pentobi peruse plex-media-player protonmail-bridge psi psi-plus python27Packages.python-csxcad python37Packages.python-csxcad python37Packages.python-openems python38Packages.python-csxcad python38Packages.python-openems qlcplus rsibreak rssguard saga samplv1 sdrangel sigil skanlite skrooge solarus solarus-quest-editor sonic-lineup strawberry teamspeak_client tellico virtmanager-qt vnote webcamoid zoom-us

freezeboy · 2020-11-20T22:15:41Z

I guess obs-ndi is normal as the rest of the stack now use qt5.15, I can change its Qt version too, but I won't be able to build it anyway

I start looking the other errors

jonringer · 2020-11-20T22:21:29Z

I guess obs-ndi is normal as the rest of the stack now use qt5.15, I can change its Qt version too, but I won't be able to build it anyway

I start looking the other errors

either way, this is still an improvement. Thanks! :)

doronbehar · 2020-11-21T08:21:11Z

3 packages failed to build:
kmymoney obs-ndi xflr5

That's a regression from the last time I tried to build kmymoney - it fails due to xmlsec not building:

https://gist.github.com/doronbehar/4b34941feb73855eb307b3470d12dff2

doronbehar · 2020-11-21T08:47:35Z

@freezeboy when you rebased it you forced pushed and forgot some commits of mine :(. For instance qtwebkit was fixed there.

doronbehar · 2020-11-21T08:58:21Z

Follow up PR: #104474

kmymoney needs #104472 in order to work.

ofborg bot requested review from alkeryn, globin and kylewlacy November 4, 2020 23:51

ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Nov 4, 2020

ofborg bot requested review from kuznero and tiramiseb November 5, 2020 15:56

ofborg bot removed the 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. label Nov 5, 2020

ofborg bot requested a review from matthuszagh November 5, 2020 16:11

ofborg bot requested a review from esclear November 5, 2020 16:56

freezeboy changed the title ~~Update fixes~~ treewide: Qt5.X -> Qt5.15 (when possible) Nov 5, 2020

freezeboy mentioned this pull request Nov 6, 2020

Tracking issue for Qt/KDE issues on 20.09 #102340

Closed

7 tasks

doronbehar approved these changes Nov 6, 2020

View reviewed changes

doronbehar requested a review from ttuegel November 6, 2020 10:09

freezeboy force-pushed the update-fixes branch from d8f8754 to 0ae54d6 Compare November 6, 2020 21:54

doronbehar mentioned this pull request Nov 7, 2020

Move some qt5 style packages to qt5-packages.nix #102594

Closed

10 tasks

ofborg bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 7, 2020

doronbehar force-pushed the update-fixes branch from d892174 to 6deabf8 Compare November 7, 2020 09:29

ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Nov 7, 2020

freezeboy and others added 18 commits November 20, 2020 22:24

libsForQt5.herqq: fix build with qt5.15

c99a4f9

Using a unreleased commit from upstream. Also moved the derivation to mkLibsForQt5 to let the application choose its Qt5 version. Did not put an alias as previous version was broken since ages.

p4v: comment why it is broken with Qt5.15

a624258

ostinato: 0.9 -> 1.1

e4aa0e0

* Port to Qt5.15 in the process * Cleanup the derivation to use new style

libsForQt5.kde2-decoration: 1.0 -> 1.1

c173f41

Fixes build for Qt5.15 Split output to mutilple outputs to reduce user closure size

retroshare: move to alias and explain why it is broken

ecf4fd1

sigil: migrate to Qt5.15 and fix segfault

bb18d1d

libsForQt5.qtcurve: fix build with Qt5.15

38b041b

moved the initial qtcurve package to mkLibsForQt5 function to decouple from Qt5 version added an alias qtcurve -> libsForQt5.qtcurve for backward compatibility add option to disable gtk2 support (still enabled by default)

kmymoney: pin to qt5.14

b203a64

mendeley: comment why it needs qt5.14

3b4598f

merkaator: comment why it needs qt5.14

c240827

amarok: migrate to Qt5.15

28ea56d

communi: migrate to Qt5.15

78e3620

csound-qt: migrate to Qt5.15

df3065a

Did not touch the dependency to python27 but may require another PR

fritzing: migrate to Qt5.15

d63a389

kgraphviewer: migrate to Qt5.15

2bdac39

luminanceHDR: migrate to Qt5.15

c604e61

rssguard: migrate to Qt5.15

5c2d391

obs-studio,obs-v4l2sink: migrate to Qt5.15

8b0dee1

obs-nvi was not touched but should be modified as well, it requires a custom download that I don't use, so I prefer to let official maintainer do it.

freezeboy force-pushed the update-fixes branch from 94b007f to 8b0dee1 Compare November 20, 2020 21:26

ofborg bot removed the 6.topic: qt/kde Object-oriented framework for GUI creation label Nov 20, 2020

freezeboy deleted the update-fixes branch November 20, 2020 22:15

ghost mentioned this pull request Nov 21, 2020

kde2-decoration: 1.0 -> 1.1 #103432

Closed

doronbehar mentioned this pull request Nov 21, 2020

qt515.qtwebkit: unbreak #104474

Merged

Uh oh!

Comments

Conversation

freezeboy commented Nov 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation for this change

Things done

Uh oh!

doronbehar left a comment

Choose a reason for hiding this comment

Uh oh!

freezeboy commented Nov 6, 2020

Uh oh!

doronbehar commented Nov 6, 2020

Uh oh!

freezeboy commented Nov 6, 2020

Uh oh!

freezeboy commented Nov 6, 2020

Uh oh!

doronbehar commented Nov 7, 2020

Uh oh!

freezeboy commented Nov 7, 2020

Uh oh!

freezeboy commented Nov 20, 2020

Uh oh!

jonringer commented Nov 20, 2020

Uh oh!

freezeboy commented Nov 20, 2020

Uh oh!

jonringer commented Nov 20, 2020

Uh oh!

doronbehar commented Nov 21, 2020

Uh oh!

doronbehar commented Nov 21, 2020

Uh oh!

doronbehar commented Nov 21, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

freezeboy commented Nov 4, 2020 •

edited

Loading