Skip to content

Comments

qt5: 5.15.0 -> 5.15.1#102216

Closed
gebner wants to merge 1 commit intoNixOS:stagingfrom
gebner:qt5151
Closed

qt5: 5.15.0 -> 5.15.1#102216
gebner wants to merge 1 commit intoNixOS:stagingfrom
gebner:qt5151

Conversation

@gebner
Copy link
Member

@gebner gebner commented Oct 31, 2020

Motivation for this change

New upstream version.

Closes #100041.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@gebner gebner changed the base branch from master to staging October 31, 2020 10:07
@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux-stdenv This PR causes stdenv to rebuild on Linux and must target a staging branch. 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package and removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: golang Go is a high-level general purpose programming language that is statically typed and compiled. 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: pantheon The Pantheon desktop environment 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: ruby A dynamic, open source programming language with a focus on simplicity and productivity. 6.topic: rust General-purpose programming language emphasizing performance, type safety, and concurrency. 6.topic: stdenv Standard environment 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 31, 2020
@gebner gebner added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Oct 31, 2020
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. and removed 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Oct 31, 2020
@gebner gebner marked this pull request as ready for review October 31, 2020 19:04
@gebner gebner requested a review from ttuegel as a code owner October 31, 2020 19:04
@gebner
Copy link
Member Author

gebner commented Oct 31, 2020

I didn't try to build everything that depends on qt, but I don't expect much breakage since this is just a point release.

@FRidh
Copy link
Member

FRidh commented Nov 1, 2020

KDE frameworks package purpose fails and thereby the application okular as well.

builder for '/nix/store/v1k26dcl0wnpj571a7isx38sn694hrx0-purpose-5.73.0.drv' failed with exit code 2; last 10 log lines:
     96 |         const auto socketError = m_socket.socketError();
        |                                           ^~~~~~~~~~~
        |                                           LocalSocketError
  /build/purpose-5.73.0/src/externalprocess/purposeprocess_main.cpp: In function 'int main(int, char**)':
  /build/purpose-5.73.0/src/externalprocess/purposeprocess_main.cpp:136:76: note: #pragma message: warning: make QGuiApplication, consider QCoreApplication?
    136 | #pragma message("warning: make QGuiApplication, consider QCoreApplication?")
        |                                                                            ^
  make[2]: *** [src/CMakeFiles/purposeprocess.dir/build.make:95: src/CMakeFiles/purposeprocess.dir/externalprocess/purposeprocess_main.cpp.o] Error 1
  make[1]: *** [CMakeFiles/Makefile2:671: src/CMakeFiles/purposeprocess.dir/all] Error 2
  make: *** [Makefile:149: all] Error 2

@FRidh
Copy link
Member

FRidh commented Nov 1, 2020

Rebuilding my system now with this update based on top of #101369.

@unclechu
Copy link
Member

unclechu commented Nov 3, 2020

It probably closes #98009 too.

@doronbehar
Copy link
Contributor

@gebner could you please add the patch I wanted to add in #100041 ?

See also: #99456 (comment) .

@gebner
Copy link
Member Author

gebner commented Nov 5, 2020

@doronbehar The patch is already included.

@FRidh
Copy link
Member

FRidh commented Nov 5, 2020

ffe65c3 is needed for kpurpose.

Rebuilt my system successfully with this change. Did not test runtime though.

@unclechu
Copy link
Member

unclechu commented Nov 5, 2020

It seems this one doesn’t #98009. Am I testing this correctly? It took a while before everything compiles.

2020-11-05 21-39-32

nix-shell -E 'let pkgs=import (fetchTarball {url="https://github.com/NixOS/nixpkgs/archive/5856b4c99356e63119daa14f01626891b03af539.tar.gz";}) {}; in pkgs.mkShell {buildInputs = [pkgs.vlc];}' --run vlc

2020-11-05 22-42-14

nix-shell -E 'let pkgs=import (fetchTarball {url="https://github.com/NixOS/nixpkgs/archive/5856b4c99356e63119daa14f01626891b03af539.tar.gz";}) {}; in pkgs.mkShell {buildInputs = [pkgs.audacious pkgs.vlc];}' --run audacious

@ghost ghost mentioned this pull request Nov 6, 2020
10 tasks
@unclechu
Copy link
Member

unclechu commented Nov 7, 2020

First I applied a patch made of #102594 on top of nixos-unstable, it fixed dark theme for vlc and psi-plus for me but not audacious. Then I applied also this PR:

(set -eo pipefail && curl --fail -Ls https://github.com/NixOS/nixpkgs/pull/102216.patch | git apply)

And this also fixed audacious for me.
2020-11-07 02-32-48
I rebuilt the system by this command (while being in a directory of nixpkgs repository):

sudo nixos-rebuild switch -I nixpkgs="$PWD"

I didn’t test this MR without #102594 yet.

@unclechu
Copy link
Member

unclechu commented Nov 7, 2020

I tested this PR separately and it only fixed audacious for me, vlc and psi-plus were still having light theme. So both #102594 and #102216 to fix Adwaita Dark for Qt applications.

@doronbehar
Copy link
Contributor

Thanks for your report @unclechu, very appreciated.

@FRidh FRidh mentioned this pull request Nov 21, 2020
10 tasks
@poelzi
Copy link
Member

poelzi commented Nov 26, 2020

This should go into nixos 20.09 or better #104448 since it got more bugfixes as well.

@FRidh FRidh mentioned this pull request Dec 7, 2020
4 tasks
@ttuegel
Copy link
Member

ttuegel commented Dec 9, 2020

I'm going to close this in favor of #106118. We should consolidate our efforts there, as it is the most complete pull request in the Qt 5.15.2 series.

@ttuegel ttuegel closed this Dec 9, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: qt/kde Object-oriented framework for GUI creation 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants