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

wxGTK31: 3.1.3 -> 3.1.4 #95460

Closed
wants to merge 1 commit into from
Closed

wxGTK31: 3.1.3 -> 3.1.4 #95460

wants to merge 1 commit into from

Conversation

@tfmoraes
Copy link
Contributor

@tfmoraes tfmoraes commented Aug 14, 2020

❯ nixpkgs-review rev e00baf6b52db9f377d1f444ec985f61f53f30c53                                                                                                                                                                                  nixpkgs-review 
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
$ git worktree add /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/nixpkgs d22cd376e501df3012f208488b9ff12384efffc6
Preparing worktree (detached HEAD d22cd376e50)
HEAD is now at d22cd376e50 Merge pull request #95161 from lf-/patch-1
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit e00baf6b52db9f377d1f444ec985f61f53f30c53
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/nixpkgs -qaP --xml --out-path --show-trace --meta
12 packages updated:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer prusa-slicer pwsafe treesheets wxHexEditor wxGTK31-gtk3 (3.1.3 → 3.1.4) wxGTK31 (3.1.3 → 3.1.4)

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/rev-e00baf6b52db9f377d1f444ec985f61f53f30c53/build.nix
[15 built, 73 copied (1031.3 MiB), 249.2 MiB DL]
11 packages built:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer pwsafe treesheets wxGTK31 wxGTK31-gtk3 wxhexeditor
Motivation for this change

Update WxWidgets to 3.1.4

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.
@tfmoraes
Copy link
Contributor Author

@tfmoraes tfmoraes commented Aug 15, 2020

Now that it's really building wx3.1.4 a package (pwsafe) is failing to build:

nix-shell -p nixpkgs-review --run "nixpkgs-review rev 21986a9b3424182406f1e96966fdf3785f0a8538"                                                                    
$ git -c fetch.prune=false fetch --force https://github.com/NixOS/nixpkgs master:refs/nixpkgs-review/0
remote: Enumerating objects: 494, done.
remote: Counting objects: 100% (494/494), done.
remote: Compressing objects: 100% (9/9), done.
remote: Total 767 (delta 484), reused 487 (delta 484), pack-reused 273
Receiving objects: 100% (767/767), 459.28 KiB | 1.00 MiB/s, done.
Resolving deltas: 100% (531/531), completed with 225 local objects.
From https://github.com/NixOS/nixpkgs
   ff8e1825ab8..99d379c45c7  master     -> refs/nixpkgs-review/0
$ git worktree add /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/nixpkgs 99d379c45c793c078af4bb5d6c85459f72b1f30b
Preparing worktree (detached HEAD 99d379c45c7)
HEAD is now at 99d379c45c7 Merge pull request #79874 from oxzi/tinycbor-v0.5.3
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/nixpkgs -qaP --xml --out-path --show-trace
$ git merge --no-commit 21986a9b3424182406f1e96966fdf3785f0a8538
Automatic merge went well; stopped before committing as requested
$ nix-env -f /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/nixpkgs -qaP --xml --out-path --show-trace --meta
12 packages updated:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer prusa-slicer pwsafe treesheets wxHexEditor wxGTK31 (3.1.3 → 3.1.4) wxGTK31-gtk3 (3.1.3 → 3.1.4)

$ nix build --no-link --keep-going --option build-use-sandbox relaxed -f /home/thiago/.cache/nixpkgs-review/rev-21986a9b3424182406f1e96966fdf3785f0a8538/build.nix
builder for '/nix/store/3fsqjnj1d94h9795djhbjv7jsbpv22ms-pwsafe-3.52.0.drv' failed with exit code 2; last 10 log lines:
        |                                        GetLabelText
  /build/source/src/ui/wxWidgets/PasswordSafeSearch.cpp:129:41: error: 'class wxSearchCtrl' has no member named 'IsModified'
    129 |   if (m_criteria->IsDirty() || txtCtrl->IsModified() || m_searchPointer.IsEmpty()) {
        |                                         ^~~~~~~~~~
  /build/source/src/ui/wxWidgets/PasswordSafeSearch.cpp:152:14: error: 'class wxSearchCtrl' has no member named 'SetModified'
    152 |     txtCtrl->SetModified(false);
        |              ^~~~~~~~~~~
  make[2]: *** [CMakeFiles/pwsafe.dir/build.make:134: CMakeFiles/pwsafe.dir/src/ui/wxWidgets/PasswordSafeSearch.cpp.o] Error 1
  make[1]: *** [CMakeFiles/Makefile2:253: CMakeFiles/pwsafe.dir/all] Error 2
  make: *** [Makefile:182: all] Error 2
cannot build derivation '/nix/store/744dxk025c2i2nsywab8q333fm2ijsvi-env.drv': 1 dependencies couldn't be built
[10 built (1 failed), 0.0 MiB DL]
error: build of '/nix/store/744dxk025c2i2nsywab8q333fm2ijsvi-env.drv' failed
1 package failed to build:
pwsafe

10 packages built:
cubicsdr diff-pdf grandorgue kicad-unstable kicad-unstable-small prusa-slicer treesheets wxGTK31 wxGTK31-gtk3 wxhexeditor

@jonringer
Copy link
Contributor

@jonringer jonringer commented Aug 15, 2020

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the commits.

This can be done with:

git reset HEAD~1                    # move fixup commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

@jonringer
Copy link
Contributor

@jonringer jonringer commented Aug 15, 2020

cc @c0bw3b @pjones on potential pwsafe breakage

@tfmoraes
Copy link
Contributor Author

@tfmoraes tfmoraes commented Aug 15, 2020

Please follow CONTRIBUTING.md and manual#submitting-changes-making-patches and squash the commits.

This can be done with:

git reset HEAD~1                    # move fixup commits into unstaged
git add -- pkgs/                    # move changes into staged
git commit --amend --no-edit        # add changes to previous commit
git push ... ... --force            # modify current PR branch

I think it's OK now.

@tfmoraes
Copy link
Contributor Author

@tfmoraes tfmoraes commented Aug 15, 2020

cc @c0bw3b @pjones on potential pwsafe breakage

I did a test here, if I set pwsafe to compile with wxGTK30 it compiles.

@tfmoraes tfmoraes closed this Oct 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants