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

unbreak with protobuf 3.7+

Index: src/mumble/UserModel.cpp
--- src/mumble/UserModel.cpp.orig
+++ 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"
@@ -45,6 +44,9 @@
 #include "ServerHandler.h"
 #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;
