diff options
| author | nros <nros> | 2015-04-15 14:10:15 +0000 |
|---|---|---|
| committer | nros <nros> | 2015-04-15 14:10:15 +0000 |
| commit | 8ea0cbf786816d80a1c095b805340d580b2011a6 (patch) | |
| tree | 02b32cfb2784af82d5501f1e8cc1b0842947444d /x11 | |
| parent | 2a994a5e506a1fd16ed6134f8cacf1a97ca88b8d (diff) | |
| download | pkgsrc-8ea0cbf786816d80a1c095b805340d580b2011a6.tar.gz | |
Removed unneeded part of patch.
Added comment about upstream commit and
future removal.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/qt5-qtbase/distinfo | 4 | ||||
| -rw-r--r-- | x11/qt5-qtbase/patches/patch-src_corelib_io_qstorageinfo_unix.cpp | 21 |
2 files changed, 8 insertions, 17 deletions
diff --git a/x11/qt5-qtbase/distinfo b/x11/qt5-qtbase/distinfo index e540128309c..c283a810abc 100644 --- a/x11/qt5-qtbase/distinfo +++ b/x11/qt5-qtbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2015/04/08 10:31:28 nros Exp $ +$NetBSD: distinfo,v 1.20 2015/04/15 14:10:15 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) = 0bdd882056e4015cd2277c5b53451c563895b3e7 +SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = d6a8e931c25ce2f7065047a8861728b836bdddf8 SHA1 (patch-src_gui_image_qbmphandler.cpp) = 1e540711365f056657100ec84b22789e60443c98 SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081 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 140d5bb5145..b347753e3f1 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,7 +1,9 @@ -$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.3 2015/04/08 10:31:28 nros Exp $ +$NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.4 2015/04/15 14:10:15 nros Exp $ * make statvfs available on non-NetBSD BSD platforms * NetBSD uses struct statvfs as first argument to getmntinfo * fix build on SunOS +* filed and commited upstream: http://codereview.qt-project.org/110257 + everything here is fixed in QT 5.5 --- src/corelib/io/qstorageinfo_unix.cpp.orig 2014-12-05 16:24:37.000000000 +0000 +++ src/corelib/io/qstorageinfo_unix.cpp @@ -52,6 +52,7 @@ @@ -12,26 +14,15 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.3 2015/04/08 10:31:28 nr #elif defined(Q_OS_ANDROID) # include <sys/mount.h> # include <sys/vfs.h> -@@ -63,6 +64,8 @@ +@@ -63,6 +64,7 @@ # 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 +77,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 +124,11 @@ public: +@@ -118,7 +120,11 @@ public: inline QByteArray device() const; private: #if defined(Q_OS_BSD4) @@ -44,7 +35,7 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.3 2015/04/08 10:31:28 nr int entryCount; int currentIndex; #elif defined(Q_OS_SOLARIS) -@@ -196,22 +206,22 @@ inline bool QStorageIterator::isValid() +@@ -196,22 +202,22 @@ inline bool QStorageIterator::isValid() inline bool QStorageIterator::next() { |