From 72ba7b5d263b6d909ae59040536a499a596237c2 Mon Sep 17 00:00:00 2001
From: fanquake <fanquake@gmail.com>
Date: Fri, 22 Mar 2024 17:29:22 +0000
Subject: [PATCH 1/2] depends: libnatpmp
 f2433bec24ca3d3f22a8a7840728a3ac177f94ba

This includes once CMake related change I upstreamed:
https://github.com/miniupnp/libnatpmp/pull/43.
---
 depends/packages/libnatpmp.mk | 4 ++--
 doc/dependencies.md           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/depends/packages/libnatpmp.mk b/depends/packages/libnatpmp.mk
index caa809ec0b4..e222f29eee0 100644
--- a/depends/packages/libnatpmp.mk
+++ b/depends/packages/libnatpmp.mk
@@ -1,8 +1,8 @@
 package=libnatpmp
-$(package)_version=07004b97cf691774efebe70404cf22201e4d330d
+$(package)_version=f2433bec24ca3d3f22a8a7840728a3ac177f94ba
 $(package)_download_path=https://github.com/miniupnp/libnatpmp/archive
 $(package)_file_name=$($(package)_version).tar.gz
-$(package)_sha256_hash=9321953ceb39d07c25463e266e50d0ae7b64676bb3a986d932b18881ed94f1fb
+$(package)_sha256_hash=ef84979950dfb3556705b63c9cd6c95501b75e887fba466234b187f3c9029669
 $(package)_patches=no_libtool.patch
 
 define $(package)_set_vars
diff --git a/doc/dependencies.md b/doc/dependencies.md
index 1e48d225b05..4003f22b916 100644
--- a/doc/dependencies.md
+++ b/doc/dependencies.md
@@ -35,7 +35,7 @@ You can find installation instructions in the `build-*.md` file for your platfor
 ### Networking
 | Dependency | Releases | Version used | Minimum required | Runtime |
 | --- | --- | --- | --- | --- |
-| [libnatpmp](../depends/packages/libnatpmp.mk) | [link](https://github.com/miniupnp/libnatpmp/) | commit [07004b9...](https://github.com/bitcoin/bitcoin/pull/25917) | | No |
+| [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 |
 
 ### Notifications

From 3c1ae3ee33d4d9dbea046d5ab8ee924a12982759 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Wed, 19 Apr 2023 16:34:39 -0400
Subject: [PATCH 2/2] depends: switch libnatpmp to CMake

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
---
 depends/packages/libnatpmp.mk              | 18 ++++++------------
 depends/patches/libnatpmp/no_libtool.patch | 15 ---------------
 2 files changed, 6 insertions(+), 27 deletions(-)
 delete mode 100644 depends/patches/libnatpmp/no_libtool.patch

diff --git a/depends/packages/libnatpmp.mk b/depends/packages/libnatpmp.mk
index e222f29eee0..5a573a18e7f 100644
--- a/depends/packages/libnatpmp.mk
+++ b/depends/packages/libnatpmp.mk
@@ -3,24 +3,18 @@ $(package)_version=f2433bec24ca3d3f22a8a7840728a3ac177f94ba
 $(package)_download_path=https://github.com/miniupnp/libnatpmp/archive
 $(package)_file_name=$($(package)_version).tar.gz
 $(package)_sha256_hash=ef84979950dfb3556705b63c9cd6c95501b75e887fba466234b187f3c9029669
-$(package)_patches=no_libtool.patch
+$(package)_build_subdir=build
 
-define $(package)_set_vars
-  $(package)_build_opts=CC="$($(package)_cc)"
-  $(package)_build_opts_mingw32=CPPFLAGS=-DNATPMP_STATICLIB
-  $(package)_build_env+=CFLAGS="$($(package)_cflags) $($(package)_cppflags)" AR="$($(package)_ar)"
-endef
-
-define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/no_libtool.patch
+define $(package)_config_cmds
+  $($(package)_cmake) -S .. -B .
 endef
 
 define $(package)_build_cmds
-  $(MAKE) libnatpmp.a $($(package)_build_opts)
+  $(MAKE) natpmp
 endef
 
 define $(package)_stage_cmds
-  mkdir -p $($(package)_staging_prefix_dir)/include $($(package)_staging_prefix_dir)/lib &&\
-  install *.h $($(package)_staging_prefix_dir)/include &&\
+  mkdir -p $($(package)_staging_prefix_dir)/include $($(package)_staging_prefix_dir)/lib && \
+  install ../natpmp.h  ../natpmp_declspec.h $($(package)_staging_prefix_dir)/include && \
   install libnatpmp.a $($(package)_staging_prefix_dir)/lib
 endef
diff --git a/depends/patches/libnatpmp/no_libtool.patch b/depends/patches/libnatpmp/no_libtool.patch
deleted file mode 100644
index 2b9f01f6ebd..00000000000
--- a/depends/patches/libnatpmp/no_libtool.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ruN libnatpmp-07004b97cf691774efebe70404cf22201e4d330d/Makefile libnatpmp-07004b97cf691774efebe70404cf22201e4d330d.new/Makefile
---- libnatpmp-07004b97cf691774efebe70404cf22201e4d330d/Makefile	2022-07-05 07:49:50.000000000 +0000
-+++ libnatpmp-07004b97cf691774efebe70404cf22201e4d330d.new/Makefile	2024-01-23 20:59:35.674821779 +0000
-@@ -197,11 +197,7 @@
- 	$(CC) $(LDFLAGS) -o $@ $^ $(LDLIBS)
- 
- $(STATICLIB):	$(LIBOBJS)
--ifneq (, $(findstring darwin, $(OS)))
--	$(LIBTOOL) -static -o $@ $?
--else
- 	$(AR) crs $@ $?
--endif
- 
- $(SHAREDLIB):	$(LIBOBJS)
- ifneq (, $(findstring darwin, $(OS)))