Skip to content

Commit

Permalink
screen: fix GBK chars' rendering (termux#23096)
Browse files Browse the repository at this point in the history
  • Loading branch information
licy183 authored and bigbio2002 committed Feb 7, 2025
1 parent dd9970d commit 5707441
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 1 deletion.
5 changes: 4 additions & 1 deletion packages/screen/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ TERMUX_PKG_DESCRIPTION="Terminal multiplexer with VT100/ANSI terminal emulation"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="5.0.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/screen/screen-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971
TERMUX_PKG_DEPENDS="ncurses, termux-auth"
# libandroid-support is necessary as screen uses `wcwidth`, see #22688
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, termux-auth"
TERMUX_PKG_BUILD_DEPENDS="libcrypt"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
--with-system_screenrc=$TERMUX_PREFIX/etc/screenrc
--disable-socket-dir
--disable-pam
--enable-colors256
Expand Down
12 changes: 12 additions & 0 deletions packages/screen/issue-22688.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
This reverts https://git.savannah.gnu.org/cgit/screen.git/commit/?id=7fc842ddc6e5905da2c5961547e3ff7385bbcc44

--- a/display.c
+++ b/display.c
@@ -437,6 +437,7 @@
{

if (D_encoding == UTF8) {
+ c = (c & 255) | (unsigned char)D_rend.font << 8;
if (D_mbcs) {
c = D_mbcs;
if (D_x == D_width)

0 comments on commit 5707441

Please sign in to comment.