r549 - in x86/branches/utf8: . packages/glibc packages/nALFS

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Aug 4 08:41:59 PDT 2005


Author: alexander
Date: 2005-08-04 09:41:58 -0600 (Thu, 04 Aug 2005)
New Revision: 549

Added:
   x86/branches/utf8/packages/nALFS/nALFS-1.2.4-locale-1.patch
Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/packages/glibc/Makefile
   x86/branches/utf8/packages/nALFS/Makefile
Log:
* Fixed line drawing characters in nALFS.
* Installed the list of supported locales from glibc
  as /usr/share/i18n/SUPPORTED for documentational purpose.



Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-08-04 10:00:39 UTC (rev 548)
+++ x86/branches/utf8/BUGS	2005-08-04 15:41:58 UTC (rev 549)
@@ -16,7 +16,7 @@
   rendered by Groff as multibte ones are wrapped incorrectly.
 
 procps:
-  "watch" still doesn't display non-ASCII characters in UTF-8 locales.
+  "watch" still doesn't display non-ASCII characters in UTF-8 locales. WONTFIX.
 
 slang:
   slang 2.x supports UTF-8, but most slang-based apps either don't support
@@ -46,7 +46,7 @@
   instead of properly calculated string width).
 
 lfs-bootscripts:
-  language selector is untested.
+  language selector is not well-tested.
 
 Xorg:
   The locale-names patch is not well-tested, and the configurator installed
@@ -93,12 +93,6 @@
   easier and there is a de-facto standard for such operation:
   /charset KOI8-R
 
-nALFS:
-  Absolutely untested. Does not contain any "setlocale" call but uses ncurses.
-  This means incorrect line-drawing characters in UTF-8 locales on linux
-  console. Probably a setlocale(LC_CTYPE, "") before initscr() is sufficient
-  to fix that.
-
 mutt:
   Flowed text wrapping is wrong. To see this, run this command:
   mutt -f packages/mutt/bug

Modified: x86/branches/utf8/packages/glibc/Makefile
===================================================================
--- x86/branches/utf8/packages/glibc/Makefile	2005-08-04 10:00:39 UTC (rev 548)
+++ x86/branches/utf8/packages/glibc/Makefile	2005-08-04 15:41:58 UTC (rev 549)
@@ -31,7 +31,7 @@
 	 ../$(DIR)/configure --prefix=$(WD) --disable-profile --enable-add-ons=nptl,libidn --enable-kernel=2.6.0 \
 	 --with-binutils=$(WD)/bin --without-gd --without-cvs --with-headers=$(WD)/include --disable-selinux && \
 	 PARALLELMFLAGS=-j3 make && if [ ! -d $(WD)/etc ] ; then mkdir $(WD)/etc ; fi && \
-	 touch $(WD)/etc/ld.so.conf && make install $ ; fi
+	 touch $(WD)/etc/ld.so.conf && make install ; fi
 	@make clean
 
 chroot:
@@ -55,6 +55,7 @@
 	 --without-cvs --libexecdir=/usr/lib/glibc && \
 	 PARALLELMFLAGS=-j3 make && \
 	 touch /etc/ld.so.conf && make install && make localedata/install-locales && \
+	 install -m644 ../$(DIR)/localedata/SUPPORTED /usr/share/i18n && \
 	 make -C ../$(DIR)/linuxthreads/man && make -C ../$(DIR)/linuxthreads/man install && \
 	 cp $(ROOT)/etc/nsswitch.conf /etc && \
 	 cp --remove-destination /usr/share/zoneinfo/$(timezone) /etc/localtime && \

Modified: x86/branches/utf8/packages/nALFS/Makefile
===================================================================
--- x86/branches/utf8/packages/nALFS/Makefile	2005-08-04 10:00:39 UTC (rev 548)
+++ x86/branches/utf8/packages/nALFS/Makefile	2005-08-04 15:41:58 UTC (rev 549)
@@ -6,7 +6,7 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 URL= http://www.linuxfromscratch.org/alfs/downloads/stable/$(FILE)
-
+PATCH= $(DIR)-locale-1.patch
 #RULES
 
 .PHONY: clean chroot stage2
@@ -20,6 +20,7 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f /usr/bin/nALFS ] ; then unpack $(FILE) && cd $(DIR) && \
+	 patch -Np1 -i ../$(PATCH) && \
 	 ./configure --prefix=/usr --with-libxml2 --with-curl --with-ssl && \
 	 make -j3 && \
 	 make install ; fi

Added: x86/branches/utf8/packages/nALFS/nALFS-1.2.4-locale-1.patch
===================================================================
--- x86/branches/utf8/packages/nALFS/nALFS-1.2.4-locale-1.patch	2005-08-04 10:00:39 UTC (rev 548)
+++ x86/branches/utf8/packages/nALFS/nALFS-1.2.4-locale-1.patch	2005-08-04 15:41:58 UTC (rev 549)
@@ -0,0 +1,25 @@
+Submitted By: Alexander E. Patrakov
+Initial Package Version: 1.2.4
+Origin: Alexander E. Patrakov
+Description: In order to display line drawing characters on Linux console
+in UTF-8 mode, initscr() should be called with the correct locale.
+
+diff -ur nALFS-1.2.4.orig/src/win.c nALFS-1.2.4/src/win.c
+--- nALFS-1.2.4.orig/src/win.c	2003-11-07 03:28:22.000000000 +0500
++++ nALFS-1.2.4/src/win.c	2005-08-04 20:49:19.259677808 +0600
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <locale.h>
+ #include <curses.h>
+ 
+ #ifdef HAVE_CONFIG_H
+@@ -224,6 +225,7 @@
+ 
+ void start_display(void)
+ {
++	setlocale(LC_CTYPE, "");
+ 	initscr();
+ 	cbreak();
+ 	noecho();




More information about the livecd mailing list