haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

MiniUPnPc: bump to version 2.1. (#2279)

Browse Source
This commit is contained in:
miqlas
2018-07-04 15:16:38 +02:00
committed by fbrosson
parent 396d256ae6
commit 74071c6422
2 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
net-libs/miniupnpc/patches/miniupnpc-2.0.20171102.patchset → net-libs/miniupnpc/patches/miniupnpc-2.1.patchset
View File

@@ -5,12 +5,12 @@ Subject: Haiku got no IP_MREQN
diff --git a/minissdpc.c b/minissdpc.c
index 3479de8..8d9aebc 100644
index 35128a0..9b5ec9a 100644
--- a/minissdpc.c
+++ b/minissdpc.c
@@ -67,7 +67,7 @@ struct sockaddr_un {
#define PRINT_SOCKET_ERROR(x) perror(x)
#endif
@@ -62,7 +62,7 @@ struct sockaddr_un {
#include "miniupnpc_socketdef.h"
-#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__GNU__) && !defined(__FreeBSD_kernel__)
+#if !defined(__DragonFly__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(_WIN32) && !defined(__CYGWIN__) && !defined(__sun) && !defined(__GNU__) && !defined(__FreeBSD_kernel__) && !defined(__HAIKU__)
@@ -18,7 +18,7 @@ index 3479de8..8d9aebc 100644
#endif
--
2.14.2
2.16.4
From 6469b592119544458368771223bfbf58ae8e8b7c Mon Sep 17 00:00:00 2001
@@ -28,10 +28,10 @@ Subject: On Haiku SIOCGIFADDR lives in sys/sockio.h
diff --git a/minissdpc.c b/minissdpc.c
index 8d9aebc..f492a27 100644
index 9b5ec9a..c58acc1 100644
--- a/minissdpc.c
+++ b/minissdpc.c
@@ -75,6 +75,8 @@ struct sockaddr_un {
@@ -70,6 +70,8 @@ struct sockaddr_un {
#include <sys/ioctl.h>
#if defined(__sun)
#include <sys/sockio.h>
@@ -41,7 +41,7 @@ index 8d9aebc..f492a27 100644
#endif
--
2.14.2
2.16.4
From ced64c1ef646fdce2a7a674514a4fba93ba33e0c Mon Sep 17 00:00:00 2001
@@ -98,7 +98,7 @@ index d1954f5..ac0ced7 100644
default:
break;
--
2.14.2
2.16.4
From adbacfa365ac35160e44a485b50c5113301eb859 Mon Sep 17 00:00:00 2001
@@ -108,12 +108,12 @@ Subject: Haiku got networking stuffs in -lnetwork
diff --git a/CMakeLists.txt b/CMakeLists.txt
index adb30ef..28ec485 100644
index c1061b1..83f197e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,6 +106,10 @@ if (WIN32)
# set (LDLIBS ${SOCKET_LIBRARY} ${NSL_LIBRARY} ${RESOLV_LIBRARY} ${LDLIBS})
endif (WIN32)
@@ -11,6 +11,10 @@ option (UPNPC_BUILD_TESTS "Build test executables" TRUE)
option (UPNPC_BUILD_SAMPLE "Build sample executables" TRUE)
option (NO_GETADDRINFO "Define NO_GETADDRINFO" FALSE)
+if (HAIKU)
+ list(APPEND LDLIBS -lnetwork)
@@ -121,7 +121,7 @@ index adb30ef..28ec485 100644
+
if (NOT UPNPC_BUILD_STATIC AND NOT UPNPC_BUILD_SHARED)
message (FATAL "Both shared and static libraries are disabled!")
endif (NOT UPNPC_BUILD_STATIC AND NOT UPNPC_BUILD_SHARED)
endif ()
--
2.14.2
2.16.4