On Sat Feb 15, 2020 at 02:15:45PM +0100, Solene Rapenne wrote: > On Sat, Feb 15, 2020 at 07:18:45AM +0100, Rafael Sadowski wrote: > > Update mumble to the latest stable version. I just tested the start-up > > on amd64. I have on clue how to test it and to be honest I don't care. > > I just want to get rid of Qt4. So mumble people, come out and test! > > > > OK, Feedback? > > your patch applies but then compilation fails due to a patch looking for > a file > > solene@t480 /usr/ports/audio/mumble $ make > ===> Patching for mumble-1.3.0 > ===> Applying OpenBSD patch patch-compiler_pri > Hmm... Looks like a unified diff to me... > The text leading up to this was: > -------------------------- > |$OpenBSD: patch-compiler_pri,v 1.2 2017/02/28 15:35:22 dcoppa Exp $ > |--- compiler.pri.orig Fri Jan 27 13:29:08 2017 > |+++ compiler.pri Tue Feb 28 16:04:48 2017 > -------------------------- > File to patch:
cvs is hard. New diff below with deleted old patches. Thanks for the note. Index: Makefile =================================================================== RCS file: /cvs/ports/audio/mumble/Makefile,v retrieving revision 1.35 diff -u -p -u -p -r1.35 Makefile --- Makefile 6 Dec 2019 23:12:07 -0000 1.35 +++ Makefile 15 Feb 2020 13:29:50 -0000 @@ -2,27 +2,25 @@ COMMENT = low-latency voice chat client -GH_ACCOUNT = mumble-voip -GH_PROJECT = mumble -GH_TAGNAME = 1.2.19 -REVISION = 5 +DISTNAME = mumble-1.3.0 CATEGORIES = audio HOMEPAGE = https://www.mumble.info/ +MASTER_SITES = https://github.com/mumble-voip/mumble/releases/download/1.3.0/ +EXTRACT_SUFX = .zip + # BSD3 PERMIT_PACKAGE = Yes -WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c crypto -WANTLIB += fontconfig freetype lib/qt4/QtDBus lib/qt4/QtGui -WANTLIB += lib/qt4/QtNetwork lib/qt4/QtSql lib/qt4/QtSvg -WANTLIB += lib/qt4/QtXml m opus portaudio protobuf -WANTLIB += pthread sndfile speex speexdsp ssl ${COMPILER_LIBCXX} +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network +WANTLIB += Qt5Sql Qt5Widgets Qt5Xml X11 Xi c crypto m opus protobuf +WANTLIB += sndfile speex speexdsp ssl COMPILER = base-clang ports-gcc -MODULES = devel/qmake x11/qt4 +MODULES = devel/qmake x11/qt5 SEPARATE_BUILD = No BUILD_DEPENDS = audio/celt07 \ Index: distinfo =================================================================== RCS file: /cvs/ports/audio/mumble/distinfo,v retrieving revision 1.14 diff -u -p -u -p -r1.14 distinfo --- distinfo 28 Feb 2017 15:35:21 -0000 1.14 +++ distinfo 15 Feb 2020 13:29:50 -0000 @@ -1,2 +1,2 @@ -SHA256 (mumble-1.2.19.tar.gz) = eDXpzseBhM1z8JFEjhTapFHNIGQxd1trq61wvIG2/VA= -SIZE (mumble-1.2.19.tar.gz) = 3324626 +SHA256 (mumble-1.3.0.zip) = YMU5aHKnoQ2bzIyOEUfsBWMPnidI0SklncJvMkFWLxs= +SIZE (mumble-1.3.0.zip) = 10392654 Index: patches/patch-compiler_pri =================================================================== RCS file: patches/patch-compiler_pri diff -N patches/patch-compiler_pri --- patches/patch-compiler_pri 28 Feb 2017 15:35:22 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-compiler_pri,v 1.2 2017/02/28 15:35:22 dcoppa Exp $ ---- compiler.pri.orig Fri Jan 27 13:29:08 2017 -+++ compiler.pri Tue Feb 28 16:04:48 2017 -@@ -117,8 +117,7 @@ unix:!macx { - QMAKE_LFLAGS = -Wl,--no-add-needed - } - -- DEFINES *= _FORTIFY_SOURCE=2 -- QMAKE_LFLAGS *= -Wl,-z,relro -Wl,-z,now -+ QMAKE_LFLAGS *= -Wl,--export-dynamic -Wl,-z,now - - CONFIG(symbols) { - QMAKE_CFLAGS *= -g Index: patches/patch-main_pro =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-main_pro,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-main_pro --- patches/patch-main_pro 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ patches/patch-main_pro 15 Feb 2020 13:29:50 -0000 @@ -2,14 +2,15 @@ $OpenBSD: patch-main_pro,v 1.1.1.1 2013/ Use celt from our ports tree ---- main.pro.orig Sat Jun 1 23:16:30 2013 -+++ main.pro Thu Sep 26 11:10:30 2013 -@@ -12,7 +12,7 @@ CONFIG *= ordered debug_and_release +Index: main.pro +--- main.pro.orig ++++ main.pro +@@ -21,7 +21,7 @@ SUBDIRS *= src/mumble_proto CONFIG(sbcelt) { - SUBDIRS *= celt-0.7.0-build sbcelt-lib-build sbcelt-helper-build + SUBDIRS *= 3rdparty/celt-0.7.0-build 3rdparty/sbcelt-lib-build 3rdparty/sbcelt-helper-build } else { -- unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) { -+ unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt07) { +- unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0 celt) { ++ unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0 celt07) { CONFIG *= no-bundled-celt } !CONFIG(no-bundled-celt) { Index: patches/patch-plugins_link_link_pro =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-plugins_link_link_pro,v retrieving revision 1.3 diff -u -p -u -p -r1.3 patch-plugins_link_link_pro --- patches/patch-plugins_link_link_pro 23 Mar 2014 18:17:34 -0000 1.3 +++ patches/patch-plugins_link_link_pro 15 Feb 2020 13:29:50 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-plugins_link_link_pro,v 1.3 2014/03/23 18:17:34 kili Exp $ ---- plugins/link/link.pro.orig Wed Sep 25 18:13:36 2013 -+++ plugins/link/link.pro Wed Sep 25 18:17:10 2013 -@@ -9,8 +9,4 @@ win32 { - +Index: plugins/link/link.pro +--- plugins/link/link.pro.orig ++++ plugins/link/link.pro +@@ -15,7 +15,4 @@ win32 { unix { - SOURCES = link-posix.cpp -- -- !macx { -- LIBS += -lrt -- } + SOURCES = link-posix.cpp + +- linux* { +- LIBS += -lrt +- } } Index: patches/patch-src_Net_cpp =================================================================== RCS file: patches/patch-src_Net_cpp diff -N patches/patch-src_Net_cpp --- patches/patch-src_Net_cpp 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_Net_cpp,v 1.1.1.1 2013/10/01 10:28:44 dcoppa Exp $ - -Add missing headers - ---- src/Net.cpp.orig Sat Jun 1 23:16:31 2013 -+++ src/Net.cpp Wed Aug 21 16:01:20 2013 -@@ -32,6 +32,13 @@ - - #include "Net.h" - -+#ifdef Q_OS_UNIX -+#include <sys/socket.h> -+#include <sys/types.h> -+#include <netinet/in.h> -+#include <netinet/tcp.h> -+#endif -+ - HostAddress::HostAddress() { - addr[0] = addr[1] = 0ULL; - } Index: patches/patch-src_mumble_ACLEditor_cpp =================================================================== RCS file: patches/patch-src_mumble_ACLEditor_cpp diff -N patches/patch-src_mumble_ACLEditor_cpp --- patches/patch-src_mumble_ACLEditor_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_mumble_ACLEditor_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/ACLEditor.cpp ---- src/mumble/ACLEditor.cpp.orig -+++ src/mumble/ACLEditor.cpp -@@ -37,10 +37,12 @@ - #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: patches/patch-src_mumble_About_cpp =================================================================== RCS file: patches/patch-src_mumble_About_cpp diff -N patches/patch-src_mumble_About_cpp --- patches/patch-src_mumble_About_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_About_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/About.cpp ---- src/mumble/About.cpp.orig -+++ src/mumble/About.cpp -@@ -32,9 +32,11 @@ - - #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: patches/patch-src_mumble_AudioOutputSpeech_h =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_AudioOutputSpeech_h,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_mumble_AudioOutputSpeech_h --- patches/patch-src_mumble_AudioOutputSpeech_h 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ patches/patch-src_mumble_AudioOutputSpeech_h 15 Feb 2020 13:29:50 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-src_mumble_AudioOutputSp Use celt from our ports tree ---- src/mumble/AudioOutputSpeech.h.orig Wed Sep 25 16:41:59 2013 -+++ src/mumble/AudioOutputSpeech.h Wed Sep 25 16:42:22 2013 -@@ -36,7 +36,7 @@ +Index: src/mumble/AudioOutputSpeech.h +--- src/mumble/AudioOutputSpeech.h.orig ++++ src/mumble/AudioOutputSpeech.h +@@ -10,7 +10,7 @@ #include <speex/speex.h> #include <speex/speex_resampler.h> #include <speex/speex_jitter.h> Index: patches/patch-src_mumble_AudioOutput_cpp =================================================================== RCS file: patches/patch-src_mumble_AudioOutput_cpp diff -N patches/patch-src_mumble_AudioOutput_cpp --- patches/patch-src_mumble_AudioOutput_cpp 5 Aug 2019 17:42:40 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ -$OpenBSD: patch-src_mumble_AudioOutput_cpp,v 1.2 2019/08/05 17:42:40 sthen Exp $ - -chunk 1 - unbreak with protobuf 3.7+ - -chunk 2 - do not use non-existent template version of std::abs -commit ea861fe86743c8402bbad77d8d1dd9de8dce447e - -Index: src/mumble/AudioOutput.cpp ---- src/mumble/AudioOutput.cpp.orig -+++ src/mumble/AudioOutput.cpp -@@ -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, unsigned int nsam - top[2] = 0.0f; - } - -- if (std::abs<float>(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { -+ if (std::abs(front[0] * top[0] + front[1] * top[1] + front[2] * top[2]) > 0.01f) { - // Not perpendicular. Assume Y up and rotate 90 degrees. - - float azimuth = 0.0f; Index: patches/patch-src_mumble_AudioWizard_cpp =================================================================== RCS file: patches/patch-src_mumble_AudioWizard_cpp diff -N patches/patch-src_mumble_AudioWizard_cpp --- patches/patch-src_mumble_AudioWizard_cpp 5 Aug 2019 17:42:40 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,77 +0,0 @@ -$OpenBSD: patch-src_mumble_AudioWizard_cpp,v 1.3 2019/08/05 17:42:40 sthen Exp $ - -chunk 1 - unbreak with protobuf 3.7+ - -others - - -Disable submitting anonymous statistics - -Disable Text-To-Speech; use sound notifications by default - -There's a convoluted threading issue: in PAAudio.cpp, around line 338, -it will get caught in an infinite loop. It relies on the PortAudioInput -object being destroyed in another thread, thereby setting bRunning to -false and telling it to exit the loop, which will never happen. Luckily, -this bug is only exposed by the AudioWizard configuration stuff. So, -skip calling restartAudio() from on_qsOutputDelay_valueChanged() while -the AudioWizard is starting up - -Index: src/mumble/AudioWizard.cpp ---- src/mumble/AudioWizard.cpp.orig -+++ 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; - } -@@ -62,7 +64,8 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) { - setupUi(this); - - // Done -- qcbUsage->setChecked(g.s.bUsage); -+ qcbUsage->setEnabled(false); -+ qcbUsage->setChecked(false); - - // Device - if (AudioInputRegistrar::qmNew) { -@@ -114,18 +117,10 @@ AudioWizard::AudioWizard(QWidget *p) : QWizard(p) { - else - qrbQualityCustom->setChecked(true); - -- quint32 iMessage = Settings::LogNone; -- for (int i = Log::firstMsgType;i <= Log::lastMsgType; ++i) { -- iMessage |= (g.s.qmMessages[i] & (Settings::LogSoundfile | Settings::LogTTS)); -- } -+ qrbNotificationTTS->setEnabled(false); -+ qrbNotificationTTS->setChecked(false); -+ qrbNotificationSounds->setChecked(true); - -- if (iMessage == Settings::LogTTS && g.s.bTTS) -- qrbNotificationTTS->setChecked(true); -- else if (iMessage == Settings::LogSoundfile) -- qrbNotificationSounds->setChecked(true); -- else // If we find mixed message types or only tts with main tts disable assume custom -- qrbNotificationCustom->setChecked(true); -- - qrbNotificationCustom->setVisible(qrbNotificationCustom->isChecked()); - - qrbQualityCustom->setVisible(qrbQualityCustom->isChecked()); -@@ -308,7 +303,8 @@ void AudioWizard::on_qcbOutputDevice_activated(int) { - void AudioWizard::on_qsOutputDelay_valueChanged(int v) { - qlOutputDelay->setText(tr("%1 ms").arg(v*10)); - g.s.iOutputDelay = v; -- restartAudio(); -+ if (! bInit) -+ restartAudio(); - } - - void AudioWizard::on_qsMaxAmp_valueChanged(int v) { Index: patches/patch-src_mumble_Audio_cpp =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_Audio_cpp,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_mumble_Audio_cpp --- patches/patch-src_mumble_Audio_cpp 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ patches/patch-src_mumble_Audio_cpp 15 Feb 2020 13:29:50 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-src_mumble_Audio_cpp,v 1 Fix loading of CELT plugins; use celt from our tree ---- src/mumble/Audio.cpp.orig Sat Jun 1 23:16:31 2013 -+++ src/mumble/Audio.cpp Wed Sep 25 16:04:00 2013 -@@ -66,34 +66,20 @@ void CodecInit::initialize() { +Index: src/mumble/Audio.cpp +--- src/mumble/Audio.cpp.orig ++++ src/mumble/Audio.cpp +@@ -53,7 +53,7 @@ void CodecInit::initialize() { delete codec; } #else @@ -13,19 +14,12 @@ Fix loading of CELT plugins; use celt fr if (codec->isValid()) { codec->report(); g.qmCodecs.insert(codec->bitstreamVersion(), codec); - } else { - delete codec; -- codec = new CELTCodec070(QLatin1String("0.0.0")); -- if (codec->isValid()) { -- codec->report(); -- g.qmCodecs.insert(codec->bitstreamVersion(), codec); -- } else { -- delete codec; -- } +@@ -68,19 +68,12 @@ void CodecInit::initialize() { + } } - codec = new CELTCodec011(QLatin1String("0.11.0")); -+ codec = new CELTCodec011(QLatin1String("0")); ++ codec = new CELTCodec011(QLatin1String("11")); if (codec->isValid()) { codec->report(); g.qmCodecs.insert(codec->bitstreamVersion(), codec); Index: patches/patch-src_mumble_BanEditor_cpp =================================================================== RCS file: patches/patch-src_mumble_BanEditor_cpp diff -N patches/patch-src_mumble_BanEditor_cpp --- patches/patch-src_mumble_BanEditor_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_BanEditor_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/BanEditor.cpp ---- src/mumble/BanEditor.cpp.orig -+++ src/mumble/BanEditor.cpp -@@ -33,9 +33,11 @@ - #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: patches/patch-src_mumble_CELTCodec_cpp =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_CELTCodec_cpp,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_mumble_CELTCodec_cpp --- patches/patch-src_mumble_CELTCodec_cpp 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ patches/patch-src_mumble_CELTCodec_cpp 15 Feb 2020 13:29:50 -0000 @@ -2,9 +2,10 @@ $OpenBSD: patch-src_mumble_CELTCodec_cpp Fix loading of CELT plugins; use celt from our tree ---- src/mumble/CELTCodec.cpp.orig Sat Jun 1 23:16:31 2013 -+++ src/mumble/CELTCodec.cpp Wed Sep 25 16:09:11 2013 -@@ -41,12 +41,6 @@ +Index: src/mumble/CELTCodec.cpp +--- src/mumble/CELTCodec.cpp.orig ++++ src/mumble/CELTCodec.cpp +@@ -17,12 +17,6 @@ #define RESOLVE(var) { * reinterpret_cast<void **>(&var) = static_cast<void *>(qlCELT.resolve(#var)); bValid = bValid && (var != NULL); } #endif @@ -14,40 +15,40 @@ Fix loading of CELT plugins; use celt fr -}; -#endif - - CELTCodec::CELTCodec(const QString &version) { + CELTCodec::CELTCodec(const QString &celt_version) { bValid = false; cmMode = NULL; -@@ -55,53 +49,9 @@ CELTCodec::CELTCodec(const QString &version) { +@@ -31,53 +25,8 @@ CELTCodec::CELTCodec(const QString &celt_version) { qlCELT.setLoadHints(QLibrary::ResolveAllSymbolsHint); QStringList alternatives; -#if defined(Q_OS_MAC) -- alternatives << QString::fromLatin1("libcelt0.%1.dylib").arg(version); -- alternatives << QString::fromLatin1("celt0.%1.dylib").arg(version); -- alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(version); -- alternatives << QString::fromLatin1("celt.%1.dylib").arg(version); +- alternatives << QString::fromLatin1("libcelt0.%1.dylib").arg(celt_version); +- alternatives << QString::fromLatin1("celt0.%1.dylib").arg(celt_version); +- alternatives << QString::fromLatin1("libcelt.%1.dylib").arg(celt_version); +- alternatives << QString::fromLatin1("celt.%1.dylib").arg(celt_version); -#elif defined(Q_OS_UNIX) -- alternatives << QString::fromLatin1("libcelt0.so.%1").arg(version); -- alternatives << QString::fromLatin1("libcelt.so.%1").arg(version); -- alternatives << QString::fromLatin1("celt.so.%1").arg(version); +- alternatives << QString::fromLatin1("libcelt0.so.%1").arg(celt_version); +- alternatives << QString::fromLatin1("libcelt.so.%1").arg(celt_version); +- alternatives << QString::fromLatin1("celt.so.%1").arg(celt_version); -#else - int cpuinfo[4]; - __cpuid(cpuinfo, 1); - if (cpuinfo[3] & 0x02000000) { - if (cpuinfo[3] & 0x04000000) { - if (cpuinfo[2] & 0x00000001) { -- alternatives << QString::fromLatin1("celt0.%1.sse3.dll").arg(version); +- alternatives << QString::fromLatin1("celt0.%1.sse3.dll").arg(celt_version); - } -- alternatives << QString::fromLatin1("celt0.%1.sse2.dll").arg(version); +- alternatives << QString::fromLatin1("celt0.%1.sse2.dll").arg(celt_version); - } -- alternatives << QString::fromLatin1("celt0.%1.sse.dll").arg(version); +- alternatives << QString::fromLatin1("celt0.%1.sse.dll").arg(celt_version); - } -+ alternatives << QString::fromLatin1("libcelt%1.so").arg(version); - -- alternatives << QString::fromLatin1("celt0.%1.dll").arg(version); +- +- alternatives << QString::fromLatin1("celt0.%1.dll").arg(celt_version); -#endif ++ alternatives << QString::fromLatin1("libcelt%1.so").arg(version); foreach(const QString &lib, alternatives) { -- qlCELT.setFileName(QApplication::instance()->applicationDirPath() + QLatin1String("/") + lib); +- qlCELT.setFileName(MumbleApplication::instance()->applicationVersionRootPath() + QLatin1String("/") + lib); - if (qlCELT.load()) { - bValid = true; - break; Index: patches/patch-src_mumble_CELTCodec_h =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_CELTCodec_h,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_mumble_CELTCodec_h --- patches/patch-src_mumble_CELTCodec_h 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ patches/patch-src_mumble_CELTCodec_h 15 Feb 2020 13:29:50 -0000 @@ -2,10 +2,11 @@ $OpenBSD: patch-src_mumble_CELTCodec_h,v Use celt from our ports tree ---- src/mumble/CELTCodec.h.orig Wed Sep 25 16:42:04 2013 -+++ src/mumble/CELTCodec.h Wed Sep 25 16:42:34 2013 -@@ -32,7 +32,7 @@ - #define CELTCODEC_H_ +Index: src/mumble/CELTCodec.h +--- src/mumble/CELTCodec.h.orig ++++ src/mumble/CELTCodec.h +@@ -7,7 +7,7 @@ + #define MUMBLE_MUMBLE_CELTCODEC_H_ #include <stdint.h> -#include <celt.h> Index: patches/patch-src_mumble_ConnectDialog_cpp =================================================================== RCS file: patches/patch-src_mumble_ConnectDialog_cpp diff -N patches/patch-src_mumble_ConnectDialog_cpp --- patches/patch-src_mumble_ConnectDialog_cpp 5 Aug 2019 17:42:40 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$OpenBSD: patch-src_mumble_ConnectDialog_cpp,v 1.3 2019/08/05 17:42:40 sthen Exp $ - -chunk 1 - unbreak with protobuf 3.7+ - -chunk 2 - Prevent method from being hidden instead of being overridden - -Index: src/mumble/ConnectDialog.cpp ---- src/mumble/ConnectDialog.cpp.orig -+++ 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; -@@ -120,7 +122,7 @@ ServerView::~ServerView() { - delete siPublic; - } - --QMimeData *ServerView::mimeData(const QList<QTreeWidgetItem *>& mimeitems) const { -+QMimeData *ServerView::mimeData(QList<QTreeWidgetItem *> mimeitems) const { - if (mimeitems.isEmpty()) - return NULL; - Index: patches/patch-src_mumble_ConnectDialog_h =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_ConnectDialog_h,v retrieving revision 1.1.1.1 diff -u -p -u -p -r1.1.1.1 patch-src_mumble_ConnectDialog_h --- patches/patch-src_mumble_ConnectDialog_h 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ patches/patch-src_mumble_ConnectDialog_h 15 Feb 2020 13:29:50 -0000 @@ -2,14 +2,15 @@ $OpenBSD: patch-src_mumble_ConnectDialog Prevent method from being hidden instead of being overridden ---- src/mumble/ConnectDialog.h.orig Sat Sep 28 03:41:05 2013 -+++ src/mumble/ConnectDialog.h Sat Sep 28 03:43:16 2013 -@@ -107,7 +107,7 @@ class ServerView : public QTreeWidget { +Index: src/mumble/ConnectDialog.h +--- src/mumble/ConnectDialog.h.orig ++++ src/mumble/ConnectDialog.h +@@ -105,7 +105,7 @@ class ServerView : public QTreeWidget { ServerItem *getParent(const QString &continent, const QString &countrycode, const QString &countryname, const QString &usercontinentcode, const QString &usercountrycode); protected: -- virtual QMimeData *mimeData(const QList<QTreeWidgetItem *>&) const; +- QMimeData *mimeData(const QList<QTreeWidgetItem *>) const Q_DECL_OVERRIDE; + virtual QMimeData *mimeData(QList<QTreeWidgetItem *>) const; - virtual QStringList mimeTypes() const; - virtual Qt::DropActions supportedDropActions() const; - virtual bool dropMimeData(QTreeWidgetItem *, int, const QMimeData *, Qt::DropAction); + QStringList mimeTypes() const Q_DECL_OVERRIDE; + Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + bool dropMimeData(QTreeWidgetItem *, int, const QMimeData *, Qt::DropAction) Q_DECL_OVERRIDE; Index: patches/patch-src_mumble_CustomElements_cpp =================================================================== RCS file: patches/patch-src_mumble_CustomElements_cpp diff -N patches/patch-src_mumble_CustomElements_cpp --- patches/patch-src_mumble_CustomElements_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_CustomElements_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/CustomElements.cpp ---- src/mumble/CustomElements.cpp.orig -+++ 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: patches/patch-src_mumble_DBus_cpp =================================================================== RCS file: patches/patch-src_mumble_DBus_cpp diff -N patches/patch-src_mumble_DBus_cpp --- patches/patch-src_mumble_DBus_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_DBus_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/DBus.cpp ---- src/mumble/DBus.cpp.orig -+++ 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: patches/patch-src_mumble_GlobalShortcut_cpp =================================================================== RCS file: patches/patch-src_mumble_GlobalShortcut_cpp diff -N patches/patch-src_mumble_GlobalShortcut_cpp --- patches/patch-src_mumble_GlobalShortcut_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_mumble_GlobalShortcut_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/GlobalShortcut.cpp ---- src/mumble/GlobalShortcut.cpp.orig -+++ src/mumble/GlobalShortcut.cpp -@@ -36,8 +36,10 @@ - #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 Index: patches/patch-src_mumble_GlobalShortcut_unix_cpp =================================================================== RCS file: patches/patch-src_mumble_GlobalShortcut_unix_cpp diff -N patches/patch-src_mumble_GlobalShortcut_unix_cpp --- patches/patch-src_mumble_GlobalShortcut_unix_cpp 12 Jun 2015 09:43:12 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_mumble_GlobalShortcut_unix_cpp,v 1.2 2015/06/12 09:43:12 dcoppa Exp $ - -'XKeycodeToKeysym' is deprecated - ---- src/mumble/GlobalShortcut_unix.cpp.orig Thu Jun 11 21:49:58 2015 -+++ src/mumble/GlobalShortcut_unix.cpp Fri Jun 12 10:33:36 2015 -@@ -337,7 +337,7 @@ QString GlobalShortcutX::buttonName(const QVariant &v) - if (!ok) - return QString(); - if ((key < 0x118) || (key >= 0x128)) { -- KeySym ks=XKeycodeToKeysym(QX11Info::display(), static_cast<KeyCode>(key), 0); -+ KeySym ks=XkbKeycodeToKeysym(QX11Info::display(), static_cast<KeyCode>(key), 0, 0); - if (ks == NoSymbol) { - return QLatin1String("0x")+QString::number(key,16); - } else { Index: patches/patch-src_mumble_GlobalShortcut_unix_h =================================================================== RCS file: patches/patch-src_mumble_GlobalShortcut_unix_h diff -N patches/patch-src_mumble_GlobalShortcut_unix_h --- patches/patch-src_mumble_GlobalShortcut_unix_h 9 Dec 2015 12:22:45 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_mumble_GlobalShortcut_unix_h,v 1.2 2015/12/09 12:22:45 dcoppa Exp $ - -'XKeycodeToKeysym' is deprecated - ---- src/mumble/GlobalShortcut_unix.h.orig Sun Dec 6 11:05:24 2015 -+++ src/mumble/GlobalShortcut_unix.h Wed Dec 9 12:53:17 2015 -@@ -34,6 +34,7 @@ - - #include <QX11Info> - #include <X11/X.h> -+#include <X11/XKBlib.h> - #include <X11/Xlib.h> - #ifndef NO_XINPUT2 - #include <X11/extensions/XI2.h> Index: patches/patch-src_mumble_LCD_cpp =================================================================== RCS file: patches/patch-src_mumble_LCD_cpp diff -N patches/patch-src_mumble_LCD_cpp --- patches/patch-src_mumble_LCD_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_LCD_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/LCD.cpp ---- src/mumble/LCD.cpp.orig -+++ src/mumble/LCD.cpp -@@ -35,9 +35,11 @@ - - #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; - Index: patches/patch-src_mumble_Log_cpp =================================================================== RCS file: patches/patch-src_mumble_Log_cpp diff -N patches/patch-src_mumble_Log_cpp --- patches/patch-src_mumble_Log_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_mumble_Log_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Log.cpp ---- src/mumble/Log.cpp.orig -+++ src/mumble/Log.cpp -@@ -36,12 +36,14 @@ - #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: patches/patch-src_mumble_Log_unix_cpp =================================================================== RCS file: patches/patch-src_mumble_Log_unix_cpp diff -N patches/patch-src_mumble_Log_unix_cpp --- patches/patch-src_mumble_Log_unix_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_Log_unix_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Log_unix.cpp ---- src/mumble/Log_unix.cpp.orig -+++ src/mumble/Log_unix.cpp -@@ -32,9 +32,11 @@ - #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 Index: patches/patch-src_mumble_LookConfig_cpp =================================================================== RCS file: patches/patch-src_mumble_LookConfig_cpp diff -N patches/patch-src_mumble_LookConfig_cpp --- patches/patch-src_mumble_LookConfig_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_mumble_LookConfig_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/LookConfig.cpp ---- src/mumble/LookConfig.cpp.orig -+++ src/mumble/LookConfig.cpp -@@ -35,8 +35,10 @@ - - #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: patches/patch-src_mumble_MainWindow_cpp =================================================================== RCS file: patches/patch-src_mumble_MainWindow_cpp diff -N patches/patch-src_mumble_MainWindow_cpp --- patches/patch-src_mumble_MainWindow_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_mumble_MainWindow_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/MainWindow.cpp ---- src/mumble/MainWindow.cpp.orig -+++ 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" -@@ -74,6 +73,9 @@ - #ifdef QT_MAC_USE_COCOA - #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() Index: patches/patch-src_mumble_Messages_cpp =================================================================== RCS file: patches/patch-src_mumble_Messages_cpp diff -N patches/patch-src_mumble_Messages_cpp --- patches/patch-src_mumble_Messages_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_mumble_Messages_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Messages.cpp ---- src/mumble/Messages.cpp.orig -+++ 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" -@@ -54,6 +53,9 @@ - #include "UserModel.h" - #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; \ Index: patches/patch-src_mumble_NetworkConfig_cpp =================================================================== RCS file: patches/patch-src_mumble_NetworkConfig_cpp diff -N patches/patch-src_mumble_NetworkConfig_cpp --- patches/patch-src_mumble_NetworkConfig_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_NetworkConfig_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/NetworkConfig.cpp ---- src/mumble/NetworkConfig.cpp.orig -+++ src/mumble/NetworkConfig.cpp -@@ -34,9 +34,11 @@ - - #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: patches/patch-src_mumble_OSS_cpp =================================================================== RCS file: patches/patch-src_mumble_OSS_cpp diff -N patches/patch-src_mumble_OSS_cpp --- patches/patch-src_mumble_OSS_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,18 +0,0 @@ -$OpenBSD: patch-src_mumble_OSS_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OSS.cpp ---- src/mumble/OSS.cpp.orig -+++ src/mumble/OSS.cpp -@@ -38,8 +38,9 @@ - #include <sys/ioctl.h> - - #include "User.h" --#include "Global.h" - #include "MainWindow.h" -+ -+#include "Global.h" - - #define NBLOCKS 8 - Index: patches/patch-src_mumble_OverlayClient_cpp =================================================================== RCS file: patches/patch-src_mumble_OverlayClient_cpp diff -N patches/patch-src_mumble_OverlayClient_cpp --- patches/patch-src_mumble_OverlayClient_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_mumble_OverlayClient_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OverlayClient.cpp ---- src/mumble/OverlayClient.cpp.orig -+++ src/mumble/OverlayClient.cpp -@@ -34,13 +34,15 @@ - #include "OverlayText.h" - #include "User.h" - #include "Channel.h" --#include "Global.h" - #include "Message.h" - #include "Database.h" - #include "NetworkConfig.h" - #include "ServerHandler.h" - #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), Index: patches/patch-src_mumble_OverlayConfig_cpp =================================================================== RCS file: patches/patch-src_mumble_OverlayConfig_cpp diff -N patches/patch-src_mumble_OverlayConfig_cpp --- patches/patch-src_mumble_OverlayConfig_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-src_mumble_OverlayConfig_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OverlayConfig.cpp ---- src/mumble/OverlayConfig.cpp.orig -+++ 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); - } -@@ -480,6 +482,8 @@ void OverlayConfig::on_qpbLoadPreset_clicked() { - qs.beginGroup(QLatin1String("overlay")); - load_preset.load(&qs); - qs.endGroup(); -+ -+#include "Global.h" - - #ifdef Q_OS_WIN - load_preset.qslBlacklist = s.os.qslBlacklist; Index: patches/patch-src_mumble_OverlayEditorScene_cpp =================================================================== RCS file: patches/patch-src_mumble_OverlayEditorScene_cpp diff -N patches/patch-src_mumble_OverlayEditorScene_cpp --- patches/patch-src_mumble_OverlayEditorScene_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_mumble_OverlayEditorScene_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OverlayEditorScene.cpp ---- src/mumble/OverlayEditorScene.cpp.orig -+++ src/mumble/OverlayEditorScene.cpp -@@ -34,13 +34,15 @@ - #include "OverlayText.h" - #include "User.h" - #include "Channel.h" --#include "Global.h" - #include "Message.h" - #include "Database.h" - #include "NetworkConfig.h" - #include "ServerHandler.h" - #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; Index: patches/patch-src_mumble_OverlayEditor_cpp =================================================================== RCS file: patches/patch-src_mumble_OverlayEditor_cpp diff -N patches/patch-src_mumble_OverlayEditor_cpp --- patches/patch-src_mumble_OverlayEditor_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_mumble_OverlayEditor_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OverlayEditor.cpp ---- src/mumble/OverlayEditor.cpp.orig -+++ src/mumble/OverlayEditor.cpp -@@ -34,13 +34,15 @@ - #include "OverlayText.h" - #include "User.h" - #include "Channel.h" --#include "Global.h" - #include "Message.h" - #include "Database.h" - #include "NetworkConfig.h" - #include "ServerHandler.h" - #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), Index: patches/patch-src_mumble_OverlayUserGroup_cpp =================================================================== RCS file: patches/patch-src_mumble_OverlayUserGroup_cpp diff -N patches/patch-src_mumble_OverlayUserGroup_cpp --- patches/patch-src_mumble_OverlayUserGroup_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_mumble_OverlayUserGroup_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OverlayUserGroup.cpp ---- src/mumble/OverlayUserGroup.cpp.orig -+++ src/mumble/OverlayUserGroup.cpp -@@ -35,13 +35,15 @@ - #include "User.h" - #include "Channel.h" - #include "ClientUser.h" --#include "Global.h" - #include "Message.h" - #include "Database.h" - #include "NetworkConfig.h" - #include "ServerHandler.h" - #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 { Index: patches/patch-src_mumble_OverlayUser_cpp =================================================================== RCS file: patches/patch-src_mumble_OverlayUser_cpp diff -N patches/patch-src_mumble_OverlayUser_cpp --- patches/patch-src_mumble_OverlayUser_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_mumble_OverlayUser_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/OverlayUser.cpp ---- src/mumble/OverlayUser.cpp.orig -+++ src/mumble/OverlayUser.cpp -@@ -35,13 +35,15 @@ - #include "User.h" - #include "Channel.h" - #include "ClientUser.h" --#include "Global.h" - #include "Message.h" - #include "Database.h" - #include "NetworkConfig.h" - #include "ServerHandler.h" - #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(); Index: patches/patch-src_mumble_Overlay_cpp =================================================================== RCS file: patches/patch-src_mumble_Overlay_cpp diff -N patches/patch-src_mumble_Overlay_cpp --- patches/patch-src_mumble_Overlay_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-src_mumble_Overlay_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Overlay.cpp ---- src/mumble/Overlay.cpp.orig -+++ 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" -@@ -44,6 +43,9 @@ - #include "ServerHandler.h" - #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; Index: patches/patch-src_mumble_Overlay_macx_mm =================================================================== RCS file: patches/patch-src_mumble_Overlay_macx_mm diff -N patches/patch-src_mumble_Overlay_macx_mm --- patches/patch-src_mumble_Overlay_macx_mm 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_mumble_Overlay_macx_mm,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Overlay_macx.mm ---- src/mumble/Overlay_macx.mm.orig -+++ src/mumble/Overlay_macx.mm -@@ -33,8 +33,10 @@ - #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: patches/patch-src_mumble_Plugins_cpp =================================================================== RCS file: patches/patch-src_mumble_Plugins_cpp diff -N patches/patch-src_mumble_Plugins_cpp --- patches/patch-src_mumble_Plugins_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_mumble_Plugins_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Plugins.cpp ---- src/mumble/Plugins.cpp.orig -+++ src/mumble/Plugins.cpp -@@ -32,13 +32,15 @@ - - #include "Plugins.h" - --#include "Global.h" - #include "Log.h" - #include "MainWindow.h" - #include "Message.h" - #include "ServerHandler.h" - #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: patches/patch-src_mumble_PulseAudio_cpp =================================================================== RCS file: patches/patch-src_mumble_PulseAudio_cpp diff -N patches/patch-src_mumble_PulseAudio_cpp --- patches/patch-src_mumble_PulseAudio_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_mumble_PulseAudio_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/PulseAudio.cpp ---- src/mumble/PulseAudio.cpp.orig -+++ 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: patches/patch-src_mumble_RichTextEditor_cpp =================================================================== RCS file: patches/patch-src_mumble_RichTextEditor_cpp diff -N patches/patch-src_mumble_RichTextEditor_cpp --- patches/patch-src_mumble_RichTextEditor_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_RichTextEditor_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/RichTextEditor.cpp ---- src/mumble/RichTextEditor.cpp.orig -+++ src/mumble/RichTextEditor.cpp -@@ -32,9 +32,11 @@ - - #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); Index: patches/patch-src_mumble_ServerHandler_cpp =================================================================== RCS file: patches/patch-src_mumble_ServerHandler_cpp diff -N patches/patch-src_mumble_ServerHandler_cpp --- patches/patch-src_mumble_ServerHandler_cpp 5 Aug 2019 17:42:40 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,34 +0,0 @@ -$OpenBSD: patch-src_mumble_ServerHandler_cpp,v 1.3 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Add missing headers - -Index: src/mumble/ServerHandler.cpp ---- src/mumble/ServerHandler.cpp.orig -+++ 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" -@@ -46,6 +45,16 @@ - #include "RichTextEditor.h" - #include "SSL.h" - #include "User.h" -+ -+#ifdef Q_OS_UNIX -+#include <sys/socket.h> -+#include <sys/types.h> -+#include <netinet/in.h> -+#include <netinet/tcp.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" - - ServerHandlerMessageEvent::ServerHandlerMessageEvent(const QByteArray &msg, unsigned int mtype, bool flush) : QEvent(static_cast<QEvent::Type>(SERVERSEND_EVENT)) { - qbaMsg = msg; Index: patches/patch-src_mumble_Settings_cpp =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_Settings_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_mumble_Settings_cpp --- patches/patch-src_mumble_Settings_cpp 12 Jun 2015 09:43:12 -0000 1.2 +++ patches/patch-src_mumble_Settings_cpp 15 Feb 2020 13:29:50 -0000 @@ -4,9 +4,10 @@ Disable Text-To-Speech Disable submitting anonymous statistics ---- src/mumble/Settings.cpp.orig Thu Jun 11 21:49:58 2015 -+++ src/mumble/Settings.cpp Fri Jun 12 10:33:36 2015 -@@ -256,7 +256,7 @@ Settings::Settings() { +Index: src/mumble/Settings.cpp +--- src/mumble/Settings.cpp.orig ++++ src/mumble/Settings.cpp +@@ -222,7 +222,7 @@ Settings::Settings() { atTransmit = VAD; bTransmitPosition = false; bMute = bDeaf = false; @@ -15,12 +16,12 @@ Disable submitting anonymous statistics bTTSMessageReadBack = false; iTTSVolume = 75; iTTSThreshold = 250; -@@ -315,7 +315,7 @@ Settings::Settings() { - bHideInTray = true; +@@ -298,7 +298,7 @@ Settings::Settings() { + bHideInTray = !isUnityDesktop && QSystemTrayIcon::isSystemTrayAvailable(); #endif bStateInTray = true; - bUsage = true; + bUsage = false; bShowUserCount = false; bChatBarUseSelection = false; - wlWindowLayout = LayoutClassic; + bFilterHidesEmptyChannels = true; Index: patches/patch-src_mumble_SocketRPC_cpp =================================================================== RCS file: patches/patch-src_mumble_SocketRPC_cpp diff -N patches/patch-src_mumble_SocketRPC_cpp --- patches/patch-src_mumble_SocketRPC_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_SocketRPC_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/SocketRPC.cpp ---- src/mumble/SocketRPC.cpp.orig -+++ src/mumble/SocketRPC.cpp -@@ -34,9 +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" - - SocketRPCClient::SocketRPCClient(QLocalSocket *s, QObject *p) : QObject(p), qlsSocket(s), qbBuffer(NULL) { - qlsSocket->setParent(this); Index: patches/patch-src_mumble_TextToSpeech_unix_cpp =================================================================== RCS file: patches/patch-src_mumble_TextToSpeech_unix_cpp diff -N patches/patch-src_mumble_TextToSpeech_unix_cpp --- patches/patch-src_mumble_TextToSpeech_unix_cpp 1 Oct 2013 10:28:44 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_TextToSpeech_unix_cpp,v 1.1.1.1 2013/10/01 10:28:44 dcoppa Exp $ ---- src/mumble/TextToSpeech_unix.cpp.orig Sat Jun 1 23:16:32 2013 -+++ src/mumble/TextToSpeech_unix.cpp Wed Aug 21 16:01:20 2013 -@@ -33,7 +33,7 @@ - #include "TextToSpeech.h" - - #ifdef USE_SPEECHD --#include <libspeechd.h> -+#include <speech-dispatcher/libspeechd.h> - #endif - - #include "Global.h" -@@ -81,7 +81,6 @@ void TextToSpeechPrivate::setVolume(int vol) { - } - #else - TextToSpeechPrivate::TextToSpeechPrivate() { -- qWarning("TextToSpeech: Compiled without support for speech-dispatcher"); - } - - TextToSpeechPrivate::~TextToSpeechPrivate() { Index: patches/patch-src_mumble_Tokens_cpp =================================================================== RCS file: patches/patch-src_mumble_Tokens_cpp diff -N patches/patch-src_mumble_Tokens_cpp --- patches/patch-src_mumble_Tokens_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_mumble_Tokens_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/Tokens.cpp ---- src/mumble/Tokens.cpp.orig -+++ src/mumble/Tokens.cpp -@@ -33,8 +33,10 @@ - #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: patches/patch-src_mumble_UserEdit_cpp =================================================================== RCS file: patches/patch-src_mumble_UserEdit_cpp diff -N patches/patch-src_mumble_UserEdit_cpp --- patches/patch-src_mumble_UserEdit_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$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); Index: patches/patch-src_mumble_UserInformation_cpp =================================================================== RCS file: patches/patch-src_mumble_UserInformation_cpp diff -N patches/patch-src_mumble_UserInformation_cpp --- patches/patch-src_mumble_UserInformation_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_mumble_UserInformation_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/UserInformation.cpp ---- src/mumble/UserInformation.cpp.orig -+++ src/mumble/UserInformation.cpp -@@ -34,10 +34,12 @@ - - #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; Index: patches/patch-src_mumble_UserModel_cpp =================================================================== RCS file: patches/patch-src_mumble_UserModel_cpp diff -N patches/patch-src_mumble_UserModel_cpp --- patches/patch-src_mumble_UserModel_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$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; Index: patches/patch-src_mumble_UserView_cpp =================================================================== RCS file: patches/patch-src_mumble_UserView_cpp diff -N patches/patch-src_mumble_UserView_cpp --- patches/patch-src_mumble_UserView_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_mumble_UserView_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/UserView.cpp ---- src/mumble/UserView.cpp.orig -+++ src/mumble/UserView.cpp -@@ -35,10 +35,12 @@ - #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) Index: patches/patch-src_mumble_VersionCheck_cpp =================================================================== RCS file: patches/patch-src_mumble_VersionCheck_cpp diff -N patches/patch-src_mumble_VersionCheck_cpp --- patches/patch-src_mumble_VersionCheck_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_VersionCheck_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/VersionCheck.cpp ---- src/mumble/VersionCheck.cpp.orig -+++ src/mumble/VersionCheck.cpp -@@ -32,9 +32,11 @@ - - #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: patches/patch-src_mumble_VoiceRecorderDialog_cpp =================================================================== RCS file: patches/patch-src_mumble_VoiceRecorderDialog_cpp diff -N patches/patch-src_mumble_VoiceRecorderDialog_cpp --- patches/patch-src_mumble_VoiceRecorderDialog_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_VoiceRecorderDialog_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/VoiceRecorderDialog.cpp ---- src/mumble/VoiceRecorderDialog.cpp.orig -+++ src/mumble/VoiceRecorderDialog.cpp -@@ -34,9 +34,11 @@ - #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")); Index: patches/patch-src_mumble_VoiceRecorder_cpp =================================================================== RCS file: patches/patch-src_mumble_VoiceRecorder_cpp diff -N patches/patch-src_mumble_VoiceRecorder_cpp --- patches/patch-src_mumble_VoiceRecorder_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_mumble_VoiceRecorder_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/VoiceRecorder.cpp ---- src/mumble/VoiceRecorder.cpp.orig -+++ src/mumble/VoiceRecorder.cpp -@@ -36,10 +36,12 @@ - - #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) : Index: patches/patch-src_mumble_WASAPINotificationClient_cpp =================================================================== RCS file: patches/patch-src_mumble_WASAPINotificationClient_cpp diff -N patches/patch-src_mumble_WASAPINotificationClient_cpp --- patches/patch-src_mumble_WASAPINotificationClient_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ -$OpenBSD: patch-src_mumble_WASAPINotificationClient_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/WASAPINotificationClient.cpp ---- src/mumble/WASAPINotificationClient.cpp.orig -+++ src/mumble/WASAPINotificationClient.cpp -@@ -29,12 +29,14 @@ - */ - - #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: patches/patch-src_mumble_WASAPI_cpp =================================================================== RCS file: patches/patch-src_mumble_WASAPI_cpp diff -N patches/patch-src_mumble_WASAPI_cpp --- patches/patch-src_mumble_WASAPI_cpp 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_WASAPI_cpp,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/WASAPI.cpp ---- src/mumble/WASAPI.cpp.orig -+++ 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: patches/patch-src_mumble_main_cpp =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_main_cpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_mumble_main_cpp --- patches/patch-src_mumble_main_cpp 28 Feb 2017 15:35:22 -0000 1.2 +++ patches/patch-src_mumble_main_cpp 15 Feb 2020 13:29:50 -0000 @@ -2,15 +2,16 @@ $OpenBSD: patch-src_mumble_main_cpp,v 1. Fix loading of translation files ---- src/mumble/main.cpp.orig Fri Jan 27 13:29:08 2017 -+++ src/mumble/main.cpp Tue Feb 28 16:04:48 2017 -@@ -334,7 +334,8 @@ int main(int argc, char **argv) { +Index: src/mumble/main.cpp +--- src/mumble/main.cpp.orig ++++ src/mumble/main.cpp +@@ -386,7 +386,8 @@ int main(int argc, char **argv) { a.installTranslator(&translator); QTranslator loctranslator; - if (loctranslator.load(QLatin1String("mumble_") + locale, a.applicationDirPath())) + QString localeDir = QLatin1String(MUMTEXT(LOCALE_PATH)); -+ if (loctranslator.load(QLatin1String("mumble_") + locale, localeDir)) - a.installTranslator(&loctranslator); ++ if (loctranslator.load(QLatin1String("mumble_") + locale, localeDir)) + a.installTranslator(&loctranslator); // Can overwrite strings from bundled mumble translation - QTranslator qttranslator; + // With modularization of Qt 5 some - but not all - of the qt_<locale>.ts files have become Index: patches/patch-src_mumble_mumble_pch_hpp =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_mumble_pch_hpp,v retrieving revision 1.2 diff -u -p -u -p -r1.2 patch-src_mumble_mumble_pch_hpp --- patches/patch-src_mumble_mumble_pch_hpp 12 Jun 2015 09:43:12 -0000 1.2 +++ patches/patch-src_mumble_mumble_pch_hpp 15 Feb 2020 13:29:50 -0000 @@ -2,12 +2,13 @@ $OpenBSD: patch-src_mumble_mumble_pch_hp Use celt from our ports tree ---- src/mumble/mumble_pch.hpp.orig Thu Jun 11 21:49:58 2015 -+++ src/mumble/mumble_pch.hpp Fri Jun 12 10:33:36 2015 -@@ -45,7 +45,7 @@ - #define __int64_t __int64 +Index: src/mumble/mumble_pch.hpp +--- src/mumble/mumble_pch.hpp.orig ++++ src/mumble/mumble_pch.hpp +@@ -55,7 +55,7 @@ + #define ENABLE_SNDFILE_WINDOWS_PROTOTYPES 1 + #endif #include <sndfile.h> - #undef __int64_t -#include <celt.h> +#include <celt07/celt.h> #ifdef USE_SBCELT Index: patches/patch-src_mumble_mumble_pro =================================================================== RCS file: /cvs/ports/audio/mumble/patches/patch-src_mumble_mumble_pro,v retrieving revision 1.4 diff -u -p -u -p -r1.4 patch-src_mumble_mumble_pro --- patches/patch-src_mumble_mumble_pro 10 May 2016 07:44:11 -0000 1.4 +++ patches/patch-src_mumble_mumble_pro 15 Feb 2020 13:29:50 -0000 @@ -1,29 +1,33 @@ -$OpenBSD: patch-src_mumble_mumble_pro,v 1.4 2016/05/10 07:44:11 dcoppa Exp $ +$OpenBSD$ -Use celt from our ports tree - ---- src/mumble/mumble.pro.orig Thu May 5 17:48:09 2016 -+++ src/mumble/mumble.pro Tue May 10 09:19:52 2016 -@@ -67,12 +67,9 @@ CONFIG(sbcelt) { +Index: src/mumble/mumble.pro +--- src/mumble/mumble.pro.orig ++++ src/mumble/mumble.pro +@@ -320,16 +320,9 @@ CONFIG(sbcelt) { LIBS *= -lcelt -lsbcelt DEFINES *= SBCELT_PREFIX_API SBCELT_COMPAT_API USE_SBCELT } else { -- unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt) { -+ unix:!CONFIG(bundled-celt):system(pkg-config --atleast-version=0.7.0 celt07) { - CONFIG *= no-bundled-celt +- unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0 celt) { ++ unix:!CONFIG(bundled-celt):system($$PKG_CONFIG --atleast-version=0.7.0 celt07) { + CONFIG *= no-bundled-celt } - CONFIG(no-bundled-celt) { -- INCLUDEPATH *= /usr/include/celt +- INCLUDEPATH *= /usr/include/celt +- unix { +- QMAKE_CFLAGS *= "-I/usr/include/celt" "-isystem /usr/include/celt" +- QMAKE_CXXFLAGS *= "-I/usr/include/celt" "-isystem /usr/include/celt" +- } - } !CONFIG(no-bundled-celt) { - INCLUDEPATH *= ../../celt-0.7.0-src/libcelt - } -@@ -212,7 +209,7 @@ unix { - HEADERS *= GlobalShortcut_unix.h - SOURCES *= GlobalShortcut_unix.cpp TextToSpeech_unix.cpp Overlay_unix.cpp SharedMemory_unix.cpp Log_unix.cpp - PKGCONFIG *= x11 -- LIBS *= -lrt -lXi -+ LIBS *= -lXi + INCLUDEPATH *= ../../3rdparty/celt-0.7.0-src/libcelt + unix { +@@ -539,9 +532,6 @@ unix { + } + + must_pkgconfig(x11) +- linux* { +- LIBS *= -lrt +- } + LIBS *= -lXi !CONFIG(no-oss) { - CONFIG *= oss Index: patches/patch-src_mumble_os_macx_mm =================================================================== RCS file: patches/patch-src_mumble_os_macx_mm diff -N patches/patch-src_mumble_os_macx_mm --- patches/patch-src_mumble_os_macx_mm 5 Aug 2019 17:42:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_mumble_os_macx_mm,v 1.1 2019/08/05 17:42:40 sthen Exp $ - -unbreak with protobuf 3.7+ - -Index: src/mumble/os_macx.mm ---- src/mumble/os_macx.mm.orig -+++ src/mumble/os_macx.mm -@@ -30,9 +30,11 @@ - */ - - #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; Index: patches/patch-themes_MumbleTheme_qrc =================================================================== RCS file: patches/patch-themes_MumbleTheme_qrc diff -N patches/patch-themes_MumbleTheme_qrc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-themes_MumbleTheme_qrc 15 Feb 2020 13:29:50 -0000 @@ -0,0 +1,16 @@ +$OpenBSD$ + +Remove broken files + +Index: themes/MumbleTheme.qrc +--- themes/MumbleTheme.qrc.orig ++++ themes/MumbleTheme.qrc +@@ -85,8 +85,6 @@ + <file alias="exported/config_ui.svg">Mumble/exported/config_ui.svg</file> + <file alias="mimetypes/image-x-generic.svg">Mumble/mimetypes/image-x-generic.svg</file> + <file alias="mimetypes/text-html.svg">Mumble/mimetypes/text-html.svg</file> +- <file alias="OSX Dark.qss">Mumble/OSX Dark.qss</file> +- <file alias="OSX Lite.qss">Mumble/OSX Lite.qss</file> + <file alias="status/text-missing.svg">Mumble/status/text-missing.svg</file> + </qresource> + </RCC> Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/audio/mumble/pkg/PLIST,v retrieving revision 1.5 diff -u -p -u -p -r1.5 PLIST --- pkg/PLIST 29 Jun 2018 22:16:09 -0000 1.5 +++ pkg/PLIST 15 Feb 2020 13:29:50 -0000 @@ -1,30 +1,56 @@ @comment $OpenBSD: PLIST,v 1.5 2018/06/29 22:16:09 espie Exp $ @bin bin/mumble lib/mumble/ -lib/mumble/liblink.so -lib/mumble/libmanual.so +@so lib/mumble/liblink.so @man man/man1/mumble.1 share/applications/mumble.desktop share/icons/hicolor/scalable/apps/mumble.svg share/mumble/ share/mumble/locale/ +share/mumble/locale/mumble_ar.qm +share/mumble/locale/mumble_be.qm +share/mumble/locale/mumble_bg.qm +share/mumble/locale/mumble_br.qm share/mumble/locale/mumble_cs.qm +share/mumble/locale/mumble_cy.qm share/mumble/locale/mumble_da.qm share/mumble/locale/mumble_de.qm +share/mumble/locale/mumble_el.qm +share/mumble/locale/mumble_el_GR.qm share/mumble/locale/mumble_en.qm +share/mumble/locale/mumble_en_GB.qm +share/mumble/locale/mumble_eo.qm share/mumble/locale/mumble_es.qm +share/mumble/locale/mumble_eu.qm +share/mumble/locale/mumble_fa_IR.qm +share/mumble/locale/mumble_fi.qm share/mumble/locale/mumble_fr.qm +share/mumble/locale/mumble_gl.qm share/mumble/locale/mumble_he.qm +share/mumble/locale/mumble_hi.qm share/mumble/locale/mumble_hu.qm share/mumble/locale/mumble_it.qm share/mumble/locale/mumble_ja.qm +share/mumble/locale/mumble_ko.qm +share/mumble/locale/mumble_lt.qm +share/mumble/locale/mumble_nb_NO.qm share/mumble/locale/mumble_nl.qm +share/mumble/locale/mumble_nl_BE.qm +share/mumble/locale/mumble_no.qm share/mumble/locale/mumble_pl.qm share/mumble/locale/mumble_pt_BR.qm +share/mumble/locale/mumble_pt_PT.qm +share/mumble/locale/mumble_ro.qm share/mumble/locale/mumble_ru.qm +share/mumble/locale/mumble_sk.qm share/mumble/locale/mumble_sv.qm +share/mumble/locale/mumble_te.qm +share/mumble/locale/mumble_th.qm share/mumble/locale/mumble_tr.qm +share/mumble/locale/mumble_uk.qm +share/mumble/locale/mumble_vi.qm share/mumble/locale/mumble_zh_CN.qm +share/mumble/locale/mumble_zh_HK.qm share/mumble/locale/mumble_zh_TW.qm @tag gtk-update-icon-cache %D/share/icons/hicolor @tag update-desktop-database
