Date: Mon, 23 May 2022 09:54:34 GMT From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 43f9f2c86ae8 - main - editors/wxhexeditor: fix the port's build on ARM Message-ID: <202205230954.24N9sYFY095611@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=43f9f2c86ae89d8285ff6fcd441b0395a292d0c1 commit 43f9f2c86ae89d8285ff6fcd441b0395a292d0c1 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2022-05-23 09:52:24 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202205230954.24N9sYFY095611>