On at Feb 15, 2020 at 05:47:51PM +0100, Solene Rapenne wrote: > On Sat, Feb 15, 2020 at 04:00:31PM +0100, Rafael Sadowski wrote: > > On Sat Feb 15, 2020 at 03:44:37PM +0100, Solene Rapenne wrote: > > > On Sat, Feb 15, 2020 at 02:31:45PM +0100, Rafael Sadowski wrote: > > > > 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. > > > > > > > > > > thank you! Now I hit an error while compiling. I freshly updated my > > > packages and also my ports tree > > > > > > > Sorry Solene, no my ports day. > > > > > > this patch work :) Mumble 1.3.0 work correctly, but it can't connect to > some older servers, it will complain that the server is using old > crypto, I'm not sure it's worth an entry in current.html though. It's > totally not an issue with mumble 1.3.0 of course.
I don't think that's necessary. If you want to write something, go ahead. > > infrastructure/bin/portcheck says > LIB_DEPENDS audio/portaudio-svn not needed for audio/mumble ? Fixed that issue and also added jack as a dependency. > > Thank you for taking care of mumble, I really think it's important to > keep it working :) > OK for the diff below? 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 20 Feb 2020 09:19:12 -0000 @@ -2,27 +2,23 @@ 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} - -COMPILER = base-clang ports-gcc +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5DBus Qt5Gui Qt5Network +WANTLIB += Qt5Sql Qt5Svg Qt5Widgets Qt5Xml X11 Xi c crypto jack +WANTLIB += m opus protobuf sndfile speex speexdsp ssl -MODULES = devel/qmake x11/qt4 +MODULES = devel/qmake x11/qt5 SEPARATE_BUILD = No BUILD_DEPENDS = audio/celt07 \ @@ -30,9 +26,10 @@ BUILD_DEPENDS = audio/celt07 \ LIB_DEPENDS = audio/libsndfile>=1.0.25p0 \ audio/opus \ - audio/portaudio-svn \ + audio/jack \ audio/speex \ - devel/protobuf + devel/protobuf \ + x11/qt5/qtsvg RUN_DEPENDS = audio/celt07 \ audio/celt=0.11.1v1 \ 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 20 Feb 2020 09:19:12 -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 20 Feb 2020 09:19:12 -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 20 Feb 2020 09:19:12 -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 20 Feb 2020 09:19:12 -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 20 Feb 2020 09:19:12 -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 20 Feb 2020 09:19:12 -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(celt_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 20 Feb 2020 09:19:12 -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 20 Feb 2020 09:19:12 -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
