[Glibc-bsd-commits] r3194 - in trunk/kfreebsd-8/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2010-11-21 12:49:30 +0000 (Sun, 21 Nov 2010)
New Revision: 3194

Modified:
   trunk/kfreebsd-8/debian/changelog
   trunk/kfreebsd-8/debian/patches/106_teken_op.diff
Log:
  * Replace 106_teken_op.diff by upstream patch.



Modified: trunk/kfreebsd-8/debian/changelog
===================================================================
--- trunk/kfreebsd-8/debian/changelog	2010-11-21 11:37:44 UTC (rev 3193)
+++ trunk/kfreebsd-8/debian/changelog	2010-11-21 12:49:30 UTC (rev 3194)
@@ -7,8 +7,11 @@
     - drop firmware even as modules inside 999_firmware.diff 
   * Re-enable ulpt in kernel. Closes: #598417.
   * Raise NKPT on amd64 via 916_NKPT_amd64.diff. Closes: #596577.
+  
+  [ Aurelien Jarno ]
+  * Replace 106_teken_op.diff by upstream patch.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 16 Nov 2010 12:11:23 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Sun, 21 Nov 2010 12:07:02 +0100
 
 kfreebsd-8 (8.1-5) unstable; urgency=medium
 

Modified: trunk/kfreebsd-8/debian/patches/106_teken_op.diff
===================================================================
--- trunk/kfreebsd-8/debian/patches/106_teken_op.diff	2010-11-21 11:37:44 UTC (rev 3193)
+++ trunk/kfreebsd-8/debian/patches/106_teken_op.diff	2010-11-21 12:49:30 UTC (rev 3194)
@@ -1,34 +1,33 @@
-
-  teach how to handle orig_pair ESC sequence 
-  generated by "TERM=cons25 tput op"
-   TERM=cons25 tput op | od -ax
-  see #559364
-
---- a/sys/dev/syscons/teken/sequences
-+++ b/sys/dev/syscons/teken/sequences
-@@ -88,6 +88,7 @@
- IL	Insert line				^[ [ L		n
- IND	Index					^[ D
- NEL	Next line				^[ E
-+OP	Orig Pair				^[ [ x
- RI	Reverse index				^[ M
- RIS	Reset to Initial State			^[ c
- RM	Reset Mode				^[ [ l		r
---- a/sys/dev/syscons/teken/teken_subr.h
-+++ b/sys/dev/syscons/teken/teken_subr.h
-@@ -1056,6 +1056,15 @@
+--- a/sys/dev/syscons/teken/teken_subr_compat.h
++++ b/sys/dev/syscons/teken/teken_subr_compat.h
+@@ -75,6 +75,20 @@
+ 	    (duration & 0xffff));
  }
  
- static void
-+teken_subr_orig_pair(teken_t *t)
++static void
++teken_subr_cons25_set_graphic_rendition(teken_t *t, unsigned int cmd,
++    unsigned int param __unused)
 +{
-+	/* Set default foreground color. */
-+	t->t_curattr.ta_fgcolor = t->t_defattr.ta_fgcolor;
-+	/* Set default background color. */
-+	t->t_curattr.ta_bgcolor = t->t_defattr.ta_bgcolor;
++
++	switch (cmd) {
++	case 0: /* Reset. */
++		t->t_curattr = t->t_defattr;
++		break;
++	default:
++		teken_printf("unsupported attribute %u\n", cmd);
++	}
 +}
 +
-+static void
- teken_subr_set_graphic_rendition(teken_t *t, unsigned int ncmds,
-     unsigned int cmds[])
- {
+ #if 0
+ static void
+ teken_subr_vt52_decid(teken_t *t)
+--- a/sys/dev/syscons/teken/sequences
++++ b/sys/dev/syscons/teken/sequences
+@@ -104,6 +104,7 @@
+ C25ADFG	Cons25 set adapter foreground		^[ [ = F	r
+ C25BLPD	Cons25 set bell pitch duration		^[ [ = B	r r
+ C25CURS	Cons25 set cursor type			^[ [ = S	r
++C25SGR	Cons25 set graphic rendition		^[ [ x		r r
+ C25VTSW	Cons25 switch virtual terminal		^[ [ z		r
+ 
+ # VT52 compatibility