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

gnome.gnome-settings-daemon338: fix build with meson 0.61 #164266

Merged
merged 1 commit into from
Mar 17, 2022
Merged

gnome.gnome-settings-daemon338: fix build with meson 0.61 #164266

merged 1 commit into from
Mar 17, 2022

Conversation

bobby285271
Copy link
Member

@bobby285271 bobby285271 commented Mar 15, 2022 •
edited
Loading

Description of changes

This was forgotten during #154837

Things done

@github-actions github-actions bot added the 6.topic: GNOME GNOME desktop environment and its underlying platform label Mar 15, 2022
@bobby285271

This comment was marked as outdated.

Sign in to view
@bobby285271 bobby285271 added the 2.status: work-in-progress This PR isn't done label Mar 15, 2022
@bobby285271

This comment was marked as outdated.

Sign in to view
@NickCao
Copy link
Member

NickCao commented Mar 15, 2022

Wow that's a lot of breakage! But GNOME 42 should be released in several days, would it be better to wait for it? By several days I mean like 3/19 for the release tarball.

@bobby285271
Copy link
Member Author

bobby285271 commented Mar 15, 2022 •
edited
Loading

(Edited)

I am not sure whether the GNOME 42 bump can be merged in a short period, and I am also not sure whether the GNOME 42 PR will bump everything. I will leave the decision to jtojnar... I have no motivation to test building other packages, so I am happy to just close this if requested.

For informative purpose, some other GNOME packages that I know does not build with 0.61 on d9f692405b7f5ade62ddde890f09bf701ae3b2b6 without fixing:

  • gnome.gnome-settings-daemon
  • gnome.gnome-disk-utility
  • gnome.gnome-sound-recorder
  • gnome.gnome-sudoku
  • gnome.gnome-tetravex
  • gnome.gnome-weather
  • gnome.hitori
  • gnome.polari
  • gnome.simple-scan
  • gnome.totem
  • gnome.gucharmap
  • gnome.gnome-user-share
  • gnome.gnome-books
  • gnome.gnome-shell
  • gnome.gnome-terminal

(More edit): The previous commits are kept here: https://github.com/bobby285271/nixpkgs/tree/gnome-meson deleted, I think I have addressed most of them in other PRs.

@NickCao
Copy link
Member

NickCao commented Mar 15, 2022

The current staging next still need a few days to stabilize, and the next one is also a big one with systemd 250, we would sure have enough time to sort everything out before it hits master.

@ofborg ofborg bot requested a review from davidak March 15, 2022 14:22
@jtojnar
Copy link
Member

jtojnar commented Mar 15, 2022 •
edited
Loading

Wow, you have done quite a loot of good work here, the changes look good.

Personally, I would be too lazy for that and just revert the Meson commit that adds strictness until GNOME 42 is available.

@bobby285271
Copy link
Member Author

Personally, I would be too lazy for that and just revert the Meson commit that adds strictness until GNOME 42 is available.

Sounds good. I updated this PR to include only one fix for gsd338, which is definitely not going to have any new release.

@bobby285271 bobby285271 changed the title GNOME: fix build with meson 0.61 gnome.gnome-settings-daemon338: fix build with meson 0.61 Mar 16, 2022
@bobby285271 bobby285271 removed the 2.status: work-in-progress This PR isn't done label Mar 16, 2022
@bobby285271
Copy link
Member Author

bobby285271 commented Mar 16, 2022 •
edited
Loading

@ofborg build gnome.gnome-settings-daemon338
@ofborg test pantheon
@ofborg eval

@bobby285271 bobby285271 marked this pull request as ready for review March 16, 2022 01:27
@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 and removed 10.rebuild-darwin: 1-10 labels Mar 16, 2022
@bobby285271
Copy link
Member Author

Result of nixpkgs-review pr 164266 run on x86_64-linux 1

28 packages built:
  • gnome.gnome-settings-daemon338 (pantheon.gnome-settings-daemon)
  • monitor
  • pantheon.elementary-greeter
  • pantheon.elementary-gsettings-schemas
  • pantheon.elementary-session-settings
  • pantheon.gala
  • pantheon.switchboard-plug-a11y
  • pantheon.switchboard-plug-bluetooth
  • pantheon.switchboard-plug-keyboard
  • pantheon.switchboard-plug-mouse-touchpad
  • pantheon.switchboard-plug-pantheon-shell
  • pantheon.switchboard-plug-power
  • pantheon.switchboard-plug-security-privacy
  • pantheon.switchboard-with-plugs
  • pantheon.wingpanel
  • pantheon.wingpanel-applications-menu
  • pantheon.wingpanel-indicator-a11y
  • pantheon.wingpanel-indicator-bluetooth
  • pantheon.wingpanel-indicator-datetime
  • pantheon.wingpanel-indicator-keyboard
  • pantheon.wingpanel-indicator-network
  • pantheon.wingpanel-indicator-nightlight
  • pantheon.wingpanel-indicator-notifications
  • pantheon.wingpanel-indicator-power
  • pantheon.wingpanel-indicator-session
  • pantheon.wingpanel-indicator-sound
  • pantheon.wingpanel-with-indicators
  • wingpanel-indicator-ayatana

@jtojnar
Copy link
Member

jtojnar commented Mar 16, 2022

I am trying to build gnome-bluetooth against meson with this annotation removed to see if it serves as a workaround: https://github.com/mesonbuild/meson/blob/1be444b4647214dbd9a43084ffbf01ef95a78287/mesonbuild/modules/i18n.py#L154

@bobby285271
Copy link
Member Author

Yeah this is what was done in mesonbuild/meson#9445

@bobby285271
Copy link
Member Author

mesonbuild/meson@022c035 applies for me and built gnome.gnome-settings-daemon338 without the fix in this PR (I have a separate meson_0_61 package in my local branch).

@jtojnar
Copy link
Member

jtojnar commented Mar 16, 2022

Oh, nice, that might be even better.

@bobby285271 bobby285271 mentioned this pull request Mar 16, 2022
Merged
13 tasks
@NickCao NickCao mentioned this pull request Mar 16, 2022
Closed
13 tasks
@bobby285271
Copy link
Member Author

I decided I will still merge this in a few hours unless objections. Pantheon 7 is not likely going to happen in NixOS 22.05 and I really have no idea when we can get rid of mutter338/gsd338 (elementary/gala#1326) and mesonbuild/meson@022c035 eventually has to be removed from the patch set. 😓

@bobby285271 bobby285271 merged commit 0bc3400 into NixOS:master Mar 17, 2022
@bobby285271 bobby285271 deleted the meson061 branch March 17, 2022 12:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

@hedning hedning Awaiting requested review from hedning

@amaxine amaxine Awaiting requested review from amaxine

@domenkozar domenkozar Awaiting requested review from domenkozar

@dasj19 dasj19 Awaiting requested review from dasj19

@davidak davidak Awaiting requested review from davidak

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.
3 participants
@bobby285271 @NickCao @jtojnar