kio: Various patches to fix build on SunOS.

4 files changed, 57 insertions, 2 deletions

diff --git a/devel/kio/Makefile b/devel/kio/Makefile
index ff5e44c2b8e..776194160cb 100644
--- a/devel/kio/Makefile
+++ b/devel/kio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/04/14 07:33:54 adam Exp $
+# $NetBSD: Makefile,v 1.24 2018/06/15 13:46:48 jperkin Exp $
 
 DISTNAME=	kio-${KF5VER}
 PKGREVISION=	1
@@ -14,6 +14,8 @@ USE_TOOLS+=	msgmerge
 
 CMAKE_ARGS+=	-DKAUTH_DBUS_DIR=${PREFIX}/share/examples/kio
 
+LDFLAGS.SunOS+=	-lsocket
+
 SUBST_CLASSES+=		xdg
 SUBST_STAGE.xdg=	pre-configure
 SUBST_MESSAGE.xdg=	Install via examples dir.
diff --git a/devel/kio/distinfo b/devel/kio/distinfo
index e46d8f7e3e7..f7d6159cf81 100644
--- a/devel/kio/distinfo
+++ b/devel/kio/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.5 2018/04/11 11:50:35 markd Exp $
+$NetBSD: distinfo,v 1.6 2018/06/15 13:46:48 jperkin Exp $
 
 SHA1 (kio-5.44.0.tar.xz) = 272c7fce9fbcc895204b8eeb3e75d6261d47d5fa
 RMD160 (kio-5.44.0.tar.xz) = baf8671698b24b1688510dfe3e8ed9287c946b77
 SHA512 (kio-5.44.0.tar.xz) = ec50fce1b60eda5ba637abd37a14e10d853bbf35be2d1ef48ee69681ed2f5356d919e06f0156558187f0e7bc5f642790e72af6f7554a1c72ffd445d22844429b
 Size (kio-5.44.0.tar.xz) = 3145388 bytes
 SHA1 (patch-src_core_config-kmountpoint.h.cmake) = 7da0ea584a8c10b7b5476dd91f56a284869f056c
+SHA1 (patch-src_ioslaves_file_file.cpp) = 2c6269f8a4b7a505612ff84cb247190b5f5096e6
+SHA1 (patch-src_ioslaves_file_file__unix.cpp) = 2f5350b513364099fde558745fdd608c629c07d1
 SHA1 (patch-src_ioslaves_file_sharefd_p.h) = b54cc6f5fea7fe99467b92bbea1e6120116d2f9e
diff --git a/devel/kio/patches/patch-src_ioslaves_file_file.cpp b/devel/kio/patches/patch-src_ioslaves_file_file.cpp
new file mode 100644
index 00000000000..a1d5f434155
--- /dev/null
+++ b/devel/kio/patches/patch-src_ioslaves_file_file.cpp
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_ioslaves_file_file.cpp,v 1.1 2018/06/15 13:46:48 jperkin Exp $
+
+Properly comment out debug code.
+
+--- src/ioslaves/file/file.cpp.orig	2018-03-04 11:01:29.000000000 +0000
++++ src/ioslaves/file/file.cpp
+@@ -1148,7 +1148,7 @@ void FileProtocol::unmount(const QString
+ 
+     if (volmgt_running()) {
+         // qDebug() << "VOLMGT: looking for "
+-                << _point.toLocal8Bit();
++        //        << _point.toLocal8Bit();
+ 
+         if ((mnttab = QT_FOPEN(MNTTAB, "r")) == NULL) {
+             err = QLatin1String("could not open mnttab");
+@@ -1176,8 +1176,8 @@ void FileProtocol::unmount(const QString
+         if (devname == NULL) {
+             err = QLatin1String("not in mnttab");
+             // qDebug() << "VOLMGT: "
+-                    << QFile::encodeName(_point).data()
+-                    << ": " << err;
++            //        << QFile::encodeName(_point).data()
++            //        << ": " << err;
+             error(KIO::ERR_CANNOT_UNMOUNT, err);
+             return;
+         }
diff --git a/devel/kio/patches/patch-src_ioslaves_file_file__unix.cpp b/devel/kio/patches/patch-src_ioslaves_file_file__unix.cpp
new file mode 100644
index 00000000000..8fb5ca8ff26
--- /dev/null
+++ b/devel/kio/patches/patch-src_ioslaves_file_file__unix.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_ioslaves_file_file__unix.cpp,v 1.1 2018/06/15 13:46:48 jperkin Exp $
+
+Fix HAVE_DIRENT_D_TYPE define.
+
+--- src/ioslaves/file/file_unix.cpp.orig	2018-03-04 11:01:29.000000000 +0000
++++ src/ioslaves/file/file_unix.cpp
+@@ -463,9 +463,7 @@ void FileProtocol::listDir(const QUrl &u
+     //qDebug() << "========= LIST " << url << "details=" << details << " =========";
+     UDSEntry entry;
+ 
+-#ifndef HAVE_DIRENT_D_TYPE
+     QT_STATBUF st;
+-#endif
+     QT_DIRENT *ep;
+     while ((ep = QT_READDIR(dp)) != nullptr) {
+         entry.clear();
+@@ -484,7 +482,7 @@ void FileProtocol::listDir(const QUrl &u
+          */
+         if (details == 0) {
+             entry.insert(KIO::UDSEntry::UDS_NAME, filename);
+-#ifdef HAVE_DIRENT_D_TYPE
++#if HAVE_DIRENT_D_TYPE
+             entry.insert(KIO::UDSEntry::UDS_FILE_TYPE,
+                          (ep->d_type == DT_DIR) ? S_IFDIR : S_IFREG);
+             const bool isSymLink = (ep->d_type == DT_LNK);