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

[22.05] cinnamon.cinnamon-common: many fixes #196285

Merged
merged 6 commits into from
Oct 17, 2022
Merged

[22.05] cinnamon.cinnamon-common: many fixes #196285

merged 6 commits into from
Oct 17, 2022

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Oct 16, 2022 •
edited
Loading

Description of changes

Actually I should do this earlier, but I hope this is better than no backport.

Partly backports #186742, #187434, #190918, #194687, #187856.

Fixes or helps #168924, #101881, #129946, #177041, #194612 (on 22.05).

Things done
  • Boot into a Cinnamon 5.2 VM and check if all fixes still applies
  • Re-visit all related upstream code

@bobby285271
cinnamon.cinnamon-common: fix msgfmt path for Spices.py
13f6362 
Closes NixOS#168924

(cherry picked from commit a29ca0e)
@bobby285271
cinnamon.cinnamon-common: ensure caribou is in XDG_DATA_DIRS
438c357 
Some of its layout files are required for constructing a keyboard model.

Closes NixOS#101881

(cherry picked from commit 3de049f)
@bobby285271
cinnamon.cinnamon-common: ensure xapp is available for cinnamon-deskt…
8ec26bc 
…op-editor

Closes NixOS#129946
Closes NixOS#177041

(cherry picked from commit d00b39e)
@bobby285271
cinnamon.cinnamon-common: Fix upload-system-info path
1bc7436 
(cherry picked from commit 6d36e7b)
@bobby285271
cinnamon.cinnamon-common: Fix locking from menu
f73c9bd 
Closes NixOS#194612

(cherry picked from commit 8e2afcd)
@bobby285271
maintainers: add bobby285271 to cinnamon maintainer
20f0a28 
(cherry picked from commit 957b36c)
@github-actions github-actions bot added the 6.topic: cinnamon Desktop environment label Oct 16, 2022
@ofborg ofborg bot requested a review from mkg20001 October 16, 2022 15:11
@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: 1-10 labels Oct 16, 2022
@bobby285271 bobby285271 marked this pull request as ready for review October 16, 2022 23:39
@bobby285271 bobby285271 merged commit 05648fd into NixOS:release-22.05 Oct 17, 2022
@bobby285271 bobby285271 deleted the cinnamon-stable branch October 17, 2022 02:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkg20001 mkg20001 Awaiting requested review from mkg20001 mkg20001 is a code owner

Assignees
No one assigned
Labels
6.topic: cinnamon Desktop environment 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 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.
1 participant
@bobby285271