18-kconfig-nconfig-fix-multi-byte-UTF-handling.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445
  1. From 7285996aa0006d671bb01f0d35991d254b2b2b01 Mon Sep 17 00:00:00 2001
  2. From: Brian Norris <computersforpeace@gmail.com>
  3. Date: Wed, 4 Jun 2014 00:52:31 -0700
  4. Subject: kconfig: nconfig: fix multi-byte UTF handling
  5. Currently, Kconfig descriptions that use multi-byte UTF-8 characters
  6. (such as MTD_NAND_CAFE) will have their menu entries dropped from the
  7. 'make nconfig' ncurses menu, and all subsequent entries in the same
  8. window will be omitted. This seems to be due to the ncurses 'menu'
  9. library, which does not traditionally handle UTF-8 >8-bit characters
  10. properly.
  11. The ncursesw library ('w' is for "wide") is written to handle these
  12. UTF-8 characters, and is practically a drop-in replacement at the source
  13. level. Use it by default, if available.
  14. Link: https://bugzilla.kernel.org/show_bug.cgi?id=43067
  15. Signed-off-by: Brian Norris <computersforpeace@gmail.com>
  16. Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
  17. Cc: Martin Walch <walch.martin@web.de>
  18. Acked-by: Sam Ravnborg <sam@ravnborg.org>
  19. Signed-off-by: Michal Marek <mmarek@suse.cz>
  20. ---
  21. scripts/kconfig/Makefile | 3 ++-
  22. 1 file changed, 2 insertions(+), 1 deletion(-)
  23. (limited to 'scripts/kconfig/Makefile')
  24. diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
  25. index e7bf38e..c059385 100644
  26. --- a/scripts/kconfig/Makefile
  27. +++ b/scripts/kconfig/Makefile
  28. @@ -191,7 +191,8 @@ HOSTCFLAGS_gconf.o = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
  29. HOSTLOADLIBES_mconf = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
  30. HOSTLOADLIBES_nconf = $(shell \
  31. - pkg-config --libs menu panel ncurses 2>/dev/null \
  32. + pkg-config --libs menuw panelw ncursesw 2>/dev/null \
  33. + || pkg-config --libs menu panel ncurses 2>/dev/null \
  34. || echo "-lmenu -lpanel -lncurses" )
  35. $(obj)/qconf.o: $(obj)/.tmp_qtcheck
  36. --
  37. cgit v1.1