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.

Sign up for GitHub

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

gnome3.mutter328: backport changes from 3.32 #60210

Merged
merged 1 commit into from
Apr 28, 2019
Merged

gnome3.mutter328: backport changes from 3.32 #60210

merged 1 commit into from
Apr 28, 2019
+28 −1

Conversation

worldofpeace
Copy link
Contributor

gsettings-desktop-schemas made the following change in 3.320

Change tablets'/touchscreens' "display" setting to "output" one
with different semantics.

That coincides with GNOME/mutter#1331

This caused a segmentation fault in gala on Fedora2

Settings schema 'org.gnome.desktop.peripherals.touchscreen'
does not contain a key named 'display'

I haven't experienced said segfault here in NixOS but I don't see
a reason not to use the solution reached there, which was to backport
relevant change1 to mutter 3.28.

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

Sorry, something went wrong.

@worldofpeace
gnome3.mutter328: backport changes from 3.32
b2dc8c0 
gsettings-desktop-schemas made the following change in 3.32[0]
> Change tablets'/touchscreens' "display" setting to "output" one
> with different semantics.

That coincides with GNOME/mutter#133[1]

This caused a segmentation fault in gala on Fedora[2]
> Settings schema 'org.gnome.desktop.peripherals.touchscreen'
> does not contain a key named 'display'

I haven't experienced said segfault here in NixOS but I don't see
a reason not to use the solution reached there, which was to backport
relevant change[1] to mutter 3.28.

[0]: https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/commit/c7eee129c6edbc1a5b121fa3327d83049325becb
[1]: https://gitlab.gnome.org/GNOME/mutter/merge_requests/133
[2]: https://bugzilla.redhat.com/show_bug.cgi?id=1700337
@worldofpeace worldofpeace requested a review from jtojnar April 25, 2019 13:43
@worldofpeace worldofpeace added the 6.topic: pantheon The Pantheon desktop environment label Apr 25, 2019
@ofborg ofborg bot added 6.topic: GNOME GNOME desktop environment and its underlying platform and removed 6.topic: pantheon The Pantheon desktop environment labels Apr 25, 2019
@ofborg ofborg bot requested a review from hedning April 25, 2019 13:59
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 labels Apr 25, 2019
@hedning
Copy link
Contributor

hedning commented Apr 25, 2019

I haven't experienced said segfault here in NixOS

Packages that use of mutter328 shouldn't have access to mutter-3.32's schema, so this shouldn't be any problem for us really.

If the patches doesn't bring any extra functionality we shouldn't really need them TBH, but it doesn't hurt ofc. to pull them in.

@worldofpeace
Copy link
Contributor Author

Packages that use of mutter328 shouldn't have access to mutter-3.32's schema, so this shouldn't be any problem for us really.

Tiny win for purity 😀

If the patches doesn't bring any extra functionality we shouldn't really need them TBH, but it doesn't hurt ofc. to pull them in.

https://gitlab.gnome.org/GNOME/mutter/merge_requests/133
But g-s-d still did take care of the policy, figuring out which display-mappable input device belongs to which display.
This series of commits move this role within mutter as well, making it possible to drop a good chunk of code in g-s-d.

So I guess it was dropped from g-s-d 3.32 so this function is now missing here?

@hedning
Copy link
Contributor

hedning commented Apr 25, 2019

So I guess it was dropped from g-s-d 3.32 so this function is now missing here?

Yeah, looks like it. Lets pull in the changes 👍

@worldofpeace
Copy link
Contributor Author

TBH there's probably much worse things at play here that I don't know about yet 🤣

(can they just support latest mutter already)

@worldofpeace worldofpeace merged commit 24f15a7 into NixOS:master Apr 28, 2019
@worldofpeace worldofpeace deleted the mutter328/fix branch April 28, 2019 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar

@hedning hedning

Assignees
No one assigned
Labels
6.topic: GNOME GNOME desktop environment and its underlying platform 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 11-100 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@worldofpeace @hedning