Attachment 193983 Details for Bug 228735 – Fix

[patch] Fix

kf5-kdnssd.diff (text/plain), 5.03 KB, created by Ashish SHUKLA on 2018-06-04 05:22:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ashish SHUKLA

Created: 2018-06-04 05:22:37 UTC

Size: 5.03 KB

patch

obsolete

>Index: kf5-kdnssd/Makefile
>===================================================================
>--- kf5-kdnssd/Makefile	(revision 471530)
>+++ kf5-kdnssd/Makefile	(working copy)
>@@ -2,6 +2,7 @@
> 
> PORTNAME=	kdnssd
> DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	dns kde kde-frameworks
> 
> MAINTAINER=	kde@FreeBSD.org
>Index: kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp
>===================================================================
>--- kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp	(nonexistent)
>+++ kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- src/mdnsd-publicservice.cpp.orig	2018-05-05 12:57:24 UTC
>++++ src/mdnsd-publicservice.cpp
>+@@ -160,7 +160,7 @@ void PublicService::publishAsync()
>+     TXTRecordCreate(&txt, 0, 0);
>+     QMap<QString, QByteArray>::ConstIterator itEnd = d->m_textData.cend();
>+     for (QMap<QString, QByteArray>::ConstIterator it = d->m_textData.cbegin(); it != itEnd; ++it) {
>+-        if (TXTRecordSetValue(&txt, it.key().toUtf8(), it.value().length(), it.value()) != kDNSServiceErr_NoError) {
>++        if (TXTRecordSetValue(&txt, it.key().toUtf8().constData(), it.value().length(), it.value().data()) != kDNSServiceErr_NoError) {
>+             TXTRecordDeallocate(&txt);
>+             emit published(false);
>+             return;
>+@@ -171,7 +171,7 @@ void PublicService::publishAsync()
>+     Q_FOREACH (const QString &subtype, d->m_subtypes) {
>+         fullType += ',' + subtype;
>+     }
>+-    if (DNSServiceRegister(&ref, 0, 0, d->m_serviceName.toUtf8(), fullType.toLatin1().constData(), domainToDNS(d->m_domain), NULL,
>++    if (DNSServiceRegister(&ref, 0, 0, d->m_serviceName.toUtf8().constData(), fullType.toLatin1().constData(), domainToDNS(d->m_domain).constData(), NULL,
>+                            htons(d->m_port), TXTRecordGetLength(&txt), TXTRecordGetBytesPtr(&txt), publish_callback,
>+                            reinterpret_cast<void *>(d)) == kDNSServiceErr_NoError) {
>+         d->setRef(ref);
>
>Property changes on: kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp
>===================================================================
>--- kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp	(nonexistent)
>+++ kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp	(working copy)
>@@ -0,0 +1,13 @@
>+--- src/mdnsd-remoteservice.cpp.orig	2018-06-04 03:21:44 UTC
>++++ src/mdnsd-remoteservice.cpp
>+@@ -82,8 +82,8 @@ void RemoteService::resolveAsync()
>+     d->m_resolved = false;
>+     //qDebug() << this << ":Starting resolve of : " << d->m_serviceName << " " << d->m_type << " " << d->m_domain << "\n";
>+     DNSServiceRef ref;
>+-    if (DNSServiceResolve(&ref, 0, 0, d->m_serviceName.toUtf8(), d->m_type.toLatin1().constData(),
>+-                          domainToDNS(d->m_domain), (DNSServiceResolveReply)resolve_callback, reinterpret_cast<void *>(d))
>++    if (DNSServiceResolve(&ref, 0, 0, d->m_serviceName.toUtf8().constData(), d->m_type.toLatin1().constData(),
>++                          domainToDNS(d->m_domain).constData(), (DNSServiceResolveReply)resolve_callback, reinterpret_cast<void *>(d))
>+             == kDNSServiceErr_NoError) {
>+         d->setRef(ref);
>+     }
>
>Property changes on: kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp
>===================================================================
>--- kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp	(nonexistent)
>+++ kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/mdnsd-servicebrowser.cpp.orig	2018-05-05 12:57:24 UTC
>++++ src/mdnsd-servicebrowser.cpp
>+@@ -100,7 +100,7 @@ void ServiceBrowser::startBrowse()
>+         fullType = d->m_subtype + "._sub." + d->m_type;
>+     }
>+     if (DNSServiceBrowse(&ref, 0, 0, fullType.toLatin1().constData(),
>+-                         domainToDNS(d->m_domain), query_callback, reinterpret_cast<void *>(d))
>++                         domainToDNS(d->m_domain).constData(), query_callback, reinterpret_cast<void *>(d))
>+             == kDNSServiceErr_NoError) {
>+         d->setRef(ref);
>+     }
>
>Property changes on: kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

ashish: maintainer-approval? (ashish)

Actions: View | Diff

Attachments on bug 228735: 193983