pool/mumble
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert to branch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=10
This commit is contained in:
Ludwig Nussel 2011-03-24 12:21:14 +00:00 committed by Git OBS Bridge
parent 0a7ef68020
commit 5502ef270b
3 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
0001-if-service-name-is-empty-don-t-pass-an-empty-string.diff Normal file
View File

@ -0,0 +1,28 @@
From d2a97b874e55ad156781a2762ff32ae9566de495 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Thu, 24 Mar 2011 09:04:53 +0100
Subject: [PATCH mumble] if service name is empty don't pass an empty string
DNSServiceRegister uses the local host name if the name is NULL but does nothing if it's empty
---
src/bonjour/bonjourserviceregister.cpp | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/bonjour/bonjourserviceregister.cpp b/src/bonjour/bonjourserviceregister.cpp
index a818d8c..5f82779 100644
--- a/src/bonjour/bonjourserviceregister.cpp
+++ b/src/bonjour/bonjourserviceregister.cpp
@@ -53,7 +53,9 @@ void BonjourServiceRegister::registerService(const BonjourRecord &record, quint1
}
#endif
- DNSServiceErrorType err = DNSServiceRegister(&dnssref, 0, 0, record.serviceName.toUtf8().constData(),
+ DNSServiceErrorType err = DNSServiceRegister(&dnssref, 0, 0,
+ record.serviceName.isEmpty() ? 0
+ : record.serviceName.toUtf8().constData(),
record.registeredType.toUtf8().constData(),
record.replyDomain.isEmpty() ? 0
: record.replyDomain.toUtf8().constData(), 0,
--
1.7.3.4

31
0001-register-the-local-host-name-instead-of-qsRegName-via.diff
View File

@ -1,31 +0,0 @@
From e05c7781954601d81da1770235d99e5f25b85393 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 23 Mar 2011 18:23:47 +0100
Subject: [PATCH mumble] register the local host name instead of qsRegName via bonjour
no qsRegName means not registering via bonjour. Setting qsRegName
causes a warning wrt public registration. So just use the local host
name instead.
---
src/murmur/Server.cpp | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp
index d173e9e..b52d576 100644
--- a/src/murmur/Server.cpp
+++ b/src/murmur/Server.cpp
@@ -467,8 +467,9 @@ void Server::setLiveConf(const QString &key, const QString &value) {
void Server::initBonjour() {
bsRegistration = new BonjourServer();
if (bsRegistration->bsrRegister) {
- log("Announcing server via bonjour");
- bsRegistration->bsrRegister->registerService(BonjourRecord(qsRegName, "_mumble._tcp", ""),
+ QString name = QHostInfo::localHostName();
+ log(QString("Announcing %1 via bonjour").arg(name));
+ bsRegistration->bsrRegister->registerService(BonjourRecord(name, "_mumble._tcp", ""),
usPort);
}
}
--
1.7.3.4

2
mumble.spec
View File

@ -81,7 +81,7 @@ Source2: mumble-server.init
Patch0: 0001-fix-build-error-with-capability.h.diff
Patch1: 0001-fix-user-switching.diff
Patch2: 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff
Patch3: 0001-register-the-local-host-name-instead-of-qsRegName-via.diff
Patch3: 0001-if-service-name-is-empty-don-t-pass-an-empty-string.diff
Patch50: mumble-1.2.2-buildcompare.diff
# hack, no clue about glx so no idea to fix this properly
Patch99: mumble-1.1.4-sle10glx.diff