diff options
author | joerg <joerg@pkgsrc.org> | 2014-08-13 22:32:43 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2014-08-13 22:32:43 +0000 |
commit | 30eabe4993014c62bac680d630596ef5ecf03368 (patch) | |
tree | b5dfca9ad277f708302572fbd28d8980c013bf6b /x11/wxGTK30/patches | |
parent | df226fde9dce7d8d643736ac7eefcd41cac208cd (diff) | |
download | pkgsrc-30eabe4993014c62bac680d630596ef5ecf03368.tar.gz |
Fix build on NetBSD. Add missing libSM dependency. Sort dependencies.
Bump revision.
Diffstat (limited to 'x11/wxGTK30/patches')
-rw-r--r-- | x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp new file mode 100644 index 00000000000..d4201bb2094 --- /dev/null +++ b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp @@ -0,0 +1,32 @@ +$NetBSD: patch-src_unix_fswatcher__kqueue.cpp,v 1.1 2014/08/13 22:32:43 joerg Exp $ + +--- src/unix/fswatcher_kqueue.cpp.orig 2014-08-13 21:20:42.000000000 +0000 ++++ src/unix/fswatcher_kqueue.cpp +@@ -125,8 +125,13 @@ public: + struct kevent event; + int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR; + int flags = Watcher2NativeFlags(watch->GetFlags()); ++#ifdef __NetBSD__ ++ EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action, ++ flags, 0, (intptr_t)watch.get() ); ++#else + EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action, + flags, 0, watch.get() ); ++#endif + + // TODO more error conditions according to man + // TODO best deal with the error here +@@ -281,10 +286,11 @@ protected: + + wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%d, filter=%d, flags=%u, " + "fflags=%u, data=%d, user_data=%p", +- e.ident, e.filter, e.flags, e.fflags, e.data, e.udata); ++ e.ident, e.filter, e.flags, e.fflags, e.data, ++ (const void *)e.udata); + + // for ease of use +- wxFSWatchEntryKq& w = *(static_cast<wxFSWatchEntry*>(e.udata)); ++ wxFSWatchEntryKq& w = *(reinterpret_cast<wxFSWatchEntry*>(e.udata)); + int nflags = e.fflags; + + // clear ignored flags |