diff options
| author | wiz <wiz@pkgsrc.org> | 2019-10-16 20:43:14 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-10-16 20:43:14 +0000 |
| commit | 63068ca4396cc80a82462fce9fd485242a5f866a (patch) | |
| tree | 658bb92373f81bf6243892d59535e4574409320c /x11/wxGTK30 | |
| parent | 633f9c81e7b3f5fb2b7cd83e83ebd32591711f91 (diff) | |
| download | pkgsrc-63068ca4396cc80a82462fce9fd485242a5f866a.tar.gz | |
wxGTK30: fix build on NetBSD 9.99.14+
Diffstat (limited to 'x11/wxGTK30')
| -rw-r--r-- | x11/wxGTK30/distinfo | 4 | ||||
| -rw-r--r-- | x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp | 21 |
2 files changed, 18 insertions, 7 deletions
diff --git a/x11/wxGTK30/distinfo b/x11/wxGTK30/distinfo index 79b6922bde9..688ddfefa21 100644 --- a/x11/wxGTK30/distinfo +++ b/x11/wxGTK30/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.17 2018/08/16 12:26:49 wiz Exp $ +$NetBSD: distinfo,v 1.18 2019/10/16 20:43:14 wiz Exp $ SHA1 (wxWidgets-3.0.4.tar.bz2) = 246561a73ec5b9a5a7aaaaed46b64515dc9039ab RMD160 (wxWidgets-3.0.4.tar.bz2) = 179bcd489aec0a56a7a2890be68ee718b87a1c7a @@ -10,4 +10,4 @@ SHA1 (patch-configure) = c63471b4f1b24ab0d97846f452c3c186e2d207b5 SHA1 (patch-configure.in) = 420105dca608dcdcc6ee6a1e9b6da14049681a4e SHA1 (patch-src_tiff_configure) = 4bdb7b96231b4db0da3a0a1f7d8350ad4222080e SHA1 (patch-src_tiff_configure.ac) = de55f861e64fd0bbecc10086213dd98bd3b4f3ca -SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 29c7887590b29dd53f9cf9ea1526f1c8d9465aed +SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 6a8924975690854e9c162fed906b6ecca77874b5 diff --git a/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp index 3c7fe3e9b85..45533dee906 100644 --- a/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp +++ b/x11/wxGTK30/patches/patch-src_unix_fswatcher__kqueue.cpp @@ -1,15 +1,26 @@ -$NetBSD: patch-src_unix_fswatcher__kqueue.cpp,v 1.2 2018/08/16 11:46:25 wiz Exp $ +$NetBSD: patch-src_unix_fswatcher__kqueue.cpp,v 1.3 2019/10/16 20:43:14 wiz Exp $ Fix compilation error on NetBSD https://trac.wxwidgets.org/ticket/18199 ---- src/unix/fswatcher_kqueue.cpp.orig 2014-08-13 21:20:42.000000000 +0000 +--- src/unix/fswatcher_kqueue.cpp.orig 2018-03-07 16:55:38.000000000 +0000 +++ src/unix/fswatcher_kqueue.cpp -@@ -125,8 +125,13 @@ public: +@@ -14,6 +14,10 @@ + #pragma hdrstop + #endif + ++#ifdef __NetBSD__ ++#include <sys/param.h> ++#endif ++ + #if wxUSE_FSWATCHER + + #include "wx/fswatcher.h" +@@ -125,8 +129,13 @@ public: struct kevent event; int action = EV_ADD | EV_ENABLE | EV_CLEAR | EV_ERROR; int flags = Watcher2NativeFlags(watch->GetFlags()); -+#ifdef __NetBSD__ ++#if defined(__NetBSD__) && (__NetBSD_Version__ <= 999001400) + EV_SET( &event, watch->GetFileDescriptor(), EVFILT_VNODE, action, + flags, 0, (intptr_t)watch.get() ); +#else @@ -19,7 +30,7 @@ https://trac.wxwidgets.org/ticket/18199 // TODO more error conditions according to man // TODO best deal with the error here -@@ -281,10 +286,11 @@ protected: +@@ -281,10 +290,11 @@ protected: wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%d, filter=%d, flags=%u, " "fflags=%u, data=%d, user_data=%p", |