Skip to content

gupnp, gupnp_1_6: fix compilation#246931

Merged
bobby285271 merged 2 commits intoNixOS:staging-nextfrom
uninsane:pr-fix-gupnp
Aug 12, 2023
Merged

gupnp, gupnp_1_6: fix compilation#246931
bobby285271 merged 2 commits intoNixOS:staging-nextfrom
uninsane:pr-fix-gupnp

Conversation

@uninsane
Copy link
Copy Markdown
Contributor

@uninsane uninsane commented Aug 3, 2023 •
edited
Loading

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 uninsane mentioned this pull request Aug 3, 2023
Merged
12 tasks
@ofborg ofborg bot added 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux and should normally target the staging branches. labels Aug 3, 2023
@uninsane
Copy link
Copy Markdown
Contributor Author

uninsane commented Aug 3, 2023 •
edited
Loading

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
risicle
risicle reviewed Aug 4, 2023
View reviewed changes
uninsane added 2 commits August 6, 2023 08:40
@uninsane
gupnp: fix compilation
aa6f328 
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.
@uninsane
gupnp_1_6: 1.6.4 -> 1.6.5
da269e3 
this fixes the build with meson 1.2.0, and nothing more:
- <https://gitlab.gnome.org/GNOME/gupnp/-/commits/gupnp-1.6.5>
@uninsane uninsane mentioned this pull request Aug 8, 2023
Merged
12 tasks
This was referenced Aug 12, 2023
Merged
Closed
@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
Closed
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

Reviewers

@risicle risicle risicle left review comments

Assignees

No one assigned

Labels

10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501-1000 This PR causes many rebuilds on Linux 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@uninsane @risicle @bobby285271