From owner-svn-ports-head@freebsd.org Sat Mar 9 21:00:41 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A194E1536E17; Sat, 9 Mar 2019 21:00:41 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 41767725CF; Sat, 9 Mar 2019 21:00:41 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 35DF518C37; Sat, 9 Mar 2019 21:00:41 +0000 (UTC) (envelope-from cmt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x29L0fhd087641; Sat, 9 Mar 2019 21:00:41 GMT (envelope-from cmt@FreeBSD.org) Received: (from cmt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x29L0eRg087640; Sat, 9 Mar 2019 21:00:40 GMT (envelope-from cmt@FreeBSD.org) Message-Id: <201903092100.x29L0eRg087640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cmt set sender to cmt@FreeBSD.org using -f From: Christoph Moench-Tegeder Date: Sat, 9 Mar 2019 21:00:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495200 - in head/x11-toolkits/wxgtk30: . files X-SVN-Group: ports-head X-SVN-Commit-Author: cmt X-SVN-Commit-Paths: in head/x11-toolkits/wxgtk30: . files X-SVN-Commit-Revision: 495200 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 41767725CF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.953,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 21:00:42 -0000 Author: cmt Date: Sat Mar 9 21:00:40 2019 New Revision: 495200 URL: https://svnweb.freebsd.org/changeset/ports/495200 Log: wxgtk30: fix format strings for printing kevent data WxWidgets can watch for filesystem changes via kevent(2). To aid debugging, incoming events are passed to a logging function (log level TRACE, which will be discarded unless explicitely enabled). The format strings used here did not match FreeBSD's struct kevent, and this mismatch triggered an assertion inside wx. (The assertion message was ./include/wx/strvararg.h(456): assert "(argtype & (wxFormatStringSpecifier::value)) == argtype" failed in wxArgNormalizer(): format specifier doesn't match argument type for your search engine's reference). (Observed e.g. in cad/kicad when (auto-)saving a project, where the assertion failure was passed as an error dialog to the GUI - having this pop up when saving your work does not instill confidence). This patch uses the format specifiers from inttypes.h and accounts for the changes to struct kevent between FreeBSD 11 and 12. NB: wxgtk31 has similar code in the same place, with some improvements, but IMO the fix is incomplete (it doesn't account for 11 vs 12). Maintainer will be notified. Added: head/x11-toolkits/wxgtk30/files/patch-src_unix_fswatcher__kqueue.cpp (contents, props changed) Modified: head/x11-toolkits/wxgtk30/Makefile Modified: head/x11-toolkits/wxgtk30/Makefile ============================================================================== --- head/x11-toolkits/wxgtk30/Makefile Sat Mar 9 20:37:00 2019 (r495199) +++ head/x11-toolkits/wxgtk30/Makefile Sat Mar 9 21:00:40 2019 (r495200) @@ -3,7 +3,7 @@ PORTNAME= wx PORTVERSION= 3.0.4 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits PKGNAMESUFFIX= 30-gtk3 Added: head/x11-toolkits/wxgtk30/files/patch-src_unix_fswatcher__kqueue.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/wxgtk30/files/patch-src_unix_fswatcher__kqueue.cpp Sat Mar 9 21:00:40 2019 (r495200) @@ -0,0 +1,28 @@ +--- src/unix/fswatcher_kqueue.cpp.orig 2018-03-07 17:21:58 UTC ++++ src/unix/fswatcher_kqueue.cpp +@@ -20,8 +20,10 @@ + + #ifdef wxHAS_KQUEUE + ++#include + #include + #include ++#include + + #include "wx/dynarray.h" + #include "wx/evtloop.h" +@@ -279,8 +281,12 @@ class wxFSWatcherImplKqueue : public wxFSWatcherImpl ( + { + wxASSERT_MSG(e.udata, "Null user data associated with kevent!"); + +- wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%d, filter=%d, flags=%u, " +- "fflags=%u, data=%d, user_data=%p", ++ wxLogTrace(wxTRACE_FSWATCHER, "Event: ident=%" PRIuPTR ", filter=%hd, flags=%hu, " ++#if __FreeBSD_version >= 1200033 ++ "fflags=%u, data=%" PRId64 ", user_data=%p", ++#else ++ "fflags=%u, data=%" PRIdPTR ", user_data=%p", ++#endif + e.ident, e.filter, e.flags, e.fflags, e.data, e.udata); + + // for ease of use