diff options
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourRecord.h (renamed from src/bonjour/BonjourRecord.h) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp (renamed from src/bonjour/BonjourServiceBrowser.cpp) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourServiceBrowser.h (renamed from src/bonjour/BonjourServiceBrowser.h) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourServiceRegister.cpp (renamed from src/bonjour/BonjourServiceRegister.cpp) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourServiceRegister.h (renamed from src/bonjour/BonjourServiceRegister.h) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourServiceResolver.cpp (renamed from src/bonjour/BonjourServiceResolver.cpp) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/BonjourServiceResolver.h (renamed from src/bonjour/BonjourServiceResolver.h) | 0 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/LICENSE | 25 | ||||
-rw-r--r-- | 3rdparty/qqbonjour-src/README | 13 | ||||
-rwxr-xr-x | scripts/mklic.pl | 3 | ||||
-rw-r--r-- | src/mumble/licenses.h | 30 | ||||
-rw-r--r-- | src/mumble/mumble.pro | 13 | ||||
-rw-r--r-- | src/murmur/murmur.pro | 11 |
13 files changed, 87 insertions, 8 deletions
diff --git a/src/bonjour/BonjourRecord.h b/3rdparty/qqbonjour-src/BonjourRecord.h index 3bf553eb1..3bf553eb1 100644 --- a/src/bonjour/BonjourRecord.h +++ b/3rdparty/qqbonjour-src/BonjourRecord.h diff --git a/src/bonjour/BonjourServiceBrowser.cpp b/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp index ce30e5f66..ce30e5f66 100644 --- a/src/bonjour/BonjourServiceBrowser.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp diff --git a/src/bonjour/BonjourServiceBrowser.h b/3rdparty/qqbonjour-src/BonjourServiceBrowser.h index 0bc0c743a..0bc0c743a 100644 --- a/src/bonjour/BonjourServiceBrowser.h +++ b/3rdparty/qqbonjour-src/BonjourServiceBrowser.h diff --git a/src/bonjour/BonjourServiceRegister.cpp b/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp index 110f06aca..110f06aca 100644 --- a/src/bonjour/BonjourServiceRegister.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceRegister.cpp diff --git a/src/bonjour/BonjourServiceRegister.h b/3rdparty/qqbonjour-src/BonjourServiceRegister.h index 6b37749c3..6b37749c3 100644 --- a/src/bonjour/BonjourServiceRegister.h +++ b/3rdparty/qqbonjour-src/BonjourServiceRegister.h diff --git a/src/bonjour/BonjourServiceResolver.cpp b/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp index 503f24c97..503f24c97 100644 --- a/src/bonjour/BonjourServiceResolver.cpp +++ b/3rdparty/qqbonjour-src/BonjourServiceResolver.cpp diff --git a/src/bonjour/BonjourServiceResolver.h b/3rdparty/qqbonjour-src/BonjourServiceResolver.h index d2a669ea1..d2a669ea1 100644 --- a/src/bonjour/BonjourServiceResolver.h +++ b/3rdparty/qqbonjour-src/BonjourServiceResolver.h diff --git a/3rdparty/qqbonjour-src/LICENSE b/3rdparty/qqbonjour-src/LICENSE new file mode 100644 index 000000000..0d974d830 --- /dev/null +++ b/3rdparty/qqbonjour-src/LICENSE @@ -0,0 +1,25 @@ +Copyright (c) 2007, Trenton Schulz + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/3rdparty/qqbonjour-src/README b/3rdparty/qqbonjour-src/README new file mode 100644 index 000000000..c13703607 --- /dev/null +++ b/3rdparty/qqbonjour-src/README @@ -0,0 +1,13 @@ +The files in this directory are originally from an article +in Qt Quarterly 23: + +https://doc.qt.io/archives/qq/qq23-bonjour.html + +The files in this directory are used directly in the +Mumble and Murmur build. Because of this, there is no +"qqbonjour-build" directory. + +These files are modified and are now de facto maintained by +the Mumble project. + +For information about the license, see the LICENSE file. diff --git a/scripts/mklic.pl b/scripts/mklic.pl index ee3689475..7dd1f8491 100755 --- a/scripts/mklic.pl +++ b/scripts/mklic.pl @@ -79,7 +79,8 @@ my @thirdPartyLicenses = ( "Additional Qt translations", "https://www.virtualbox.org/ticket/2018", "USING_BUNDLED_QT_TRANSLATIONS"], ["licenseFilterSvg", "../icons/filter.txt", "filter.svg icon", "https://commons.wikimedia.org/wiki/File:Filter.svg"], ["licenseEmojiOne", "../3rdPartyLicenses/cc_by_sa_40_legalcode.txt", "Emoji One artwork", "http://emojione.com/"], - ["licenseXInputCheck", "../3rdparty/xinputcheck-src/COPYING.txt", "XInputCheck (SDL_IsXInput function)", "https://www.libsdl.org/"] + ["licenseXInputCheck", "../3rdparty/xinputcheck-src/COPYING.txt", "XInputCheck (SDL_IsXInput function)", "https://www.libsdl.org/"], + ["licenseQQBonjour", "../3rdparty/qqbonjour-src/LICENSE", "QQBonjour", "https://doc.qt.io/archives/qq/qq23-bonjour.html"] ); # Print 3rd party licenses diff --git a/src/mumble/licenses.h b/src/mumble/licenses.h index d0d7d1f3d..6ba9e950d 100644 --- a/src/mumble/licenses.h +++ b/src/mumble/licenses.h @@ -854,7 +854,6 @@ static const char *licenseEmojiOne = static const char *licenseXInputCheck = - "\n" "Simple DirectMedia Layer\n" "Copyright (C) 1997-2016 Sam Lantinga <slouken@libsdl.org>\n" " \n" @@ -875,6 +874,34 @@ static const char *licenseXInputCheck = "3. This notice may not be removed or altered from any source distribution."; +static const char *licenseQQBonjour = + "Copyright (c) 2007, Trenton Schulz\n" + "\n" + "Redistribution and use in source and binary forms, with or without\n" + "modification, are permitted provided that the following conditions are met:\n" + "\n" + " 1. Redistributions of source code must retain the above copyright notice,\n" + " this list of conditions and the following disclaimer.\n" + "\n" + " 2. Redistributions in binary form must reproduce the above copyright notice,\n" + " this list of conditions and the following disclaimer in the documentation\n" + " and/or other materials provided with the distribution.\n" + "\n" + " 3. The name of the author may not be used to endorse or promote products\n" + " derived from this software without specific prior written permission.\n" + "\n" + "THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED\n" + "WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n" + "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO\n" + "EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n" + "SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,\n" + "PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;\n" + "OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n" + "WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR\n" + "OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n" + "ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."; + + static const ThirdPartyLicense licenses3rdParties[] = { ThirdPartyLicense("CELT", "http://www.celt-codec.org/", licenseCELT), ThirdPartyLicense("Opus", "http://www.opus-codec.org/", licenseOpus), @@ -896,6 +923,7 @@ static const ThirdPartyLicense licenses3rdParties[] = { ThirdPartyLicense("filter.svg icon", "https://commons.wikimedia.org/wiki/File:Filter.svg", licenseFilterSvg), ThirdPartyLicense("Emoji One artwork", "http://emojione.com/", licenseEmojiOne), ThirdPartyLicense("XInputCheck (SDL_IsXInput function)", "https://www.libsdl.org/", licenseXInputCheck), + ThirdPartyLicense("QQBonjour", "https://doc.qt.io/archives/qq/qq23-bonjour.html", licenseQQBonjour), ThirdPartyLicense(), }; diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro index 770dd45d0..68df5c742 100644 --- a/src/mumble/mumble.pro +++ b/src/mumble/mumble.pro @@ -251,7 +251,7 @@ FORMS *= ConfigDialog.ui \ include(translations.pri) PRECOMPILED_HEADER = mumble_pch.hpp -INCLUDEPATH *= ../bonjour +INCLUDEPATH *= ../../3rdparty/qqbonjour-src CONFIG(static) { # Ensure that static Mumble.app on Mac OS X @@ -541,8 +541,15 @@ asio { bonjour { DEFINES *= USE_BONJOUR - HEADERS *= ../bonjour/BonjourRecord.h ../bonjour/BonjourServiceResolver.h ../bonjour/BonjourServiceBrowser.h BonjourClient.h - SOURCES *= ../bonjour/BonjourServiceResolver.cpp ../bonjour/BonjourServiceBrowser.cpp BonjourClient.cpp + HEADERS *= \ + ../../3rdparty/qqbonjour-src/BonjourRecord.h \ + ../../3rdparty/qqbonjour-src/BonjourServiceResolver.h \ + ../../3rdparty/qqbonjour-src/BonjourServiceBrowser.h \ + BonjourClient.h + SOURCES *= \ + ../../3rdparty/qqbonjour-src/BonjourServiceResolver.cpp \ + ../../3rdparty/qqbonjour-src/BonjourServiceBrowser.cpp \ + BonjourClient.cpp win32 { INCLUDEPATH *= "$$BONJOUR_PATH/include" QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32" diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro index 659c99eee..33496bb7a 100644 --- a/src/murmur/murmur.pro +++ b/src/murmur/murmur.pro @@ -137,9 +137,14 @@ ice { bonjour { DEFINES *= USE_BONJOUR - HEADERS *= ../bonjour/BonjourRecord.h ../bonjour/BonjourServiceRegister.h BonjourServer.h - SOURCES *= ../bonjour/BonjourServiceRegister.cpp BonjourServer.cpp - INCLUDEPATH *= ../bonjour + HEADERS *= \ + ../../3rdparty/qqbonjour-src/BonjourRecord.h \ + ../../3rdparty/qqbonjour-src/BonjourServiceRegister.h \ + BonjourServer.h + SOURCES *= \ + ../../3rdparty/qqbonjour-src/BonjourServiceRegister.cpp \ + BonjourServer.cpp + INCLUDEPATH *= ../../3rdparty/qqbonjour-src win32 { INCLUDEPATH *= "$$BONJOUR_PATH/include" QMAKE_LIBDIR *= "$$BONJOUR_PATH/lib/win32" |