From 2a88ec3c02ab46c8b816cfa348ea53075f57a59c Mon Sep 17 00:00:00 2001
From: OBATA Akio <obache@wizdas.com>
Date: Sat, 6 Apr 2019 16:49:26 +0900
Subject: Revive NetBSD support

Catch up to TDE and OS changes

Signed-off-by: OBATA Akio <obache@wizdas.com>
---
 tdeioslave/media/mediamanager/fstabbackend.cpp   | 6 ++++--
 tdeioslave/media/mediamanager/fstabbackend.h     | 4 ++--
 tdeioslave/media/medianotifier/medianotifier.cpp | 5 ++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'tdeioslave/media')

diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp
index c0e91c228..8eca21771 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.cpp
+++ b/tdeioslave/media/mediamanager/fstabbackend.cpp
@@ -69,7 +69,7 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly)
 
 	KDirWatch::self()->startScan();
 
-#ifdef Q_OS_FREEBSD
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 	connect( &m_mtabTimer, TQT_SIGNAL( timeout() ),
 	         this, TQT_SLOT( handleMtabChange() ) );
 	m_mtabTimer.start(250);
@@ -180,7 +180,7 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly)
 void FstabBackend::handleMtabChange(bool allowNotification)
 {
 	TQStringList new_mtabIds;
-	KMountPoint::List mtab = KMountPoint::currentMountPoints();
+	KMountPoint::List mtab = KMountPoint::currentMountPoints(KMountPoint::NeedRealDeviceName);
 
 	KMountPoint::List::iterator it = mtab.begin();
 	KMountPoint::List::iterator end = mtab.end();
@@ -419,6 +419,8 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint,
 	       || devNode.find("/dev/scd")!=-1 || devNode.find("/dev/sr")!=-1
 	       // FREEBSD SPECIFIC
 	       || devNode.find("/acd")!=-1 || devNode.find("/scd")!=-1
+	       // NETBSD SPECIFIC
+	       || devNode.find("/cd")!=-1 || devNode.find("/cd")!=-1
 	        )
 	{
 		mimeType = "media/cdrom";
diff --git a/tdeioslave/media/mediamanager/fstabbackend.h b/tdeioslave/media/mediamanager/fstabbackend.h
index 24529d95a..0aed11333 100644
--- a/tdeioslave/media/mediamanager/fstabbackend.h
+++ b/tdeioslave/media/mediamanager/fstabbackend.h
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 #include <tqvariant.h>
 
-#ifdef Q_OS_FREEBSD
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 #include <tqtimer.h>
 #endif
 
@@ -60,7 +60,7 @@ private:
 	TQStringList m_mtabIds;
         TQMap<TQString, TQString> m_mtabEntries;
 	TQStringList m_fstabIds;
-#ifdef Q_OS_FREEBSD
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
 	TQTimer m_mtabTimer;
 #endif
 };
diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp
index d40c5ae27..88f58af2d 100644
--- a/tdeioslave/media/medianotifier/medianotifier.cpp
+++ b/tdeioslave/media/medianotifier/medianotifier.cpp
@@ -19,13 +19,16 @@
 
 #include "medianotifier.h"
 
-#if defined (__OpenBSD__) || defined(__FreeBSD__)
+#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__)
 #include <sys/statvfs.h>
 #include <sys/param.h>
 #include <sys/mount.h>
 #else
 #include <sys/vfs.h>
 #endif
+#if defined(__NetBSD__)
+#define statfs statvfs
+#endif
 
 #include <tqfile.h>
 #include <tqfileinfo.h>
-- 
cgit v1.2.3