From 37e24a807bcae74d30827be55d035fb2f97c82c07b580a2542c31b869c428a0b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 28 Mar 2011 08:54:20 +0000 Subject: [PATCH 1/3] Updating link to change in openSUSE:Factory/mumble revision 8.0 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=c287574d8c78f3939d1a38633162d10a --- mumble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mumble.spec b/mumble.spec index 69c72ed..9ccfd74 100644 --- a/mumble.spec +++ b/mumble.spec @@ -432,4 +432,5 @@ getent passwd mumble-server >/dev/null || \ %endif %config /etc/tmpfiles.d/mumble-server.conf %endif + %changelog From 5a60dd0f8c13a5c2306d098bd7db39eee6d06579d83fb186248a7afb29d36ba8 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Sun, 3 Apr 2011 10:28:18 +0000 Subject: [PATCH 2/3] - fix plugin path OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=16 --- mumble.changes | 5 +++++ mumble.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mumble.changes b/mumble.changes index fbc967e..aeb4281 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Apr 3 10:28:09 UTC 2011 - lnussel@suse.de + +- fix plugin path + ------------------------------------------------------------------- Thu Mar 24 13:43:05 UTC 2011 - lnussel@suse.de diff --git a/mumble.spec b/mumble.spec index 9ccfd74..368781b 100644 --- a/mumble.spec +++ b/mumble.spec @@ -224,7 +224,7 @@ qmake \ QMAKE_CXXFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \ DEFINES*=NO_UPDATE_CHECK \ DEFINES*=MUMBLE_VERSION=%version \ - DEFINES*=PLUGIN_PATH=%{_libdir}/mumble \ + DEFINES*=PLUGIN_PATH=%{_libdir}/mumble/plugins \ CONFIG*=packaged \ %if 0%{?suse_version} DEFINES*=SYSTEM_CA_DIR=/etc/ssl/certs \ From bfee8d9226ff2a38ae1bb668aa2d1bacf3dfa563b5e2303ab0acdcae0bc3f690 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 11 Apr 2011 12:58:42 +0000 Subject: [PATCH 3/3] - fix bonjour support OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=17 --- ...onjour-support-using-avahi-compat-lib.diff | 47 +++++++++++++++++++ mumble.changes | 5 ++ mumble.spec | 2 + 3 files changed, 54 insertions(+) create mode 100644 0001-fix-bonjour-support-using-avahi-compat-lib.diff diff --git a/0001-fix-bonjour-support-using-avahi-compat-lib.diff b/0001-fix-bonjour-support-using-avahi-compat-lib.diff new file mode 100644 index 0000000..e29dd7d --- /dev/null +++ b/0001-fix-bonjour-support-using-avahi-compat-lib.diff @@ -0,0 +1,47 @@ +From bb366a77262db2f14159a25c624183bffcf2efb8 Mon Sep 17 00:00:00 2001 +From: Ludwig Nussel +Date: Mon, 11 Apr 2011 14:56:25 +0200 +Subject: [PATCH mumble] fix bonjour support using avahi compat lib + +several reads may be required until the resolved callback fires so don't delete record in the read callback. +--- + src/bonjour/bonjourserviceresolver.cpp | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/bonjour/bonjourserviceresolver.cpp b/src/bonjour/bonjourserviceresolver.cpp +index 534095c..3bbdc66 100644 +--- a/src/bonjour/bonjourserviceresolver.cpp ++++ b/src/bonjour/bonjourserviceresolver.cpp +@@ -77,7 +77,6 @@ void BonjourServiceResolver::resolveBonjourRecord(const BonjourRecord &record) { + + void BonjourServiceResolver::bonjourSocketReadyRead(int sockfd) { + ResolveRecord *rr = qmResolvers.value(sockfd); +- qmResolvers.remove(sockfd); + + if (! rr) + return; +@@ -86,7 +85,6 @@ void BonjourServiceResolver::bonjourSocketReadyRead(int sockfd) { + if (err != kDNSServiceErr_NoError) + emit error(rr->record, err); + +- delete rr; + } + + +@@ -95,6 +93,7 @@ void BonjourServiceResolver::bonjourResolveReply(DNSServiceRef, DNSServiceFlags + const char *, const char *hosttarget, quint16 port, + quint16 , const char *, void *context) { + ResolveRecord *rr = static_cast(context); ++ rr->bsr->qmResolvers.remove(DNSServiceRefSockFD(rr->dnssref)); + + if (errorCode != kDNSServiceErr_NoError) { + emit rr->bsr->error(rr->record, errorCode); +@@ -102,4 +101,5 @@ void BonjourServiceResolver::bonjourResolveReply(DNSServiceRef, DNSServiceFlags + } + rr->bonjourPort = qFromBigEndian(port); + emit rr->bsr->bonjourRecordResolved(rr->record, QString::fromUtf8(hosttarget), rr->bonjourPort); ++ delete rr; + } +-- +1.7.3.4 + diff --git a/mumble.changes b/mumble.changes index aeb4281..6e57897 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Apr 11 12:58:26 UTC 2011 - lnussel@suse.de + +- fix bonjour support + ------------------------------------------------------------------- Sun Apr 3 10:28:09 UTC 2011 - lnussel@suse.de diff --git a/mumble.spec b/mumble.spec index 368781b..9d0576a 100644 --- a/mumble.spec +++ b/mumble.spec @@ -101,6 +101,7 @@ Patch1: 0001-fix-user-switching.diff Patch2: 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff Patch3: 0001-if-service-name-is-empty-don-t-pass-an-empty-string.diff Patch4: 0001-remove-CAP_NET_ADMIN.diff +Patch5: 0001-fix-bonjour-support-using-avahi-compat-lib.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 @@ -169,6 +170,7 @@ won't be audible to other players. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 # %patch50 -p1 %if 0%{?suse_version} && 0%{?suse_version} < 1020