diff --git a/kde/frameworks/tier2/kdnssd/fix-mac.diff b/kde/frameworks/tier2/kdnssd/fix-mac.diff new file mode 100644 index 00000000..b1f815ea --- /dev/null +++ b/kde/frameworks/tier2/kdnssd/fix-mac.diff @@ -0,0 +1,51 @@ +diff --git a/src/mdnsd-publicservice.cpp b/src/mdnsd-publicservice.cpp +index 7f39ef6..7451d71 100644 +--- a/src/mdnsd-publicservice.cpp ++++ b/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().constData()) != 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); +diff --git a/src/mdnsd-remoteservice.cpp b/src/mdnsd-remoteservice.cpp +index d15725b..88f75f3 100644 +--- a/src/mdnsd-remoteservice.cpp ++++ b/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); + } +diff --git a/src/mdnsd-servicebrowser.cpp b/src/mdnsd-servicebrowser.cpp +index 476bb17..41ec51d 100644 +--- a/src/mdnsd-servicebrowser.cpp ++++ b/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); + } + diff --git a/kde/frameworks/tier2/kdnssd/kdnssd.py b/kde/frameworks/tier2/kdnssd/kdnssd.py index 3642fd17..c49e549e 100644 --- a/kde/frameworks/tier2/kdnssd/kdnssd.py +++ b/kde/frameworks/tier2/kdnssd/kdnssd.py @@ -1,24 +1,22 @@ import info class subinfo(info.infoclass): - def registerOptions(self): - self.parent.package.categoryInfo.platforms = CraftCore.compiler.Platforms.NotMacOS - def setTargets(self): self.versionInfo.setDefaultValues() - + # https://raw.githubusercontent.com/KDE-mac/homebrew-kde/master/Formula/kf5-kdnssd.rb + self.patchToApply["5.50.0"] = [("fix-mac.diff", 1)] self.description = "KDNSSD Framework" def setDependencies(self): self.buildDependencies["virtual/base"] = "default" self.buildDependencies["kde/frameworks/extra-cmake-modules"] = "default" self.runtimeDependencies["kde/frameworks/tier1/kconfig"] = "default" from Package.CMakePackageBase import * class Package(CMakePackageBase): def __init__(self): CMakePackageBase.__init__(self)