diff options
| author | merge-script <fanquake@gmail.com> | 2024-05-02 11:21:24 +0800 |
|---|---|---|
| committer | merge-script <fanquake@gmail.com> | 2024-05-02 11:21:24 +0800 |
| commit | 1cc3aa4d21e3e4ff7a651bc71fec062ec5a9eb09 (patch) | |
| tree | 74ce41f1c4c54c508ede0d373238c47369647356 /doc | |
| parent | d73245abc70346a0e8805d50a1f395706084294c (diff) | |
| parent | 5195baa60087ee366290887ad982fc491e14c111 (diff) | |
| download | bitcoin-1cc3aa4d21e3e4ff7a651bc71fec062ec5a9eb09.tar.xz | |
Merge bitcoin/bitcoin#29707: depends: build miniupnpc with CMake
5195baa60087ee366290887ad982fc491e14c111 depends: fix miniupnpc snprintf usage on Windows (fanquake)
3c2d440f1497f60bb444326f51383df244dcdfe9 depends: switch miniupnpc to CMake (Cory Fields)
f5618c79d9e7af05c2987044dc2da03697f8bb89 depends: add upstream CMake patch to miniupnpc (fanquake)
6866b571ab96f03ca0775424e45458c5731f230f depends: miniupnpc 2.2.7 (fanquake)
Pull request description:
This picks up one of the changes from #29232, which is a switch to building miniupnpc with CMake. It includes an update to the most recent version of miniupnpc (2.2.7), which means we can drop one patch from that commit, and includes a new patch for a change I've upstreamed https://github.com/miniupnp/miniupnp/pull/721, as well as some suggestions from the previous PR.
ACKs for top commit:
theuni:
ACK 5195baa60087ee366290887ad982fc491e14c111.
TheCharlatan:
utACK 5195baa60087ee366290887ad982fc491e14c111
Tree-SHA512: 5b27e132cd5eed285e9be34c8b96893417d92a1ae55c99345c9a89e1c1c5e40e4bc840bc061b879758b2b11fcb520cd98c3da985c1e153f2e5380cf63efe2d69
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/dependencies.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/dependencies.md b/doc/dependencies.md index 43973d0c15..2b9d9128d3 100644 --- a/doc/dependencies.md +++ b/doc/dependencies.md @@ -36,7 +36,7 @@ You can find installation instructions in the `build-*.md` file for your platfor | Dependency | Releases | Version used | Minimum required | Runtime | | --- | --- | --- | --- | --- | | [libnatpmp](../depends/packages/libnatpmp.mk) | [link](https://github.com/miniupnp/libnatpmp/) | commit [f2433be...](https://github.com/bitcoin/bitcoin/pull/29708) | | No | -| [MiniUPnPc](../depends/packages/miniupnpc.mk) | [link](https://miniupnp.tuxfamily.org/) | [2.2.2](https://github.com/bitcoin/bitcoin/pull/20421) | 2.1 | No | +| [MiniUPnPc](../depends/packages/miniupnpc.mk) | [link](https://miniupnp.tuxfamily.org/) | [2.2.7](https://github.com/bitcoin/bitcoin/pull/29707) | 2.1 | No | ### Notifications | Dependency | Releases | Version used | Minimum required | Runtime | |