From nobody Mon May 23 09:54:34 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C95FD1B33841; Mon, 23 May 2022 09:54:34 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L6CNV57Kpz3CHK; Mon, 23 May 2022 09:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653299674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQjEwpS7ZHHrKwrDIh80OzFuS4/y2Ui+FZEHKiym7Oc=; b=kd/Ut5P2sBVpeiKSBxKpxFx5HhIeDLEXfTQF9liKCHZ4iuK0NvIythxxhYdTpLXAJEP3A0 kDU3Z/6EKxlMb63ESNbcc72Xn1NFUYsrxzPqzCRixpXKH02Xtj4AJBrwjpvqaJgTUYL2gf j/hxRmWqSwylAzWpPpINPG61fIjU8uQYOjnUd0U4Hdyl5K3NsiZUpOYgFFZx4v7e7tiQuQ Dk86zxxjtymqZNaC9FbGqOh2YATZCnymTHGuvDsY9T7myic+Ja3i/kUGyHsxfBIR6FsuRN yDZ+dJwcawG+kUj7suKFaqpdaN07H3CXpyPj3bCjzG0goDu1FbUXzfkEMG0zxA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8C61C5B93; Mon, 23 May 2022 09:54:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24N9sY64095612; Mon, 23 May 2022 09:54:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24N9sYFY095611; Mon, 23 May 2022 09:54:34 GMT (envelope-from git) Date: Mon, 23 May 2022 09:54:34 GMT Message-Id: <202205230954.24N9sYFY095611@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 43f9f2c86ae8 - main - editors/wxhexeditor: fix the port's build on ARM List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43f9f2c86ae89d8285ff6fcd441b0395a292d0c1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653299674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rQjEwpS7ZHHrKwrDIh80OzFuS4/y2Ui+FZEHKiym7Oc=; b=r65KKBXM95zgD19jMOltjlm0EglD0oI3mIu4o0MedzrQ958FsBP8sxLvJQcERssZ3VS/x3 elc/rKK8TWRkb0sija/TDokKcUsp8FqOuoA2pbApKQiOnOTWpI+lAg3rrU6lO098sLEz9p YktjY2y2M7SyWOZlOPLtCFw36XuMdHqrrnHlXlZBGktjVPlvpxdnpbq99iLkta5hy/56ji ODUaZWz25869qAmcIdWmwyvvQGvsyJX1Nwi3P7wSCa/TetbdXutZnUkV9G+Rah3vchTDeo 0M/wHR5JB5u/9DKu7oUZ0JFAAknBRxhXWAtETsT+OwwZh/mM6NFnXw315KvSuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653299674; a=rsa-sha256; cv=none; b=eAVp++xWyF7D2klvhBSFi9GoIboNKTyklyYqTM/+DKG8dROC5nvS9jeeCDMQ+jypA/hmcw 6GnPBbwo+33B6K7NO959ytjAu+BM8abZ6mFZgKBoPiuRzkuRDqlCai/N3pq2OKQH7jtQ94 zaupangxcVV/ecVr0WfXoKA7tpZT/7v76HB5HSLCUbvauAzNzFFFyT0k9NIg8BDs1lYdem veAso0DQ+O9sjyNKfCtV5btbHlEAYDFSJtzOw74ELxBFws75UqnrbW4v+RkvTd85LWJBc6 ucxP9h9Orc76d9D9uhGZxJX7MIqecXMbLL+JQ72YPDWqbm3sO0joOw+FX6iqiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=43f9f2c86ae89d8285ff6fcd441b0395a292d0c1 commit 43f9f2c86ae89d8285ff6fcd441b0395a292d0c1 Author: Alexey Dokuchaev AuthorDate: 2022-05-23 09:52:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2022-05-23 09:52:24 +0000 editors/wxhexeditor: fix the port's build on ARM Mixing different types in ternary expression is a bad idea. PR: 264007 --- .../files/patch-src_HexEditorCtrl_wxHexCtrl_wxHexCtrl.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/editors/wxhexeditor/files/patch-src_HexEditorCtrl_wxHexCtrl_wxHexCtrl.cpp b/editors/wxhexeditor/files/patch-src_HexEditorCtrl_wxHexCtrl_wxHexCtrl.cpp index 1fa7cc741a07..9ad2e050dbc0 100644 --- a/editors/wxhexeditor/files/patch-src_HexEditorCtrl_wxHexCtrl_wxHexCtrl.cpp +++ b/editors/wxhexeditor/files/patch-src_HexEditorCtrl_wxHexCtrl_wxHexCtrl.cpp @@ -18,3 +18,12 @@ chrC |= atoh( chr ); //chrC = (atoh( RenderedHexByte.ToAscii()[0] ) << 4) | atoh( RenderedHexByte.ToAscii()[1] ); +@@ -2365,7 +2365,7 @@ cpformat(a) + else if(i==0x7E) + newCP += wxChar(0x203E);//Overline + else if(i<0x80) +- newCP += ((i<0x20 || i==0x7F) ? '.' : wxChar(i)); ++ newCP += ((i<0x20 || i==0x7F) ? L'.' : wxChar(i)); + else if( i>=0xA1 && i<0xE0) + newCP += wxChar(i-0xA0+0xFF60); + else