CVS commit: pkgsrc/x11/mlterm

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Mon Dec 12 17:42:04 UTC 2022

Modified Files:
        pkgsrc/x11/mlterm: distinfo
        pkgsrc/x11/mlterm/patches: patch-uitoolkit_fb_ui__display__wscons.c

Log Message:
mlterm: remove unnecessary chunk not generated by mkpatches(1).


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 pkgsrc/x11/mlterm/distinfo
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/mlterm/distinfo
diff -u pkgsrc/x11/mlterm/distinfo:1.95 pkgsrc/x11/mlterm/distinfo:1.96
--- pkgsrc/x11/mlterm/distinfo:1.95     Sun Jul 24 08:56:54 2022
+++ pkgsrc/x11/mlterm/distinfo  Mon Dec 12 17:42:04 2022
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.95 2022/07/24 08:56:54 rin Exp $
+$NetBSD: distinfo,v 1.96 2022/12/12 17:42:04 tsutsui Exp $
 
 BLAKE2s (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3bd490eb661bc802cb05ebbb17a73956f5a62ca3838dcf5cb7baad0c01c3ebdb
 SHA512 (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 3076dafbc98a01738d88acf0e0f52e15d33862b3e9b7a851a4496f1be07ee9e51103daf7842954bcae1f1ba62bd6645b0bd60af7f66ee98721bdf3786b9fcbaf
 Size (mlterm-3.9.2/mlterm-3.9.2.tar.gz) = 4259208 bytes
 SHA1 (patch-configure) = 266b3e8383c425c7ef8cd180f07e1199890521ba
 SHA1 (patch-etc_font-fb) = 52c18f512c67ff530c0c326394fdf43956d71cb0
-SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = ab508245bf5f924853a765177509f274833631af
+SHA1 (patch-uitoolkit_fb_ui__display__wscons.c) = 5697668f9e294d313d2b9f9c670b047d3bcd8078
 SHA1 (patch-uitoolkit_xlib_ui__imagelib.c) = 4c8b3f520d9e1e4fa900b860767799ee16fa0026
 SHA1 (patch-vtemu_Makefile.in) = 172f12f73408489f782d63c8b0b7915af441d368
 SHA1 (patch-vtemu_vt__parser.c) = ac8e6c8748047778daa1fc22c971e10e58918887

Index: pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c
diff -u pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c:1.6 pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c:1.7
--- pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c:1.6      Sat Jul  9 09:40:20 2022
+++ pkgsrc/x11/mlterm/patches/patch-uitoolkit_fb_ui__display__wscons.c  Mon Dec 12 17:42:04 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-uitoolkit_fb_ui__display__wscons.c,v 1.6 2022/07/09 09:40:20 rin Exp $
+$NetBSD: patch-uitoolkit_fb_ui__display__wscons.c,v 1.7 2022/12/12 17:42:04 tsutsui Exp $
 
 Add support for 8- and 4-bpp planar fb found on NetBSD/amiga.
 
@@ -14,8 +14,8 @@ Logic to detect planar fb is not very el
 
 This has been merged to upstream, and will be in the next release.
 
---- uitoolkit/fb/ui_display_wscons.c.orig      2022-01-17 00:20:31.000000000 +0900
-+++ uitoolkit/fb/ui_display_wscons.c   2022-07-07 05:22:09.475716704 +0900
+--- uitoolkit/fb/ui_display_wscons.c.orig      2022-01-16 15:20:31.000000000 +0000
++++ uitoolkit/fb/ui_display_wscons.c
 @@ -380,8 +380,17 @@ static int open_display(u_int depth /* u
    _display.height = _disp.height = vinfo.height;
    _disp.depth = vinfo.depth;
@@ -36,15 +36,6 @@ This has been merged to upstream, and wi
      /* always 8 or less bpp */
  
      if (_disp.depth > 8) {
-@@ -394,7 +403,7 @@ static int open_display(u_int depth /* u
-     _display.shift_0 = 7;
-     _display.mask = 1;
-   } else
--#endif
-+#endif
-       if (_disp.depth < 8) {
- #ifdef ENABLE_2_4_PPB
-     _display.pixels_per_byte = 8 / _disp.depth;
 @@ -444,6 +453,19 @@ static int open_display(u_int depth /* u
      }
    } else