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

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
Contributor

lovesegfault commented Apr 22, 2020

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
Contributor Author

lovesegfault commented Apr 22, 2020

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
Contributor Author

lovesegfault commented Apr 23, 2020

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
Member

worldofpeace commented Apr 23, 2020

@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
Contributor Author

lovesegfault commented Apr 23, 2020

Oh, I rebased and now it fails; investigating.

@lovesegfault lovesegfault force-pushed the lovesegfault:gtk3-3.24.18 branch from b3a774b to af87f13 Apr 23, 2020
@lovesegfault
Copy link
Contributor Author

lovesegfault commented Apr 23, 2020

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

@worldofpeace worldofpeace merged commit 7fb1ff9 into NixOS:staging Apr 23, 2020
15 of 16 checks passed
15 of 16 checks passed
gtk3, gtk3.passthru.tests on aarch64-linux
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="af87f13"; rev="af87f13d0c9ace72a46553de1208755fb52aaa22"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
gtk3, gtk3.passthru.tests on x86_64-linux Success
Details
Staging automation moved this from WIP to Done Apr 23, 2020
@worldofpeace
Copy link
Member

worldofpeace commented Apr 23, 2020

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

Perfect, thanks @lovesegfault

@lovesegfault lovesegfault deleted the lovesegfault:gtk3-3.24.18 branch Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Staging
  
Done
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.