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

Jump to bottom

gtk3: 3.24.17 -> 3.24.18 #85802

Merged
merged 1 commit into from Apr 23, 2020
Merged

gtk3: 3.24.17 -> 3.24.18 #85802

merged 1 commit into from Apr 23, 2020

Conversation

lovesegfault
Copy link
Member

Motivation for this change

GTK 3.24.17 has a critical issue which breaks many applications under Wayland. This issue was fixed in 3.24.18.

cc. @jtojnar @worldofpeace for review
cc. @FRidh for inclusion into the current staging merge

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.

@lovesegfault
Copy link
Member Author

I'm about halfway through building all the changed pkgs.

@FRidh FRidh added this to WIP in Staging via automation Apr 23, 2020
@lovesegfault
Copy link
Member Author

World rebuild was fine, I've been running this for a couple days and it's working normally.

It's ready to go.

@worldofpeace
Copy link
Contributor

@lovesegfault Are you sure, ofborg shows a build with a patch failing to apply

source root is gtk+-3.24.18
setting SOURCE_DATE_EPOCH to timestamp 1586475563 of file gtk+-3.24.18/build/win32/vs16/gtk3-version-paths.props
patching sources
applying patch /nix/store/aq2pv5ijchrhhk07lhmcscdjw8babgph-3.0-immodules.cache.patch
patching file gtk/deprecated/gtkrc.c
Hunk #1 succeeded at 774 with fuzz 1.
applying patch /nix/store/f0brcnzizhmn58nw3sdzcdaqgmfqfl1k-Xft-setting-fallback-compute-DPI-properly.patch
patching file gdk/x11/gdkxftdefaults.c
applying patch /nix/store/1g3l5z56gvj9z61f72p13n6x43ymz48m-01-build-Fix-path-handling-in-pkgconfig.patch
patching file meson.build
Hunk #1 succeeded at 852 (offset 18 lines).
applying patch /nix/store/3zvj1qhvakcmr4fnivsdczdgqjw51yrb-79732da1ed8cb167440fb047c72cfc0d888a187b.patch
patching file gdk/wayland/gdkwindow-wayland.c
Hunk #1 FAILED at 1635.
1 out of 1 hunk FAILED -- saving rejects to file gdk/wayland/gdkwindow-wayland.c.rej
builder for '/nix/store/lmkm9px8zmlr94m4hqyk9mj1a2jcs1gw-gtk+3-3.24.18.drv' failed with exit code 1

@lovesegfault
Copy link
Member Author

Oh, I rebased and now it fails; investigating.

@lovesegfault
Copy link
Member Author

@worldofpeace Fixed, removed patches that were already incorporated into this release

@worldofpeace worldofpeace merged commit 7fb1ff9 into NixOS:staging Apr 23, 2020
Staging automation moved this from WIP to Done Apr 23, 2020
@worldofpeace
Copy link
Contributor

@worldofpeace Fixed, removed patches that were already incorporated into this release

Perfect, thanks @lovesegfault ✨

@lovesegfault lovesegfault deleted the gtk3-3.24.18 branch April 23, 2020 17:14
@evils evils mentioned this pull request May 2, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@vcunat vcunat Awaiting requested review from vcunat

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 2501-5000
Projects
Staging
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@lovesegfault @worldofpeace