Fix build on smartos.

2 files changed, 52 insertions, 6 deletions

diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo
index 8c1fc8a166c..1428f31c52b 100644
--- a/x11/qt5-qtbase/distinfo
+++ b/x11/qt5-qtbase/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2015/01/06 23:00:16 joerg Exp $
+$NetBSD: distinfo,v 1.16 2015/02/14 22:12:34 nros Exp $
 
 SHA1 (qtbase-opensource-src-5.4.0.tar.xz) = 2e3d32f32e36a92782ca66c260940824746900bd
 RMD160 (qtbase-opensource-src-5.4.0.tar.xz) = 0df3e024b331c705e895fb5bb76cacd71c6e4909
@@ -18,7 +18,7 @@ SHA1 (patch-src_corelib_codecs_qiconvcodec.cpp) = c206e4bea1a25b9c8dc301b0cc7a66
 SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a749109ad5fbcb2180
 SHA1 (patch-src_corelib_io_io.pri) = c4bb37370849bfbc994809825ff94090d71a7116
 SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 7732cae95975af17e0618667b979c3b84d51adae
-SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 6d7f9dc13dabfbdac0d71662794d7fad8b0cf215
+SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 271f12fc32ffea7c72e62e8add20abf6939b275a
 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
 SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
 SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
diff --git a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
index ed4cffc5d95..a6ebbd0059a 100644
--- a/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
+++ b/x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
@@ -1,8 +1,27 @@
-$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
-
---- src/corelib/io/qstorageinfo_unix.cpp.orig	2014-12-17 11:12:56.000000000 +0000
+$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.2 2015/02/14 22:12:34 nros Exp $
+* fix build on SunOS
+--- src/corelib/io/qstorageinfo_unix.cpp.orig	2014-12-05 16:24:37.000000000 +0000
 +++ src/corelib/io/qstorageinfo_unix.cpp
-@@ -118,7 +118,7 @@ public:
+@@ -63,6 +63,8 @@
+ #  include <sys/statvfs.h>
+ #elif defined(Q_OS_SOLARIS)
+ #  include <sys/mnttab.h>
++#  include <sys/types.h>
++#  include <sys/statvfs.h>
+ #endif
+ 
+ #if defined(Q_OS_BSD4)
+@@ -74,6 +76,9 @@
+ #  if !defined(ST_RDONLY)
+ #    define ST_RDONLY 1 // hack for missing define on Android
+ #  endif
++#elif defined(Q_OS_SOLARIS)
++#  define QT_STATFSBUF struct statvfs
++#  define QT_STATFS    ::statvfs
+ #else
+ #  if defined(QT_LARGEFILE_SUPPORT)
+ #    define QT_STATFSBUF struct statvfs64
+@@ -118,7 +123,7 @@ public:
      inline QByteArray device() const;
  private:
  #if defined(Q_OS_BSD4)
@@ -11,3 +30,30 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.1 2014/12/30 17:23:46 ad
      int entryCount;
      int currentIndex;
  #elif defined(Q_OS_SOLARIS)
+@@ -196,22 +201,22 @@ inline bool QStorageIterator::isValid()
+ 
+ inline bool QStorageIterator::next()
+ {
+-    return ::getmntent(fp, &mnt) == Q_NULLPTR;
++    return ::getmntent(fp, &mnt) == 0;
+ }
+ 
+ inline QString QStorageIterator::rootPath() const
+ {
+-    return QFile::decodeName(mnt->mnt_mountp);
++    return QFile::decodeName(mnt.mnt_mountp);
+ }
+ 
+ inline QByteArray QStorageIterator::fileSystemType() const
+ {
+-    return QByteArray(mnt->mnt_fstype);
++    return QByteArray(mnt.mnt_fstype);
+ }
+ 
+ inline QByteArray QStorageIterator::device() const
+ {
+-    return QByteArray(mnt->mnt_mntopts);
++    return QByteArray(mnt.mnt_mntopts);
+ }
+ 
+ #elif defined(Q_OS_ANDROID)