pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/chat/mumble
Module Name: pkgsrc
Committed By: nia
Date: Mon Jun 17 08:08:31 UTC 2019
Modified Files:
pkgsrc/chat/mumble: Makefile distinfo options.mk
pkgsrc/chat/mumble/patches: patch-src_mumble_AudioOutput.cpp
Added Files:
pkgsrc/chat/mumble/patches: patch-src_mumble_ACLEditor.cpp
patch-src_mumble_About.cpp patch-src_mumble_AudioWizard.cpp
patch-src_mumble_BanEditor.cpp patch-src_mumble_ConnectDialog.cpp
patch-src_mumble_CustomElements.cpp patch-src_mumble_DBus.cpp
patch-src_mumble_GlobalShortcut.cpp patch-src_mumble_LCD.cpp
patch-src_mumble_Log.cpp patch-src_mumble_Log__unix.cpp
patch-src_mumble_LookConfig.cpp patch-src_mumble_MainWindow.cpp
patch-src_mumble_Messages.cpp patch-src_mumble_NetworkConfig.cpp
patch-src_mumble_OSS.cpp patch-src_mumble_Overlay.cpp
patch-src_mumble_OverlayClient.cpp
patch-src_mumble_OverlayConfig.cpp
patch-src_mumble_OverlayEditor.cpp
patch-src_mumble_OverlayEditorScene.cpp
patch-src_mumble_OverlayUser.cpp
patch-src_mumble_OverlayUserGroup.cpp
patch-src_mumble_Overlay__macx.mm patch-src_mumble_Plugins.cpp
patch-src_mumble_PulseAudio.cpp patch-src_mumble_RichTextEditor.cpp
patch-src_mumble_ServerHandler.cpp patch-src_mumble_SocketRPC.cpp
patch-src_mumble_Tokens.cpp patch-src_mumble_UserEdit.cpp
patch-src_mumble_UserInformation.cpp patch-src_mumble_UserModel.cpp
patch-src_mumble_UserView.cpp patch-src_mumble_VersionCheck.cpp
patch-src_mumble_VoiceRecorder.cpp
patch-src_mumble_VoiceRecorderDialog.cpp
patch-src_mumble_WASAPI.cpp
patch-src_mumble_WASAPINotificationClient.cpp
patch-src_mumble_os__macx.mm
Log Message:
mumble: Fix build with newer protobuf.
While here, use a working portaudio library and make it a default.
https://github.com/mumble-voip/mumble/pull/3623
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/chat/mumble/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/chat/mumble/distinfo \
pkgsrc/chat/mumble/options.mk
cvs rdiff -u -r0 -r1.1 \
pkgsrc/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_About.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_BanEditor.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_CustomElements.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_DBus.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_LCD.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_Log.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_Log__unix.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_LookConfig.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_MainWindow.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_Messages.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm \
pkgsrc/chat/mumble/patches/patch-src_mumble_Plugins.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_Tokens.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_UserEdit.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_UserInformation.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_UserModel.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_UserView.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPI.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp \
pkgsrc/chat/mumble/patches/patch-src_mumble_os__macx.mm
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.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/Makefile
diff -u pkgsrc/chat/mumble/Makefile:1.2 pkgsrc/chat/mumble/Makefile:1.3
--- pkgsrc/chat/mumble/Makefile:1.2 Sat Dec 22 18:28:07 2018
+++ pkgsrc/chat/mumble/Makefile Mon Jun 17 08:08:31 2019
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2018/12/22 18:28:07 nia Exp $
+# $NetBSD: Makefile,v 1.3 2019/06/17 08:08:31 nia Exp $
DISTNAME= mumble-1.2.19
+PKGREVISION= 1
CATEGORIES= chat audio
MASTER_SITES= ${MASTER_SITE_GITHUB:=mumble-voip/}
GITHUB_PROJECT= mumble
Index: pkgsrc/chat/mumble/distinfo
diff -u pkgsrc/chat/mumble/distinfo:1.1 pkgsrc/chat/mumble/distinfo:1.2
--- pkgsrc/chat/mumble/distinfo:1.1 Sat Dec 22 18:17:39 2018
+++ pkgsrc/chat/mumble/distinfo Mon Jun 17 08:08:31 2019
@@ -1,10 +1,50 @@
-$NetBSD: distinfo,v 1.1 2018/12/22 18:17:39 nia Exp $
+$NetBSD: distinfo,v 1.2 2019/06/17 08:08:31 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_AudioOutput.cpp) = 63ad8a2545af3c83daca8a953cc96030397869e8
+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
Index: pkgsrc/chat/mumble/options.mk
diff -u pkgsrc/chat/mumble/options.mk:1.1 pkgsrc/chat/mumble/options.mk:1.2
--- pkgsrc/chat/mumble/options.mk:1.1 Sat Dec 22 18:17:39 2018
+++ pkgsrc/chat/mumble/options.mk Mon Jun 17 08:08:31 2019
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2018/12/22 18:17:39 nia Exp $
+# $NetBSD: options.mk,v 1.2 2019/06/17 08:08:31 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.mumble
PKG_SUPPORTED_OPTIONS= alsa dbus pulseaudio portaudio
-PKG_SUGGESTED_OPTIONS= dbus
+PKG_SUGGESTED_OPTIONS= dbus portaudio
PKG_SUGGESTED_OPTIONS.Linux= alsa
.include "../../mk/bsd.options.mk"
@@ -27,7 +27,7 @@ CONFIG_OPTIONS+= CONFIG+=no-pulseaudio
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-.include "../../audio/portaudio/buildlink3.mk"
+.include "../../audio/portaudio-devel/buildlink3.mk"
.else
CONFIG_OPTIONS+= CONFIG+=no-portaudio
.endif
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp
diff -u pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp:1.1 pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp:1.2
--- pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp:1.1 Sat Dec 22 18:17:39 2018
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp Mon Jun 17 08:08:31 2019
@@ -1,10 +1,27 @@
-$NetBSD: patch-src_mumble_AudioOutput.cpp,v 1.1 2018/12/22 18:17:39 nia Exp $
+$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 2017-01-27 06:48:33.000000000 +0000
+--- src/mumble/AudioOutput.cpp.orig 2019-06-17 07:42:51.973326995 +0000
+++ src/mumble/AudioOutput.cpp
-@@ -431,7 +431,7 @@ bool AudioOutput::mix(void *outbuff, uns
+@@ -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;
}
Added files:
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,19 @@
+$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;
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_About.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_About.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_About.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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"));
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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;
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_BanEditor.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_BanEditor.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_BanEditor.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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);
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_CustomElements.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_CustomElements.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_CustomElements.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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)
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_DBus.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_DBus.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_DBus.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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) {
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_LCD.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_LCD.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_LCD.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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) {
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Log.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Log.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Log.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,21 @@
+$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);
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Log__unix.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Log__unix.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Log__unix.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_LookConfig.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_LookConfig.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_LookConfig.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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);
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_MainWindow.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_MainWindow.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_MainWindow.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Messages.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Messages.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Messages.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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()) \
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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);
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OSS.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,16 @@
+$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 {
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayClient.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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) {
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,31 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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),
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUser.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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();
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Overlay__macx.mm Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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>
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Plugins.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Plugins.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Plugins.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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);
+ }
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_PulseAudio.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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)";
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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);
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_ServerHandler.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_SocketRPC.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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);
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_Tokens.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_Tokens.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_Tokens.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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);
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_UserEdit.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_UserEdit.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_UserEdit.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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);
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_UserInformation.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_UserInformation.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_UserInformation.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,19 @@
+$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());
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_UserModel.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_UserModel.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_UserModel.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,22 @@
+$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;
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_UserView.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_UserView.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_UserView.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,19 @@
+$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
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_VersionCheck.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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;
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,19 @@
+$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) {
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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);
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPI.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPI.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPI.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,17 @@
+$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.
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp Mon Jun 17 08:08:31 2019
@@ -0,0 +1,21 @@
+$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);
+
Index: pkgsrc/chat/mumble/patches/patch-src_mumble_os__macx.mm
diff -u /dev/null pkgsrc/chat/mumble/patches/patch-src_mumble_os__macx.mm:1.1
--- /dev/null Mon Jun 17 08:08:31 2019
+++ pkgsrc/chat/mumble/patches/patch-src_mumble_os__macx.mm Mon Jun 17 08:08:31 2019
@@ -0,0 +1,18 @@
+$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;
+
Home |
Main Index |
Thread Index |
Old Index