head	1.2;
access;
symbols
	pkgsrc-2019Q2:1.1.0.2
	pkgsrc-2019Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2019.09.16.22.46.21;	author nia;	state dead;
branches;
next	1.1;
commitid	LCRU5SpFMHhAZhDB;

1.1
date	2019.06.17.08.08.31;	author nia;	state Exp;
branches;
next	;
commitid	HJ0nqpv1vH6t3wrB;


desc
@@


1.2
log
@mumble: Update to 1.3.0

Full release notes:
https://www.mumble.info/blog/mumble-1.3.0-release-announcement/
@
text
@$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
@


1.1
log
@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
@
text
@d1 1
a1 1
$NetBSD$
@