From 266deaaef162b51a40446ef49e0c91b13dced95d Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 9 Jul 2024 14:48:37 -0700
Subject: [PATCH] subprojects: libnpupnp: update to 6.1.3

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 subprojects/libnpupnp.wrap                    | 15 ++---
 .../packagefiles/libnpupnp_gcc14.patch        | 66 -------------------
 2 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100644 subprojects/packagefiles/libnpupnp_gcc14.patch

diff --git a/subprojects/libnpupnp.wrap b/subprojects/libnpupnp.wrap
index 83865ad75..5c705aa3d 100644
--- a/subprojects/libnpupnp.wrap
+++ b/subprojects/libnpupnp.wrap
@@ -1,13 +1,10 @@
 [wrap-file]
-directory = libnpupnp-6.1.2
-source_url = https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-6.1.2.tar.gz
-source_filename = libnpupnp-6.1.2.tar.gz
-source_hash = d83cadc997a5367030820de6c4a49130b38fe605bf3d0d2c939d7d1c06aa3226
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libnpupnp_6.1.2-1/libnpupnp-6.1.2.tar.gz
-wrapdb_version = 6.1.2-1
-
-# https://github.com/medoc92/npupnp/commit/bb59a9d961efb3c88999f02204bd7cfb5cb45e54
-diff_files = libnpupnp_gcc14.patch
+directory = libnpupnp-6.1.3
+source_url = https://www.lesbonscomptes.com/upmpdcli/downloads/libnpupnp-6.1.3.tar.gz
+source_filename = libnpupnp-6.1.3.tar.gz
+source_hash = 80c3d5adc388e59057be52c4c33d7708efe05318487c09e342e7a1f4a83aa792
+source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libnpupnp_6.1.3-1/libnpupnp-6.1.3.tar.gz
+wrapdb_version = 6.1.3-1
 
 [provide]
 libnpupnp = libnpupnp_dep
diff --git a/subprojects/packagefiles/libnpupnp_gcc14.patch b/subprojects/packagefiles/libnpupnp_gcc14.patch
deleted file mode 100644
index cb253bd83..000000000
--- a/subprojects/packagefiles/libnpupnp_gcc14.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb59a9d961efb3c88999f02204bd7cfb5cb45e54 Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Wed, 24 Apr 2024 15:01:26 -0700
-Subject: [PATCH] fix compilation with GCC14
-
-algorithm include is needed.
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- src/api/upnpapi.cpp         | 1 +
- src/ssdp/ssdp_ctrlpt.cpp    | 1 +
- src/webserver/webserver.cpp | 8 ++++----
- 3 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/api/upnpapi.cpp b/src/api/upnpapi.cpp
-index 3765f5b..cce88fb 100644
---- a/src/api/upnpapi.cpp
-+++ b/src/api/upnpapi.cpp
-@@ -32,6 +32,7 @@
- 
- #include "config.h"
- 
-+#include <algorithm>
- #include <array>
- #include <mutex>
- #include <sstream>
-diff --git a/src/ssdp/ssdp_ctrlpt.cpp b/src/ssdp/ssdp_ctrlpt.cpp
-index bfddf95..0f41649 100644
---- a/src/ssdp/ssdp_ctrlpt.cpp
-+++ b/src/ssdp/ssdp_ctrlpt.cpp
-@@ -36,6 +36,7 @@ nnn * Redistribution and use in source and binary forms, with or without
- #ifdef INCLUDE_CLIENT_APIS
- #if EXCLUDE_SSDP == 0
- 
-+#include <algorithm>
- #include <chrono>
- #include <cstring>
- #include <iostream>
-diff --git a/src/webserver/webserver.cpp b/src/webserver/webserver.cpp
-index c427db3..d6184f0 100644
---- a/src/webserver/webserver.cpp
-+++ b/src/webserver/webserver.cpp
-@@ -43,11 +43,12 @@
- 
- #include "webserver.h"
- 
-+#include <algorithm>
-+#include <cassert>
-+#include <cinttypes>
- #include <map>
--#include <unordered_map>
- #include <mutex>
--
--#include <cinttypes>
-+#include <unordered_map>
- 
- #include "genut.h"
- #include "ssdplib.h"
-@@ -55,7 +56,6 @@
- #include "upnpapi.h"
- #include "uri.h"
- 
--#include <cassert>
- #include <fcntl.h>
- #include <sys/stat.h>
-