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

Qt5: 5.9.3 -> 5.10.0 #33297

Merged
merged 2 commits into from Jan 16, 2018
Merged

Qt5: 5.9.3 -> 5.10.0 #33297

merged 2 commits into from Jan 16, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Jan 1, 2018

Motivation for this change

I hope that I tackled all required extra packages in other pull requests. (nox review is taking ages)

@LnL7 can you try that on Mac?

@ttuegel

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

/nix/store/cmgjkmgri309v29jxfdfzwzk8i79514y-apple-framework-Foundation/Library/Frameworks/Foundation.framework/Headers/NSPortCoder.h:18:1: warning: method has no return type specified; defaults to 'id' [-Wmissing-method-return-type]
+ portCoderWithReceivePort:(NSPort *)rcvPort sendPort:(NSPort *)sndPort components:(NSArray *)comps NS_DEPRECATED(10_0, 10_7, 2_0, NA);
^
  (id)
qcorewlanengine.mm:290:5: error: type arguments cannot be applied to non-parameterized class 'NSArray'
    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
    ^      ~~~~~~~~~~~~
qcorewlanengine.mm:605:5: error: type arguments cannot be applied to non-parameterized class 'NSArray'
    NSArray<NSString *> *wifiInterfaces = [CWWiFiClient interfaceNames];
    ^      ~~~~~~~~~~~~
4 warnings and 2 errors generated.
make[4]: *** [Makefile:2068: .obj/qcorewlanengine.o] Error 1
make[4]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src/plugins/bearer/corewlan'
make[3]: *** [Makefile:46: sub-corewlan-make_first] Error 2
make[3]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src/plugins/bearer'
make[2]: *** [Makefile:78: sub-bearer-make_first] Error 2
make[2]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src/plugins'
make[1]: *** [Makefile:722: sub-plugins-make_first] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src'
make: *** [Makefile:49: sub-src-make_first] Error 2

@ttuegel
Copy link
Member

ttuegel commented Jan 2, 2018

When the Darwin build failure is fixed, I will merge this offline. I have an unmerged fix for a closure-size bug that will also apply here; I'll merge them together to avoid rebuilding the Qt-world twice.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 2, 2018

@LnL7 could you try again please?

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Failure for system: x86_64-darwin

In file included from /nix/store/6fx1x2fzsf03ddrf5lxm5n7f5nnj2jzn-apple-framework-AppKit/Library/Frameworks/AppKit.framework/Headers/AppKit.h:203:
/nix/store/6fx1x2fzsf03ddrf5lxm5n7f5nnj2jzn-apple-framework-AppKit/Library/Frameworks/AppKit.framework/Headers/NSPathComponentCell.h:42:27: warning: 'copy' attribute on property 'image' does not match the property inherited from 'NSCell' [-Wproperty-attribute-mismatch]
@property (copy) NSImage *image;
                          ^
qcocoawindow.mm:1702:29: error: property 'superview' not found on object of type 'id'
        [window.contentView.superview setNeedsDisplay:YES];
                            ^
11 warnings and 1 error generated.
make[4]: *** [Makefile:7439: .obj/qcocoawindow.o] Error 1
make[4]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src/plugins/platforms/cocoa'
make[3]: *** [Makefile:97: sub-cocoa-make_first] Error 2
make[3]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src/plugins/platforms'
make[2]: *** [Makefile:103: sub-platforms-make_first] Error 2
make[2]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src/plugins'
make[1]: *** [Makefile:722: sub-plugins-make_first] Error 2
make[1]: Leaving directory '/private/tmp/nix-build-qtbase-5.10.0.drv-0/qtbase-everywhere-src-5.10.0/src'
make: *** [Makefile:49: sub-src-make_first] Error 2
builder for '/nix/store/qnmpbd6ahqq9pgc0nsb1l5dy639zfkap-qtbase-5.10.0.drv' failed with exit code 2

@LnL7
Copy link
Member

LnL7 commented Jan 2, 2018

@bkchr This one looks like it might need some debugging, let me know if you want me to look at it.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 3, 2018

@LnL7 yeah, it would be nice if you could debug this error.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 8, 2018

@LnL7 any updates? :)

@LnL7
Copy link
Member

LnL7 commented Jan 8, 2018

Sorry, I've been pretty busy with other stuff.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 9, 2018

Okay.

@ttuegel do you have any Mac OS?

@LnL7
Copy link
Member

LnL7 commented Jan 9, 2018

That fixes qtbase, still testing the rest.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 9, 2018

👍

@LnL7
Copy link
Member

LnL7 commented Jan 9, 2018

@GrahamcOfBorg eval

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

Darwin builds are ok now, sandboxing doesn't work yet but I don't really want to go down that rabbit hole.

@LnL7
Copy link
Member

LnL7 commented Jan 10, 2018

Does an extra qtXX set increase the memory usage by a significant amount? Other evaluations seem to be working fine right now.

@ttuegel
Copy link
Member

ttuegel commented Jan 10, 2018

@ttuegel do you have any Mac OS?

@bkchr No, I have only x86_64-linux.

Does an extra qtXX set increase the memory usage by a significant amount? Other evaluations seem to be working fine right now.

@LnL7 It should not because there are not many packages.

I think we should leave the default Qt 5 version at Qt 5.9.x for now. I have two reasons; one is that Qt 5.9 is an LTS branch, the other is that KDE is still shipping fixes for Qt 5.9 and I suspect Qt 5.10 is going to break things that upstream doesn't even know about yet. I want to re-evaluate this stance after Frameworks 5.42, though.

@LnL7
Copy link
Member

LnL7 commented Jan 10, 2018

@GrahamcOfBorg eval

@bkchr
Copy link
Contributor Author

bkchr commented Jan 10, 2018

@ttuegel I saw posts that they already shipped the 5.10 beta for kde neon.

@grahamc
Copy link
Member

grahamc commented Jan 10, 2018

@GrahamcOfBorg eval

:/

@LnL7
Copy link
Member

LnL7 commented Jan 10, 2018

From what I can tell this increases the memory usage by almost 200mb causing the evaluator to hit the default heapsize limit.

@ttuegel
Copy link
Member

ttuegel commented Jan 11, 2018

I saw posts that they already shipped the 5.10 beta for kde neon.

Yes, but they haven't shipped any patches for Qt 5.10, which means it isn't ready. In fact, they just had to respin two packages in the Applications release today to patch for Qt 5.9.3, so they obviously aren't caught up yet.

From what I can tell this increases the memory usage by almost 200mb causing the evaluator to hit the default heapsize limit.

There must be a bug in the package set; there is no way that adding O(10) packages should increase memory use that much!

@ttuegel
Copy link
Member

ttuegel commented Jan 11, 2018

There must be a bug in the package set; there is no way that adding O(10) packages should increase memory use that much!

Hm, it's actually more like O(100) packages because of needing to build libraries with every version of Qt for compatibility. In the long term, I would like to take advantage of the Qt ABI to re-link everything against our latest Qt version; this would drastically cut down on the number of libraries there are to build. In the short term, I think I will just remove recurseIntoAttrs from libsForQt5.

@ttuegel ttuegel mentioned this pull request Jan 11, 2018
8 tasks
@LnL7
Copy link
Member

LnL7 commented Jan 11, 2018

@GrahamcOfBorg eval

@ttuegel
Copy link
Member

ttuegel commented Jan 15, 2018

@bkchr I'm working on merging this now.

ttuegel added a commit to ttuegel/nixpkgs that referenced this pull request Jan 16, 2018
@ttuegel ttuegel merged commit 3793320 into NixOS:master Jan 16, 2018
@adisbladis
Copy link
Member

This broke kimageformats https://hydra.nixos.org/build/67594049

@bkchr
Copy link
Contributor Author

bkchr commented Jan 16, 2018

Fixed in: #33927

@adisbladis
Copy link
Member

adisbladis commented Jan 16, 2018

There is a whole lot of other breakages too.

@bkchr Could you take a look at these packages:
akonadi
kinit
kwin
kwindowsystem
libkscreen
plasma-desktop
plasma-workspace
plasma-vault

@bkchr
Copy link
Contributor Author

bkchr commented Jan 16, 2018

@adisbladis I tested libkscreen and kwindowsystem and both were downloaded from the cache? I'm on a commit from this morning.

@adisbladis
Copy link
Member

@bkchr I just greped for usage of NIX_CFLAGS_COMPILE.
I know for a fact plasma-vault and kinit are broken.

@bkchr
Copy link
Contributor Author

bkchr commented Jan 16, 2018

Yep, I will look into them, when I got time :)

@adisbladis
Copy link
Member

Thanks 👍

@sifmelcara sifmelcara mentioned this pull request Jan 18, 2018
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants