pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/mumble mumble: Fix build with newer protobuf.
details: https://anonhg.NetBSD.org/pkgsrc/rev/7bfc9709d14b
branches: trunk
changeset: 397119:7bfc9709d14b
user: nia <nia%pkgsrc.org@localhost>
date: Mon Jun 17 08:08:31 2019 +0000
description:
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
diffstat:
chat/mumble/Makefile | 3 +-
chat/mumble/distinfo | 44 +++++++++-
chat/mumble/options.mk | 6 +-
chat/mumble/patches/patch-src_mumble_ACLEditor.cpp | 19 ++++
chat/mumble/patches/patch-src_mumble_About.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_AudioOutput.cpp | 23 ++++-
chat/mumble/patches/patch-src_mumble_AudioWizard.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_BanEditor.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_CustomElements.cpp | 17 +++
chat/mumble/patches/patch-src_mumble_DBus.cpp | 17 +++
chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp | 17 +++
chat/mumble/patches/patch-src_mumble_LCD.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_Log.cpp | 21 ++++
chat/mumble/patches/patch-src_mumble_Log__unix.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_LookConfig.cpp | 17 +++
chat/mumble/patches/patch-src_mumble_MainWindow.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_Messages.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_NetworkConfig.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_OSS.cpp | 16 +++
chat/mumble/patches/patch-src_mumble_Overlay.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_OverlayClient.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_OverlayConfig.cpp | 31 +++++++
chat/mumble/patches/patch-src_mumble_OverlayEditor.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_OverlayEditorScene.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_OverlayUser.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_OverlayUserGroup.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_Overlay__macx.mm | 17 +++
chat/mumble/patches/patch-src_mumble_Plugins.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_PulseAudio.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_RichTextEditor.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_ServerHandler.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_SocketRPC.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_Tokens.cpp | 17 +++
chat/mumble/patches/patch-src_mumble_UserEdit.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_UserInformation.cpp | 19 ++++
chat/mumble/patches/patch-src_mumble_UserModel.cpp | 22 +++++
chat/mumble/patches/patch-src_mumble_UserView.cpp | 19 ++++
chat/mumble/patches/patch-src_mumble_VersionCheck.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_VoiceRecorder.cpp | 19 ++++
chat/mumble/patches/patch-src_mumble_VoiceRecorderDialog.cpp | 18 ++++
chat/mumble/patches/patch-src_mumble_WASAPI.cpp | 17 +++
chat/mumble/patches/patch-src_mumble_WASAPINotificationClient.cpp | 21 ++++
chat/mumble/patches/patch-src_mumble_os__macx.mm | 18 ++++
44 files changed, 845 insertions(+), 9 deletions(-)
diffs (truncated from 1063 to 300 lines):
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/Makefile
--- a/chat/mumble/Makefile Mon Jun 17 07:31:12 2019 +0000
+++ b/chat/mumble/Makefile Mon Jun 17 08:08:31 2019 +0000
@@ -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
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/distinfo
--- a/chat/mumble/distinfo Mon Jun 17 07:31:12 2019 +0000
+++ b/chat/mumble/distinfo Mon Jun 17 08:08:31 2019 +0000
@@ -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
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/options.mk
--- a/chat/mumble/options.mk Mon Jun 17 07:31:12 2019 +0000
+++ b/chat/mumble/options.mk Mon Jun 17 08:08:31 2019 +0000
@@ -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 @@
.endif
.if !empty(PKG_OPTIONS:Mportaudio)
-.include "../../audio/portaudio/buildlink3.mk"
+.include "../../audio/portaudio-devel/buildlink3.mk"
.else
CONFIG_OPTIONS+= CONFIG+=no-portaudio
.endif
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_ACLEditor.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_ACLEditor.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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;
+ }
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_About.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_About.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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"));
+
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_AudioOutput.cpp
--- a/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp Mon Jun 17 07:31:12 2019 +0000
+++ b/chat/mumble/patches/patch-src_mumble_AudioOutput.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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;
}
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_AudioWizard.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_AudioWizard.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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;
+ }
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_BanEditor.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_BanEditor.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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);
+
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_ConnectDialog.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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;
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_CustomElements.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_CustomElements.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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)
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_DBus.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_DBus.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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) {
+ }
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/mumble/patches/patch-src_mumble_GlobalShortcut.cpp Mon Jun 17 08:08:31 2019 +0000
@@ -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
diff -r d9151bf45384 -r 7bfc9709d14b chat/mumble/patches/patch-src_mumble_LCD.cpp
Home |
Main Index |
Thread Index |
Old Index