Date: Mon, 23 Jul 2018 15:19:06 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475185 - head/security/keepassx/files Message-ID: <201807231519.w6NFJ606046840@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Jul 23 15:19:06 2018 New Revision: 475185 URL: https://svnweb.freebsd.org/changeset/ports/475185 Log: security/keepassx: Unbreak with Clang 6 lib/AutoTypeX11.cpp:195:16: error: assigning to 'Window' (aka 'unsigned long') from incompatible type 'nullptr_t' focusWindow = NULL; ^~~~ http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475044_s336572/logs/KeePassX-0.4.4.log Added: head/security/keepassx/files/patch-src_lib_AutoTypeGlobalX11.cpp (contents, props changed) Modified: head/security/keepassx/files/patch-src_lib_AutoTypeX11.cpp Added: head/security/keepassx/files/patch-src_lib_AutoTypeGlobalX11.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/keepassx/files/patch-src_lib_AutoTypeGlobalX11.cpp Mon Jul 23 15:19:06 2018 (r475185) @@ -0,0 +1,14 @@ +lib/AutoTypeGlobalX11.cpp:65:17: error: assigning to 'Window' (aka 'unsigned long') from incompatible type 'nullptr_t' + focusWindow = NULL; + ^~~~ +--- src/lib/AutoTypeGlobalX11.cpp.orig 2018-07-23 15:16:19 UTC ++++ src/lib/AutoTypeGlobalX11.cpp +@@ -62,7 +62,7 @@ void AutoTypeGlobalX11::perform(IEntryHandle* entry, b + focusedWindow = 0; + } + else { +- focusWindow = NULL; ++ focusWindow = 0; + } + + AutoTypeX11::perform(entry, hideWindow, nr, wasLocked); Modified: head/security/keepassx/files/patch-src_lib_AutoTypeX11.cpp ============================================================================== --- head/security/keepassx/files/patch-src_lib_AutoTypeX11.cpp Mon Jul 23 15:11:55 2018 (r475184) +++ head/security/keepassx/files/patch-src_lib_AutoTypeX11.cpp Mon Jul 23 15:19:06 2018 (r475185) @@ -1,3 +1,6 @@ +lib/AutoTypeX11.cpp:195:16: error: assigning to 'Window' (aka 'unsigned long') from incompatible type 'nullptr_t' + focusWindow = NULL; + ^~~~ --- src/lib/AutoTypeX11.cpp.orig 2009-09-13 14:43:10 UTC +++ src/lib/AutoTypeX11.cpp @@ -23,6 +23,7 @@ @@ -8,3 +11,12 @@ #ifndef GLOBAL_AUTOTYPE AutoType* autoType = NULL; +@@ -191,7 +192,7 @@ void AutoTypeX11::perform(IEntryHandle* entry, bool hi + } + + inAutoType = false; +- focusWindow = NULL; ++ focusWindow = 0; + } + + void AutoTypeX11::sleepTime(int msec){
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807231519.w6NFJ606046840>