mumble: Update to 1.3.0

Full release notes:
https://www.mumble.info/blog/mumble-1.3.0-release-announcement/

48 files changed, 66 insertions, 969 deletions

diff --git a/chat/mumble/Makefile b/chat/mumble/Makefile
index 3033cb965f2..cb595646a83 100644
--- a/chat/mumble/Makefile
+++ b/chat/mumble/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2019/08/22 12:22:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.7 2019/09/16 22:46:20 nia Exp $
 
-DISTNAME=	mumble-1.2.19
-PKGREVISION=	3
+DISTNAME=	mumble-1.3.0
 CATEGORIES=	chat audio
 MASTER_SITES=	${MASTER_SITE_GITHUB:=mumble-voip/}
 GITHUB_PROJECT=	mumble
@@ -12,27 +11,20 @@ HOMEPAGE=	https://wiki.mumble.info/wiki/Main_Page
 COMMENT=	Low latency VOIP software
 LICENSE=	modified-bsd
 
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config gmake
 USE_LANGUAGES=	c c++11
 USE_LIBTOOL=	yes
 
-BUILD_DEPENDS+=	boost-headers-[0-9]*:../../devel/boost-headers
-DEPENDS+=	qt4-sqlite3-[0-9]*:../../x11/qt4-sqlite3
+BUILD_TARGET=	release
 
-# cut down on excessive noise from headers to attempt to make it easier to
-# find problems
-CXXFLAGS+=	-Wno-deprecated-declarations
-CXXFLAGS+=	-Wno-float-conversion
-CXXFLAGS+=	-Wno-unused-parameter
-
-BUILDLINK_TRANSFORM+=	rm:-Wconversion
-BUILDLINK_TRANSFORM+=	rm:-Wold-style-cast
+CONFIG_OPTIONS+=	DEFINES+="PLUGIN_PATH=${PREFIX}/lib/mumble"
 
 CONFIG_OPTIONS+=	CONFIG+=no-bundled-opus
 CONFIG_OPTIONS+=	CONFIG+=no-bundled-speex
 
 # appears to break the build
 CONFIG_OPTIONS+=	CONFIG+=no-embed-qt-translations
+CONFIG_OPTIONS+=	CONFIG+=no-pch
 
 # support for an old Logitech keyboard - requires missing library
 CONFIG_OPTIONS+=	CONFIG+=no-g15
@@ -40,22 +32,22 @@ CONFIG_OPTIONS+=	CONFIG+=no-g15
 # requires missing ZeroC utilities
 CONFIG_OPTIONS+=	CONFIG+=no-ice
 
-# required by protobuf
-CONFIG_OPTIONS+=	CONFIG+=c++11
-
 .include "../../mk/oss.buildlink3.mk"
 
 .if ${OSS_TYPE} != "none"
 SUBST_CLASSES+=		oss
 SUBST_STAGE.oss=	pre-configure
 SUBST_MESSAGE.oss=	Correct path to OSS device.
+SUBST_FILES.oss+=	src/mumble/mumble.pro
 SUBST_FILES.oss+=	src/mumble/OSS.cpp
-SUBST_SED.oss=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_SED.oss+=		-e "s,/dev/dsp,${DEVOSSAUDIO},g"
+SUBST_VARS.oss+=	LIBOSSAUDIO
 .endif
 
-INSTALLATION_DIRS+=	bin lib
+INSTALLATION_DIRS+=	bin lib/mumble
 INSTALLATION_DIRS+=	share/applications
 INSTALLATION_DIRS+=	share/icons/hicolor/128x128/apps
+INSTALLATION_DIRS+=	share/icons/hicolor/512x512/apps
 INSTALLATION_DIRS+=	share/icons/hicolor/scalable/apps
 INSTALLATION_DIRS+=	share/pixmaps
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1
@@ -66,15 +58,28 @@ do-configure:
 	    QMAKE_CFLAGS=${CFLAGS:Q} QMAKE_CXXFLAGS=${CXXFLAGS:Q}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd ${DESTDIR}${PREFIX}/bin
-	${INSTALL_LIB} ${WRKSRC}/release/.libs/libcelt0.so.0.11.0 ${DESTDIR}${PREFIX}/lib/libcelt-mumble.so.0.7.0
-	${INSTALL_LIB} ${WRKSRC}/release/.libs/libmumble.so.${PKGVERSION_NOREV} ${DESTDIR}${PREFIX}/lib
-	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop ${DESTDIR}${PREFIX}/share/applications
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm ${DESTDIR}${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.osx.png ${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
-	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_MAN} ${WRKSRC}/man/mumble.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/release/mumble \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/release/murmurd \
+		${DESTDIR}${PREFIX}/bin
+	${INSTALL_LIB} ${WRKSRC}/release/libmumble* \
+		${DESTDIR}${PREFIX}/lib/mumble
+	${INSTALL_LIB} ${WRKSRC}/release/plugins/liblink* \
+		${DESTDIR}${PREFIX}/lib/mumble
+	${INSTALL_LIB} ${WRKSRC}/release/libcelt* \
+		${DESTDIR}${PREFIX}/lib/mumble
+	${INSTALL_DATA} ${WRKSRC}/scripts/mumble.desktop \
+		${DESTDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/man/mumble.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble.svg \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/icons/mumble.xpm \
+		${DESTDIR}${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/themes/Mumble/mumble.png \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/512x512/apps/mumble.png
+	${INSTALL_DATA} ${WRKSRC}/themes/Mumble/mumble.osx.png \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/128x128/apps/mumble.png
 
 .include "options.mk"
 .include "../../audio/libopus/buildlink3.mk"
@@ -89,8 +94,8 @@ do-install:
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../net/mDNSResponder/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtsvg/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
-.include "../../x11/qt4-libs/buildlink3.mk"
-.include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/mumble/PLIST b/chat/mumble/PLIST
index 086cabc4c29..fb17ffeff15 100644
--- a/chat/mumble/PLIST
+++ b/chat/mumble/PLIST
@@ -1,10 +1,21 @@
-@comment $NetBSD: PLIST,v 1.1 2018/12/22 18:17:39 nia Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/09/16 22:46:20 nia Exp $
 bin/mumble
 bin/murmurd
-lib/libcelt-mumble.so.0.7.0
-lib/libmumble.so.${PKGVERSION}
+lib/mumble/libcelt0.so
+lib/mumble/libcelt0.so.0
+lib/mumble/libcelt0.so.0.11
+lib/mumble/libcelt0.so.0.11.0
+lib/mumble/libcelt0.so.0.7
+lib/mumble/libcelt0.so.0.7.0
+lib/mumble/liblink.so
+lib/mumble/libmumble.so
+lib/mumble/libmumble.so.1
+lib/mumble/libmumble.so.1.3
+lib/mumble/libmumble.so.${PKGVERSION}
+lib/mumble/libmumble_proto.a
 man/man1/mumble.1
 share/applications/mumble.desktop
 share/icons/hicolor/128x128/apps/mumble.png
+share/icons/hicolor/512x512/apps/mumble.png
 share/icons/hicolor/scalable/apps/mumble.svg
 share/pixmaps/mumble.xpm
diff --git a/chat/mumble/distinfo b/chat/mumble/distinfo
index 288ce49efa9..59373f799ea 100644
--- a/chat/mumble/distinfo
+++ b/chat/mumble/distinfo
@@ -1,50 +1,7 @@
-$NetBSD: distinfo,v 1.2 2019/06/17 08:08:31 nia Exp $
+$NetBSD: distinfo,v 1.3 2019/09/16 22:46:20 nia Exp $
 
-SHA1 (mumble-1.2.19.tar.gz) = 8ea9dafad14e6c730da72ae9b4625778e499d94f
-RMD160 (mumble-1.2.19.tar.gz) = 9c24e5348c4ae5689d1fc0759c17d547a9b83eaf
-SHA512 (mumble-1.2.19.tar.gz) = f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-Size (mumble-1.2.19.tar.gz) = 3210865 bytes
-SHA1 (patch-main.pro) = af7e2dcdc803dc9c81ce1d8bff06fdbee30c9bfa
-SHA1 (patch-src_mumble_ACLEditor.cpp) = 62bb69db467255314a5cc5b27b156bafca5567af
-SHA1 (patch-src_mumble_About.cpp) = 59a091a51c048dfa1b5cb2a7767933f675fad0a2
-SHA1 (patch-src_mumble_AudioOutput.cpp) = 7b72d86c66581aba015867372dfb4f099cad1054
-SHA1 (patch-src_mumble_AudioWizard.cpp) = 1fedfca084509861c3efecbe71b8ff1c1dd1213a
-SHA1 (patch-src_mumble_BanEditor.cpp) = d0e8b2058b3ba82c4c75486ea215958e5e867be8
-SHA1 (patch-src_mumble_ConnectDialog.cpp) = b7932ed4cdf52f35728d1982106af40ca0fa7d43
-SHA1 (patch-src_mumble_CustomElements.cpp) = 2e70edde52b3cd692d23caa96685174de69ae04c
-SHA1 (patch-src_mumble_DBus.cpp) = 484d8aa24ab00a719815bbc72f3d03a402b872d4
-SHA1 (patch-src_mumble_GlobalShortcut.cpp) = 45f4dcaa8567318c084b3c79a1bd8413ed9f44ea
-SHA1 (patch-src_mumble_LCD.cpp) = c337bc207a21f2b469ba621eebda728b45845a97
-SHA1 (patch-src_mumble_Log.cpp) = ed8287c4a9ce5c0d7156a6f66a9332eeb92a265e
-SHA1 (patch-src_mumble_Log__unix.cpp) = f2ec4732a1b34b6337b78712da4fe6e873bb20ed
-SHA1 (patch-src_mumble_LookConfig.cpp) = a55b3a4f0cca694c2f557edba691adcf2b4624ac
-SHA1 (patch-src_mumble_MainWindow.cpp) = d73e2dffe822a2578f932c1ed7ac9259cb4c81f8
-SHA1 (patch-src_mumble_Messages.cpp) = 652998b92396d1eb3ee77f1f19e4a4ab21877683
-SHA1 (patch-src_mumble_NetworkConfig.cpp) = b5b1b0181f5ba92e63b7f73cbac92452ecb239f9
-SHA1 (patch-src_mumble_OSS.cpp) = 1413083d910d96661b3d8f0e1ead2b11e0830be5
-SHA1 (patch-src_mumble_Overlay.cpp) = 3ea93b70053158a8cd6885a8f7333d66f28e0ad5
-SHA1 (patch-src_mumble_OverlayClient.cpp) = cca2b5b12eeb301475bde7e6769f87ad938cf57b
-SHA1 (patch-src_mumble_OverlayConfig.cpp) = ff2880273f3ea11277961b47bf3d4f108848d9f9
-SHA1 (patch-src_mumble_OverlayEditor.cpp) = d1b82ee298d9c2f20ce1ee8f519c1fa69d82c4e6
-SHA1 (patch-src_mumble_OverlayEditorScene.cpp) = be465cca8a5151fb774777b36e7a844897f51a7e
-SHA1 (patch-src_mumble_OverlayUser.cpp) = 4733a1c173c72c1eb4a7e8fa6a09e3a74a23f5da
-SHA1 (patch-src_mumble_OverlayUserGroup.cpp) = 1dc4f71a036732740de1085e0247f0b26636ef6d
-SHA1 (patch-src_mumble_Overlay__macx.mm) = 77c4ade9d31f91bb3f97ac10facece1dda07ddae
-SHA1 (patch-src_mumble_Plugins.cpp) = 08500d929a3c2180c7c9dc4710599fd3a6b914a9
-SHA1 (patch-src_mumble_PulseAudio.cpp) = c4b47157b79348cb13198b43bbe2841e8c341fb4
-SHA1 (patch-src_mumble_RichTextEditor.cpp) = 4fbeb6c42ba532a1821e9a694def406456d9c2cd
-SHA1 (patch-src_mumble_ServerHandler.cpp) = 55b8a2f68dafd07b228485aa1054716a2589e4ff
-SHA1 (patch-src_mumble_SocketRPC.cpp) = 72da425f708f839b2b7e9d617a6d9bcadb5febe9
-SHA1 (patch-src_mumble_Tokens.cpp) = b979070bacaf54d07fc0ca824d01795eac32f91b
-SHA1 (patch-src_mumble_UserEdit.cpp) = 3045ab6ef2b25405804d1059fba50a2970a3d958
-SHA1 (patch-src_mumble_UserInformation.cpp) = 3c734af7523a6ea1ed75a8dcb4033d8e2e5a3314
-SHA1 (patch-src_mumble_UserModel.cpp) = d040aff300795aa1712392c431c7042bef6e66b0
-SHA1 (patch-src_mumble_UserView.cpp) = e87405d3cca5cdabb9426af4b061c23eefc1b770
-SHA1 (patch-src_mumble_VersionCheck.cpp) = e803c917f9e1cc334b4c02ee785a15822ec35da1
-SHA1 (patch-src_mumble_VoiceRecorder.cpp) = 42330828988d4ffadbc9f66c5356f603d866e1ac
-SHA1 (patch-src_mumble_VoiceRecorderDialog.cpp) = cd971a013d859a14a2e625cf910ed2f0f5d3eba0
-SHA1 (patch-src_mumble_WASAPI.cpp) = b5b72ecdbc2b4da0fbe87341cbabcf1ac39f73b9
-SHA1 (patch-src_mumble_WASAPINotificationClient.cpp) = 9aaf2ccb4a57e6568e1570f421beb4f3e141d5c8
-SHA1 (patch-src_mumble_mumble.pro) = 478325bf97a716da84374e16943b6e99b7ad4d78
-SHA1 (patch-src_mumble_mumble__pch.hpp) = aeb4e255e92e2f8cd7314241c81efdf63006e235
-SHA1 (patch-src_mumble_os__macx.mm) = df795ac3eb920f1b396fef345214a521c796ce7f
+SHA1 (mumble-1.3.0.tar.gz) = 25944623dae8e79e0f440d718c85efe03fdce998
+RMD160 (mumble-1.3.0.tar.gz) = a83757c7b633565a470dfa438173fa9db8e2b168
+SHA512 (mumble-1.3.0.tar.gz) = 2a629fc97f3c7c587c9a3b40fc96cf15d668acada37282ec1c4a5b169ad37717d60af94d12c7bce45f2816c265f76a99ebad40a006adcf8ca38a117e7c0a4122
+Size (mumble-1.3.0.tar.gz) = 8788587 bytes
+SHA1 (patch-src_mumble_mumble.pro) = a49c3263f6034b2ea7c8633e24823937f4c4d3f5
diff --git a/chat/mumble/options.mk b/chat/mumble/options.mk
index 518bfc9b3d0..b1add8b0cca 100644
--- a/chat/mumble/options.mk
+++ b/chat/mumble/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2019/06/17 08:08:31 nia Exp $
+# $NetBSD: options.mk,v 1.3 2019/09/16 22:46:20 nia Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.mumble
-PKG_SUPPORTED_OPTIONS=		alsa dbus pulseaudio portaudio
-PKG_SUGGESTED_OPTIONS=		dbus portaudio
+PKG_SUPPORTED_OPTIONS=		alsa pulseaudio portaudio
+PKG_SUGGESTED_OPTIONS=		portaudio
 PKG_SUGGESTED_OPTIONS.Linux=	alsa
 
 .include "../../mk/bsd.options.mk"
@@ -14,12 +14,6 @@ CONFIG_OPTIONS+=	CONFIG+=alsa
 CONFIG_OPTIONS+=	CONFIG+=no-alsa
 .endif
 
-.if !empty(PKG_OPTIONS:Mdbus)
-.include "../../x11/qt4-qdbus/buildlink3.mk"
-.else
-CONFIG_OPTIONS+=	CONFIG+=no-dbus
-.endif
-
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
 .else
diff --git a/chat/mumble/patches/patch-main.pro b/chat/mumble/patches/patch-main.pro
deleted file mode 100644
index 25b1877bea1..00000000000
--- a/chat/mumble/patches/patch-main.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-main.pro,v 1.1 2018/12/22 18:17:39 nia Exp $
-
-Always use the builtin version of celt to avoid API incompatibilities.
-
---- main.pro.orig	2017-01-27 06:48:33.000000000 +0000
-+++ main.pro
-@@ -12,9 +12,6 @@ CONFIG *= ordered debug_and_release
-   CONFIG(sbcelt) {
-     SUBDIRS *= celt-0.7.0-build sbcelt-lib-build sbcelt-helper-build
-   } else {
--    unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) {
--      CONFIG *= no-bundled-celt
--    }
-     !CONFIG(no-bundled-celt) {
-       SUBDIRS *= celt-0.7.0-build celt-0.11.0-build
-     }
diff --git a/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp b/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp
deleted file mode 100644
index cc3e0d85e34..00000000000
--- a/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_mumble_ACLEditor.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/ACLEditor.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/ACLEditor.cpp
-@@ -37,11 +37,13 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "Log.h"
- #include "ServerHandler.h"
- #include "User.h"
- 
-+ // We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- ACLGroup::ACLGroup(const QString &name) : Group(NULL, name) {
- 	bInherited = false;
- }
diff --git a/chat/mumble/patches/patch-src_mumble_About.cpp b/chat/mumble/patches/patch-src_mumble_About.cpp
deleted file mode 100644
index 9fab9b8d1be..00000000000
--- a/chat/mumble/patches/patch-src_mumble_About.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_About.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/About.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/About.cpp
-@@ -32,10 +32,12 @@
- 
- #include "About.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "licenses.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- AboutDialog::AboutDialog(QWidget *p) : QDialog(p) {
- 	setWindowTitle(tr("About Mumble"));
- 
diff --git a/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp b/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp
deleted file mode 100644
index 23202b92399..00000000000
--- a/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-src_mumble_AudioOutput.cpp,v 1.2 2019/06/17 08:08:31 nia Exp $
-
-https://github.com/mumble-voip/mumble/pull/3287
-
---- src/mumble/AudioOutput.cpp.orig	2019-06-17 07:42:51.973326995 +0000
-+++ src/mumble/AudioOutput.cpp
-@@ -37,13 +37,15 @@
- #include "AudioOutputSample.h"
- #include "AudioOutputSpeech.h"
- #include "User.h"
--#include "Global.h"
- #include "Message.h"
- #include "Plugins.h"
- #include "PacketDataStream.h"
- #include "ServerHandler.h"
- #include "VoiceRecorder.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- // Remember that we cannot use static member classes that are not pointers, as the constructor
- // for AudioOutputRegistrar() might be called before they are initialized, as the constructor
- // is called from global initialization.
-@@ -431,7 +433,7 @@ bool AudioOutput::mix(void *outbuff, uns
- 					top[2] = 0.0f;
- 				}
- 
--				if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
-+				if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) {
- 					// Not perpendicular. Assume Y up and rotate 90 degrees.
- 
- 					float azimuth = 0.0f;
diff --git a/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp b/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp
deleted file mode 100644
index 289db55144f..00000000000
--- a/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_AudioWizard.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/AudioWizard.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/AudioWizard.cpp
-@@ -34,10 +34,12 @@
- 
- #include "AudioInput.h"
- #include "AudioOutputSample.h"
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- CompletablePage::CompletablePage(QWizard *p) : QWizardPage(p) {
- 	bComplete = true;
- }
diff --git a/chat/mumble/patches/patch-src_mumble_BanEditor.cpp b/chat/mumble/patches/patch-src_mumble_BanEditor.cpp
deleted file mode 100644
index d57881f7640..00000000000
--- a/chat/mumble/patches/patch-src_mumble_BanEditor.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_BanEditor.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/BanEditor.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/BanEditor.cpp
-@@ -33,10 +33,12 @@
- #include "BanEditor.h"
- 
- #include "Channel.h"
--#include "Global.h"
- #include "Net.h"
- #include "ServerHandler.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- BanEditor::BanEditor(const MumbleProto::BanList &msg, QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
diff --git a/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp b/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp
deleted file mode 100644
index 199925ae9c2..00000000000
--- a/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_ConnectDialog.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/ConnectDialog.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/ConnectDialog.cpp
-@@ -40,10 +40,12 @@
- 
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "ServerHandler.h"
- #include "WebFetch.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- QMap<QString, QIcon> ServerItem::qmIcons;
- QList<PublicInfo> ConnectDialog::qlPublicServers;
- QString ConnectDialog::qsUserCountry, ConnectDialog::qsUserCountryCode, ConnectDialog::qsUserContinentCode;
diff --git a/chat/mumble/patches/patch-src_mumble_CustomElements.cpp b/chat/mumble/patches/patch-src_mumble_CustomElements.cpp
deleted file mode 100644
index da640a9db7c..00000000000
--- a/chat/mumble/patches/patch-src_mumble_CustomElements.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_CustomElements.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/CustomElements.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/CustomElements.cpp
-@@ -34,10 +34,11 @@
- #include "CustomElements.h"
- 
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Log.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
- 
- LogTextBrowser::LogTextBrowser(QWidget *p)
- 	: m_pos(0)
diff --git a/chat/mumble/patches/patch-src_mumble_DBus.cpp b/chat/mumble/patches/patch-src_mumble_DBus.cpp
deleted file mode 100644
index 9697395ca5b..00000000000
--- a/chat/mumble/patches/patch-src_mumble_DBus.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_DBus.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/DBus.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/DBus.cpp
-@@ -34,10 +34,11 @@
- 
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
- 
- MumbleDBus::MumbleDBus(QObject *mw) : QDBusAbstractAdaptor(mw) {
- }
diff --git a/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp b/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp
deleted file mode 100644
index 81fe0a17a5e..00000000000
--- a/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_GlobalShortcut.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/GlobalShortcut.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/GlobalShortcut.cpp
-@@ -36,9 +36,11 @@
- #include "ClientUser.h"
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- /*!
-   \class ShortcutKeyWidget
-   Widget used to define and key combination for a shortcut. Once it gains
diff --git a/chat/mumble/patches/patch-src_mumble_LCD.cpp b/chat/mumble/patches/patch-src_mumble_LCD.cpp
deleted file mode 100644
index a76118cfe41..00000000000
--- a/chat/mumble/patches/patch-src_mumble_LCD.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_LCD.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/LCD.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/LCD.cpp
-@@ -35,10 +35,12 @@
- 
- #include "ClientUser.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "ServerHandler.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- QList<LCDEngineNew> *LCDEngineRegistrar::qlInitializers;
- 
- LCDEngineRegistrar::LCDEngineRegistrar(LCDEngineNew cons) {
diff --git a/chat/mumble/patches/patch-src_mumble_Log.cpp b/chat/mumble/patches/patch-src_mumble_Log.cpp
deleted file mode 100644
index b4c6dc921c4..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Log.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_mumble_Log.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Log.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Log.cpp
-@@ -36,13 +36,15 @@
- #include "AudioOutput.h"
- #include "AudioOutputSample.h"
- #include "Channel.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "NetworkConfig.h"
- #include "RichTextEditor.h"
- #include "ServerHandler.h"
- #include "TextToSpeech.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- static ConfigWidget *LogConfigDialogNew(Settings &st) {
- 	return new LogConfig(st);
- }
diff --git a/chat/mumble/patches/patch-src_mumble_Log__unix.cpp b/chat/mumble/patches/patch-src_mumble_Log__unix.cpp
deleted file mode 100644
index ad8a311ba48..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Log__unix.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_Log__unix.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Log_unix.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Log_unix.cpp
-@@ -32,10 +32,12 @@
- #include "mumble_pch.hpp"
- 
- #include "Log.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Settings.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- void Log::postNotification(MsgType mt, const QString &console, const QString &plain) {
- 	// Message notification with balloon tooltips
- 	QString qsIcon;
diff --git a/chat/mumble/patches/patch-src_mumble_LookConfig.cpp b/chat/mumble/patches/patch-src_mumble_LookConfig.cpp
deleted file mode 100644
index abdd124f561..00000000000
--- a/chat/mumble/patches/patch-src_mumble_LookConfig.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_LookConfig.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/LookConfig.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/LookConfig.cpp
-@@ -35,9 +35,11 @@
- 
- #include "AudioInput.h"
- #include "AudioOutput.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- static ConfigWidget *LookConfigNew(Settings &st) {
- 	return new LookConfig(st);
- }
diff --git a/chat/mumble/patches/patch-src_mumble_MainWindow.cpp b/chat/mumble/patches/patch-src_mumble_MainWindow.cpp
deleted file mode 100644
index f23773ed904..00000000000
--- a/chat/mumble/patches/patch-src_mumble_MainWindow.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_MainWindow.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/MainWindow.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/MainWindow.cpp
-@@ -46,7 +46,6 @@
- #include "Connection.h"
- #include "ConnectDialog.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "Log.h"
- #include "Net.h"
-@@ -75,6 +74,9 @@
- #include "ConfigDialog_macx.h"
- #endif
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- /*!
-   \fn void MainWindow::findDesiredChannel()
-   This function tries to join a desired channel on connect. It gets called
diff --git a/chat/mumble/patches/patch-src_mumble_Messages.cpp b/chat/mumble/patches/patch-src_mumble_Messages.cpp
deleted file mode 100644
index e8c5126db00..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Messages.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_Messages.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Messages.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Messages.cpp
-@@ -41,7 +41,6 @@
- #include "Connection.h"
- #include "ConnectDialog.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "Log.h"
- #include "MainWindow.h"
-@@ -55,6 +54,9 @@
- #include "VersionCheck.h"
- #include "ViewCert.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- #define ACTOR_INIT \
- 	ClientUser *pSrc=NULL; \
- 	if (msg.has_actor()) \
diff --git a/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp b/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp
deleted file mode 100644
index a1c2cba3000..00000000000
--- a/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_NetworkConfig.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/NetworkConfig.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/NetworkConfig.cpp
-@@ -34,10 +34,12 @@
- 
- #include "NetworkConfig.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "OSInfo.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- static ConfigWidget *NetworkConfigNew(Settings &st) {
- 	return new NetworkConfig(st);
- }
diff --git a/chat/mumble/patches/patch-src_mumble_OSS.cpp b/chat/mumble/patches/patch-src_mumble_OSS.cpp
deleted file mode 100644
index 6d2bf0d0368..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OSS.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_mumble_OSS.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OSS.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OSS.cpp
-@@ -38,9 +38,10 @@
- #include <sys/ioctl.h>
- 
- #include "User.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+#include "Global.h"
-+
- #define NBLOCKS 8
- 
- class OSSEnumerator {
diff --git a/chat/mumble/patches/patch-src_mumble_Overlay.cpp b/chat/mumble/patches/patch-src_mumble_Overlay.cpp
deleted file mode 100644
index e38280a4f81..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Overlay.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_Overlay.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Overlay.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Overlay.cpp
-@@ -35,7 +35,6 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Database.h"
--#include "Global.h"
- #include "GlobalShortcut.h"
- #include "MainWindow.h"
- #include "Message.h"
-@@ -45,6 +44,9 @@
- #include "User.h"
- #include "WebFetch.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- OverlayAppInfo::OverlayAppInfo(QString name, QIcon icon) {
- 	qsDisplayName = name;
- 	qiIcon = icon;
diff --git a/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp b/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp
deleted file mode 100644
index 987764ae477..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_OverlayClient.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OverlayClient.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OverlayClient.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,9 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- OverlayClient::OverlayClient(QLocalSocket *socket, QObject *p) :
- 		QObject(p),
- 		ougUsers(&g.s.os) {
diff --git a/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp b/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp
deleted file mode 100644
index 6105bdabdc7..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_mumble_OverlayConfig.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OverlayConfig.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OverlayConfig.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,9 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- static ConfigWidget *OverlayConfigDialogNew(Settings &st) {
- 	return new OverlayConfig(st);
- }
-@@ -481,6 +483,8 @@ void OverlayConfig::on_qpbLoadPreset_cli
- 	load_preset.load(&qs);
- 	qs.endGroup();
- 
-+#include "Global.h"
-+
- #ifdef Q_OS_WIN
- 	load_preset.qslBlacklist = s.os.qslBlacklist;
- 	load_preset.qslWhitelist = s.os.qslWhitelist;
diff --git a/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp b/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp
deleted file mode 100644
index 5b8428ed1f4..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_OverlayEditor.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OverlayEditor.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OverlayEditor.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,9 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- OverlayEditor::OverlayEditor(QWidget *p, QGraphicsItem *qgi, OverlaySettings *osptr) :
- 		QDialog(p),
- 		qgiPromote(qgi),
diff --git a/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp b/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp
deleted file mode 100644
index f9ebb755f01..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_OverlayEditorScene.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OverlayEditorScene.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OverlayEditorScene.cpp
-@@ -34,7 +34,6 @@
- #include "OverlayText.h"
- #include "User.h"
- #include "Channel.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -42,6 +41,9 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- OverlayEditorScene::OverlayEditorScene(const OverlaySettings &srcos, QObject *p) : QGraphicsScene(p), os(srcos) {
- 	tsColor = Settings::Talking;
- 	uiZoom = 2;
diff --git a/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp b/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp
deleted file mode 100644
index 7acd8e60d03..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_OverlayUser.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OverlayUser.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OverlayUser.cpp
-@@ -35,7 +35,6 @@
- #include "User.h"
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -43,6 +42,9 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- OverlayUser::OverlayUser(ClientUser *cu, unsigned int height, OverlaySettings *osptr) : OverlayGroup(), os(osptr), uiSize(height), cuUser(cu), tsColor(Settings::Passive) {
- 	setup();
- 	updateLayout();
diff --git a/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp b/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp
deleted file mode 100644
index 872546b4a80..00000000000
--- a/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_OverlayUserGroup.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/OverlayUserGroup.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/OverlayUserGroup.cpp
-@@ -35,7 +35,6 @@
- #include "User.h"
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "Message.h"
- #include "Database.h"
- #include "NetworkConfig.h"
-@@ -43,6 +42,9 @@
- #include "MainWindow.h"
- #include "GlobalShortcut.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- template <typename T>
- QRectF OverlayGroup::boundingRect() const {
- 	QRectF qr;
diff --git a/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm b/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm
deleted file mode 100644
index 71a63033b43..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_Overlay__macx.mm,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Overlay_macx.mm.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Overlay_macx.mm
-@@ -33,9 +33,11 @@
- #import <ScriptingBridge/ScriptingBridge.h>
- #include <Carbon/Carbon.h>
- #include "Overlay.h"
--#include "Global.h"
- #include "MainWindow.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- extern "C" {
- #include <xar/xar.h>
- }
diff --git a/chat/mumble/patches/patch-src_mumble_Plugins.cpp b/chat/mumble/patches/patch-src_mumble_Plugins.cpp
deleted file mode 100644
index c4690e70274..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Plugins.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_Plugins.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Plugins.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Plugins.cpp
-@@ -32,7 +32,6 @@
- 
- #include "Plugins.h"
- 
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- #include "Message.h"
-@@ -40,6 +39,9 @@
- #include "../../plugins/mumble_plugin.h"
- #include "WebFetch.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- static ConfigWidget *PluginConfigDialogNew(Settings &st) {
- 	return new PluginConfig(st);
- }
diff --git a/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp b/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp
deleted file mode 100644
index 12ab4c27880..00000000000
--- a/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_PulseAudio.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/PulseAudio.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/PulseAudio.cpp
-@@ -37,11 +37,12 @@
- #include <errno.h>
- #include <sys/ioctl.h>
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "Timer.h"
- #include "User.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
- 
- static const char *mumble_sink_input = "Mumble Speakers";
- static const char *mumble_echo = "Mumble Speakers (Echo)";
diff --git a/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp b/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp
deleted file mode 100644
index 4049a37dab2..00000000000
--- a/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_RichTextEditor.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/RichTextEditor.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/RichTextEditor.cpp
-@@ -32,10 +32,12 @@
- 
- #include "RichTextEditor.h"
- 
--#include "Global.h"
- #include "Log.h"
- #include "MainWindow.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- RichTextHtmlEdit::RichTextHtmlEdit(QWidget *p) : QTextEdit(p) {
- 	m_document = new LogDocument(this);
- 	setDocument(m_document);
diff --git a/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp b/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp
deleted file mode 100644
index 091fd536277..00000000000
--- a/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_ServerHandler.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/ServerHandler.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/ServerHandler.cpp
-@@ -37,7 +37,6 @@
- #include "Cert.h"
- #include "Connection.h"
- #include "Database.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "Message.h"
- #include "NetworkConfig.h"
-@@ -47,6 +46,9 @@
- #include "SSL.h"
- #include "User.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) {
- 	qbaMsg = msg;
- 	uiType = mtype;
diff --git a/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp b/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp
deleted file mode 100644
index 6fc497aadc7..00000000000
--- a/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_SocketRPC.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/SocketRPC.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/SocketRPC.cpp
-@@ -34,10 +34,12 @@
- 
- #include "Channel.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- SocketRPCClient::SocketRPCClient(QLocalSocket *s, QObject *p) : QObject(p), qlsSocket(s), qbBuffer(NULL) {
- 	qlsSocket->setParent(this);
- 
diff --git a/chat/mumble/patches/patch-src_mumble_Tokens.cpp b/chat/mumble/patches/patch-src_mumble_Tokens.cpp
deleted file mode 100644
index 30edb4d7326..00000000000
--- a/chat/mumble/patches/patch-src_mumble_Tokens.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_Tokens.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/Tokens.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/Tokens.cpp
-@@ -33,9 +33,11 @@
- #include "Tokens.h"
- 
- #include "Database.h"
--#include "Global.h"
- #include "ServerHandler.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- Tokens::Tokens(QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
diff --git a/chat/mumble/patches/patch-src_mumble_UserEdit.cpp b/chat/mumble/patches/patch-src_mumble_UserEdit.cpp
deleted file mode 100644
index 85c41abb2d7..00000000000
--- a/chat/mumble/patches/patch-src_mumble_UserEdit.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_UserEdit.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/UserEdit.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/UserEdit.cpp
-@@ -32,10 +32,12 @@
- 
- #include "UserEdit.h"
- 
--#include "Global.h"
- #include "ServerHandler.h"
- #include "User.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- UserEdit::UserEdit(const MumbleProto::UserList &msg, QWidget *p) : QDialog(p) {
- 	setupUi(this);
- 
diff --git a/chat/mumble/patches/patch-src_mumble_UserInformation.cpp b/chat/mumble/patches/patch-src_mumble_UserInformation.cpp
deleted file mode 100644
index f57ffe80f74..00000000000
--- a/chat/mumble/patches/patch-src_mumble_UserInformation.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_mumble_UserInformation.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/UserInformation.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/UserInformation.cpp
-@@ -34,11 +34,13 @@
- 
- #include "Audio.h"
- #include "CELTCodec.h"
--#include "Global.h"
- #include "Net.h"
- #include "ServerHandler.h"
- #include "ViewCert.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- static QString decode_utf8_qssl_string(const QString &input) {
- 	QString i = input;
- 	return QUrl::fromPercentEncoding(i.replace(QLatin1String("\\x"), QLatin1String("%")).toLatin1());
diff --git a/chat/mumble/patches/patch-src_mumble_UserModel.cpp b/chat/mumble/patches/patch-src_mumble_UserModel.cpp
deleted file mode 100644
index d7dfe8b1177..00000000000
--- a/chat/mumble/patches/patch-src_mumble_UserModel.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-src_mumble_UserModel.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/UserModel.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/UserModel.cpp
-@@ -36,7 +36,6 @@
- #include "ClientUser.h"
- #include "Channel.h"
- #include "Database.h"
--#include "Global.h"
- #include "LCD.h"
- #include "Log.h"
- #include "MainWindow.h"
-@@ -46,6 +45,9 @@
- #include "Usage.h"
- #include "User.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- QHash <Channel *, ModelItem *> ModelItem::c_qhChannels;
- QHash <ClientUser *, ModelItem *> ModelItem::c_qhUsers;
- bool ModelItem::bUsersTop = false;
diff --git a/chat/mumble/patches/patch-src_mumble_UserView.cpp b/chat/mumble/patches/patch-src_mumble_UserView.cpp
deleted file mode 100644
index 9ea83a3e1e1..00000000000
--- a/chat/mumble/patches/patch-src_mumble_UserView.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_mumble_UserView.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/UserView.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/UserView.cpp
-@@ -35,11 +35,13 @@
- #include "Channel.h"
- #include "ClientUser.h"
- #include "Log.h"
--#include "Global.h"
- #include "MainWindow.h"
- #include "ServerHandler.h"
- #include "UserModel.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- /*!
-   \fn bool UserView::event(QEvent *evt)
-   This implementation contains a special handler to display
diff --git a/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp b/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp
deleted file mode 100644
index abdcf70ba9c..00000000000
--- a/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_VersionCheck.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/VersionCheck.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/VersionCheck.cpp
-@@ -32,10 +32,12 @@
- 
- #include "VersionCheck.h"
- 
--#include "Global.h"
- #include "MainWindow.h"
- #include "WebFetch.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- VersionCheck::VersionCheck(bool autocheck, QObject *p, bool focus) : QObject(p) {
- 	bSilent = autocheck;
- 
diff --git a/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp b/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp
deleted file mode 100644
index 1f2d632ea15..00000000000
--- a/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_mumble_VoiceRecorder.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/VoiceRecorder.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/VoiceRecorder.cpp
-@@ -36,11 +36,13 @@
- 
- #include "AudioOutput.h"
- #include "ClientUser.h"
--#include "Global.h"
- #include "ServerHandler.h"
- 
- #include "../Timer.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- VoiceRecorder::RecordBuffer::RecordBuffer(const ClientUser *cu,
-         boost::shared_array<float> buffer, int samples, quint64 timestamp) :
- 		cuUser(cu), fBuffer(buffer), iSamples(samples), uiTimestamp(timestamp) {
diff --git a/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp b/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp
deleted file mode 100644
index e73d560a74f..00000000000
--- a/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_VoiceRecorderDialog.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/VoiceRecorderDialog.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/VoiceRecorderDialog.cpp
-@@ -34,10 +34,12 @@
- #include "VoiceRecorderDialog.h"
- 
- #include "AudioOutput.h"
--#include "Global.h"
- #include "ServerHandler.h"
- #include "VoiceRecorder.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- VoiceRecorderDialog::VoiceRecorderDialog(QWidget *p) : QDialog(p), qtTimer(new QTimer(this)) {
- 	qtTimer->setObjectName(QLatin1String("qtTimer"));
- 	qtTimer->setInterval(200);
diff --git a/chat/mumble/patches/patch-src_mumble_WASAPI.cpp b/chat/mumble/patches/patch-src_mumble_WASAPI.cpp
deleted file mode 100644
index 17accbafafa..00000000000
--- a/chat/mumble/patches/patch-src_mumble_WASAPI.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_mumble_WASAPI.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/WASAPI.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/WASAPI.cpp
-@@ -32,10 +32,11 @@
- 
- #include "WASAPI.h"
- #include "WASAPINotificationClient.h"
--#include "Global.h"
- #include "Timer.h"
- #include "User.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
- 
- // Now that Win7 is published, which includes public versions of these
- // interfaces, we simply inherit from those but use the "old" IIDs.
diff --git a/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp b/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp
deleted file mode 100644
index 592f3c312f1..00000000000
--- a/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-src_mumble_WASAPINotificationClient.cpp,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/WASAPINotificationClient.cpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/WASAPINotificationClient.cpp
-@@ -29,13 +29,15 @@
- */
- 
- #include <initguid.h>
--#include <Global.h>
- #include <QMutexLocker>
- #include "MainWindow.h"
- #include <boost/thread/once.hpp>
- 
- #include "WASAPINotificationClient.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- HRESULT STDMETHODCALLTYPE WASAPINotificationClient::OnDefaultDeviceChanged(EDataFlow flow, ERole role, LPCWSTR pwstrDefaultDevice) {
- 	const QString device = QString::fromWCharArray(pwstrDefaultDevice);
- 
diff --git a/chat/mumble/patches/patch-src_mumble_mumble.pro b/chat/mumble/patches/patch-src_mumble_mumble.pro
index e9f7ea7a2e7..8b75b6820b0 100644
--- a/chat/mumble/patches/patch-src_mumble_mumble.pro
+++ b/chat/mumble/patches/patch-src_mumble_mumble.pro
@@ -1,43 +1,14 @@
-$NetBSD: patch-src_mumble_mumble.pro,v 1.1 2018/12/22 18:17:39 nia Exp $
+$NetBSD: patch-src_mumble_mumble.pro,v 1.2 2019/09/16 22:46:21 nia Exp $
 
-Always use the builtin version of celt to avoid API incompatibilities.
+Add the OSS library, if any.
 
-Use ${LIBOSSAUDIO}.
-
-Find speech-dispatcher's include directory with pkgconf.
-
---- src/mumble/mumble.pro.orig	2017-01-27 06:48:33.000000000 +0000
+--- src/mumble/mumble.pro.orig	2019-09-07 19:44:58.000000000 +0000
 +++ src/mumble/mumble.pro
-@@ -67,15 +67,7 @@ CONFIG(sbcelt) {
-   LIBS *= -lcelt -lsbcelt
-   DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT
- } else {
--  unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) {
--    CONFIG	*= no-bundled-celt
--  }
--  CONFIG(no-bundled-celt) {
--    INCLUDEPATH	*= /usr/include/celt
--  }
--  !CONFIG(no-bundled-celt) {
--    INCLUDEPATH	*= ../../celt-0.7.0-src/libcelt
--  }
-+  INCLUDEPATH *= ../../celt-0.7.0-src/libcelt
- }
- 
- !win32 {
-@@ -240,6 +232,7 @@ oss {
- 	HEADERS *= OSS.h
- 	SOURCES *= OSS.cpp
- 	INCLUDEPATH *= /usr/lib/oss/include
-+	LIBS *= "$$LIBOSSAUDIO"
+@@ -572,6 +572,7 @@ oss {
+   HEADERS *= OSS.h
+   SOURCES *= OSS.cpp
+   INCLUDEPATH *= /usr/lib/oss/include
++  LIBS += @LIBOSSAUDIO@
  }
  
  pulseaudio {
-@@ -292,6 +285,7 @@ dbus {
- 
- speechd {
- 	DEFINES *= USE_SPEECHD
-+	PKGCONFIG *= speech-dispatcher
- 	LIBS *= -lspeechd
- }
- 
diff --git a/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp b/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp
deleted file mode 100644
index 50450243806..00000000000
--- a/chat/mumble/patches/patch-src_mumble_mumble__pch.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_mumble_mumble__pch.hpp,v 1.1 2018/12/22 18:17:39 nia Exp $
-
-https://github.com/mumble-voip/mumble/pull/3287
-
---- src/mumble/mumble_pch.hpp.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/mumble_pch.hpp
-@@ -71,6 +71,8 @@
- #include <boost/typeof/typeof.hpp>
- #include <boost/weak_ptr.hpp>
- 
-+#include <cmath>
-+
- #ifdef Q_OS_WIN
- #include <shellapi.h>
- #include <winsock2.h>
diff --git a/chat/mumble/patches/patch-src_mumble_os__macx.mm b/chat/mumble/patches/patch-src_mumble_os__macx.mm
deleted file mode 100644
index f16100f9d49..00000000000
--- a/chat/mumble/patches/patch-src_mumble_os__macx.mm
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-src_mumble_os__macx.mm,v 1.1 2019/06/17 08:08:31 nia Exp $
-
---- src/mumble/os_macx.mm.orig	2017-01-27 06:48:33.000000000 +0000
-+++ src/mumble/os_macx.mm
-@@ -30,10 +30,12 @@
- */
- 
- #include "mumble_pch.hpp"
--#include "Global.h"
- #include "Overlay.h"
- #include "MainWindow.h"
- 
-+// We define a global macro called 'g'. This can lead to issues when included code uses 'g' as a type or parameter name (like protobuf 3.7 does). As such, for now, we have to make this our last include.
-+#include "Global.h"
-+
- char *os_lang = NULL;
- static FILE *fConsole = NULL;
-