[csw-devel] SF.net SVN: gar:[4225] csw/mgar/pkg/xterm/trunk

[skayser at users.sourceforge.net]

Revision: 4225
          http://gar.svn.sourceforge.net/gar/?rev=4225&view=rev
Author:   skayser
Date:     2009-04-08 12:56:18 +0000 (Wed, 08 Apr 2009)

Log Message:
-----------
xterm: added fix for ACS chars in UTF-8 mode, added README.CSW

Modified Paths:
--------------
    csw/mgar/pkg/xterm/trunk/Makefile
    csw/mgar/pkg/xterm/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/xterm/trunk/files/README.CSW
    csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff

Modified: csw/mgar/pkg/xterm/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xterm/trunk/Makefile	2009-04-08 00:34:16 UTC (rev 4224)
+++ csw/mgar/pkg/xterm/trunk/Makefile	2009-04-08 12:56:18 UTC (rev 4225)
@@ -16,6 +16,10 @@
 
 REQUIRED_PKGS = CSWfconfig CSWlibxft2
 
+# enable -mk_width per default to address unicode form character width woes, 
+# can be taken out once upstream enhances wcwidth() sanity checking 
+#   http://article.gmane.org/gmane.comp.lib.ncurses.bugs/3795
+PATCHFILES = patch-mkwidth.diff
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
@@ -47,3 +51,8 @@
 EXTRA_INC = $(includedir)/freetype2
 
 include gar/category.mk
+
+post-install-modulated:
+	@ginstall -d $(DESTDIR)$(docdir)/$(GARNAME)
+	@cp $(FILEDIR)/README.CSW $(DESTDIR)$(docdir)/$(GARNAME)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/xterm/trunk/checksums
===================================================================
--- csw/mgar/pkg/xterm/trunk/checksums	2009-04-08 00:34:16 UTC (rev 4224)
+++ csw/mgar/pkg/xterm/trunk/checksums	2009-04-08 12:56:18 UTC (rev 4225)
@@ -1 +1,2 @@
 be25d2d3661d0bb77fc66e1bcbb3caba  download/xterm-243.tgz
+347f24b7ed3e42a3d40b1db1ed0061f0  download/patch-mkwidth.diff

Added: csw/mgar/pkg/xterm/trunk/files/README.CSW
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/README.CSW	                        (rev 0)
+++ csw/mgar/pkg/xterm/trunk/files/README.CSW	2009-04-08 12:56:18 UTC (rev 4225)
@@ -0,0 +1,22 @@
+Note: app-defaults in /opt/csw/lib/X11/app-defaults
+---------------------------------------------------
+
+Although this package delivers some x resource files in
+/opt/csw/lib/X11/app-defaults/ this folder is not evaluated by the
+Solaris libXt per default. 
+
+Either treat them as example files and copy and paste what you need into
+your system / personal x resource files or set XFILESEARCHPATH /
+XUSERFILESEARCHPATH to honor this directory.
+
+  http://www.faqs.org/faqs/x-faq/part2/section-22.html
+
+
+Note: mkWidth/-mk_width activated per default
+---------------------------------------------
+
+This xterm has been adjusted to set the mkWidth resource to true per
+default (xterm command line argument -mk_width), which works around some
+bugs with box drawing characters and Solaris locales. In case you want
+to restore the default behaviour, either start xterm with +mk_width or
+set the mkWidth resource to false.

Added: csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff
===================================================================
--- csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff	                        (rev 0)
+++ csw/mgar/pkg/xterm/trunk/files/patch-mkwidth.diff	2009-04-08 12:56:18 UTC (rev 4225)
@@ -0,0 +1,12 @@
+diff --speed-large-files --minimal -Nru xterm-243.orig/charproc.c xterm-243/charproc.c
+--- xterm-243.orig/charproc.c	2009-03-29 01:23:12.000000000 +0100
++++ xterm-243/charproc.c	2009-04-08 14:09:42.224460743 +0200
+@@ -662,7 +662,7 @@
+ 
+ #if OPT_WIDE_CHARS
+     Bres(XtNcjkWidth, XtCCjkWidth, misc.cjk_width, False),
+-    Bres(XtNmkWidth, XtCMkWidth, misc.mk_width, False),
++    Bres(XtNmkWidth, XtCMkWidth, misc.mk_width, True),
+     Bres(XtNutf8Latin1, XtCUtf8Latin1, screen.utf8_latin1, False),
+     Bres(XtNutf8Title, XtCUtf8Title, screen.utf8_title, False),
+     Bres(XtNvt100Graphics, XtCVT100Graphics, screen.vt100_graphics, True),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.