summaryrefslogtreecommitdiff
path: root/x11/qt4-libs
diff options
context:
space:
mode:
authorjaapb <jaapb>2012-09-12 17:02:49 +0000
committerjaapb <jaapb>2012-09-12 17:02:49 +0000
commit613ab83620895f77b0de7a000125b2a762a07e6b (patch)
tree8d6c3fa994912790b014062c79b6ff19618dac24 /x11/qt4-libs
parent4af1c6fdfe4187ff7b40d64a1523e1a017c6f353 (diff)
downloadpkgsrc-613ab83620895f77b0de7a000125b2a762a07e6b.tar.gz
Added patches to make Qt use kqueue instead of fam for file system support.
Patches submitted by Sverre Froyen, see: http://mail-index.netbsd.org/pkgsrc-users/2012/01/19/msg015577.html
Diffstat (limited to 'x11/qt4-libs')
-rw-r--r--x11/qt4-libs/Makefile3
-rw-r--r--x11/qt4-libs/distinfo4
-rw-r--r--x11/qt4-libs/patches/patch-src_corelib_io_io.pri14
-rw-r--r--x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp23
4 files changed, 42 insertions, 2 deletions
diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index b981ec45f68..1d7aa5b01b4 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.75 2012/05/24 08:07:33 adam Exp $
+# $NetBSD: Makefile,v 1.76 2012/09/12 17:02:50 jaapb Exp $
PKGNAME= qt4-libs-${QTVERSION}
COMMENT= C++ X GUI toolkit
+PKGREVISION= 1
.include "../../x11/qt4-libs/Makefile.common"
diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index 3c68504d078..3ad4457f235 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2012/07/25 11:40:50 fhajny Exp $
+$NetBSD: distinfo,v 1.77 2012/09/12 17:02:50 jaapb Exp $
SHA1 (qt-everywhere-opensource-src-4.8.2.tar.gz) = e1e2edef1d63ed677d6534d32800c2e1f7ad0e73
RMD160 (qt-everywhere-opensource-src-4.8.2.tar.gz) = 6a15077aee1e84076380787127b80c7bb97ebe86
@@ -48,5 +48,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = 10bfe59
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_features.pri) = d0053dd2732604908fcec294b2a833aeb6d93f40
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
+SHA1 (patch-src_corelib_io_io.pri) = eb8ada83d1d5ba18ec4cc8d0ab72d4a400112191
+SHA1 (patch-src_corelib_io_qfilesystemwatcher.cpp) = 3eef33da6498014a95f6ef9ff2df2eefcfd736db
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols.cpp) = 67744fd7eb821cbff5a763c85fc080270bd86922
SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
diff --git a/x11/qt4-libs/patches/patch-src_corelib_io_io.pri b/x11/qt4-libs/patches/patch-src_corelib_io_io.pri
new file mode 100644
index 00000000000..f4317963301
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_corelib_io_io.pri
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_corelib_io_io.pri,v 1.1 2012/09/12 17:02:50 jaapb Exp $
+
+Use kqueue instead of fam to monitor the file system
+--- src/corelib/io/io.pri.orig 2012-04-26 19:46:08.000000000 +0000
++++ src/corelib/io/io.pri
+@@ -103,7 +103,7 @@ win32 {
+ }
+
+ !nacl {
+- freebsd-*|macx-*|darwin-*|openbsd-*:{
++ freebsd-*|macx-*|darwin-*|openbsd-*|netbsd-*:{
+ SOURCES += io/qfilesystemwatcher_kqueue.cpp
+ HEADERS += io/qfilesystemwatcher_kqueue_p.h
+ }
diff --git a/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp b/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp
new file mode 100644
index 00000000000..176f42cb5ff
--- /dev/null
+++ b/x11/qt4-libs/patches/patch-src_corelib_io_qfilesystemwatcher.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_corelib_io_qfilesystemwatcher.cpp,v 1.1 2012/09/12 17:02:50 jaapb Exp $
+
+Use kqueue instead of fam to monitor the file system
+--- src/corelib/io/qfilesystemwatcher.cpp.orig 2012-04-26 19:46:08.000000000 +0000
++++ src/corelib/io/qfilesystemwatcher.cpp
+@@ -57,7 +57,7 @@
+ #elif defined(Q_OS_LINUX)
+ # include "qfilesystemwatcher_inotify_p.h"
+ # include "qfilesystemwatcher_dnotify_p.h"
+-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD)
+ # if (defined Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+ # include "qfilesystemwatcher_fsevents_p.h"
+ # endif //MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+@@ -253,7 +253,7 @@ QFileSystemWatcherEngine *QFileSystemWat
+ if(!eng)
+ eng = QDnotifyFileSystemWatcherEngine::create();
+ return eng;
+-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
++#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC) || defined(Q_OS_NETBSD)
+ # if 0 && defined(Q_OS_MAC) && (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
+ if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5)
+ return QFSEventsFileSystemWatcherEngine::create();