Accepting request 66959 from games:tools

OBS-URL: https://build.opensuse.org/request/show/66959
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mumble?expand=0&rev=9

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 <ludwig.nussel@suse.de>
+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<ResolveRecord *>(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<quint16>(port);
+ 	emit rr->bsr->bonjourRecordResolved(rr->record, QString::fromUtf8(hosttarget), rr->bonjourPort);
++	delete rr;
+ }
+-- 
+1.7.3.4
+

mumble.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+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
+
+- fix plugin path
+
 -------------------------------------------------------------------
 Thu Mar 24 13:43:05 UTC 2011 - lnussel@suse.de
 

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
@@ -224,7 +226,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 \