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.

Sign up for GitHub

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

Jump to bottom

qtchan: Fixes build from Qt upgrade. #46082

Merged
merged 1 commit into from Sep 5, 2018
Merged

qtchan: Fixes build from Qt upgrade. #46082

merged 1 commit into from Sep 5, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Sep 5, 2018

Uses an upstream fix.

Motivation for this change

Plowing through #45960 failures.

This is (with at least another failure) fallout from Qt 5.10 -> 5.11 from June.

It'll need cherry-picking to release-18.09

Things done
  • ✔️ Tested using sandboxing (nix.useSandbox on NixOS, or option 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/)
  • ⬜ Determined the impact on package closure size (by running nix path-info -S before and after)
  • ✔️ Fits CONTRIBUTING.md.

#44047 wasn't an issue since this (wrongly?) wraps with qt plugin path...

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: qtchan

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/nybsdcwrdbi7krpvjw8jy3ilkl92d0vg-qtchan-0.100
shrinking /nix/store/nybsdcwrdbi7krpvjw8jy3ilkl92d0vg-qtchan-0.100/bin/.qtchan-wrapped
strip is /nix/store/h0lbngpv6ln56hjj59i6l77vxq25flbz-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/nybsdcwrdbi7krpvjw8jy3ilkl92d0vg-qtchan-0.100/bin
patching script interpreter paths in /nix/store/nybsdcwrdbi7krpvjw8jy3ilkl92d0vg-qtchan-0.100
checking for references to /build in /nix/store/nybsdcwrdbi7krpvjw8jy3ilkl92d0vg-qtchan-0.100...
postPatchMkspecs
postPatchMkspecs
/nix/store/nybsdcwrdbi7krpvjw8jy3ilkl92d0vg-qtchan-0.100

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: qtchan

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/y20jkchcnkgqfa4ddhynb7rmm8wlcakm-qtchan-0.100
shrinking /nix/store/y20jkchcnkgqfa4ddhynb7rmm8wlcakm-qtchan-0.100/bin/.qtchan-wrapped
strip is /nix/store/y4ymnvgxygpq05h03kyzbj572zmh6zla-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/y20jkchcnkgqfa4ddhynb7rmm8wlcakm-qtchan-0.100/bin
patching script interpreter paths in /nix/store/y20jkchcnkgqfa4ddhynb7rmm8wlcakm-qtchan-0.100
checking for references to /build in /nix/store/y20jkchcnkgqfa4ddhynb7rmm8wlcakm-qtchan-0.100...
postPatchMkspecs
postPatchMkspecs
/nix/store/y20jkchcnkgqfa4ddhynb7rmm8wlcakm-qtchan-0.100

@GrahamcOfBorg
Copy link

Success on x86_64-darwin (full log)

Attempted: qtchan

Partial log (click to expand)

clang++ -c -pipe -stdlib=libc++ -O2 -O3 -std=gnu++11 -Wall -W -fPIC -DQT_USE_QSTRINGBUILDER -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -I. -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtWidgets -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtGui -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtNetwork -isystem /nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/include/QtCore -I. -I/nix/store/5wgzqjpki4xnn9vw1nvfshkpbdlddmwi-apple-framework-OpenGL/Library/Frameworks/OpenGL.framework/Headers -I/nix/store/h9n23fgzmxbi0337n0b9zzh8cbsgh1fv-apple-framework-AGL/Library/Frameworks/AGL.framework/Headers -I. -I/nix/store/hj3nr3ab7xss7g0a8nyj4f8yysy7250d-qtbase-5.11.1-dev/mkspecs/macx-clang -o moc_threadformcontext.o moc_threadformcontext.cpp
clang++ -stdlib=libc++ -o qtchan main.o mainwindow.o threadform.o clickablelabel.o boardtab.o netcontroller.o threadtab.o post.o postform.o filter.o overlay.o threadtabhelper.o treemodel.o treeitem.o settings.o boardtabhelper.o captcha.o threadinfo.o chans.o you.o notificationtray.o treeview.o notificationview.o archivetab.o threadformcontext.o qrc_files.o moc_mainwindow.o moc_threadform.o moc_clickablelabel.o moc_boardtab.o moc_netcontroller.o moc_threadtab.o moc_postform.o moc_overlay.o moc_threadtabhelper.o moc_treeitem.o moc_treemodel.o moc_settings.o moc_boardtabhelper.o moc_captcha.o moc_threadinfo.o moc_notificationtray.o moc_treeview.o moc_notificationview.o moc_archivetab.o moc_threadformcontext.o   -lQt5Widgets -L/lib -framework DiskArbitration -framework IOKit -lQt5Gui -lQt5Network -lQt5Core -framework OpenGL -framework AGL
installing
post-installation fixup
strip is /nix/store/df6k4mgdjxciy0f637lryp7c9ln7n1m3-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/4hjcqi3zg4iibf5igzqrhms01yrf8b0y-qtchan-0.100/bin
patching script interpreter paths in /nix/store/4hjcqi3zg4iibf5igzqrhms01yrf8b0y-qtchan-0.100
postPatchMkspecs
postPatchMkspecs
/nix/store/4hjcqi3zg4iibf5igzqrhms01yrf8b0y-qtchan-0.100

@xeji xeji merged commit 7ec9a33 into NixOS:master Sep 5, 2018
xeji pushed a commit that referenced this pull request Sep 5, 2018
@samueldr @xeji
qtchan: Fixes build from Qt upgrade. (#46082)
85a10bc 
Uses an upstream fix.

(cherry picked from commit 7ec9a33)
@xeji
Copy link
Contributor

xeji commented Sep 5, 2018

backport: 85a10bc

@samueldr samueldr deleted the zhf/qtchan branch September 5, 2018 13:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@samueldr @GrahamcOfBorg @xeji