From owner-svn-ports-all@freebsd.org Mon Jul 23 15:19:07 2018 Return-Path: Delivered-To: svn-ports-all@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 9B3E0104DA2F; Mon, 23 Jul 2018 15:19:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3729180EBE; Mon, 23 Jul 2018 15:19:07 +0000 (UTC) (envelope-from tobik@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 086211E384; Mon, 23 Jul 2018 15:19:07 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6NFJ6Rv046841; Mon, 23 Jul 2018 15:19:06 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6NFJ606046840; Mon, 23 Jul 2018 15:19:06 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201807231519.w6NFJ606046840@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Mon, 23 Jul 2018 15:19:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475185 - head/security/keepassx/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/security/keepassx/files X-SVN-Commit-Revision: 475185 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 15:19:07 -0000 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){