Skip to content
Permalink
Browse files

Move src/bonjour to 3rdparty/qqbonjour-src and add its license to the…

… third party license list.

Fixes #2160
  • Loading branch information...
mkrautz committed Mar 13, 2016
1 parent d3929c6 commit 6beb46e6311455416b16529e55a669f137a8ac92
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -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.
@@ -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.
@@ -79,7 +79,8 @@ ($$$)
"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
@@ -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(),
};

@@ -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"
@@ -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"

0 comments on commit 6beb46e

Please sign in to comment.
You can’t perform that action at this time.