$OpenBSD: patch-src_mumble_UserEdit_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $

unbreak with protobuf 3.7+

Index: src/mumble/UserEdit.cpp
--- src/mumble/UserEdit.cpp.orig
+++ src/mumble/UserEdit.cpp
@@ -32,9 +32,11 @@
 
 #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);
