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

gupnp, gupnp_1_6: fix compilation #246931

Merged
merged 2 commits into from
Aug 12, 2023
Merged

Conversation

uninsane
Copy link
Contributor

@uninsane uninsane commented Aug 3, 2023

meson 1.1.1 -> 1.2.0 had a few breaking changes. upstream fixed it on both the main 1.6 and legacy 1.4 branches, but only published a release for gupnp_1_6: for the legacy gupnp we have to cherry-pick that fix.

Description of changes

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.11 Release Notes (or backporting 23.05 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
  • Fits CONTRIBUTING.md.

@uninsane
Copy link
Contributor Author

uninsane commented Aug 3, 2023

upstream was quick to backport the fix ❤️, so i updated the PR to fetchpatch it instead of including the patch inline.

i somehow didn't notice that gupnp_1_6 was also broken. i can push a commit to this PR to update to 1.6.5 in a bit here. pushed a commit to fix that: it's a dead simple upgrade.

@uninsane uninsane changed the title gupnp: fix compilation gupnp, gupnp_1_6: fix compilation Aug 3, 2023
meson 1.1.1 -> 1.2.0 had a few breaking changes.
upstream fixed it on both the main 1.6 and legacy 1.4 branches,
but only published a release for `gupnp_1_6`: for the legacy `gupnp` we
have to cherry-pick that fix.
this fixes the build with meson 1.2.0, and nothing more:
- <https://gitlab.gnome.org/GNOME/gupnp/-/commits/gupnp-1.6.5>
@bobby285271 bobby285271 changed the base branch from staging to staging-next August 12, 2023 02:52
@bobby285271 bobby285271 mentioned this pull request Aug 12, 2023
12 tasks
@bobby285271 bobby285271 merged commit 0e46c9c into NixOS:staging-next Aug 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants