Skip to content

gtk3: 3.24.35 -> 3.24.36#208973

Merged
jtojnar merged 1 commit intoNixOS:stagingfrom
baloo:baloo/gtk3/3.24.36
Jan 12, 2023
Merged

gtk3: 3.24.35 -> 3.24.36#208973
jtojnar merged 1 commit intoNixOS:stagingfrom
baloo:baloo/gtk3/3.24.36

Conversation

@baloo
Copy link
Member

@baloo baloo commented Jan 4, 2023 •
edited by bobby285271
Loading

Description of changes

https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.35...3.24.36

This bring a fix where cursors would be missing on wayland:

  • gtk#5365 ("Updating GTK3 breaks cursors on Wayland completely")
  • gtk!5262 ("wayland: Look for cursor themes in $HOME")
  • gtk!5329 ("Revert "wayland: Look for cursor themes in $HOME"" - also contains revert for gtk!5192 "Make wayland load cursors on demand")

supersedes #207113

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@baloo
Copy link
Member Author

baloo commented Jan 4, 2023

I guess that should target staging, but firefox is pretty unusable without a cursor :/

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin 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. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jan 4, 2023
@bobby285271
Copy link
Member

bobby285271 commented Jan 4, 2023

🙇 Please remove the patch for gdk/wayland/cursor/meson.build even it does apply (and also remove fetchpatch2 from args). The whole gdk/wayland/cursor folder is removed in this commit.

(Yeah I imagine this will need to target staging, I rarely see mass rebuilds merged into master except critical security fixes, I am not using wayland and I don't know how bad the affect is, sorry for that)

@baloo baloo force-pushed the baloo/gtk3/3.24.36 branch from e5093ef to f2e5114 Compare January 4, 2023 06:22
@baloo baloo force-pushed the baloo/gtk3/3.24.36 branch from f2e5114 to 89d3fe8 Compare January 4, 2023 06:23
@baloo baloo changed the base branch from master to staging January 4, 2023 06:25
@baloo
Copy link
Member Author

baloo commented Jan 4, 2023 •
edited
Loading

Built it overnight, switched to it on my home-manager config and I now get cursor after launching a video (youtube, netflix, ...) which would quite reliably trigger the bug (I guess because they would hide the cursor when launching the video? and couldn't get it back?)

@baloo
Copy link
Member Author

baloo commented Jan 6, 2023

bump

@mofrim
Copy link
Contributor

mofrim commented Jan 12, 2023

Can confirm the annoying cursorlessness in firefox on wayland without this upgrade. Have been living with this since i upgraded to nixos 22.11....
This probably would also fix #207339.

@jtojnar jtojnar merged commit 8fea234 into NixOS:staging Jan 12, 2023
@jtojnar
Copy link
Member

jtojnar commented Jan 12, 2023

Thanks.

@baloo baloo deleted the baloo/gtk3/3.24.36 branch January 12, 2023 21:29
@baloo
Copy link
Member Author

baloo commented Jan 12, 2023

Thank you!

@bobby285271 bobby285271 mentioned this pull request Jan 25, 2023
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jtojnar jtojnar Awaiting requested review from jtojnar

@dasj19 dasj19 Awaiting requested review from dasj19

@amaxine amaxine Awaiting requested review from amaxine

@bobby285271 bobby285271 Awaiting requested review from bobby285271

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@hedning hedning Awaiting requested review from hedning

Assignees

No one assigned

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin 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. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@baloo @bobby285271 @mofrim @jtojnar