CVS commit: pkgsrc/chat/mumble

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Apr 10 07:47:22 UTC 2022

Modified Files:
        pkgsrc/chat/mumble: distinfo
Added Files:
        pkgsrc/chat/mumble/patches: patch-src_HostAddress.cpp
            patch-src_mumble_ServerHandler.cpp

Log Message:
mumble: missing includes on netbsd


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/chat/mumble/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/chat/mumble/patches/patch-src_HostAddress.cpp
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/chat/mumble/distinfo
diff -u pkgsrc/chat/mumble/distinfo:1.10 pkgsrc/chat/mumble/distinfo:1.11
--- pkgsrc/chat/mumble/distinfo:1.10    Fri Apr  1 11:53:28 2022
+++ pkgsrc/chat/mumble/distinfo Sun Apr 10 07:47:22 2022
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.10 2022/04/01 11:53:28 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/04/10 07:47:22 nia Exp $
 
 BLAKE2s (mumble-1.4.230.tar.gz) = 71d12d9d94a06a3c57b8b2230040efe3dff77048cbc5c4da11d1762bd5378cc8
 SHA512 (mumble-1.4.230.tar.gz) = 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53
 Size (mumble-1.4.230.tar.gz) = 9441667 bytes
 SHA1 (patch-overlay__gl_init__unix.c) = e8db446ee6b62af5c8e580a3927664c9b52bf4f7
+SHA1 (patch-src_HostAddress.cpp) = 34ea0777f76dc236e96b83e43ba486952c676a1c
 SHA1 (patch-src_ProcessResolver.cpp) = f75286127d01c2f44308d6483e2af5b5e7bc1304
 SHA1 (patch-src_mumble_CMakeLists.txt) = a171b707b8f5c8316f0c0c45bb0f8a38545f0f6a
 SHA1 (patch-src_mumble_OSS.cpp) = b0e38bade402998f7c5d0d71090a26fa4a77eb97
+SHA1 (patch-src_mumble_ServerHandler.cpp) = 915e05a3e91c78b42181ce6156231be0bae25fa1

Added files:

Index: pkgsrc/chat/mumble/patches/patch-src_HostAddress.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_HostAddress.cpp:1.1
--- /dev/null   Sun Apr 10 07:47:22 2022
+++ pkgsrc/chat/mumble/patches/patch-src_HostAddress.cpp        Sun Apr 10 07:47:22 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_HostAddress.cpp,v 1.1 2022/04/10 07:47:22 nia Exp $
+
+Add missing includes on NetBSD.
+
+--- src/HostAddress.cpp.orig   2022-01-18 01:00:00.338013600 +0000
++++ src/HostAddress.cpp
+@@ -13,7 +13,7 @@
+ #     include <ws2tcpip.h>
+ #else
+ #     include <arpa/inet.h>
+-#     if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
++#     if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
+ #             include <netinet/in.h>
+ #             include <sys/socket.h>
+ #             include <sys/types.h>

Index: pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp:1.3
--- /dev/null   Sun Apr 10 07:47:22 2022
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp       Sun Apr 10 07:47:22 2022
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mumble_ServerHandler.cpp,v 1.3 2022/04/10 07:47:22 nia Exp $
+
+Add missing include on NetBSD.
+
+--- src/mumble/ServerHandler.cpp.orig  2022-01-18 01:00:00.350014000 +0000
++++ src/mumble/ServerHandler.cpp
+@@ -51,7 +51,7 @@
+ #     include <wincrypt.h>
+ #     include <winsock2.h>
+ #else
+-#     if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
++#     if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD) || defined(Q_OS_NETBSD)
+ #             include <netinet/in.h>
+ #     endif
+ #     include <netinet/ip.h>