From owner-svn-ports-all@freebsd.org Mon Jun 4 09:34:05 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2F8DEFEC24F; Mon, 4 Jun 2018 09:34:05 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CA8207CBB5; Mon, 4 Jun 2018 09:34:04 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8FF083B68; Mon, 4 Jun 2018 09:34:04 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w549Y45q000509; Mon, 4 Jun 2018 09:34:04 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w549Y3lg000505; Mon, 4 Jun 2018 09:34:03 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201806040934.w549Y3lg000505@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Mon, 4 Jun 2018 09:34:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471535 - in head/dns/kf5-kdnssd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/dns/kf5-kdnssd: . files X-SVN-Commit-Revision: 471535 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2018 09:34:05 -0000 Author: adridg Date: Mon Jun 4 09:34:03 2018 New Revision: 471535 URL: https://svnweb.freebsd.org/changeset/ports/471535 Log: dns/kf5-kdnssd: Fix build error when compiled with MDNSRESPONDER option KDE ports build with -DQT_NO_CAST_FROM_BYTEARRAY, so the implicit cast from QByteArray to const char * is not available. Make the necessary conversion explicit. This is being upstreamed as well (but would only land in 5.48 or later). PR: 228735 Submitted by: ashish Reported by: ashish Reviewed by: tcberner Added: head/dns/kf5-kdnssd/files/ head/dns/kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp (contents, props changed) head/dns/kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp (contents, props changed) head/dns/kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp (contents, props changed) Modified: head/dns/kf5-kdnssd/Makefile Modified: head/dns/kf5-kdnssd/Makefile ============================================================================== --- head/dns/kf5-kdnssd/Makefile Mon Jun 4 08:46:46 2018 (r471534) +++ head/dns/kf5-kdnssd/Makefile Mon Jun 4 09:34:03 2018 (r471535) @@ -2,6 +2,7 @@ PORTNAME= kdnssd DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= dns kde kde-frameworks MAINTAINER= kde@FreeBSD.org Added: head/dns/kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/kf5-kdnssd/files/patch-src_mdnsd-publicservice.cpp Mon Jun 4 09:34:03 2018 (r471535) @@ -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::ConstIterator itEnd = d->m_textData.cend(); + for (QMap::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(d)) == kDNSServiceErr_NoError) { + d->setRef(ref); Added: head/dns/kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/kf5-kdnssd/files/patch-src_mdnsd-remoteservice.cpp Mon Jun 4 09:34:03 2018 (r471535) @@ -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(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(d)) + == kDNSServiceErr_NoError) { + d->setRef(ref); + } Added: head/dns/kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/kf5-kdnssd/files/patch-src_mdnsd-servicebrowser.cpp Mon Jun 4 09:34:03 2018 (r471535) @@ -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(d)) ++ domainToDNS(d->m_domain).constData(), query_callback, reinterpret_cast(d)) + == kDNSServiceErr_NoError) { + d->setRef(ref); + }